diff --git a/TGS.Interface/TGS.Interface.csproj b/TGS.Interface/TGS.Interface.csproj
index ebd639db8b..a4c2eae616 100644
--- a/TGS.Interface/TGS.Interface.csproj
+++ b/TGS.Interface/TGS.Interface.csproj
@@ -65,9 +65,9 @@
     <Compile Include="Definitions.cs" />
     <Compile Include="Enumerations.cs" />
     <Compile Include="Helpers.cs" />
-    <Compile Include="IInstance.cs" />
+    <Compile Include="Wrappers\IInstance.cs" />
     <Compile Include="InstanceMetadata.cs" />
-    <Compile Include="IServer.cs" />
+    <Compile Include="Wrappers\IServer.cs" />
     <Compile Include="IServerInterface.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Components\Repository.cs" />
diff --git a/TGS.Interface/IInstance.cs b/TGS.Interface/Wrappers/IInstance.cs
similarity index 97%
rename from TGS.Interface/IInstance.cs
rename to TGS.Interface/Wrappers/IInstance.cs
index c7e17c3e99..cf1f759785 100644
--- a/TGS.Interface/IInstance.cs
+++ b/TGS.Interface/Wrappers/IInstance.cs
@@ -1,6 +1,6 @@
 using TGS.Interface.Components;
 
-namespace TGS.Interface
+namespace TGS.Interface.Wrappers
 {
 	/// <summary>
 	/// Wrapper for <see cref="ITGInstance"/> components
diff --git a/TGS.Interface/IServer.cs b/TGS.Interface/Wrappers/IServer.cs
similarity index 96%
rename from TGS.Interface/IServer.cs
rename to TGS.Interface/Wrappers/IServer.cs
index 27125a44ba..ab7038ec34 100644
--- a/TGS.Interface/IServer.cs
+++ b/TGS.Interface/Wrappers/IServer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using TGS.Interface.Components;
 
-namespace TGS.Interface
+namespace TGS.Interface.Wrappers
 {
 	/// <summary>
 	/// Wrapper representing a <see cref="ITGSService"/>