diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
index 5857c81388..1a65bdb1c0 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -58,12 +58,6 @@
     <Compile Include="Src\Debugger\Internal\ManagedCallbackProxy.cs" />
     <Compile Include="Src\Debugger\Internal\MTA2STA.cs" />
     <Compile Include="Src\Debugger\Internal\NativeMethods.cs" />
-    <Compile Include="Src\Debugger\MetaData\FieldProps.cs" />
-    <Compile Include="Src\Debugger\MetaData\MetaData.cs" />
-    <Compile Include="Src\Debugger\MetaData\MethodProps.cs" />
-    <Compile Include="Src\Debugger\MetaData\ParamProps.cs" />
-    <Compile Include="Src\Debugger\MetaData\TypeDefProps.cs" />
-    <Compile Include="Src\Debugger\MetaData\TypeRefProps.cs" />
     <Compile Include="Src\Debugger\NDebugger.cs" />
     <Compile Include="Src\Interop enums\ClassFieldAttribute.cs" />
     <Compile Include="Src\Interop enums\CorCallingConvention.cs" />
@@ -294,6 +288,12 @@
     <Compile Include="Src\Wrappers\CorDebug\ISequentialStream.cs" />
     <Compile Include="Src\Wrappers\CorDebug\IStream.cs" />
     <Compile Include="Src\Wrappers\ResourceManager.cs" />
+    <Compile Include="Src\Wrappers\MetaData\FieldProps.cs" />
+    <Compile Include="Src\Wrappers\MetaData\MetaData.cs" />
+    <Compile Include="Src\Wrappers\MetaData\MethodProps.cs" />
+    <Compile Include="Src\Wrappers\MetaData\ParamProps.cs" />
+    <Compile Include="Src\Wrappers\MetaData\TypeDefProps.cs" />
+    <Compile Include="Src\Wrappers\MetaData\TypeRefProps.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="README.TXT" />
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/FieldProps.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/FieldProps.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/FieldProps.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/FieldProps.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/MetaData.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/MetaData.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/MetaData.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/MetaData.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/MethodProps.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/MethodProps.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/MethodProps.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/MethodProps.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/ParamProps.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/ParamProps.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/ParamProps.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/ParamProps.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/TypeDefProps.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/TypeDefProps.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/TypeDefProps.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/TypeDefProps.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/TypeRefProps.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/TypeRefProps.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/MetaData/TypeRefProps.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Wrappers/MetaData/TypeRefProps.cs