diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index 9974a746e9..082af13302 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -1,69 +1,69 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.5950
+# SharpDevelop 4.0.0.6209
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -72,45 +72,45 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -119,228 +119,234 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "src\AddIns\BackendBindings\Ruby\RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+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}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
+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}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+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
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring.Tests", "src\AddIns\Misc\SharpRefactoring\Test\SharpRefactoring.Tests.csproj", "{A4AA51DE-A096-47EC-AA5D-D91457834ECF}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -350,232 +356,207 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddI
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring.Tests", "src\AddIns\Misc\SharpRefactoring\Test\SharpRefactoring.Tests.csproj", "{A4AA51DE-A096-47EC-AA5D-D91457834ECF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
 	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\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "src\AddIns\BackendBindings\Ruby\RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
 Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
@@ -772,18 +753,6 @@ Global
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1085,122 +1054,118 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{A4AA51DE-A096-47EC-AA5D-D91457834ECF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
 		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{01DF0475-0CB2-4E81-971B-BADC60CDE3A5} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A}
+		{388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94}
 		{C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A}
-		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{01DF0475-0CB2-4E81-971B-BADC60CDE3A5} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A}
+		{C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{A4AA51DE-A096-47EC-AA5D-D91457834ECF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789}
 	EndGlobalSection
 EndGlobal
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 3d059ead99..fc933e03db 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -1,29 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-# SharpDevelop 4.0.0.6050
+# SharpDevelop 4.0.0.6209
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -33,22 +31,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Do
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -57,35 +57,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -94,169 +94,179 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
-	ProjectSection(SolutionItems) = postProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
 	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\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+	ProjectSection(ProjectDependencies) = postProject
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
+	ProjectSection(SolutionItems) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
@@ -266,196 +276,167 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddI
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReflectorAddIn", "src\AddIns\Misc\ReflectorAddIn\ReflectorAddIn\Project\ReflectorAddIn.csproj", "{8AA421C8-D7AF-4957-9F43-5135328ACB24}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}"
+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
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
+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}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "src\AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6E59AF58-F635-459A-9A35-C9AC41C00339}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
+	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{D599885D-E161-4CCE-A66E-7A40C8C4F4CC}"
-	ProjectSection(SolutionItems) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "src\AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "src\AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "src\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
 	EndProjectSection
 EndProject
 Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "src\Tools\Tools.build", "{3DF4060F-5EE0-41CF-8096-F27355FD5511}"
