diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/IRunTestCommandContext.cs b/src/AddIns/Analysis/UnitTesting/Commands/IRunTestCommandContext.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/IRunTestCommandContext.cs
rename to src/AddIns/Analysis/UnitTesting/Commands/IRunTestCommandContext.cs
diff --git a/src/AddIns/Analysis/UnitTesting/MultipleProjectBuildable.cs b/src/AddIns/Analysis/UnitTesting/Commands/MultipleProjectBuildable.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/MultipleProjectBuildable.cs
rename to src/AddIns/Analysis/UnitTesting/Commands/MultipleProjectBuildable.cs
diff --git a/src/AddIns/Analysis/UnitTesting/RunTestCommandContext.cs b/src/AddIns/Analysis/UnitTesting/Commands/RunTestCommandContext.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/RunTestCommandContext.cs
rename to src/AddIns/Analysis/UnitTesting/Commands/RunTestCommandContext.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/RunningTestsCondition.cs b/src/AddIns/Analysis/UnitTesting/Commands/RunningTestsCondition.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/RunningTestsCondition.cs
rename to src/AddIns/Analysis/UnitTesting/Commands/RunningTestsCondition.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestableCondition.cs b/src/AddIns/Analysis/UnitTesting/Commands/TestableCondition.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestableCondition.cs
rename to src/AddIns/Analysis/UnitTesting/Commands/TestableCondition.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestBuildOptions.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestBuildOptions.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestBuildOptions.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestBuildOptions.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestBuildProjectFactory.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestBuildProjectFactory.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestBuildProjectFactory.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestBuildProjectFactory.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestDebuggerService.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestDebuggerService.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestDebuggerService.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestDebuggerService.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestFileService.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestFileService.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestFileService.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestFileService.cs
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTestProcessRunner.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestProcessRunner.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/UnitTestProcessRunner.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestProcessRunner.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestSaveAllFilesCommand.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestSaveAllFilesCommand.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestSaveAllFilesCommand.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestSaveAllFilesCommand.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestTaskService.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestTaskService.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestTaskService.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestTaskService.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Implementation/UnitTestWorkbench.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestWorkbench.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Implementation/UnitTestWorkbench.cs
rename to src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestWorkbench.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestResult.cs b/src/AddIns/Analysis/UnitTesting/Model/TestResult.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestResult.cs
rename to src/AddIns/Analysis/UnitTesting/Model/TestResult.cs
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTestingOptions.cs b/src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptions.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/UnitTestingOptions.cs
rename to src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptions.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Gui/UnitTestingOptionsPanel.xaml b/src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptionsPanel.xaml
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Gui/UnitTestingOptionsPanel.xaml
rename to src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptionsPanel.xaml
diff --git a/src/AddIns/Analysis/UnitTesting/Gui/UnitTestingOptionsPanel.xaml.cs b/src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptionsPanel.xaml.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Gui/UnitTestingOptionsPanel.xaml.cs
rename to src/AddIns/Analysis/UnitTesting/Options/UnitTestingOptionsPanel.xaml.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Gui/EmptyUnitTestsPad.cs b/src/AddIns/Analysis/UnitTesting/Pad/EmptyUnitTestsPad.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Gui/EmptyUnitTestsPad.cs
rename to src/AddIns/Analysis/UnitTesting/Pad/EmptyUnitTestsPad.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/IUnitTestsPad.cs b/src/AddIns/Analysis/UnitTesting/Pad/IUnitTestsPad.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/IUnitTestsPad.cs
rename to src/AddIns/Analysis/UnitTesting/Pad/IUnitTestsPad.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs b/src/AddIns/Analysis/UnitTesting/Pad/UnitTestsPad.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Gui/UnitTestsPad.cs
rename to src/AddIns/Analysis/UnitTesting/Pad/UnitTestsPad.cs
diff --git a/src/AddIns/Analysis/UnitTesting/RemovedClasses.cs b/src/AddIns/Analysis/UnitTesting/RemovedClasses.cs
deleted file mode 100644
index 36ab54cc80..0000000000
--- a/src/AddIns/Analysis/UnitTesting/RemovedClasses.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Collections.Generic;
-
-namespace ICSharpCode.UnitTesting
-{
-	/// <summary>
-	/// Used to determine which classes have been removed by the user in the project.
-	/// </summary>
-	public class RemovedClasses
-	{
-		Dictionary<string, IClass> classDictionary = new Dictionary<string, IClass>();
-		
-		public RemovedClasses()
-		{
-		}
-		
-		public void Add(IList<IClass> classes)
-		{
-			foreach (IClass c in classes) {
-				classDictionary[c.DotNetName] = c;
-				foreach (IClass innerClass in c.InnerClasses) {
-					classDictionary[innerClass.DotNetName] = innerClass;
-				}
-			}
-		}
-		
-		/// <summary>
-		/// 
-		/// </summary>
-		/// <param name="c"></param>
-		public void Remove(IClass c)
-		{
-			classDictionary.Remove(c.DotNetName);
-			foreach (IClass innerClass in c.InnerClasses) {
-				classDictionary.Remove(innerClass.DotNetName);
-			}
-		}
-		
-		public IList<IClass> GetMissingClasses()
-		{
-			List<IClass> missingClasses = new List<IClass>();
-			foreach (IClass c in classDictionary.Values) {
-				missingClasses.Add(c);
-			}
-			return missingClasses;
-		}
-	}
-}
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/IRegisteredTestFrameworks.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/IRegisteredTestFrameworks.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/IRegisteredTestFrameworks.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/IRegisteredTestFrameworks.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestFramework.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/ITestFramework.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/ITestFramework.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/ITestFramework.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestFrameworkFactory.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/ITestFrameworkFactory.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/ITestFrameworkFactory.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/ITestFrameworkFactory.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestResultsMonitor.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/ITestResultsMonitor.cs
similarity index 88%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/ITestResultsMonitor.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/ITestResultsMonitor.cs
index 5fb7bd5bda..6a67c16e74 100644
--- a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestResultsMonitor.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestFramework/ITestResultsMonitor.cs
@@ -7,7 +7,7 @@ namespace ICSharpCode.UnitTesting
 {
 	public interface ITestResultsMonitor : IDisposable
 	{
-		event TestFinishedEventHandler TestFinished;
+		event EventHandler<TestFinishedEventArgs> TestFinished;
 		
 		string FileName { get; set; }
 		
diff --git a/src/AddIns/Analysis/UnitTesting/Service/RegisteredTestFrameworks.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/RegisteredTestFrameworks.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/RegisteredTestFrameworks.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/RegisteredTestFrameworks.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestFrameworkDescriptor.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkDescriptor.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestFrameworkDescriptor.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkDescriptor.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestFrameworkDoozer.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkDoozer.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestFrameworkDoozer.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkDoozer.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestFrameworkFactory.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkFactory.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestFrameworkFactory.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/TestFrameworkFactory.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestService.cs b/src/AddIns/Analysis/UnitTesting/TestFramework/TestService.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestService.cs
rename to src/AddIns/Analysis/UnitTesting/TestFramework/TestService.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestRunner.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/ITestRunner.cs
similarity index 78%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/ITestRunner.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/ITestRunner.cs
index 53e51e8b27..f05df18e56 100644
--- a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestRunner.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestRunner/ITestRunner.cs
@@ -8,9 +8,9 @@ namespace ICSharpCode.UnitTesting
 {
 	public interface ITestRunner : IDisposable
 	{
-		event TestFinishedEventHandler TestFinished;
+		event EventHandler<TestFinishedEventArgs> TestFinished;
 		event EventHandler AllTestsFinished;
-		event MessageReceivedEventHandler MessageReceived;
+		event EventHandler<MessageReceivedEventArgs> MessageReceived;
 		void Start(SelectedTests selectedTests);
 		void Stop();
 	}
diff --git a/src/AddIns/Analysis/UnitTesting/Service/MessageReceivedEventArgs.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/MessageReceivedEventArgs.cs
similarity index 83%
rename from src/AddIns/Analysis/UnitTesting/Service/MessageReceivedEventArgs.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/MessageReceivedEventArgs.cs
index da437a1410..15cfe8c1fd 100644
--- a/src/AddIns/Analysis/UnitTesting/Service/MessageReceivedEventArgs.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestRunner/MessageReceivedEventArgs.cs
@@ -5,8 +5,6 @@ using System;
 
 namespace ICSharpCode.UnitTesting
 {
-	public delegate void MessageReceivedEventHandler(object sender, MessageReceivedEventArgs e);
-	
 	public class MessageReceivedEventArgs : EventArgs
 	{
 		string message;
diff --git a/src/AddIns/Analysis/UnitTesting/Service/SelectedTests.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/SelectedTests.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/SelectedTests.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/SelectedTests.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestDebuggerBase.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestDebuggerBase.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestDebuggerBase.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestDebuggerBase.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestFinishedEventArgs.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestFinishedEventArgs.cs
similarity index 83%
rename from src/AddIns/Analysis/UnitTesting/Service/TestFinishedEventArgs.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestFinishedEventArgs.cs
index 15f16b6dc6..9ee6b61398 100644
--- a/src/AddIns/Analysis/UnitTesting/Service/TestFinishedEventArgs.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestRunner/TestFinishedEventArgs.cs
@@ -5,8 +5,6 @@ using System;
 
 namespace ICSharpCode.UnitTesting
 {
-	public delegate void TestFinishedEventHandler(object source, TestFinishedEventArgs e);
-	
 	public class TestFinishedEventArgs : EventArgs
 	{
 		TestResult result;
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestProcessRunnerBase.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBase.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestProcessRunnerBase.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBase.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestProcessRunnerBaseContext.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBaseContext.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Service/TestProcessRunnerBaseContext.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestProcessRunnerBaseContext.cs
diff --git a/src/AddIns/Analysis/UnitTesting/TestResultTask.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultTask.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/TestResultTask.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestResultTask.cs
diff --git a/src/AddIns/Analysis/UnitTesting/TestResultsMonitor.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsMonitor.cs
similarity index 98%
rename from src/AddIns/Analysis/UnitTesting/TestResultsMonitor.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsMonitor.cs
index 255b73db18..297dc87fb5 100644
--- a/src/AddIns/Analysis/UnitTesting/TestResultsMonitor.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsMonitor.cs
@@ -26,7 +26,7 @@ namespace ICSharpCode.UnitTesting
 		/// <summary>
 		/// Raised when a single test has been completed.
 		/// </summary>
-		public event TestFinishedEventHandler TestFinished;
+		public event EventHandler<TestFinishedEventArgs> TestFinished;
 		
 		public TestResultsMonitor(string fileName)
 		{
diff --git a/src/AddIns/Analysis/UnitTesting/TestResultsReader.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsReader.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/TestResultsReader.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestResultsReader.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Service/TestRunnerBase.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestRunnerBase.cs
similarity index 92%
rename from src/AddIns/Analysis/UnitTesting/Service/TestRunnerBase.cs
rename to src/AddIns/Analysis/UnitTesting/TestRunner/TestRunnerBase.cs
index 5b336e8966..e3482f992d 100644
--- a/src/AddIns/Analysis/UnitTesting/Service/TestRunnerBase.cs
+++ b/src/AddIns/Analysis/UnitTesting/TestRunner/TestRunnerBase.cs
@@ -37,7 +37,7 @@ namespace ICSharpCode.UnitTesting
 			}
 		}
 		
-		public event TestFinishedEventHandler TestFinished;
+		public event EventHandler<TestFinishedEventArgs> TestFinished;
 		
 		protected void OnTestFinished(object source, TestFinishedEventArgs e)
 		{
@@ -52,7 +52,7 @@ namespace ICSharpCode.UnitTesting
 			return testResult;
 		}
 		
-		public event MessageReceivedEventHandler MessageReceived;
+		public event EventHandler<MessageReceivedEventArgs> MessageReceived;
 		
 		protected virtual void OnMessageReceived(string message)
 		{
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/ClassUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/ClassUnitTestNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/ClassUnitTestNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/ClassUnitTestNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/ITestTreeView.cs b/src/AddIns/Analysis/UnitTesting/TreeView/ITestTreeView.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Interfaces/ITestTreeView.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/ITestTreeView.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/MemberUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/MemberUnitTestNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/MemberUnitTestNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/MemberUnitTestNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/NamespaceUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/NamespaceUnitTestNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/NamespaceUnitTestNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/NamespaceUnitTestNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/ProjectUnitTestNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/ProjectUnitTestNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/ProjectUnitTestNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/RootUnitTestNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/RootUnitTestNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/RootUnitTestNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/TestTreeView.cs b/src/AddIns/Analysis/UnitTesting/TreeView/TestTreeView.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/TestTreeView.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/TestTreeView.cs
diff --git a/src/AddIns/Analysis/UnitTesting/Nodes/UnitTestBaseNode.cs b/src/AddIns/Analysis/UnitTesting/TreeView/UnitTestBaseNode.cs
similarity index 100%
rename from src/AddIns/Analysis/UnitTesting/Nodes/UnitTestBaseNode.cs
rename to src/AddIns/Analysis/UnitTesting/TreeView/UnitTestBaseNode.cs
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
index 58abc4369d..c6faf5ad78 100644
--- a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
+++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
@@ -67,78 +67,78 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Commands\AbstractRunTestCommand.cs" />
+    <Compile Include="Commands\IRunTestCommandContext.cs" />
+    <Compile Include="Commands\MultipleProjectBuildable.cs" />
     <Compile Include="Commands\RunAllTestsInPadCommand.cs" />
+    <Compile Include="Commands\RunningTestsCondition.cs" />
     <Compile Include="Commands\RunProjectTestsInPadCommand.cs" />
+    <Compile Include="Commands\RunTestCommandContext.cs" />
     <Compile Include="Commands\RunTestInPadCommand.cs" />
     <Compile Include="Commands\RunTestWithDebuggerCommand.cs" />
+    <Compile Include="Commands\TestableCondition.cs" />
     <Compile Include="Commands\UnitTestCommands.cs" />
-    <Compile Include="Gui\EmptyUnitTestsPad.cs" />
-    <Compile Include="Gui\UnitTestingOptionsPanel.xaml.cs">
-      <DependentUpon>UnitTestingOptionsPanel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\UnitTestsPad.cs" />
-    <Compile Include="Implementation\UnitTestBuildOptions.cs" />
-    <Compile Include="Implementation\UnitTestBuildProjectFactory.cs" />
-    <Compile Include="Implementation\UnitTestDebuggerService.cs" />
-    <Compile Include="Implementation\UnitTestFileService.cs" />
-    <Compile Include="Implementation\UnitTestSaveAllFilesCommand.cs" />
-    <Compile Include="Implementation\UnitTestTaskService.cs" />
-    <Compile Include="Implementation\UnitTestWorkbench.cs" />
+    <Compile Include="Interfaces\IUnitTestProcessRunner.cs" />
+    <Compile Include="Interfaces\UnitTestProcessRunner.cs" />
+    <Compile Include="TestRunner\ITestRunner.cs" />
+    <Compile Include="TestRunner\TestResultsMonitor.cs" />
+    <Compile Include="TestRunner\TestResultsReader.cs" />
+    <Compile Include="TestRunner\TestResultTask.cs" />
+    <Compile Include="TestFramework\IRegisteredTestFrameworks.cs" />
+    <Compile Include="TestFramework\ITestFramework.cs" />
+    <Compile Include="TestFramework\ITestFrameworkFactory.cs" />
     <Compile Include="Interfaces\IBuildOptions.cs" />
     <Compile Include="Interfaces\IBuildProjectFactory.cs" />
     <Compile Include="Interfaces\IFileSystem.cs" />
-    <Compile Include="Interfaces\IRegisteredTestFrameworks.cs" />
-    <Compile Include="Interfaces\IRunTestCommandContext.cs" />
-    <Compile Include="Interfaces\ITestFramework.cs" />
-    <Compile Include="Interfaces\ITestFrameworkFactory.cs" />
-    <Compile Include="Interfaces\ITestResultsMonitor.cs" />
-    <Compile Include="Interfaces\ITestRunner.cs" />
-    <Compile Include="Interfaces\ITestTreeView.cs" />
     <Compile Include="Interfaces\IUnitTestDebuggerService.cs" />
-    <Compile Include="Interfaces\IUnitTestProcessRunner.cs" />
     <Compile Include="Interfaces\IUnitTestSaveAllFilesCommand.cs" />
-    <Compile Include="Interfaces\IUnitTestsPad.cs" />
     <Compile Include="Interfaces\IUnitTestTaskService.cs" />
     <Compile Include="Interfaces\IUnitTestWorkbench.cs" />
+    <Compile Include="Interfaces\UnitTestBuildOptions.cs" />
+    <Compile Include="Model\TestResult.cs" />
+    <Compile Include="Pad\EmptyUnitTestsPad.cs" />
+    <Compile Include="Pad\IUnitTestsPad.cs" />
+    <Compile Include="Pad\UnitTestsPad.cs" />
+    <Compile Include="Interfaces\UnitTestBuildProjectFactory.cs" />
+    <Compile Include="Interfaces\UnitTestDebuggerService.cs" />
+    <Compile Include="Interfaces\UnitTestFileService.cs" />
+    <Compile Include="Interfaces\UnitTestSaveAllFilesCommand.cs" />
+    <Compile Include="Interfaces\UnitTestTaskService.cs" />
+    <Compile Include="Interfaces\UnitTestWorkbench.cs" />
     <Compile Include="Model\TestClass.cs" />
     <Compile Include="Model\TestMember.cs" />
     <Compile Include="Model\TestProject.cs" />
     <Compile Include="Model\TestSolution.cs" />
-    <Compile Include="MultipleProjectBuildable.cs" />
-    <Compile Include="Nodes\ClassUnitTestNode.cs" />
-    <Compile Include="Nodes\MemberUnitTestNode.cs" />
-    <Compile Include="Nodes\NamespaceUnitTestNode.cs" />
-    <Compile Include="Nodes\ProjectUnitTestNode.cs" />
-    <Compile Include="Nodes\RootUnitTestNode.cs" />
-    <Compile Include="Nodes\UnitTestBaseNode.cs" />
+    <Compile Include="TestFramework\ITestResultsMonitor.cs" />
+    <Compile Include="TestFramework\RegisteredTestFrameworks.cs" />
+    <Compile Include="TestFramework\TestFrameworkDescriptor.cs" />
+    <Compile Include="TestFramework\TestFrameworkDoozer.cs" />
+    <Compile Include="TestFramework\TestFrameworkFactory.cs" />
+    <Compile Include="TestFramework\TestService.cs" />
+    <Compile Include="TreeView\ClassUnitTestNode.cs" />
+    <Compile Include="TreeView\ITestTreeView.cs" />
+    <Compile Include="TreeView\MemberUnitTestNode.cs" />
+    <Compile Include="TreeView\NamespaceUnitTestNode.cs" />
+    <Compile Include="TreeView\ProjectUnitTestNode.cs" />
+    <Compile Include="TreeView\RootUnitTestNode.cs" />
+    <Compile Include="TreeView\TestTreeView.cs" />
+    <Compile Include="TreeView\UnitTestBaseNode.cs" />
     <Compile Include="NUnit\NUnitConsoleApplication.cs" />
     <Compile Include="NUnit\NUnitTestDebugger.cs" />
     <Compile Include="NUnit\NUnitTestFramework.cs" />
     <Compile Include="NUnit\NUnitTestResult.cs" />
     <Compile Include="NUnit\NUnitTestRunner.cs" />
+    <Compile Include="Options\UnitTestingOptions.cs" />
+    <Compile Include="Options\UnitTestingOptionsPanel.xaml.cs">
+      <DependentUpon>UnitTestingOptionsPanel.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Resources\Images.cs" />
-    <Compile Include="RunTestCommandContext.cs" />
-    <Compile Include="Service\MessageReceivedEventArgs.cs" />
-    <Compile Include="Service\RegisteredTestFrameworks.cs" />
-    <Compile Include="Service\RunningTestsCondition.cs" />
-    <Compile Include="Service\SelectedTests.cs" />
-    <Compile Include="Service\TestableCondition.cs" />
-    <Compile Include="Service\TestDebuggerBase.cs" />
-    <Compile Include="Service\TestFinishedEventArgs.cs" />
-    <Compile Include="Service\TestFrameworkDescriptor.cs" />
-    <Compile Include="Service\TestFrameworkDoozer.cs" />
-    <Compile Include="Service\TestFrameworkFactory.cs" />
-    <Compile Include="Service\TestProcessRunnerBase.cs" />
-    <Compile Include="Service\TestProcessRunnerBaseContext.cs" />
-    <Compile Include="Service\TestResult.cs" />
-    <Compile Include="Service\TestRunnerBase.cs" />
-    <Compile Include="Service\TestService.cs" />
-    <Compile Include="TestResultsMonitor.cs" />
-    <Compile Include="TestResultsReader.cs" />
-    <Compile Include="TestResultTask.cs" />
-    <Compile Include="TestTreeView.cs" />
-    <Compile Include="UnitTestingOptions.cs" />
-    <Compile Include="UnitTestProcessRunner.cs" />
+    <Compile Include="TestRunner\MessageReceivedEventArgs.cs" />
+    <Compile Include="TestRunner\SelectedTests.cs" />
+    <Compile Include="TestRunner\TestDebuggerBase.cs" />
+    <Compile Include="TestRunner\TestFinishedEventArgs.cs" />
+    <Compile Include="TestRunner\TestProcessRunnerBase.cs" />
+    <Compile Include="TestRunner\TestProcessRunnerBaseContext.cs" />
+    <Compile Include="TestRunner\TestRunnerBase.cs" />
     <None Include="PostBuildEvent.proj" />
     <None Include="UnitTesting.addin">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -191,16 +191,17 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Commands" />
-    <Folder Include="Gui" />
-    <Folder Include="Implementation" />
+    <Folder Include="TestFramework" />
+    <Folder Include="Pad" />
     <Folder Include="Interfaces" />
     <Folder Include="Model" />
+    <Folder Include="Options" />
     <Folder Include="NUnit" />
-    <Folder Include="Service" />
-    <Folder Include="Nodes" />
+    <Folder Include="TestRunner" />
+    <Folder Include="TreeView" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Gui\UnitTestingOptionsPanel.xaml" />
+    <Page Include="Options\UnitTestingOptionsPanel.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <Import Project="PostBuildEvent.proj" />