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 6c56189697..883ef50fef 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj
@@ -56,41 +56,27 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\AssemblyInfo.cs" />
+    <Compile Include="Src\AppDomain.cs" />
+    <Compile Include="Src\AppDomainCollection.cs" />
+    <Compile Include="Src\ArrayDimension.cs" />
+    <Compile Include="Src\ArrayDimensions.cs" />
+    <Compile Include="Src\Breakpoint.cs" />
+    <Compile Include="Src\BreakpointCollection.cs" />
     <Compile Include="Src\CollectionWithEvents.cs" />
-    <Compile Include="Src\Control\AppDomain.cs" />
-    <Compile Include="Src\Control\Eval.cs" />
-    <Compile Include="Src\Control\Module.cs" />
-    <Compile Include="Src\Control\BreakpointCollection.cs" />
-    <Compile Include="Src\Control\ProcessCollection.cs" />
-    <Compile Include="Src\Control\NDebugger.cs" />
-    <Compile Include="Src\Control\AppDomainCollection.cs" />
-    <Compile Include="Src\Control\EvalCollection.cs" />
-    <Compile Include="Src\Control\ModuleCollection.cs" />
-    <Compile Include="Src\Control\ProcessEventArgs.cs" />
-    <Compile Include="Src\Control\ThreadCollection.cs" />
-    <Compile Include="Src\Control\Process.cs" />
-    <Compile Include="Src\Control\StackFrame.cs" />
-    <Compile Include="Src\Control\Stepper.cs" />
-    <Compile Include="Src\Control\Thread.cs" />
-    <Compile Include="Src\Debugger\Breakpoint.cs" />
-    <Compile Include="Src\Debugger\DebuggeeState.cs" />
-    <Compile Include="Src\Debugger\DebuggerException.cs" />
-    <Compile Include="Src\Debugger\DebuggerObject.cs" />
-    <Compile Include="Src\Debugger\Exception.cs" />
-    <Compile Include="Src\Debugger\ExceptionType.cs" />
-    <Compile Include="Src\Debugger\Options.cs" />
-    <Compile Include="Src\Debugger\PausedReason.cs" />
-    <Compile Include="Src\Debugger\PauseSession.cs" />
-    <Compile Include="Src\Debugger\SourcecodeSegment.cs" />
+    <Compile Include="Src\DebuggeeState.cs" />
+    <Compile Include="Src\DebuggerException.cs" />
+    <Compile Include="Src\DebuggerObject.cs" />
+    <Compile Include="Src\Eval.cs" />
+    <Compile Include="Src\EvalCollection.cs" />
+    <Compile Include="Src\Exception.cs" />
+    <Compile Include="Src\ExceptionType.cs" />
     <Compile Include="Src\Expressions\ExpressionEvaluator.cs" />
     <Compile Include="Src\Expressions\ExpressionExtensionMethods.cs" />
+    <Compile Include="Src\GetValueException.cs" />
     <Compile Include="Src\Internal\ManagedCallback.cs" />
     <Compile Include="Src\Internal\ManagedCallbackProxy.cs" />
     <Compile Include="Src\Internal\ManagedCallbackSwitch.cs" />
     <Compile Include="Src\Internal\MTA2STA.cs" />
-    <Compile Include="Src\Internal\Tests\ExpandAttribute.cs" />
-    <Compile Include="Src\Internal\Tests\IgnoreAttribute.cs" />
-    <Compile Include="Src\Internal\Tests\IgnoreOnExceptionAttribute.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebug.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebugChainReason.cs" />
     <Compile Include="Src\Interop\CorDebug\CorDebugClass.cs" />
@@ -220,13 +206,15 @@
     <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\DebugLocalVariableInfo.cs" />
-    <Compile Include="Src\Metadata\DebugParameterInfo.cs" />
-    <Compile Include="Src\Metadata\DebugType.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" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\CodedIndex.cs" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil.Metadata\ElementType.cs" />
@@ -267,11 +255,23 @@
     <Compile Include="Src\Mono.Cecil\Mono.Cecil.Signatures\Var.cs" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil\MethodCallingConvention.cs" />
     <Compile Include="Src\Mono.Cecil\Mono.Cecil\ReflectionException.cs" />