@@ -650,18 +631,6 @@ Global
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F261725-6318-4434-A1B1-6C70CE4CD324}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -831,98 +800,94 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
-		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
+		{1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
 		{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
+		{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
+		{DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C}
 		{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
-		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{D599885D-E161-4CCE-A66E-7A40C8C4F4CC} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
 		{C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
-		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
-		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {E0646C25-36F2-4524-969F-FA621353AB94}
-		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
-		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
-		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
-		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
-		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
-		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
+		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
 		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
-		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
-		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
-		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
-		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
+		{6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47}
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {D599885D-E161-4CCE-A66E-7A40C8C4F4CC}
-		{CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789}
-		{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789}
+		{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47}
+		{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15}
+		{0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668}
+		{AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
+		{80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{8AA421C8-D7AF-4957-9F43-5135328ACB24} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
+		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
+		{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}
+		{C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{6E59AF58-F635-459A-9A35-C9AC41C00339} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94}
+		{D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF}
+		{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE}
+		{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960}
+		{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960}
 	EndGlobalSection
 EndGlobal
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj b/samples/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
similarity index 79%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
rename to samples/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
index 35abf3fbd4..6dc1c13960 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
+++ b/samples/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.AddIn.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <RootNamespace>ICSharpCode.ComponentInspector.AddIn</RootNamespace>
@@ -20,7 +21,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\ComponentInspector\</OutputPath>
+    <OutputPath>..\..\..\AddIns\Samples\ComponentInspector\</OutputPath>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
@@ -30,7 +31,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\ComponentInspector\</OutputPath>
+    <OutputPath>..\..\..\AddIns\Samples\ComponentInspector\</OutputPath>
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <DebugSymbols>false</DebugSymbols>
@@ -38,14 +39,19 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.Core">
+      <HintPath>..\..\..\bin\ICSharpCode.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpDevelop">
+      <HintPath>..\..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <None Include="ComponentInspector.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -70,16 +76,6 @@
       <Project>{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}</Project>
       <Name>ComponentInspector.Core</Name>
     </ProjectReference>
-    <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\Base\Project\ICSharpCode.SharpDevelop.csproj">
-      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
-      <Name>ICSharpCode.SharpDevelop</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin b/samples/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
rename to samples/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs
similarity index 85%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs
index 8ca2d561bf..a9cfb6427c 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs
+++ b/samples/ComponentInspector/ComponentInspector.AddIn/Configuration/AssemblyInfo.cs
@@ -18,3 +18,6 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/GeneralOptionsPanel.xfrm b/samples/ComponentInspector/ComponentInspector.AddIn/Resources/GeneralOptionsPanel.xfrm
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/GeneralOptionsPanel.xfrm
rename to samples/ComponentInspector/ComponentInspector.AddIn/Resources/GeneralOptionsPanel.xfrm
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/ObjectTreeOptionsPanel.xfrm b/samples/ComponentInspector/ComponentInspector.AddIn/Resources/ObjectTreeOptionsPanel.xfrm
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/ObjectTreeOptionsPanel.xfrm
rename to samples/ComponentInspector/ComponentInspector.AddIn/Resources/ObjectTreeOptionsPanel.xfrm
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/TypeHandlerOptionsPanel.xfrm b/samples/ComponentInspector/ComponentInspector.AddIn/Resources/TypeHandlerOptionsPanel.xfrm
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Resources/TypeHandlerOptionsPanel.xfrm
rename to samples/ComponentInspector/ComponentInspector.AddIn/Resources/TypeHandlerOptionsPanel.xfrm
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/CloseAssemblyCommand.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/CloseAssemblyCommand.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/CloseAssemblyCommand.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/CloseAssemblyCommand.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/FindCommand.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/FindCommand.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/FindCommand.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/FindCommand.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/GeneralOptionsPanel.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/GeneralOptionsPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/GeneralOptionsPanel.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/GeneralOptionsPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ObjectTreeOptionsPanel.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/ObjectTreeOptionsPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ObjectTreeOptionsPanel.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/ObjectTreeOptionsPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/OpenAssemblyCommand.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/OpenAssemblyCommand.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/OpenAssemblyCommand.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/OpenAssemblyCommand.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ShowComponentInspectorCommand.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/ShowComponentInspectorCommand.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ShowComponentInspectorCommand.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/ShowComponentInspectorCommand.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/TypeHandlerOptionsPanel.cs b/samples/ComponentInspector/ComponentInspector.AddIn/Src/TypeHandlerOptionsPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/TypeHandlerOptionsPanel.cs
rename to samples/ComponentInspector/ComponentInspector.AddIn/Src/TypeHandlerOptionsPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources.res b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources.res
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources.res
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources.res
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/CLSDFOLD.ico b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/CLSDFOLD.ico
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/CLSDFOLD.ico
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/CLSDFOLD.ico
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClass.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClass.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClass.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClass.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClassFolder.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClassFolder.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClassFolder.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComClassFolder.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComInterfaceFolder.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComInterfaceFolder.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComInterfaceFolder.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComInterfaceFolder.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComModule.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComModule.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComModule.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComModule.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeDef.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeDef.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeDef.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeDef.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeLibFolder.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeLibFolder.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeLibFolder.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComTypeLibFolder.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComUnion.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComUnion.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/ComUnion.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/ComUnion.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/CompInsp.ico b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/CompInsp.ico
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/CompInsp.ico
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/CompInsp.ico
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/DispInterface.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/DispInterface.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/DispInterface.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/DispInterface.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderClosed.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderClosed.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderClosed.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderClosed.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderOpened.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderOpened.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderOpened.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/FolderOpened.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/OPENFOLD.ico b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/OPENFOLD.ico
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/OPENFOLD.ico
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/OPENFOLD.ico
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/Object1_16.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/Object1_16.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/Object1_16.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/Object1_16.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/Object2_16.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/Object2_16.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/Object2_16.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/Object2_16.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/TypeLib.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/TypeLib.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/TypeLib.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/TypeLib.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/activex.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/activex.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/activex.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/activex.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/activexOuter.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/activexOuter.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/activexOuter.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/activexOuter.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/gac.ico b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/gac.ico
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/gac.ico
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/gac.ico
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/gears.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/gears.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/gears.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/gears.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxassembly_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxassembly_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxassembly_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxassembly_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxclass_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxclass_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxclass_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxclass_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxconstant_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxconstant_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxconstant_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxconstant_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxdelegate_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxdelegate_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxdelegate_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxdelegate_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenum_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenum_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenum_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenum_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenumitem_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenumitem_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenumitem_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxenumitem_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxerror_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxerror_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxerror_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxerror_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxevent_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxevent_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxevent_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxevent_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxexception_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxexception_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxexception_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxexception_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxfield_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxfield_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxfield_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxfield_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxinterface_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxinterface_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxinterface_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxinterface_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxintrinsic_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxintrinsic_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxintrinsic_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxintrinsic_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmacro_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmacro_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmacro_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmacro_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmap_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmap_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmap_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmap_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmapitem_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmapitem_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmapitem_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmapitem_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmethod_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmethod_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmethod_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmethod_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmodule_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmodule_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmodule_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxmodule_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxnamespace_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxnamespace_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxnamespace_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxnamespace_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxobject_icon.ico b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxobject_icon.ico
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxobject_icon.ico
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxobject_icon.ico
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxoperator_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxoperator_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxoperator_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxoperator_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxproperty_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxproperty_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxproperty_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxproperty_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_arrow.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_arrow.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_arrow.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_arrow.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_diamond.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_diamond.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_diamond.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_diamond.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_envelope.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_envelope.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_envelope.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_envelope.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_key.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_key.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_key.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_key.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_lock.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_lock.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_lock.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxsignal_icon_lock.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxstruct_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxstruct_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxstruct_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxstruct_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtemplate_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtemplate_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtemplate_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtemplate_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtypedef_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtypedef_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtypedef_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxtypedef_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxunion_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxunion_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxunion_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxunion_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxvaluetype_icon.png b/samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxvaluetype_icon.png
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/BitmapResources/vxvaluetype_icon.png
rename to samples/ComponentInspector/ComponentInspector.Core/BitmapResources/vxvaluetype_icon.png
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj b/samples/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
similarity index 92%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
rename to samples/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
index d6f8a1e4dd..f8d231ce81 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
+++ b/samples/ComponentInspector/ComponentInspector.Core/ComponentInspector.Core.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <RootNamespace>ComponentInspector.Core</RootNamespace>
@@ -21,7 +22,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\ComponentInspector\</OutputPath>
+    <OutputPath>..\..\..\AddIns\Samples\ComponentInspector\</OutputPath>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
@@ -31,7 +32,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
-    <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\ComponentInspector\</OutputPath>
+    <OutputPath>..\..\..\AddIns\Samples\ComponentInspector\</OutputPath>
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <DebugSymbols>false</DebugSymbols>
@@ -39,6 +40,12 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.Core">
+      <HintPath>..\..\..\bin\ICSharpCode.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.Core.WinForms">
+      <HintPath>..\..\..\bin\ICSharpCode.Core.WinForms.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -49,9 +56,6 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
-      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="Src\Debug\Debugger.cs" />
     <Compile Include="Src\ObjectBrowser\ActionMenuHelper.cs" />
@@ -204,16 +208,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources" />
-    <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.WinForms\ICSharpCode.Core.WinForms.csproj">
-      <Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
-      <Name>ICSharpCode.Core.WinForms</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs
similarity index 85%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs
index ce92a629cb..4deba21fbe 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs
+++ b/samples/ComponentInspector/ComponentInspector.Core/Configuration/AssemblyInfo.cs
@@ -16,5 +16,8 @@ using System.Reflection;
 [assembly: AssemblyTitle("Component Inspector Library")]
 [assembly: AssemblyDescription("Component Inspector Library")]
 [assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("SharpDevelop")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.*")]
\ No newline at end of file
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Resources/BitmapResources.resources b/samples/ComponentInspector/ComponentInspector.Core/Resources/BitmapResources.resources
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Resources/BitmapResources.resources
rename to samples/ComponentInspector/ComponentInspector.Core/Resources/BitmapResources.resources
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/ErrorDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Controls/ErrorDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/ErrorDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Controls/ErrorDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/NumericTextBox.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Controls/NumericTextBox.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/NumericTextBox.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Controls/NumericTextBox.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListView.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListView.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListView.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Controls/TreeListView.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/CORDBLib_1_0.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/CORDBLib_1_0.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/CORDBLib_1_0.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/CORDBLib_1_0.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/Debugger.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/Debugger.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/Debugger.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/Debugger.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumHolder.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumHolder.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumHolder.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumHolder.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumMarshaler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumMarshaler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumMarshaler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/EnumMarshaler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/Profile.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/Profile.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/Profile.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/Profile.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/cordebug.idl b/samples/ComponentInspector/ComponentInspector.Core/Src/Debug/cordebug.idl
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Debug/cordebug.idl
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Debug/cordebug.idl
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActionMenuHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActionMenuHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActionMenuHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActionMenuHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/DetailPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/DetailPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/DetailPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/DetailPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/ObjectTreePanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/ObjectTreePanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/ObjectTreePanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ActiveX/ObjectTreePanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/AssemblySupport.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/AssemblySupport.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/AssemblySupport.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/AssemblySupport.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserFinder.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserFinder.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserFinder.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserFinder.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserTree.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserTree.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserTree.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/BrowserTree.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CastInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CastInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CastInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CastInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComSupport.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComSupport.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComSupport.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComSupport.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CompNumber.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CompNumber.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CompNumber.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/CompNumber.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComponentInspectorProperties.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComponentInspectorProperties.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComponentInspectorProperties.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ComponentInspectorProperties.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ControlTree.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ControlTree.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ControlTree.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ControlTree.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AboutDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AboutDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AboutDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AboutDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AttachDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AttachDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AttachDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/AttachDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CastDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CastDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CastDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CastDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ConstructorDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ConstructorDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ConstructorDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ConstructorDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CustomizeDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CustomizeDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CustomizeDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/CustomizeDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/Dialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/Dialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/Dialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/Dialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/FindDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/FindDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/FindDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/FindDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/GettingStartedDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/GettingStartedDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/GettingStartedDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/GettingStartedDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ProgressDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ProgressDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ProgressDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/ProgressDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/SplashDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/SplashDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/SplashDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/SplashDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/TracingDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/TracingDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/TracingDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/TracingDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/WaitingForAppDialog.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/WaitingForAppDialog.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/WaitingForAppDialog.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Dialogs/WaitingForAppDialog.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/DragDropSupport.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/DragDropSupport.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/DragDropSupport.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/DragDropSupport.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/EventLogList.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/EventLogList.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/EventLogList.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/EventLogList.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GacList.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GacList.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GacList.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GacList.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/BrowserDesignerTransaction.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/BrowserDesignerTransaction.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/BrowserDesignerTransaction.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/BrowserDesignerTransaction.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerContainer.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerContainer.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerContainer.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerContainer.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerHost.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerHost.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerHost.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerHost.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerSite.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerSite.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerSite.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DesignerSite.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DummyDesigner.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DummyDesigner.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DummyDesigner.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/DummyDesigner.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ImagePanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ImagePanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ImagePanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ImagePanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ToolBoxService.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ToolBoxService.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ToolBoxService.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/GuiDesigner/ToolBoxService.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IBrowserNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IBrowserNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IBrowserNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IBrowserNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ICastableTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ICastableTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ICastableTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ICastableTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IConvertableTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IConvertableTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IConvertableTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IConvertableTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDesignSurfaceNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDesignSurfaceNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDesignSurfaceNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDesignSurfaceNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDragDropSourceTarget.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDragDropSourceTarget.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDragDropSourceTarget.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDragDropSourceTarget.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDrapDropItem.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDrapDropItem.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDrapDropItem.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDrapDropItem.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDropTarget.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDropTarget.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDropTarget.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IDropTarget.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingMenuNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingMenuNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingMenuNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingMenuNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IEventLoggingNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IFavoriteTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IFavoriteTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IFavoriteTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IFavoriteTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IInvokableTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IInvokableTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IInvokableTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IInvokableTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ILinkTarget.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ILinkTarget.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ILinkTarget.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ILinkTarget.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IMenuTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IMenuTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IMenuTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IMenuTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IObjectMember.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IObjectMember.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IObjectMember.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IObjectMember.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchMaterializer.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchMaterializer.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchMaterializer.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchMaterializer.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearchNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearcher.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearcher.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearcher.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ISearcher.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITargetType.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITargetType.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITargetType.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITargetType.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITypeTreeHandler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITypeTreeHandler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITypeTreeHandler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ITypeTreeHandler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IntermediateNodeType.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IntermediateNodeType.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IntermediateNodeType.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/IntermediateNodeType.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ComLinkHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ComLinkHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ComLinkHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ComLinkHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/HelpLinkHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/HelpLinkHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/HelpLinkHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/HelpLinkHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjLinkHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjLinkHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjLinkHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjLinkHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjMemberLinkHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjMemberLinkHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjMemberLinkHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/ObjMemberLinkHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/TypeLinkHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/TypeLinkHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/TypeLinkHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/LinkHelpers/TypeLinkHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowser.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowser.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowser.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowser.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowserForm.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowserForm.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowserForm.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectBrowserForm.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectCreator.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectCreator.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectCreator.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/ObjectCreator.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/OutputList.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/OutputList.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/OutputList.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/OutputList.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PanelLabel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PanelLabel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PanelLabel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PanelLabel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ButtonPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ButtonPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ButtonPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ButtonPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustActiveXPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustActiveXPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustActiveXPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustActiveXPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustDirPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustDirPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustDirPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustDirPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustObjectPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustObjectPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustObjectPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustObjectPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustShowPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustShowPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustShowPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustShowPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustTypeHandlerPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustTypeHandlerPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustTypeHandlerPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/CustTypeHandlerPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/DetailPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/DetailPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/DetailPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/DetailPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ICustPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ICustPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ICustPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ICustPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamControlInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamControlInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamControlInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamControlInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/ParamPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/StatusPanel.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/StatusPanel.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/StatusPanel.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Panels/StatusPanel.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PresentationMap.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PresentationMap.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PresentationMap.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PresentationMap.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssembly.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssembly.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssembly.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssembly.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssemblyCollection.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssemblyCollection.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssemblyCollection.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedAssemblyCollection.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibrary.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibrary.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibrary.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibrary.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibraryCollection.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibraryCollection.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibraryCollection.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/PreviouslyOpenedTypeLibraryCollection.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfoCollection.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfoCollection.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfoCollection.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/SavedCastInfoCollection.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/AssemblyTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/AssemblyTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/AssemblyTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/AssemblyTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/BrowserTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/BrowserTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/BrowserTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/BrowserTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComAppIdRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComAppIdRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComAppIdRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComAppIdRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComCatTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComClassRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComClassRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComClassRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComClassRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComInterfaceRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComInterfaceRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComInterfaceRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComInterfaceRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComMemberTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComMemberTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComMemberTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComMemberTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComProgIdRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComProgIdRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComProgIdRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComProgIdRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComSearchMaterializer.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComSearchMaterializer.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComSearchMaterializer.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComSearchMaterializer.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibRootTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibRootTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibRootTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibRootTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeLibTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ComTypeTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/IntermediateTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/IntermediateTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/IntermediateTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/IntermediateTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/MemberTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/MemberTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/MemberTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/MemberTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ModuleTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ModuleTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ModuleTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ModuleTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/NamespaceTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/NamespaceTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/NamespaceTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/NamespaceTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTypeTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTypeTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTypeTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/ObjectTypeTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/TypeTreeNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/TypeTreeNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/TypeTreeNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TreeNodes/TypeTreeNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TypeHandlerManager.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TypeHandlerManager.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TypeHandlerManager.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/TypeHandlerManager.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/BaseTypeHandler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/BaseTypeHandler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/BaseTypeHandler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/BaseTypeHandler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/EventHandlerListTypeHandler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/EventHandlerListTypeHandler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/EventHandlerListTypeHandler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/EventHandlerListTypeHandler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IEnumeratorTypeHandler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IEnumeratorTypeHandler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IEnumeratorTypeHandler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IEnumeratorTypeHandler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IListTypeHandler.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IListTypeHandler.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IListTypeHandler.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Types/IListTypeHandler.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Version.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Version.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Version.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/ObjectBrowser/Version.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/AssemblyInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/AssemblyInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/AssemblyInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/BasicInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/BasicInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/BasicInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/BasicInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ClassCache.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ClassCache.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ClassCache.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ClassCache.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComAppInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComAppInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComAppInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComAppInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComClassInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComClassInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComClassInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComClassInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComInterfaceInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComInterfaceInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComInterfaceInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComInterfaceInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComMemberInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComMemberInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComMemberInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComMemberInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComObjectInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComObjectInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComObjectInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComObjectInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComStructInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComStructInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComStructInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComStructInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComTypeDefInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComTypeDefInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComTypeDefInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComTypeDefInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComVariableInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComVariableInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ComVariableInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ComVariableInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ICodeDom.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ICodeDom.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ICodeDom.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ICodeDom.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectNode.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectNode.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectNode.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/IObjectNode.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/NamePropCache.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/NamePropCache.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/NamePropCache.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/NamePropCache.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfo.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfo.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfoFactory.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfoFactory.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfoFactory.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/ObjectInfoFactory.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/StructAccessor.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/StructAccessor.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/StructAccessor.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/StructAccessor.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibKey.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibKey.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibKey.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibKey.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibUtil.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibUtil.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibUtil.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibUtil.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibrary.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibrary.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibrary.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Objects/TypeLibrary.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/Constants.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Util/Constants.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/Constants.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Util/Constants.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/LocalPrefs.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Util/LocalPrefs.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/LocalPrefs.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Util/LocalPrefs.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/ReflectionHelper.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Util/ReflectionHelper.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/ReflectionHelper.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Util/ReflectionHelper.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/TraceUtil.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Util/TraceUtil.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/TraceUtil.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Util/TraceUtil.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/Utils.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Util/Utils.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Util/Utils.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Util/Utils.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/ActiveX.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Win32/ActiveX.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/ActiveX.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Win32/ActiveX.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/Win32Utils.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Win32/Win32Utils.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/Win32Utils.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Win32/Win32Utils.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/Windows.cs b/samples/ComponentInspector/ComponentInspector.Core/Src/Win32/Windows.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector.Core/Src/Win32/Windows.cs
rename to samples/ComponentInspector/ComponentInspector.Core/Src/Win32/Windows.cs
diff --git a/samples/ComponentInspector/ComponentInspector.sln b/samples/ComponentInspector/ComponentInspector.sln
new file mode 100644
index 0000000000..103d33cae0
--- /dev/null
+++ b/samples/ComponentInspector/ComponentInspector.sln
@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# SharpDevelop 4.0.0.6209
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.Build.0 = Release|Any CPU
+		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/ComponentInspector.csproj b/samples/ComponentInspector/ComponentInspector/ComponentInspector.csproj
similarity index 79%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector/ComponentInspector.csproj
rename to samples/ComponentInspector/ComponentInspector/ComponentInspector.csproj
index bf6c39cccc..795696fa70 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector/ComponentInspector.csproj
+++ b/samples/ComponentInspector/ComponentInspector/ComponentInspector.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ComponentInspector</RootNamespace>
@@ -20,7 +21,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\..\..\bin\Tools\ComponentInspector\</OutputPath>
+    <OutputPath>bin\ComponentInspector\</OutputPath>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>true</DebugSymbols>
@@ -28,7 +29,7 @@
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\..\..\bin\Tools\ComponentInspector\</OutputPath>
+    <OutputPath>bin\ComponentInspector\</OutputPath>
     <Optimize>True</Optimize>
     <DefineConstants>TRACE</DefineConstants>
     <DebugSymbols>false</DebugSymbols>
@@ -36,6 +37,9 @@
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ICSharpCode.Core">
+      <HintPath>..\..\..\bin\ICSharpCode.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -52,18 +56,12 @@
       <Project>{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}</Project>
       <Name>ComponentInspector.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
-      <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
-      <Name>ICSharpCode.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\..\..\..\data\resources\StringResources.resx">
+    <EmbeddedResource Include="..\..\..\data\resources\StringResources.resx">
       <Link>Resources\StringResources.resx</Link>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-  <Import Project="PostBuildEvent.proj" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/Configuration/AssemblyInfo.cs b/samples/ComponentInspector/ComponentInspector/Configuration/AssemblyInfo.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector/Configuration/AssemblyInfo.cs
rename to samples/ComponentInspector/ComponentInspector/Configuration/AssemblyInfo.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/Src/ComponentInspectorApplication.cs b/samples/ComponentInspector/ComponentInspector/Src/ComponentInspectorApplication.cs
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector/Src/ComponentInspectorApplication.cs
rename to samples/ComponentInspector/ComponentInspector/Src/ComponentInspectorApplication.cs
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/app.config b/samples/ComponentInspector/ComponentInspector/app.config
similarity index 100%
rename from src/AddIns/Misc/ComponentInspector/ComponentInspector/app.config
rename to samples/ComponentInspector/ComponentInspector/app.config
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.sln b/src/AddIns/Misc/ComponentInspector/ComponentInspector.sln
deleted file mode 100644
index ba4b1a8eca..0000000000
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.sln
+++ /dev/null
@@ -1,64 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.1.0.1782
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.Build.0 = Release|Any CPU
-		{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj b/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj
deleted file mode 100644
index 4cc84621ea..0000000000
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector/PostBuildEvent.proj
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTarget="Build">
-	<PropertyGroup>
-		<PrepareForRunDependsOn>$(PrepareForRunDependsOn);MyPostBuildTarget</PrepareForRunDependsOn>
-	</PropertyGroup>
-	
-	<!-- MSBuild refuses to copy files that the ComponentInspector depends on when we build
-	the project using the main SharpDevelop solution. The separate ComponentInspector solution
-	works correctly without this postbuild workaround. -->
-	<ItemGroup>
-		<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\..\..\..\bin\ICSharpCode.Core.dll" />
-	</ItemGroup>
-	<Target Name="MyPostBuildTarget">
-		<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
-	</Target>
-</Project>
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index fc86556b22..d3d379b36a 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -189,18 +189,6 @@
 								<File Source="..\..\bin\Mono.Cecil.dll" Id="Mono.Cecil.dll" Name="Mono.Cecil.dll" Assembly=".net" AssemblyApplication="Mono.Cecil.dll" AssemblyManifest="Mono.Cecil.dll" KeyPath="yes" />
 							</Component>
 							<Directory Id="ToolsFolder" Name="Tools">
-								<Directory Id="ComponentInspectorFolder" Name="ComponentInspector">
-									<Component Guid="E4175768-82FD-45F4-8E7D-BB4031E97454" Id="ComponentInspectorCoreDll" DiskId="1">
-										<File Source="..\..\bin\Tools\ComponentInspector\ComponentInspector.Core.dll" Id="Tools.ComponentInspector.Core.dll" Name="ComponentInspector.Core.dll" Assembly=".net" AssemblyApplication="Tools.ComponentInspector.Core.dll" AssemblyManifest="Tools.ComponentInspector.Core.dll" KeyPath="yes" />
-									</Component>
-									<Component Guid="59BEBE19-6AF1-4557-88C5-ED0B935EAE1C" Id="ComponentInspectorExe" DiskId="1">
-										<File Source="..\..\bin\Tools\ComponentInspector\ComponentInspector.exe" Id="ComponentInspector.exe" Name="ComponentInspector.exe" Assembly=".net" AssemblyApplication="ComponentInspector.exe" AssemblyManifest="ComponentInspector.exe" KeyPath="yes" />
-										<File Source="..\..\bin\Tools\ComponentInspector\ComponentInspector.exe.config" Id="ComponentInspector.exe.config" Name="ComponentInspector.exe.config" />
-									</Component>
-									<Component Guid="F2643529-834A-4EDE-B0C2-36E0A031E997" Id="ComponentInspectorICSharpCodeCoreDll" DiskId="1">
-										<File Source="..\..\bin\Tools\ComponentInspector\ICSharpCode.Core.dll" Id="ComponentInspector.ICSharpCode.Core.dll" Name="ICSharpCode.Core.dll" Assembly=".net" AssemblyApplication="ComponentInspector.ICSharpCode.Core.dll" AssemblyManifest="ComponentInspector.ICSharpCode.Core.dll" KeyPath="yes" />
-									</Component>
-								</Directory>
 								<Directory Id="WixFolder" Name="Wix">
 									<Component Guid="78F8DB04-62B1-4A2F-A0D5-D8D890FE5D02" Id="WixVSExtension" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\WixVSExtension.dll" Id="WixVSExtension.dll" Name="WixVSExtension.dll" Assembly=".net" AssemblyApplication="WixVSExtension.dll" AssemblyManifest="WixVSExtension.dll" KeyPath="yes" />
@@ -1298,15 +1286,6 @@
 											<File Source="..\..\AddIns\AddIns\Misc\CodeAnalysis\CodeAnalysis.addin" Id="CodeAnalysis.addin" Name="CodeAnalysis.addin" />
 										</Component>
 									</Directory>
-									<Directory Id="ComponentInspectorAddInFolder" Name="ComponentInspector">
-										<Component Guid="2056340F-5471-422D-8901-9DC385D145AA" Id="ComponentInspectorAddInCoreDll" DiskId="1">
-											<File Source="..\..\AddIns\AddIns\Misc\ComponentInspector\ComponentInspector.Core.dll" Id="ComponentInspector.Core.dll" Name="ComponentInspector.Core.dll" Assembly=".net" AssemblyApplication="ComponentInspector.Core.dll" AssemblyManifest="ComponentInspector.Core.dll" KeyPath="yes" />
-										</Component>
-										<Component Guid="C3CBE9CD-ED60-4B07-9082-D5D31755C388" Id="ComponentInspectorAddInDll" DiskId="1">
-											<File Source="..\..\AddIns\AddIns\Misc\ComponentInspector\ComponentInspector.addin" Id="ComponentInspector.addin" Name="ComponentInspector.addin" />
-											<File Source="..\..\AddIns\AddIns\Misc\ComponentInspector\ComponentInspector.AddIn.dll" Id="ComponentInspector.AddIn.dll" Name="ComponentInspector.AddIn.dll" Assembly=".net" AssemblyApplication="ComponentInspector.AddIn.dll" AssemblyManifest="ComponentInspector.AddIn.dll" KeyPath="yes" />
-										</Component>
-									</Directory>
 									<Directory Id="FiletypeRegistererFolder" Name="FiletypeRegisterer">
 										<Directory Id="FileTypesFolder" Name="filetypes">
 											<Component Guid="389BF494-9AE6-476A-A0FE-39DB0CFE95D1" Id="FiletypeIcons" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 8e4466aa7d..ee9cbf2f2a 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -193,9 +193,6 @@
 				<ComponentRef Id="AvalonDockDll"/>
 				<ComponentRef Id="ICSharpCodeCorePresentationDll"/>
 				<ComponentRef Id="SharpDevelopTechNoteFiles"/>
-				<ComponentRef Id="ComponentInspectorExe"/>
-				<ComponentRef Id="ComponentInspectorCoreDll"/>
-				<ComponentRef Id="ComponentInspectorICSharpCodeCoreDll"/>
 				<ComponentRef Id="SharpDevelopProgramMenuItems"/>
 				<ComponentRef Id="DesktopFolderItems"/>
 				
@@ -349,8 +346,6 @@
 				<ComponentRef Id="AddInScoutFiles"/>
 				<ComponentRef Id="CodeAnalysisFiles"/>
 				<ComponentRef Id="CodeCoverageFiles"/>
-				<ComponentRef Id="ComponentInspectorAddInDll"/>
-				<ComponentRef Id="ComponentInspectorAddInCoreDll"/>
 				<ComponentRef Id="DebuggerAddInFiles"/>
 				<ComponentRef Id="FiletypeIcons"/>
 				<ComponentRef Id="FiletypeRegistererFiles"/>