diff --git a/OmniXaml/OmniXaml.sln b/OmniXaml/OmniXaml.sln
index 1900a0d..440d3e0 100644
--- a/OmniXaml/OmniXaml.sln
+++ b/OmniXaml/OmniXaml.sln
@@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Tests.Resources", "..\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Tests.Wpf", "Tests\OmniXaml.Tests.Wpf\OmniXaml.Tests.Wpf.csproj", "{952C2CB6-BB38-471A-AD55-D68FCAC4A5CF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlViewer", "TestApplication\XamlViewer.csproj", "{A49A57C4-6DB5-44A0-869B-39EED7884A0B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlViewer", "TestApplications\XamlViewer\XamlViewer.csproj", "{A49A57C4-6DB5-44A0-869B-39EED7884A0B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Wpf", "OmniXaml.Wpf\OmniXaml.Wpf.csproj", "{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}"
 EndProject
@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.AppServices.NetCor
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.AppServices.NetCore.Tests", "OmniXaml.AppServices.NetCore.Tests\OmniXaml.AppServices.NetCore.Tests.csproj", "{BB3EEE9D-9962-4ADB-954A-E070B0C03CC8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication2\TestApplication.csproj", "{70FEDBBC-AD3D-4AB9-8EC0-3306BE2E266D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplications\TestApplication\TestApplication.csproj", "{70FEDBBC-AD3D-4AB9-8EC0-3306BE2E266D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApplications", "TestApplications", "{2128C3CA-2925-494C-949B-93FDFF746516}"
 EndProject
diff --git a/OmniXaml/TestApplication2/App.config b/OmniXaml/TestApplications/TestApplication/App.config
similarity index 100%
rename from OmniXaml/TestApplication2/App.config
rename to OmniXaml/TestApplications/TestApplication/App.config
diff --git a/OmniXaml/TestApplication2/App.xaml b/OmniXaml/TestApplications/TestApplication/App.xaml
similarity index 100%
rename from OmniXaml/TestApplication2/App.xaml
rename to OmniXaml/TestApplications/TestApplication/App.xaml
diff --git a/OmniXaml/TestApplication2/App.xaml.cs b/OmniXaml/TestApplications/TestApplication/App.xaml.cs
similarity index 100%
rename from OmniXaml/TestApplication2/App.xaml.cs
rename to OmniXaml/TestApplications/TestApplication/App.xaml.cs
diff --git a/OmniXaml/TestApplication2/MainWindow.xaml b/OmniXaml/TestApplications/TestApplication/MainWindow.xaml
similarity index 100%
rename from OmniXaml/TestApplication2/MainWindow.xaml
rename to OmniXaml/TestApplications/TestApplication/MainWindow.xaml
diff --git a/OmniXaml/TestApplication2/MainWindow.xaml.cs b/OmniXaml/TestApplications/TestApplication/MainWindow.xaml.cs
similarity index 100%
rename from OmniXaml/TestApplication2/MainWindow.xaml.cs
rename to OmniXaml/TestApplications/TestApplication/MainWindow.xaml.cs
diff --git a/OmniXaml/TestApplication2/Properties/AssemblyInfo.cs b/OmniXaml/TestApplications/TestApplication/Properties/AssemblyInfo.cs
similarity index 100%
rename from OmniXaml/TestApplication2/Properties/AssemblyInfo.cs
rename to OmniXaml/TestApplications/TestApplication/Properties/AssemblyInfo.cs
diff --git a/OmniXaml/TestApplication2/Properties/Resources.Designer.cs b/OmniXaml/TestApplications/TestApplication/Properties/Resources.Designer.cs
similarity index 100%
rename from OmniXaml/TestApplication2/Properties/Resources.Designer.cs
rename to OmniXaml/TestApplications/TestApplication/Properties/Resources.Designer.cs
diff --git a/OmniXaml/TestApplication2/Properties/Resources.resx b/OmniXaml/TestApplications/TestApplication/Properties/Resources.resx
similarity index 100%
rename from OmniXaml/TestApplication2/Properties/Resources.resx
rename to OmniXaml/TestApplications/TestApplication/Properties/Resources.resx
diff --git a/OmniXaml/TestApplication2/Properties/Settings.Designer.cs b/OmniXaml/TestApplications/TestApplication/Properties/Settings.Designer.cs
similarity index 100%
rename from OmniXaml/TestApplication2/Properties/Settings.Designer.cs
rename to OmniXaml/TestApplications/TestApplication/Properties/Settings.Designer.cs
diff --git a/OmniXaml/TestApplication/Properties/Settings.settings b/OmniXaml/TestApplications/TestApplication/Properties/Settings.settings
similarity index 100%
rename from OmniXaml/TestApplication/Properties/Settings.settings
rename to OmniXaml/TestApplications/TestApplication/Properties/Settings.settings
diff --git a/OmniXaml/TestApplication2/TestApplication.csproj b/OmniXaml/TestApplications/TestApplication/TestApplication.csproj
similarity index 85%
rename from OmniXaml/TestApplication2/TestApplication.csproj
rename to OmniXaml/TestApplications/TestApplication/TestApplication.csproj
index 71cefd9..cfc9afc 100644
--- a/OmniXaml/TestApplication2/TestApplication.csproj
+++ b/OmniXaml/TestApplications/TestApplication/TestApplication.csproj
@@ -98,20 +98,16 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.AppServices.NetCore\OmniXaml.AppServices.NetCore.csproj">
-      <Project>{e4fb7d33-20f4-46f8-b7c6-fc11eff34cfb}</Project>
-      <Name>OmniXaml.AppServices.NetCore</Name>
-    </ProjectReference>
-    <ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.AppServices\OmniXaml.AppServices.csproj">
-      <Project>{b207c0cb-2bdf-4105-9e1d-1c5b98e98381}</Project>
+    <ProjectReference Include="..\..\OmniXaml.AppServices\OmniXaml.AppServices.csproj">
+      <Project>{B207C0CB-2BDF-4105-9E1D-1C5B98E98381}</Project>
       <Name>OmniXaml.AppServices</Name>
     </ProjectReference>
-    <ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
-      <Project>{3f5debe4-d1d2-4190-9aea-fdd4065fded7}</Project>
+    <ProjectReference Include="..\..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
+      <Project>{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}</Project>
       <Name>OmniXaml.Wpf</Name>
     </ProjectReference>
-    <ProjectReference Include="D:\Source\Repos\GitHub\OmniXAML\OmniXaml\OmniXaml\OmniXaml.csproj">
-      <Project>{0d9cc1de-84c3-40d7-9cc5-b7751e0b25d1}</Project>
+    <ProjectReference Include="..\..\OmniXaml\OmniXaml.csproj">
+      <Project>{0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1}</Project>
       <Name>OmniXaml</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/OmniXaml/TestApplication/App.config b/OmniXaml/TestApplications/XamlViewer/App.config
similarity index 100%
rename from OmniXaml/TestApplication/App.config
rename to OmniXaml/TestApplications/XamlViewer/App.config
diff --git a/OmniXaml/TestApplication/App.cs b/OmniXaml/TestApplications/XamlViewer/App.cs
similarity index 100%
rename from OmniXaml/TestApplication/App.cs
rename to OmniXaml/TestApplications/XamlViewer/App.cs
diff --git a/OmniXaml/TestApplication/App.xaml b/OmniXaml/TestApplications/XamlViewer/App.xaml
similarity index 100%
rename from OmniXaml/TestApplication/App.xaml
rename to OmniXaml/TestApplications/XamlViewer/App.xaml
diff --git a/OmniXaml/TestApplication/Execute.cs b/OmniXaml/TestApplications/XamlViewer/Execute.cs
similarity index 100%
rename from OmniXaml/TestApplication/Execute.cs
rename to OmniXaml/TestApplications/XamlViewer/Execute.cs
diff --git a/OmniXaml/TestApplication/GridExpanderSizeBehavior.cs b/OmniXaml/TestApplications/XamlViewer/GridExpanderSizeBehavior.cs
similarity index 100%
rename from OmniXaml/TestApplication/GridExpanderSizeBehavior.cs
rename to OmniXaml/TestApplications/XamlViewer/GridExpanderSizeBehavior.cs
diff --git a/OmniXaml/TestApplication/IXamlSnippetProvider.cs b/OmniXaml/TestApplications/XamlViewer/IXamlSnippetProvider.cs
similarity index 100%
rename from OmniXaml/TestApplication/IXamlSnippetProvider.cs
rename to OmniXaml/TestApplications/XamlViewer/IXamlSnippetProvider.cs
diff --git a/OmniXaml/TestApplication/Images/collection.png b/OmniXaml/TestApplications/XamlViewer/Images/collection.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/collection.png
rename to OmniXaml/TestApplications/XamlViewer/Images/collection.png
index 2313ecb..5724a51 100644
Binary files a/OmniXaml/TestApplication/Images/collection.png and b/OmniXaml/TestApplications/XamlViewer/Images/collection.png differ
diff --git a/OmniXaml/TestApplication/Images/dummy.png b/OmniXaml/TestApplications/XamlViewer/Images/dummy.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/dummy.png
rename to OmniXaml/TestApplications/XamlViewer/Images/dummy.png
index 6a2cd41..5b59af0 100644
Binary files a/OmniXaml/TestApplication/Images/dummy.png and b/OmniXaml/TestApplications/XamlViewer/Images/dummy.png differ
diff --git a/OmniXaml/TestApplication/Images/indents.png b/OmniXaml/TestApplications/XamlViewer/Images/indents.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/indents.png
rename to OmniXaml/TestApplications/XamlViewer/Images/indents.png
index 02b225c..8fa3c99 100644
Binary files a/OmniXaml/TestApplication/Images/indents.png and b/OmniXaml/TestApplications/XamlViewer/Images/indents.png differ
diff --git a/OmniXaml/TestApplication/Images/load.png b/OmniXaml/TestApplications/XamlViewer/Images/load.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/load.png
rename to OmniXaml/TestApplications/XamlViewer/Images/load.png
index 27d8c7a..c714fb5 100644
Binary files a/OmniXaml/TestApplication/Images/load.png and b/OmniXaml/TestApplications/XamlViewer/Images/load.png differ
diff --git a/OmniXaml/TestApplication/Images/member.png b/OmniXaml/TestApplications/XamlViewer/Images/member.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/member.png
rename to OmniXaml/TestApplications/XamlViewer/Images/member.png
index b20a022..311e11a 100644
Binary files a/OmniXaml/TestApplication/Images/member.png and b/OmniXaml/TestApplications/XamlViewer/Images/member.png differ
diff --git a/OmniXaml/TestApplication/Images/namespace.png b/OmniXaml/TestApplications/XamlViewer/Images/namespace.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/namespace.png
rename to OmniXaml/TestApplications/XamlViewer/Images/namespace.png
index 1c2ca36..898f4a1 100644
Binary files a/OmniXaml/TestApplication/Images/namespace.png and b/OmniXaml/TestApplications/XamlViewer/Images/namespace.png differ
diff --git a/OmniXaml/TestApplication/Images/object.png b/OmniXaml/TestApplications/XamlViewer/Images/object.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/object.png
rename to OmniXaml/TestApplications/XamlViewer/Images/object.png
index ff0daf9..92ad982 100644
Binary files a/OmniXaml/TestApplication/Images/object.png and b/OmniXaml/TestApplications/XamlViewer/Images/object.png differ
diff --git a/OmniXaml/TestApplication/Images/root.png b/OmniXaml/TestApplications/XamlViewer/Images/root.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/root.png
rename to OmniXaml/TestApplications/XamlViewer/Images/root.png
index 9565dc2..5bd923b 100644
Binary files a/OmniXaml/TestApplication/Images/root.png and b/OmniXaml/TestApplications/XamlViewer/Images/root.png differ
diff --git a/OmniXaml/TestApplication/Images/tree.png b/OmniXaml/TestApplications/XamlViewer/Images/tree.png
similarity index 89%
rename from OmniXaml/TestApplication/Images/tree.png
rename to OmniXaml/TestApplications/XamlViewer/Images/tree.png
index 8468caf..3af72e7 100644
Binary files a/OmniXaml/TestApplication/Images/tree.png and b/OmniXaml/TestApplications/XamlViewer/Images/tree.png differ
diff --git a/OmniXaml/TestApplication/Images/value.png b/OmniXaml/TestApplications/XamlViewer/Images/value.png
similarity index 98%
rename from OmniXaml/TestApplication/Images/value.png
rename to OmniXaml/TestApplications/XamlViewer/Images/value.png
index 0cc5eb4..6559e1c 100644
Binary files a/OmniXaml/TestApplication/Images/value.png and b/OmniXaml/TestApplications/XamlViewer/Images/value.png differ
diff --git a/OmniXaml/TestApplication/Images/wpf.png b/OmniXaml/TestApplications/XamlViewer/Images/wpf.png
similarity index 99%
rename from OmniXaml/TestApplication/Images/wpf.png
rename to OmniXaml/TestApplications/XamlViewer/Images/wpf.png
index b35ded9..2573a57 100644
Binary files a/OmniXaml/TestApplication/Images/wpf.png and b/OmniXaml/TestApplications/XamlViewer/Images/wpf.png differ
diff --git a/OmniXaml/TestApplication/InstanceNodeViewModel.cs b/OmniXaml/TestApplications/XamlViewer/InstanceNodeViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/InstanceNodeViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/InstanceNodeViewModel.cs
diff --git a/OmniXaml/TestApplication/LevelConverter.cs b/OmniXaml/TestApplications/XamlViewer/LevelConverter.cs
similarity index 100%
rename from OmniXaml/TestApplication/LevelConverter.cs
rename to OmniXaml/TestApplications/XamlViewer/LevelConverter.cs
diff --git a/OmniXaml/TestApplication/MainWindow.cs b/OmniXaml/TestApplications/XamlViewer/MainWindow.cs
similarity index 100%
rename from OmniXaml/TestApplication/MainWindow.cs
rename to OmniXaml/TestApplications/XamlViewer/MainWindow.cs
diff --git a/OmniXaml/TestApplication/MainWindow.xaml b/OmniXaml/TestApplications/XamlViewer/MainWindow.xaml
similarity index 100%
rename from OmniXaml/TestApplication/MainWindow.xaml
rename to OmniXaml/TestApplications/XamlViewer/MainWindow.xaml
diff --git a/OmniXaml/TestApplication/NodeTypeToUriConverter.cs b/OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs
similarity index 97%
rename from OmniXaml/TestApplication/NodeTypeToUriConverter.cs
rename to OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs
index 44076f5..c257867 100644
--- a/OmniXaml/TestApplication/NodeTypeToUriConverter.cs
+++ b/OmniXaml/TestApplications/XamlViewer/NodeTypeToUriConverter.cs
@@ -2,9 +2,7 @@ namespace TestApplication
 {
     using System;
     using System.Globalization;
-    using System.Windows;
     using System.Windows.Data;
-    using OmniXaml.Tests;
     using OmniXaml.Visualization;
 
     public class NodeTypeToUriConverter : IValueConverter
diff --git a/OmniXaml/TestApplication/Properties/Annotations.cs b/OmniXaml/TestApplications/XamlViewer/Properties/Annotations.cs
similarity index 100%
rename from OmniXaml/TestApplication/Properties/Annotations.cs
rename to OmniXaml/TestApplications/XamlViewer/Properties/Annotations.cs
diff --git a/OmniXaml/TestApplication/Properties/AssemblyInfo.cs b/OmniXaml/TestApplications/XamlViewer/Properties/AssemblyInfo.cs
similarity index 100%
rename from OmniXaml/TestApplication/Properties/AssemblyInfo.cs
rename to OmniXaml/TestApplications/XamlViewer/Properties/AssemblyInfo.cs
diff --git a/OmniXaml/TestApplication/Properties/Resources.resx b/OmniXaml/TestApplications/XamlViewer/Properties/Resources.resx
similarity index 100%
rename from OmniXaml/TestApplication/Properties/Resources.resx
rename to OmniXaml/TestApplications/XamlViewer/Properties/Resources.resx
diff --git a/OmniXaml/TestApplication/Properties/Settings.Designer.cs b/OmniXaml/TestApplications/XamlViewer/Properties/Settings.Designer.cs
similarity index 100%
rename from OmniXaml/TestApplication/Properties/Settings.Designer.cs
rename to OmniXaml/TestApplications/XamlViewer/Properties/Settings.Designer.cs
diff --git a/OmniXaml/TestApplication2/Properties/Settings.settings b/OmniXaml/TestApplications/XamlViewer/Properties/Settings.settings
similarity index 100%
rename from OmniXaml/TestApplication2/Properties/Settings.settings
rename to OmniXaml/TestApplications/XamlViewer/Properties/Settings.settings
diff --git a/OmniXaml/TestApplication/RelayCommand.cs b/OmniXaml/TestApplications/XamlViewer/RelayCommand.cs
similarity index 100%
rename from OmniXaml/TestApplication/RelayCommand.cs
rename to OmniXaml/TestApplications/XamlViewer/RelayCommand.cs
diff --git a/OmniXaml/TestApplication/Snippet.cs b/OmniXaml/TestApplications/XamlViewer/Snippet.cs
similarity index 100%
rename from OmniXaml/TestApplication/Snippet.cs
rename to OmniXaml/TestApplications/XamlViewer/Snippet.cs
diff --git a/OmniXaml/TestApplication/TestViewModel.cs b/OmniXaml/TestApplications/XamlViewer/TestViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/TestViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/TestViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/DummyLoaderViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/DummyLoaderViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/DummyLoaderViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/DummyLoaderViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/StringExtensions.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/StringExtensions.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/StringExtensions.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/StringExtensions.cs
diff --git a/OmniXaml/TestApplication/ViewModels/TagVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/TagVisualizerViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/TagVisualizerViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/TagVisualizerViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/TreeVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/TreeVisualizerViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/TreeVisualizerViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/TreeVisualizerViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/VisualizerNodeViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/VisualizerNodeViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/VisualizerNodeViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/VisualizerNodeViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/WpfLoaderViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/WpfLoaderViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/WpfLoaderViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/WpfLoaderViewModel.cs
diff --git a/OmniXaml/TestApplication/ViewModels/XamlVisualizerViewModel.cs b/OmniXaml/TestApplications/XamlViewer/ViewModels/XamlVisualizerViewModel.cs
similarity index 100%
rename from OmniXaml/TestApplication/ViewModels/XamlVisualizerViewModel.cs
rename to OmniXaml/TestApplications/XamlViewer/ViewModels/XamlVisualizerViewModel.cs
diff --git a/OmniXaml/TestApplication/Views/DummyLoaderControl.cs b/OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.cs
similarity index 100%
rename from OmniXaml/TestApplication/Views/DummyLoaderControl.cs
rename to OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.cs
diff --git a/OmniXaml/TestApplication/Views/DummyLoaderControl.xaml b/OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.xaml
similarity index 100%
rename from OmniXaml/TestApplication/Views/DummyLoaderControl.xaml
rename to OmniXaml/TestApplications/XamlViewer/Views/DummyLoaderControl.xaml
diff --git a/OmniXaml/TestApplication/Views/TagVisualizerWindow.cs b/OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.cs
similarity index 100%
rename from OmniXaml/TestApplication/Views/TagVisualizerWindow.cs
rename to OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.cs
diff --git a/OmniXaml/TestApplication/Views/TagVisualizerWindow.xaml b/OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.xaml
similarity index 100%
rename from OmniXaml/TestApplication/Views/TagVisualizerWindow.xaml
rename to OmniXaml/TestApplications/XamlViewer/Views/TagVisualizerWindow.xaml
diff --git a/OmniXaml/TestApplication/Views/TreeVisualizerWindow.cs b/OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.cs
similarity index 100%
rename from OmniXaml/TestApplication/Views/TreeVisualizerWindow.cs
rename to OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.cs
diff --git a/OmniXaml/TestApplication/Views/TreeVisualizerWindow.xaml b/OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.xaml
similarity index 100%
rename from OmniXaml/TestApplication/Views/TreeVisualizerWindow.xaml
rename to OmniXaml/TestApplications/XamlViewer/Views/TreeVisualizerWindow.xaml
diff --git a/OmniXaml/TestApplication/Views/WpfLoaderControl.cs b/OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.cs
similarity index 100%
rename from OmniXaml/TestApplication/Views/WpfLoaderControl.cs
rename to OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.cs
diff --git a/OmniXaml/TestApplication/Views/WpfLoaderControl.xaml b/OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.xaml
similarity index 100%
rename from OmniXaml/TestApplication/Views/WpfLoaderControl.xaml
rename to OmniXaml/TestApplications/XamlViewer/Views/WpfLoaderControl.xaml
diff --git a/OmniXaml/TestApplication/Views/XamlTextBox.cs b/OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.cs
similarity index 100%
rename from OmniXaml/TestApplication/Views/XamlTextBox.cs
rename to OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.cs
diff --git a/OmniXaml/TestApplication/Views/XamlTextBox.xaml b/OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.xaml
similarity index 100%
rename from OmniXaml/TestApplication/Views/XamlTextBox.xaml
rename to OmniXaml/TestApplications/XamlViewer/Views/XamlTextBox.xaml
diff --git a/OmniXaml/TestApplication/XamlSnippetProvider.cs b/OmniXaml/TestApplications/XamlViewer/XamlSnippetProvider.cs
similarity index 100%
rename from OmniXaml/TestApplication/XamlSnippetProvider.cs
rename to OmniXaml/TestApplications/XamlViewer/XamlSnippetProvider.cs
diff --git a/OmniXaml/TestApplication/XamlToolsControl.cs b/OmniXaml/TestApplications/XamlViewer/XamlToolsControl.cs
similarity index 100%
rename from OmniXaml/TestApplication/XamlToolsControl.cs
rename to OmniXaml/TestApplications/XamlViewer/XamlToolsControl.cs
diff --git a/OmniXaml/TestApplication/XamlToolsControl.xaml b/OmniXaml/TestApplications/XamlViewer/XamlToolsControl.xaml
similarity index 100%
rename from OmniXaml/TestApplication/XamlToolsControl.xaml
rename to OmniXaml/TestApplications/XamlViewer/XamlToolsControl.xaml
diff --git a/OmniXaml/TestApplication/XamlViewer.csproj b/OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj
similarity index 87%
rename from OmniXaml/TestApplication/XamlViewer.csproj
rename to OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj
index 761812d..385dde0 100644
--- a/OmniXaml/TestApplication/XamlViewer.csproj
+++ b/OmniXaml/TestApplications/XamlViewer/XamlViewer.csproj
@@ -64,28 +64,28 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=2.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Extended.Wpf.Toolkit.2.5\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -192,23 +192,23 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Xaml.Tests.Resources\Xaml.Tests.Resources.csproj">
+    <ProjectReference Include="..\..\..\Xaml.Tests.Resources\Xaml.Tests.Resources.csproj">
       <Project>{9b517520-4d99-4bf5-8219-a643f718f6dd}</Project>
       <Name>Xaml.Tests.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
+    <ProjectReference Include="..\..\OmniXaml.Wpf\OmniXaml.Wpf.csproj">
       <Project>{3F5DEBE4-D1D2-4190-9AEA-FDD4065FDED7}</Project>
       <Name>OmniXaml.Wpf</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OmniXaml\OmniXaml.csproj">
+    <ProjectReference Include="..\..\OmniXaml\OmniXaml.csproj">
       <Project>{0D9CC1DE-84C3-40D7-9CC5-B7751E0B25D1}</Project>
       <Name>OmniXaml</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests\OmniXaml.Tests.Classes\OmniXaml.Tests.Classes.csproj">
+    <ProjectReference Include="..\..\Tests\OmniXaml.Tests.Classes\OmniXaml.Tests.Classes.csproj">
       <Project>{E6FDA529-90C2-4DDA-9080-7E7EEF64B2CA}</Project>
       <Name>OmniXaml.Tests.Classes</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tests\OmniXaml.Tests\OmniXaml.Tests.csproj">
+    <ProjectReference Include="..\..\Tests\OmniXaml.Tests\OmniXaml.Tests.csproj">
       <Project>{4A7491E9-E218-45F5-BF42-430247765630}</Project>
       <Name>OmniXaml.Tests</Name>
     </ProjectReference>
diff --git a/OmniXaml/TestApplication/github_icon.png b/OmniXaml/TestApplications/XamlViewer/github_icon.png
similarity index 99%
rename from OmniXaml/TestApplication/github_icon.png
rename to OmniXaml/TestApplications/XamlViewer/github_icon.png
index ed4f82f..7ff29e3 100644
Binary files a/OmniXaml/TestApplication/github_icon.png and b/OmniXaml/TestApplications/XamlViewer/github_icon.png differ
diff --git a/OmniXaml/TestApplication/packages.config b/OmniXaml/TestApplications/XamlViewer/packages.config
similarity index 54%
rename from OmniXaml/TestApplication/packages.config
rename to OmniXaml/TestApplications/XamlViewer/packages.config
index f26133d..86f57a9 100644
--- a/OmniXaml/TestApplication/packages.config
+++ b/OmniXaml/TestApplications/XamlViewer/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Extended.Wpf.Toolkit" version="2.4.0" targetFramework="net46" userInstalled="true" />
+  <package id="Extended.Wpf.Toolkit" version="2.5.0" targetFramework="net46" userInstalled="true" />
 </packages>
\ No newline at end of file