+    <Compile Include="Src\NDebugger.cs" />
+    <Compile Include="Src\Options.cs" />
+    <Compile Include="Src\PausedReason.cs" />
+    <Compile Include="Src\PauseSession.cs" />
+    <Compile Include="Src\Process.cs" />
+    <Compile Include="Src\ProcessCollection.cs" />
+    <Compile Include="Src\ProcessEventArgs.cs" />
+    <Compile Include="Src\SourcecodeSegment.cs" />
+    <Compile Include="Src\StackFrame.cs" />
+    <Compile Include="Src\Stepper.cs" />
+    <Compile Include="Src\Tests\ExpandAttribute.cs" />
+    <Compile Include="Src\Tests\IgnoreAttribute.cs" />
+    <Compile Include="Src\Tests\IgnoreOnExceptionAttribute.cs" />
+    <Compile Include="Src\Thread.cs" />
+    <Compile Include="Src\ThreadCollection.cs" />
     <Compile Include="Src\Util\HighPrecisionTimer.cs" />
-    <Compile Include="Src\Values\ArrayDimension.cs" />
-    <Compile Include="Src\Values\ArrayDimensions.cs" />
-    <Compile Include="Src\Values\GetValueException.cs" />
-    <Compile Include="Src\Values\Value.cs" />
+    <Compile Include="Src\Value.cs" />
     <Compile Include="Src\Wrappers\CorDebug\Autogenerated\CorDebug.cs" />
     <Compile Include="Src\Wrappers\CorDebug\Autogenerated\CorDebugChainReason.cs" />
     <Compile Include="Src\Wrappers\CorDebug\Autogenerated\CorDebugClass.cs" />
@@ -451,11 +451,29 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Src\Expressions" />
+    <Folder Include="Src\Internal" />
+    <Folder Include="Src\Interop" />
+    <Folder Include="Src\Interop\CorDebug" />
+    <Folder Include="Src\Interop\CorSym" />
+    <Folder Include="Src\Interop\Enums" />
+    <Folder Include="Src\Interop\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" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Metadata" />
     <Folder Include="Src\Mono.Cecil\Mono.Cecil.Signatures" />
+    <Folder Include="Src\Tests" />
+    <Folder Include="Src\Util" />
+    <Folder Include="Src\Wrappers" />
+    <Folder Include="Src\Wrappers\CorDebug" />
+    <Folder Include="Src\Wrappers\CorDebug\Autogenerated" />
+    <Folder Include="Src\Wrappers\CorPub" />
+    <Folder Include="Src\Wrappers\CorPub\Autogenerated" />
+    <Folder Include="Src\Wrappers\CorSym" />
+    <Folder Include="Src\Wrappers\CorSym\Autogenerated" />
+    <Folder Include="Src\Wrappers\MetaData" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/AppDomain.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/AppDomain.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomain.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/AppDomainCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/AppDomainCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/AppDomainCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/ArrayDimension.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ArrayDimension.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/ArrayDimension.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ArrayDimension.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/ArrayDimensions.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ArrayDimensions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/ArrayDimensions.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ArrayDimensions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoint.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoint.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/BreakpointCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/BreakpointCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/BreakpointCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/BreakpointCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggeeState.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggeeState.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggeeState.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerException.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerException.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerObject.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerObject.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerObject.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/DebuggerObject.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Eval.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/EvalCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/EvalCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EvalCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Exception.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Exception.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionType.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/ExceptionType.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ExceptionType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/GetValueException.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/GetValueException.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/GetValueException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Module.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Module.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ModuleCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ModuleCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ModuleCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/NDebugger.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Options.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Options.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Options.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Options.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PauseSession.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/PauseSession.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PauseSession.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/PauseSession.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PausedReason.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/PausedReason.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/PausedReason.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/PausedReason.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Process.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ProcessEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/SourcecodeSegment.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/SourcecodeSegment.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StackFrame.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StackFrame.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/StackFrame.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Stepper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/ExpandAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/ExpandAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/ExpandAttribute.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/ExpandAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreAttribute.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreOnExceptionAttribute.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreOnExceptionAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/Tests/IgnoreOnExceptionAttribute.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Tests/IgnoreOnExceptionAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Thread.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadCollection.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadCollection.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/ThreadCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Values/Value.cs
rename to src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Value.cs