diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 0fffada66c..ab4fed11f0 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -255,17 +255,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CD
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Misc\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Misc\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Misc\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 3c2a2c1c7a..e4af0881e4 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -185,12 +185,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CD
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Misc\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Misc\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs b/src/AddIns/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs
rename to src/AddIns/Debugger/Debugger.AddIn/BreakpointChangeMenuBuilder.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/COPYING b/src/AddIns/Debugger/Debugger.AddIn/COPYING
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/COPYING
rename to src/AddIns/Debugger/Debugger.AddIn/COPYING
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.addin
rename to src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
similarity index 94%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
rename to src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
index 9e12bd8b01..c85b9a7750 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
@@ -37,7 +37,7 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\Debugger\</OutputPath>
+    <OutputPath>..\..\..\..\AddIns\AddIns\Debugger\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <StartAction>Program</StartAction>
-    <StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
+    <StartProgram>..\..\..\..\bin\SharpDevelop.exe</StartProgram>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore">
@@ -205,7 +205,7 @@
       <DependentUpon>DebuggerEventForm.cs</DependentUpon>
     </EmbeddedResource>
     <Compile Include="Service\SetCurrentStatementCommand.cs" />
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+    <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Properties\GlobalAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Pads\DebuggerPad.cs" />
@@ -314,22 +314,22 @@
     <Content Include="Debugger.AddIn.addin">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Content>
-    <ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
+    <ProjectReference Include="..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
+    <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
       <Name>ICSharpCode.SharpDevelop</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
+    <ProjectReference Include="..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
       <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
       <Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
       <Name>ICSharpCode.Core.Presentation</Name>
       <Private>False</Private>
@@ -341,12 +341,12 @@
       <SpecificVersion>False</SpecificVersion>
     </ProjectReference>
     <Content Include="PostBuildEvent.proj" />
-    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
       <Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
       <Name>ICSharpCode.SharpDevelop.Dom</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
       <Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
       <Name>ICSharpCode.SharpDevelop.Widgets</Name>
       <Private>False</Private>
@@ -359,17 +359,17 @@
     <Page Include="Visualizers\Graph\ObjectGraphControl.xaml" />
     <Page Include="Visualizers\GridVisualizer\GridVisualizerWindow.xaml" />
     <Page Include="Visualizers\TextVisualizer\TextVisualizerWindow.xaml" />
-    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
       <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
       <Name>NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj">
+    <ProjectReference Include="..\..\..\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj">
       <Project>{E73BB233-D88B-44A7-A98F-D71EE158381D}</Project>
       <Name>Aga.Controls</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
