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 3f383fc400..e05b135c32 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -204,13 +204,13 @@
     <Compile Include="Src\Interop\Enums\CorTokenType.cs" />
     <Compile Include="Src\Interop\MetaData\COR_FIELD_OFFSET.cs" />
     <Compile Include="Src\Interop\MetaData\IMetaDataImport.cs" />
-    <Compile Include="Src\Metadata\DebugFieldInfo.cs" />
-    <Compile Include="Src\Metadata\DebugLocalVariableInfo.cs" />
-    <Compile Include="Src\Metadata\DebugMethodInfo.cs" />
-    <Compile Include="Src\Metadata\DebugParameterInfo.cs" />
-    <Compile Include="Src\Metadata\DebugPropertyInfo.cs" />
-    <Compile Include="Src\Metadata\DebugType.cs" />
-    <Compile Include="Src\Metadata\IDebugMemberInfo.cs" />
+    <Compile Include="Src\MetaData\DebugFieldInfo.cs" />
+    <Compile Include="Src\MetaData\DebugLocalVariableInfo.cs" />
+    <Compile Include="Src\MetaData\DebugMethodInfo.cs" />
+    <Compile Include="Src\MetaData\DebugParameterInfo.cs" />
+    <Compile Include="Src\MetaData\DebugPropertyInfo.cs" />
+    <Compile Include="Src\MetaData\DebugType.cs" />
+    <Compile Include="Src\MetaData\IDebugMemberInfo.cs" />
     <Compile Include="Src\Module.cs" />
     <Compile Include="Src\ModuleCollection.cs" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil.Binary\ImageFormatException.cs" />
@@ -457,7 +457,7 @@
     <Folder Include="Src\Interop\CorSym" />
     <Folder Include="Src\Interop\Enums" />
     <Folder Include="Src\Interop\MetaData" />
-    <Folder Include="Src\Metadata" />
+    <Folder Include="Src\MetaData" />
     <Folder Include="Src\Mono.Cecil" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Binary" />
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugFieldInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugFieldInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugFieldInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugLocalVariableInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugLocalVariableInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugLocalVariableInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugMethodInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugMethodInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugMethodInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugParameterInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugParameterInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugParameterInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugPropertyInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugPropertyInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugPropertyInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/DebugType.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/DebugType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/IDebugMemberInfo.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/IDebugMemberInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Metadata1/IDebugMemberInfo.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/MetaData/IDebugMemberInfo.cs