+    <ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
       <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
       <Name>ICSharpCode.Core.WinForms</Name>
       <Private>False</Private>
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user
rename to src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj.user
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/DisableBreakpointMenuCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/DisableBreakpointMenuCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/DisableBreakpointMenuCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/DisableBreakpointMenuCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/EnableBreakpointMenuCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/EnableBreakpointMenuCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/EnableBreakpointMenuCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/EnableBreakpointMenuCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/IsActiveBreakpointCondition.cs b/src/AddIns/Debugger/Debugger.AddIn/IsActiveBreakpointCondition.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/IsActiveBreakpointCondition.cs
rename to src/AddIns/Debugger/Debugger.AddIn/IsActiveBreakpointCondition.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/IsBreakpointCondition.cs b/src/AddIns/Debugger/Debugger.AddIn/IsBreakpointCondition.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/IsBreakpointCondition.cs
rename to src/AddIns/Debugger/Debugger.AddIn/IsBreakpointCondition.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptions.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptions.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.Designer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.Designer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.Designer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.resx b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.resx
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.resx
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingOptionsPanel.resx
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.Designer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx b/src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx
rename to src/AddIns/Debugger/Debugger.AddIn/Options/DebuggingSymbolsPanel.resx
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/BreakPointsPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/CallStackPad.Menu.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.Menu.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/CallStackPad.Menu.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.Menu.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/CallStackPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/CallStackPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/ConsolePad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/DebuggerPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/DebuggerPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/DebuggerPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/DebuggerPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/LoadedModulesPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/LocalVarPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/ObjectGraphPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ObjectGraphPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/ObjectGraphPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/ObjectGraphPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.Menu.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.Menu.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.Menu.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.Menu.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/RunningThreadsPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/SelectLanguageCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/SelectLanguageCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/SelectLanguageCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/SelectLanguageCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPad.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPadCommands.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadCommands.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPadCommands.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadCommands.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/PostBuildEvent.proj b/src/AddIns/Debugger/Debugger.AddIn/PostBuildEvent.proj
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/PostBuildEvent.proj
rename to src/AddIns/Debugger/Debugger.AddIn/PostBuildEvent.proj
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Properties/AssemblyInfo.cs b/src/AddIns/Debugger/Debugger.AddIn/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Properties/AssemblyInfo.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Properties/AssemblyInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/AttachToProcessForm.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/AttachToProcessForm.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/AttachToProcessForm.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/AttachToProcessForm.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.Designer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.resx b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.resx
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.resx
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.resx
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.Designer.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.Designer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.Designer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.Designer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.resx b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.resx
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/DebuggerEventForm.resx
rename to src/AddIns/Debugger/Debugger.AddIn/Service/DebuggerEventForm.resx
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml b/src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/EditBreakpointScriptWindow.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/RemotingConfigurationHelpper.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/RemotingConfigurationHelpper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/RemotingConfigurationHelpper.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/RemotingConfigurationHelpper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/RunToCursorCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/RunToCursorCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/RunToCursorCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/RunToCursorCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/SetCurrentStatementCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/SetCurrentStatementCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/SetCurrentStatementCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/SetCurrentStatementCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Adapters/DynamicTreeDebuggerRow.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/DynamicTreeDebuggerRow.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Adapters/DynamicTreeDebuggerRow.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/DynamicTreeDebuggerRow.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/DebuggerResourceService.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/DebuggerResourceService.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/DebuggerResourceService.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/DebuggerResourceService.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/IContextMenu.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IContextMenu.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/IContextMenu.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/IContextMenu.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ISetText.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ISetText.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/ISetText.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/ISetText.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Utils.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Utils.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/TreeModel/Utils.cs
rename to src/AddIns/Debugger/Debugger.AddIn/TreeModel/Utils.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ExpressionVisualizerCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ExpressionVisualizerCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ExpressionVisualizerCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ExpressionVisualizerCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerMenuCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerMenuCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerMenuCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/GridVisualizerMenuCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/IVisualizerCommandDescriptor.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/IVisualizerCommandDescriptor.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/IVisualizerCommandDescriptor.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/IVisualizerCommandDescriptor.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerMenuCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerMenuCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerMenuCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/ObjectGraphVisualizerMenuCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/TextVisualizerCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/TextVisualizerCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/TextVisualizerCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/TextVisualizerCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/VisualizerDescriptors.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/VisualizerDescriptors.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/VisualizerDescriptors.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/VisualizerDescriptors.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/XmlVisualizerCommand.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/XmlVisualizerCommand.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Commands/XmlVisualizerCommand.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Commands/XmlVisualizerCommand.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/DebuggerVisualizerException.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/DebuggerVisualizerException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/DebuggerVisualizerException.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/DebuggerVisualizerException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/IEvaluate.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/IEvaluate.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/IEvaluate.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/IEvaluate.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/IListValuesProvider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/IListValuesProvider.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/IListValuesProvider.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/IListValuesProvider.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/ObjectPropertyComparer.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/ObjectPropertyComparer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/ObjectPropertyComparer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/ObjectPropertyComparer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingCollection.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingCollection.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingObservableCollection.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingObservableCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingObservableCollection.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Common/VirtualizingObservableCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Controls/DragScrollViewer.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Controls/DragScrollViewer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Controls/DragScrollViewer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Controls/DragScrollViewer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/CanvasLocationAdapter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/CanvasLocationAdapter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/CanvasLocationAdapter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/CanvasLocationAdapter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/GraphDrawer.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/GraphDrawer.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/GraphDrawer.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/GraphDrawer.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PlusToggleButton.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Expanded.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedContentNodes.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedExpressions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNodeEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphDiff.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphDiff.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphDiff.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphDiff.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphMatcher.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphMatcher.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphMatcher.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/GraphMatcher.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedEdge.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedEdge.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedEdge.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedEdge.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraph.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraph.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraph.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraph.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraphNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraphNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraphNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraphNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNodeProperty.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNodeProperty.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNodeProperty.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedNodeProperty.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedPropertyEventArgs.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedPropertyEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedPropertyEventArgs.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedPropertyEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/BoxDotFormatter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/BoxDotFormatter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/BoxDotFormatter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/BoxDotFormatter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/DotFormatter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/DotFormatter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/DotFormatter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/DotFormatter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/IdGenerator.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/IdGenerator.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/IdGenerator.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/IdGenerator.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/LayoutDirection.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/LayoutDirection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/LayoutDirection.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/LayoutDirection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoDoubleFormatter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoDoubleFormatter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoDoubleFormatter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoDoubleFormatter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoEdgeRouter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoEdgeRouter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoEdgeRouter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoEdgeRouter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoPositionTransform.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoPositionTransform.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoPositionTransform.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoPositionTransform.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoProcess.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoProcess.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoProcess.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/NeatoProcess.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/RecordDotFormatter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/RecordDotFormatter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/RecordDotFormatter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/RecordDotFormatter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeEdge.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeEdge.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeEdge.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeEdge.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeLR.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeLR.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeLR.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeLR.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeTB.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeTB.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeTB.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeGraphNodeTB.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeLayouter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeLayouter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeLayouter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/Tree/TreeLayouter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/NodeControlCache.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/NodeControlCache.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/NodeControlCache.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/NodeControlCache.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/NamedEdge.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/NamedEdge.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/NamedEdge.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/NamedEdge.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraph.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraph.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraph.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraph.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphBuilder.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraph/ObjectGraphProperty.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphControl.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ObjectGraphWindow.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/AbstractNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/BaseClassNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NestedNodeType.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NestedNodeType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NestedNodeType.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NestedNodeType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/NonPublicMembersNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/PropertyNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/TreeModel/ThisNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/GridVisualizerWindow.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ObjectValue.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ObjectValue.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ObjectValue.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ObjectValue.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/EnumerableValuesProvider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/EnumerableValuesProvider.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/EnumerableValuesProvider.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/EnumerableValuesProvider.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/GridValuesProvider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/GridValuesProvider.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/GridValuesProvider.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/GridValuesProvider.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/ListValuesProvider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/ListValuesProvider.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/ListValuesProvider.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/GridVisualizer/ValueProviders/ListValuesProvider.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/ICorDebug.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/ICorDebug.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/ICorDebug.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/ICorDebug.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/IEnumerableNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IEnumerableNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/IEnumerableNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/IEnumerableNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/IListNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/IListNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/ObjectProperty.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/ObjectProperty.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/ObjectProperty.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/ObjectProperty.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/DisplayAttribute.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/DisplayAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/DisplayAttribute.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/DisplayAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/EnumViewModel.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/EnumViewModel.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/EnumViewModel.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/EnumViewModel.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewHideableColumn.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewHideableColumn.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewHideableColumn.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewHideableColumn.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ScrollUtils.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ScrollUtils.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ScrollUtils.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ScrollUtils.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/TooltipVisibilityConverter.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/TooltipVisibilityConverter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/TooltipVisibilityConverter.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/TooltipVisibilityConverter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ViewModelBase.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ViewModelBase.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ViewModelBase.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/ViewModelBase.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerMode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerMode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerMode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerMode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/TextVisualizer/TextVisualizerWindow.xaml.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/AtomicType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/DebuggerHelpers.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/DebuggerHelpers.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/DebuggerHelpers.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/DebuggerHelpers.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/DictionaryExtensions.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/DictionaryExtensions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/DictionaryExtensions.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/DictionaryExtensions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/IEnumerableExtensions.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/IEnumerableExtensions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/IEnumerableExtensions.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/IEnumerableExtensions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/ITreeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/ITreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/ITreeNode.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/ITreeNode.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/LinqUtils.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/LinqUtils.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/LinqUtils.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/LinqUtils.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/ListHelper.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/ListHelper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/ListHelper.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/ListHelper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/Lookup.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/Lookup.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/Lookup.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/Lookup.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/LookupValueCollection.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/LookupValueCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/LookupValueCollection.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/LookupValueCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/StringHelper.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/StringHelper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/StringHelper.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/StringHelper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/TreeFlattener.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/TreeFlattener.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/TreeFlattener.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/TreeFlattener.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/TypeResolver.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/TypeResolver.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.AddIn/Visualizers/Utils/TypeResolver.cs
rename to src/AddIns/Debugger/Debugger.AddIn/Visualizers/Utils/TypeResolver.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/AppDomain.cs b/src/AddIns/Debugger/Debugger.Core/AppDomain.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/AppDomain.cs
rename to src/AddIns/Debugger/Debugger.Core/AppDomain.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/AppDomainCollection.cs b/src/AddIns/Debugger/Debugger.Core/AppDomainCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/AppDomainCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/AppDomainCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ArrayDimension.cs b/src/AddIns/Debugger/Debugger.Core/ArrayDimension.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ArrayDimension.cs
rename to src/AddIns/Debugger/Debugger.Core/ArrayDimension.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ArrayDimensions.cs b/src/AddIns/Debugger/Debugger.Core/ArrayDimensions.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ArrayDimensions.cs
rename to src/AddIns/Debugger/Debugger.Core/ArrayDimensions.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Breakpoint.cs b/src/AddIns/Debugger/Debugger.Core/Breakpoint.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Breakpoint.cs
rename to src/AddIns/Debugger/Debugger.Core/Breakpoint.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/BreakpointCollection.cs b/src/AddIns/Debugger/Debugger.Core/BreakpointCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/BreakpointCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/BreakpointCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/CollectionWithEvents.cs b/src/AddIns/Debugger/Debugger.Core/CollectionWithEvents.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/CollectionWithEvents.cs
rename to src/AddIns/Debugger/Debugger.Core/CollectionWithEvents.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/DebuggeeState.cs b/src/AddIns/Debugger/Debugger.Core/DebuggeeState.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/DebuggeeState.cs
rename to src/AddIns/Debugger/Debugger.Core/DebuggeeState.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.csproj b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
similarity index 98%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.csproj
rename to src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
index f668efc640..b7f0a239ea 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.csproj
+++ b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj
@@ -18,7 +18,7 @@
     <FileAlignment>4096</FileAlignment>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\Debugger\</OutputPath>
+    <OutputPath>..\..\..\..\AddIns\AddIns\Debugger\</OutputPath>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <PublishUrl>http://localhost/Debugger.Core/</PublishUrl>
     <Install>true</Install>
@@ -201,11 +201,11 @@
     <Folder Include="Tests" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
       <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
       <Name>NRefactory</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.csproj.user b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj.user
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.csproj.user
rename to src/AddIns/Debugger/Debugger.Core/Debugger.Core.csproj.user
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.shfb b/src/AddIns/Debugger/Debugger.Core/Debugger.Core.shfb
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Debugger.Core.shfb
rename to src/AddIns/Debugger/Debugger.Core/Debugger.Core.shfb
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/DebuggerException.cs b/src/AddIns/Debugger/Debugger.Core/DebuggerException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/DebuggerException.cs
rename to src/AddIns/Debugger/Debugger.Core/DebuggerException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/DebuggerObject.cs b/src/AddIns/Debugger/Debugger.Core/DebuggerObject.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/DebuggerObject.cs
rename to src/AddIns/Debugger/Debugger.Core/DebuggerObject.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Eval.cs b/src/AddIns/Debugger/Debugger.Core/Eval.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Eval.cs
rename to src/AddIns/Debugger/Debugger.Core/Eval.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/EvalCollection.cs b/src/AddIns/Debugger/Debugger.Core/EvalCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/EvalCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/EvalCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Exception.cs b/src/AddIns/Debugger/Debugger.Core/Exception.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Exception.cs
rename to src/AddIns/Debugger/Debugger.Core/Exception.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ExceptionType.cs b/src/AddIns/Debugger/Debugger.Core/ExceptionType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ExceptionType.cs
rename to src/AddIns/Debugger/Debugger.Core/ExceptionType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/GetValueException.cs b/src/AddIns/Debugger/Debugger.Core/GetValueException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/GetValueException.cs
rename to src/AddIns/Debugger/Debugger.Core/GetValueException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/Common.cs b/src/AddIns/Debugger/Debugger.Core/Interop/Common.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/Common.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/Common.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebug.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorDebug.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebug.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorDebug.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.generated.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.generated.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.generated.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorDebugExtensionMethods.generated.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublish.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorPublish.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublish.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorPublish.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.generated.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.generated.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.generated.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorPublishExtensionMethods.generated.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSym.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorSym.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSym.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorSym.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.generated.cs b/src/AddIns/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.generated.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.generated.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/CorSymExtensionMethods.generated.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/MTA2STA.cs b/src/AddIns/Debugger/Debugger.Core/Interop/MTA2STA.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/MTA2STA.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/MTA2STA.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/MetaData.cs b/src/AddIns/Debugger/Debugger.Core/Interop/MetaData.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/MetaData.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/MetaData.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs b/src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/MetaDataWrapper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/NativeMethods.cs b/src/AddIns/Debugger/Debugger.Core/Interop/NativeMethods.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/NativeMethods.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/NativeMethods.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/TrackedComObjects.cs b/src/AddIns/Debugger/Debugger.Core/Interop/TrackedComObjects.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/TrackedComObjects.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/TrackedComObjects.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Interop/Util.cs b/src/AddIns/Debugger/Debugger.Core/Interop/Util.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Interop/Util.cs
rename to src/AddIns/Debugger/Debugger.Core/Interop/Util.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallback.cs b/src/AddIns/Debugger/Debugger.Core/ManagedCallback.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallback.cs
rename to src/AddIns/Debugger/Debugger.Core/ManagedCallback.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallbackProxy.cs b/src/AddIns/Debugger/Debugger.Core/ManagedCallbackProxy.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallbackProxy.cs
rename to src/AddIns/Debugger/Debugger.Core/ManagedCallbackProxy.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallbackSwitch.cs b/src/AddIns/Debugger/Debugger.Core/ManagedCallbackSwitch.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ManagedCallbackSwitch.cs
rename to src/AddIns/Debugger/Debugger.Core/ManagedCallbackSwitch.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugConstructorInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugConstructorInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugConstructorInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugConstructorInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugFieldInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugFieldInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugFieldInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugFieldInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugLocalVariableInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugLocalVariableInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugLocalVariableInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugLocalVariableInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugMethodInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugMethodInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugMethodInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugMethodInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugParameterInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugParameterInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugParameterInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugParameterInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugPropertyInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugPropertyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugPropertyInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugPropertyInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugType.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/DebugType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/DebugType.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/DebugType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/IDebugMemberInfo.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/IDebugMemberInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/IDebugMemberInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/IDebugMemberInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/MetaData/IOverloadable.cs b/src/AddIns/Debugger/Debugger.Core/MetaData/IOverloadable.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/MetaData/IOverloadable.cs
rename to src/AddIns/Debugger/Debugger.Core/MetaData/IOverloadable.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Module.cs b/src/AddIns/Debugger/Debugger.Core/Module.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Module.cs
rename to src/AddIns/Debugger/Debugger.Core/Module.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ModuleCollection.cs b/src/AddIns/Debugger/Debugger.Core/ModuleCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ModuleCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/ModuleCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Binary/ImageFormatException.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Binary/ImageFormatException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Binary/ImageFormatException.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Binary/ImageFormatException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/CodedIndex.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/CodedIndex.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/CodedIndex.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/CodedIndex.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/ElementType.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/ElementType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/ElementType.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/ElementType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataFormatException.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataFormatException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataFormatException.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataFormatException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataToken.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataToken.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataToken.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/MetadataToken.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/TokenType.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/TokenType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/TokenType.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/TokenType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Metadata/Utilities.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Array.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Array.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Array.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Array.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ArrayShape.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ArrayShape.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ArrayShape.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ArrayShape.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/BaseSignatureVisitor.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/BaseSignatureVisitor.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/BaseSignatureVisitor.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/BaseSignatureVisitor.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Class.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Class.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Class.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Class.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Constraint.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Constraint.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Constraint.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Constraint.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomAttrib.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomAttrib.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomAttrib.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomAttrib.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomMod.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomMod.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomMod.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/CustomMod.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FieldSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FieldSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FieldSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FieldSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FnPtr.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FnPtr.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FnPtr.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/FnPtr.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericArg.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericArg.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericArg.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericArg.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInst.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInst.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInst.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInst.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInstSignature.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInstSignature.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInstSignature.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/GenericInstSignature.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitable.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitable.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitable.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitable.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitor.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitor.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitor.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ISignatureVisitor.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/InputOutputItem.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/InputOutputItem.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/InputOutputItem.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/InputOutputItem.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/LocalVarSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/LocalVarSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/LocalVarSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/LocalVarSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MVar.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MVar.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MVar.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MVar.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MarshalSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MarshalSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MarshalSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MarshalSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodDefSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodDefSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodDefSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodDefSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodRefSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodRefSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodRefSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodRefSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSpec.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSpec.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSpec.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/MethodSpec.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Param.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Param.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Param.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Param.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/PropertySig.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/PropertySig.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/PropertySig.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/PropertySig.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Ptr.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Ptr.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Ptr.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Ptr.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/RetType.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/RetType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/RetType.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/RetType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SigType.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SigType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SigType.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SigType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Signature.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Signature.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Signature.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Signature.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureReader.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SignatureWriter.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SzArray.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SzArray.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SzArray.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/SzArray.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/TypeSpec.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ValueType.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ValueType.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ValueType.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/ValueType.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Var.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Var.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Var.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil.Signatures/Var.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/MethodCallingConvention.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/MethodCallingConvention.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/MethodCallingConvention.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/MethodCallingConvention.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/ReflectionException.cs b/src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/ReflectionException.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/ReflectionException.cs
rename to src/AddIns/Debugger/Debugger.Core/Mono.Cecil/Mono.Cecil/ReflectionException.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/NDebugger.cs b/src/AddIns/Debugger/Debugger.Core/NDebugger.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/NDebugger.cs
rename to src/AddIns/Debugger/Debugger.Core/NDebugger.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/NRefactory/Ast/ExpressionExtensionMethods.cs b/src/AddIns/Debugger/Debugger.Core/NRefactory/Ast/ExpressionExtensionMethods.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/NRefactory/Ast/ExpressionExtensionMethods.cs
rename to src/AddIns/Debugger/Debugger.Core/NRefactory/Ast/ExpressionExtensionMethods.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs b/src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
rename to src/AddIns/Debugger/Debugger.Core/NRefactory/Visitors/ExpressionEvaluator.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Options.cs b/src/AddIns/Debugger/Debugger.Core/Options.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Options.cs
rename to src/AddIns/Debugger/Debugger.Core/Options.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/PauseSession.cs b/src/AddIns/Debugger/Debugger.Core/PauseSession.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/PauseSession.cs
rename to src/AddIns/Debugger/Debugger.Core/PauseSession.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/PausedReason.cs b/src/AddIns/Debugger/Debugger.Core/PausedReason.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/PausedReason.cs
rename to src/AddIns/Debugger/Debugger.Core/PausedReason.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Process.cs b/src/AddIns/Debugger/Debugger.Core/Process.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Process.cs
rename to src/AddIns/Debugger/Debugger.Core/Process.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ProcessCollection.cs b/src/AddIns/Debugger/Debugger.Core/ProcessCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ProcessCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/ProcessCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ProcessEventArgs.cs b/src/AddIns/Debugger/Debugger.Core/ProcessEventArgs.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ProcessEventArgs.cs
rename to src/AddIns/Debugger/Debugger.Core/ProcessEventArgs.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Properties/AssemblyInfo.cs b/src/AddIns/Debugger/Debugger.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Properties/AssemblyInfo.cs
rename to src/AddIns/Debugger/Debugger.Core/Properties/AssemblyInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/SourcecodeSegment.cs b/src/AddIns/Debugger/Debugger.Core/SourcecodeSegment.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/SourcecodeSegment.cs
rename to src/AddIns/Debugger/Debugger.Core/SourcecodeSegment.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/StackFrame.cs b/src/AddIns/Debugger/Debugger.Core/StackFrame.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/StackFrame.cs
rename to src/AddIns/Debugger/Debugger.Core/StackFrame.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Stepper.cs b/src/AddIns/Debugger/Debugger.Core/Stepper.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Stepper.cs
rename to src/AddIns/Debugger/Debugger.Core/Stepper.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Stepping.txt b/src/AddIns/Debugger/Debugger.Core/Stepping.txt
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Stepping.txt
rename to src/AddIns/Debugger/Debugger.Core/Stepping.txt
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Tests/ExpandAttribute.cs b/src/AddIns/Debugger/Debugger.Core/Tests/ExpandAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Tests/ExpandAttribute.cs
rename to src/AddIns/Debugger/Debugger.Core/Tests/ExpandAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Tests/IgnoreAttribute.cs b/src/AddIns/Debugger/Debugger.Core/Tests/IgnoreAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Tests/IgnoreAttribute.cs
rename to src/AddIns/Debugger/Debugger.Core/Tests/IgnoreAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Tests/IgnoreOnExceptionAttribute.cs b/src/AddIns/Debugger/Debugger.Core/Tests/IgnoreOnExceptionAttribute.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Tests/IgnoreOnExceptionAttribute.cs
rename to src/AddIns/Debugger/Debugger.Core/Tests/IgnoreOnExceptionAttribute.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Thread.cs b/src/AddIns/Debugger/Debugger.Core/Thread.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Thread.cs
rename to src/AddIns/Debugger/Debugger.Core/Thread.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/ThreadCollection.cs b/src/AddIns/Debugger/Debugger.Core/ThreadCollection.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/ThreadCollection.cs
rename to src/AddIns/Debugger/Debugger.Core/ThreadCollection.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Value.cs b/src/AddIns/Debugger/Debugger.Core/Value.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Core/Value.cs
rename to src/AddIns/Debugger/Debugger.Core/Value.cs
diff --git a/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj b/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj
new file mode 100644
index 0000000000..28e6a7ad12
--- /dev/null
+++ b/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj
@@ -0,0 +1,83 @@
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Debugger.Tests</RootNamespace>
+    <AssemblyName>Debugger.Tests</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A4C858C8-51B6-4265-A695-A20FCEBA1D19}</ProjectGuid>
+    <OutputPath>..\..\..\..\bin\UnitTests\</OutputPath>
+    <Optimize>False</Optimize>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <NoStdLib>False</NoStdLib>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugType>Full</DebugType>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <DebugSymbols>true</DebugSymbols>
+    <NoWarn>219,414</NoWarn>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>DEBUG;TRACE;TEST_CODE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DefineConstants>TRACE;TEST_CODE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="DebuggerTests.cs" />
+    <Compile Include="DebuggerTestsBase.cs" />
+    <Compile Include="Tests\AppDomain_Tests.cs" />
+    <Compile Include="Tests\ControlFlow_NoBreak.cs" />
+    <Compile Include="Tests\ExpressionEvaluator_Tests.cs" />
+    <Compile Include="Tests\Breakpoint_Tests.cs" />
+    <Compile Include="Tests\StackFrame_Callstack.cs" />
+    <Compile Include="Tests\DebugType_CompilerGeneratedClasses.cs" />
+    <Compile Include="Tests\ControlFlow_DebuggeeKilled.cs" />
+    <Compile Include="Tests\DebugType_Tests.cs" />
+    <Compile Include="Tests\Exception_Custom.cs" />
+    <Compile Include="Tests\StackFrame_Lifetime.cs" />
+    <Compile Include="Tests\StackFrame_VariablesLifetime.cs" />
+    <Compile Include="Tests\_HelloWorldTest.cs" />
+    <Compile Include="Tests\ControlFlow_MainThreadExit.cs" />
+    <Compile Include="Tests\Process_MemoryReadWrite.cs" />
+    <Compile Include="Tests\Value_Tests.cs" />
+    <Compile Include="Tests\StackFrame_SetIP.cs" />
+    <Compile Include="Tests\Exception_StackOverflow.cs" />
+    <Compile Include="Tests\ControlFlow_Stepping.cs" />
+    <Compile Include="Tests\ControlFlow_TerminatePausedProcess.cs" />
+    <Compile Include="Tests\ControlFlow_TerminateRunningProcess.cs" />
+    <Compile Include="Tests\Thread_Tests.cs" />
+    <EmbeddedResource Include="Tests\*.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Tests" />
+    <ProjectReference Include="..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
+      <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
+      <Name>NRefactory</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Debugger.Core\Debugger.Core.csproj">
+      <Project>{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}</Project>
+      <Name>Debugger.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Debugger.Tests.csproj.user b/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj.user
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Debugger.Tests.csproj.user
rename to src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj.user
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Debugger.Tests.csproj b/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj~
similarity index 97%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Debugger.Tests.csproj
rename to src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj~
index d3c576d359..02eeeda0c2 100644
--- a/src/AddIns/Misc/Debugger/Debugger.Tests/Debugger.Tests.csproj
+++ b/src/AddIns/Debugger/Debugger.Tests/Debugger.Tests.csproj~
@@ -1,83 +1,83 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Debugger.Tests</RootNamespace>
-    <AssemblyName>Debugger.Tests</AssemblyName>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A4C858C8-51B6-4265-A695-A20FCEBA1D19}</ProjectGuid>
-    <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
-    <Optimize>False</Optimize>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <NoStdLib>False</NoStdLib>
-    <PlatformTarget>x86</PlatformTarget>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugType>Full</DebugType>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <FileAlignment>4096</FileAlignment>
-    <DebugSymbols>true</DebugSymbols>
-    <NoWarn>219,414</NoWarn>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DefineConstants>DEBUG;TRACE;TEST_CODE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>TRACE;TEST_CODE</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DebuggerTests.cs" />
-    <Compile Include="DebuggerTestsBase.cs" />
-    <Compile Include="Tests\AppDomain_Tests.cs" />
-    <Compile Include="Tests\ControlFlow_NoBreak.cs" />
-    <Compile Include="Tests\ExpressionEvaluator_Tests.cs" />
-    <Compile Include="Tests\Breakpoint_Tests.cs" />
-    <Compile Include="Tests\StackFrame_Callstack.cs" />
-    <Compile Include="Tests\DebugType_CompilerGeneratedClasses.cs" />
-    <Compile Include="Tests\ControlFlow_DebuggeeKilled.cs" />
-    <Compile Include="Tests\DebugType_Tests.cs" />
-    <Compile Include="Tests\Exception_Custom.cs" />
-    <Compile Include="Tests\StackFrame_Lifetime.cs" />
-    <Compile Include="Tests\StackFrame_VariablesLifetime.cs" />
-    <Compile Include="Tests\_HelloWorldTest.cs" />
-    <Compile Include="Tests\ControlFlow_MainThreadExit.cs" />
-    <Compile Include="Tests\Process_MemoryReadWrite.cs" />
-    <Compile Include="Tests\Value_Tests.cs" />
-    <Compile Include="Tests\StackFrame_SetIP.cs" />
-    <Compile Include="Tests\Exception_StackOverflow.cs" />
-    <Compile Include="Tests\ControlFlow_Stepping.cs" />
-    <Compile Include="Tests\ControlFlow_TerminatePausedProcess.cs" />
-    <Compile Include="Tests\ControlFlow_TerminateRunningProcess.cs" />
-    <Compile Include="Tests\Thread_Tests.cs" />
-    <EmbeddedResource Include="Tests\*.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Tests" />
-    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
-      <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
-      <Name>NRefactory</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Debugger.Core\Debugger.Core.csproj">
-      <Project>{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}</Project>
-      <Name>Debugger.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Debugger.Tests</RootNamespace>
+    <AssemblyName>Debugger.Tests</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A4C858C8-51B6-4265-A695-A20FCEBA1D19}</ProjectGuid>
+    <OutputPath>..\..\..\..\..\bin\UnitTests\</OutputPath>
+    <Optimize>False</Optimize>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <NoStdLib>False</NoStdLib>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugType>Full</DebugType>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
+    <DebugSymbols>true</DebugSymbols>
+    <NoWarn>219,414</NoWarn>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>DEBUG;TRACE;TEST_CODE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DefineConstants>TRACE;TEST_CODE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\..\..\Tools\NUnit\nunit.framework.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="DebuggerTests.cs" />
+    <Compile Include="DebuggerTestsBase.cs" />
+    <Compile Include="Tests\AppDomain_Tests.cs" />
+    <Compile Include="Tests\ControlFlow_NoBreak.cs" />
+    <Compile Include="Tests\ExpressionEvaluator_Tests.cs" />
+    <Compile Include="Tests\Breakpoint_Tests.cs" />
+    <Compile Include="Tests\StackFrame_Callstack.cs" />
+    <Compile Include="Tests\DebugType_CompilerGeneratedClasses.cs" />
+    <Compile Include="Tests\ControlFlow_DebuggeeKilled.cs" />
+    <Compile Include="Tests\DebugType_Tests.cs" />
+    <Compile Include="Tests\Exception_Custom.cs" />
+    <Compile Include="Tests\StackFrame_Lifetime.cs" />
+    <Compile Include="Tests\StackFrame_VariablesLifetime.cs" />
+    <Compile Include="Tests\_HelloWorldTest.cs" />
+    <Compile Include="Tests\ControlFlow_MainThreadExit.cs" />
+    <Compile Include="Tests\Process_MemoryReadWrite.cs" />
+    <Compile Include="Tests\Value_Tests.cs" />
+    <Compile Include="Tests\StackFrame_SetIP.cs" />
+    <Compile Include="Tests\Exception_StackOverflow.cs" />
+    <Compile Include="Tests\ControlFlow_Stepping.cs" />
+    <Compile Include="Tests\ControlFlow_TerminatePausedProcess.cs" />
+    <Compile Include="Tests\ControlFlow_TerminateRunningProcess.cs" />
+    <Compile Include="Tests\Thread_Tests.cs" />
+    <EmbeddedResource Include="Tests\*.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Tests" />
+    <ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
+      <Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
+      <Name>NRefactory</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Debugger.Core\Debugger.Core.csproj">
+      <Project>{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}</Project>
+      <Name>Debugger.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/DebuggerTests.cs b/src/AddIns/Debugger/Debugger.Tests/DebuggerTests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/DebuggerTests.cs
rename to src/AddIns/Debugger/Debugger.Tests/DebuggerTests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/DebuggerTestsBase.cs b/src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/DebuggerTestsBase.cs
rename to src/AddIns/Debugger/Debugger.Tests/DebuggerTestsBase.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Properties/AssemblyInfo.cs b/src/AddIns/Debugger/Debugger.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Properties/AssemblyInfo.cs
rename to src/AddIns/Debugger/Debugger.Tests/Properties/AssemblyInfo.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/AppDomain_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Breakpoint_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_DebuggeeKilled.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_MainThreadExit.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_NoBreak.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_NoBreak.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_NoBreak.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_NoBreak.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_Stepping.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminatePausedProcess.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ControlFlow_TerminateRunningProcess.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_CompilerGeneratedClasses.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/DebugType_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Exception_Custom.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Exception_Custom.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Exception_StackOverflow.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Process_MemoryReadWrite.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Callstack.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_Lifetime.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_SetIP.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/StackFrame_VariablesLifetime.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Thread_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Thread_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Value_Tests.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/Value_Tests.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/Value_Tests.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs b/src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
similarity index 100%
rename from src/AddIns/Misc/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
rename to src/AddIns/Debugger/Debugger.Tests/Tests/_HelloWorldTest.cs
diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Docs/Managed Debugger.chm b/src/AddIns/Misc/Debugger/Debugger.Core/Docs/Managed Debugger.chm
deleted file mode 100644
index ea1466d06b..0000000000
Binary files a/src/AddIns/Misc/Debugger/Debugger.Core/Docs/Managed Debugger.chm and /dev/null differ