diff --git a/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.nugetreferenceswitcher b/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.nugetreferenceswitcher
deleted file mode 100644
index e09f70cb8e..0000000000
--- a/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.nugetreferenceswitcher
+++ /dev/null
@@ -1 +0,0 @@
-OmniXaml.AppServices	../../OmniXAML/Source/OmniXaml.AppServices/OmniXaml.AppServices.csproj	../packages/OmniXaml.AppServices.1.4.0.0/lib/portable-net451+win81+wpa81/OmniXaml.AppServices.dll
diff --git a/Perspex.Xaml/Perspex.Xaml.previous.nugetreferenceswitcher b/Perspex.Xaml/Perspex.Xaml.previous.nugetreferenceswitcher
deleted file mode 100644
index 92bfcef4e9..0000000000
--- a/Perspex.Xaml/Perspex.Xaml.previous.nugetreferenceswitcher
+++ /dev/null
@@ -1,2 +0,0 @@
-Glass	../../GitHub/OmniXAML/Glass/Glass.csproj	../packages/OmniXaml.1.0.11/lib/portable-net451+win81/Glass.dll
-OmniXaml	../../GitHub/OmniXAML/OmniXaml/OmniXaml/OmniXaml.csproj	../packages/OmniXaml.1.0.11/lib/portable-net451+win81/OmniXaml.dll
diff --git a/Perspex.sln b/Perspex.sln
index d06af20390..41b7a4f308 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -3,65 +3,65 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Win32", "src\Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "Demos\TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "samples\TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "src\Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph", "Perspex.SceneGraph\Perspex.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph", "src\Perspex.SceneGraph\Perspex.SceneGraph.csproj", "{EB582467-6ABB-43A1-B052-E981BA910E3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout", "Perspex.Layout\Perspex.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout", "src\Perspex.Layout\Perspex.Layout.csproj", "{42472427-4774-4C81-8AFF-9F27B8E31721}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{B39A8919-9F95-48FE-AD7B-76E08B509888}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input", "Perspex.Input\Perspex.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input", "src\Perspex.Input\Perspex.Input.csproj", "{62024B2D-53EB-4638-B26B-85EEAA54866E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity", "Perspex.Interactivity\Perspex.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity", "src\Perspex.Interactivity\Perspex.Interactivity.csproj", "{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls", "Perspex.Controls\Perspex.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls", "src\Perspex.Controls\Perspex.Controls.csproj", "{D2221C82-4A25-4583-9B43-D791E3F6820C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling", "Perspex.Styling\Perspex.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling", "src\Perspex.Styling\Perspex.Styling.csproj", "{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling.UnitTests", "Tests\Perspex.Styling.UnitTests\Perspex.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Styling.UnitTests", "tests\Perspex.Styling.UnitTests\Perspex.Styling.UnitTests.csproj", "{47ECDF59-DEF8-4C53-87B1-2098A3429059}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls.UnitTests", "Tests\Perspex.Controls.UnitTests\Perspex.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Controls.UnitTests", "tests\Perspex.Controls.UnitTests\Perspex.Controls.UnitTests.csproj", "{5CCB5571-7C30-4E7D-967D-0E2158EBD91F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Themes.Default", "Perspex.Themes.Default\Perspex.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Themes.Default", "src\Perspex.Themes.Default\Perspex.Themes.Default.csproj", "{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph.UnitTests", "Tests\Perspex.SceneGraph.UnitTests\Perspex.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.SceneGraph.UnitTests", "tests\Perspex.SceneGraph.UnitTests\Perspex.SceneGraph.UnitTests.csproj", "{76716382-3159-460E-BDA6-C5715CF606D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Application", "Perspex.Application\Perspex.Application.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Application", "src\Perspex.Application\Perspex.Application.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Diagnostics", "Perspex.Diagnostics\Perspex.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Diagnostics", "src\Perspex.Diagnostics\Perspex.Diagnostics.csproj", "{7062AE20-5DCC-4442-9645-8195BDECE63E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base.UnitTests", "Tests\Perspex.Base.UnitTests\Perspex.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base.UnitTests", "tests\Perspex.Base.UnitTests\Perspex.Base.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{2BAFBE53-7FA4-4BB9-976F-9AFCC4F9847D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGenerics", "NGenerics\NGenerics.csproj", "{415E048E-4611-4815-9CF2-D774E29079AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGenerics", "src\NGenerics\NGenerics.csproj", "{415E048E-4611-4815-9CF2-D774E29079AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout.UnitTests", "Tests\Perspex.Layout.UnitTests\Perspex.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Layout.UnitTests", "tests\Perspex.Layout.UnitTests\Perspex.Layout.UnitTests.csproj", "{DB070A10-BF39-4752-8456-86E9D5928478}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Animation", "Perspex.Animation\Perspex.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Animation", "src\Perspex.Animation\Perspex.Animation.csproj", "{D211E587-D8BC-45B9-95A4-F297C8FA5200}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactive.UnitTests", "Perspex.Interactive.UnitTests\Perspex.Interactive.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Interactivity.UnitTests", "tests\Perspex.Interactivity.UnitTests\Perspex.Interactivity.UnitTests.csproj", "{08478EF5-44E8-42E9-92D6-15E00EC038D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Tests\Perspex.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "tests\Perspex.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "Tests\Perspex.Input.UnitTests\Perspex.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "tests\Perspex.Input.UnitTests\Perspex.Input.UnitTests.csproj", "{AC18926A-E784-40FE-B09D-BB0FE2B599F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "Tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "src\Markup\Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml.Desktop", "Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj", "{EB468C39-AAC4-4963-A7B2-0A405EA63EDD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml.Desktop", "src\Markup\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj", "{EB468C39-AAC4-4963-A7B2-0A405EA63EDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "Demos\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "samples\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{8B6A8209-894F-4BA1-B880-965FD453982C}"
 EndProject
@@ -69,7 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{9B9E3891
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{A689DEF5-D50F-4975-8B72-124C9EB54066}"
 	ProjectSection(SolutionItems) = preProject
-		Shared\SharedAssemblyInfo.cs = Shared\SharedAssemblyInfo.cs
+		src\Shared\SharedAssemblyInfo.cs = src\Shared\SharedAssemblyInfo.cs
 	EndProjectSection
 EndProject
 Global
diff --git a/Perspex.v2.ncrunchsolution b/Perspex.v2.ncrunchsolution
index f23d2119c1..11389bd8d2 100644
Binary files a/Perspex.v2.ncrunchsolution and b/Perspex.v2.ncrunchsolution differ
diff --git a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
index 6fa07fdae5..e7f901e257 100644
--- a/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
+++ b/Tests/Perspex.Base.UnitTests/Perspex.Base.UnitTests.csproj
@@ -76,9 +76,6 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Collections\PerspexListTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="PerspexObjectTests_GetObservable.cs" />
@@ -100,7 +97,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
index c9dac990a8..0736d59726 100644
--- a/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
+++ b/Tests/Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
@@ -91,9 +91,6 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="ContentPresenterTests.cs" />
     <Compile Include="BorderTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
@@ -128,35 +125,35 @@
     <Compile Include="TestRoot.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj b/Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj
index 6700545cd1..d8fc68cfac 100644
--- a/Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj
+++ b/Tests/Perspex.Direct2D1.UnitTests/Perspex.Direct2D1.UnitTests.csproj
@@ -62,9 +62,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Controls\Shapes\PathTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Media\GeometryTests.cs" />
@@ -72,39 +69,39 @@
     <Compile Include="RectComparer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
index cda453ab47..ec86056d36 100644
--- a/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
+++ b/Tests/Perspex.Input.UnitTests/Perspex.Input.UnitTests.csproj
@@ -62,9 +62,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="KeyboardNavigationTests_Arrows.cs" />
     <Compile Include="KeyboardNavigationTests_Tab.cs" />
@@ -75,35 +72,35 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
diff --git a/Perspex.Interactive.UnitTests/GlobalSuppressions.cs b/Tests/Perspex.Interactivity.UnitTests/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Interactive.UnitTests/GlobalSuppressions.cs
rename to Tests/Perspex.Interactivity.UnitTests/GlobalSuppressions.cs
diff --git a/Perspex.Interactive.UnitTests/InteractiveTests.cs b/Tests/Perspex.Interactivity.UnitTests/InteractiveTests.cs
similarity index 99%
rename from Perspex.Interactive.UnitTests/InteractiveTests.cs
rename to Tests/Perspex.Interactivity.UnitTests/InteractiveTests.cs
index fbf27bef12..ff96a2190a 100644
--- a/Perspex.Interactive.UnitTests/InteractiveTests.cs
+++ b/Tests/Perspex.Interactivity.UnitTests/InteractiveTests.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Interactive.UnitTests
+namespace Perspex.Interactivity.UnitTests
 {
     using System;
     using System.Collections.Generic;
diff --git a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj b/Tests/Perspex.Interactivity.UnitTests/Perspex.Interactivity.UnitTests.csproj
similarity index 62%
rename from Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
rename to Tests/Perspex.Interactivity.UnitTests/Perspex.Interactivity.UnitTests.csproj
index 54ea6362a9..46ee948a88 100644
--- a/Perspex.Interactive.UnitTests/Perspex.Interactive.UnitTests.csproj
+++ b/Tests/Perspex.Interactivity.UnitTests/Perspex.Interactivity.UnitTests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
-  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,8 +9,8 @@
     <ProjectGuid>{08478EF5-44E8-42E9-92D6-15E00EC038D8}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Perspex.Interactive.UnitTests</RootNamespace>
-    <AssemblyName>Perspex.Interactive.UnitTests</AssemblyName>
+    <RootNamespace>Perspex.Interactivity.UnitTests</RootNamespace>
+    <AssemblyName>Perspex.Interactivity.UnitTests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
@@ -24,7 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Perspex.Interactive.UnitTests.XML</DocumentationFile>
+    <DocumentationFile>bin\Debug\Perspex.Interactivity.UnitTests.xml</DocumentationFile>
     <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -48,19 +48,16 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
     </Reference>
     <Reference Include="xunit.assert">
-      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+      <HintPath>..\..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
     </Reference>
     <Reference Include="xunit.core">
-      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+      <HintPath>..\..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="InteractiveTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -69,27 +66,27 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NGenerics\NGenerics.csproj">
+    <ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
       <Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
       <Name>NGenerics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
@@ -98,15 +95,15 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Perspex.Interactive.UnitTests/Properties/AssemblyInfo.cs b/Tests/Perspex.Interactivity.UnitTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Interactive.UnitTests/Properties/AssemblyInfo.cs
rename to Tests/Perspex.Interactivity.UnitTests/Properties/AssemblyInfo.cs
diff --git a/Perspex.Interactive.UnitTests/packages.config b/Tests/Perspex.Interactivity.UnitTests/packages.config
similarity index 100%
rename from Perspex.Interactive.UnitTests/packages.config
rename to Tests/Perspex.Interactivity.UnitTests/packages.config
diff --git a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
index 4394e7cf60..20b55626d8 100644
--- a/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
+++ b/Tests/Perspex.Layout.UnitTests/Perspex.Layout.UnitTests.csproj
@@ -76,55 +76,52 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="FullLayoutTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NGenerics\NGenerics.csproj">
+    <ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
       <Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
       <Name>NGenerics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Perspex.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
       <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
       <Name>Perspex.Themes.Default</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index 5098fce935..455d7a993c 100644
--- a/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Tests/Perspex.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -77,9 +77,6 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="Controls\ImageTests.cs" />
     <Compile Include="Controls\BorderTests.cs" />
     <Compile Include="GlobalSuppressions.cs" />
@@ -90,39 +87,39 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.RenderTests/TestBase.cs b/Tests/Perspex.RenderTests/TestBase.cs
index 3cf61a04f9..128f0ecaa7 100644
--- a/Tests/Perspex.RenderTests/TestBase.cs
+++ b/Tests/Perspex.RenderTests/TestBase.cs
@@ -32,9 +32,9 @@ namespace Perspex.Direct2D1.RenderTests
         public TestBase(string outputPath)
         {
 #if PERSPEX_CAIRO
-            string testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\Cairo");
+            string testFiles = Path.GetFullPath(@"..\..\..\TestFiles\Cairo");
 #else
-            string testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\Direct2D1");
+            string testFiles = Path.GetFullPath(@"..\..\..\TestFiles\Direct2D1");
 #endif
             this.OutputPath = Path.Combine(testFiles, outputPath);
         }
diff --git a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
index 36b71310d8..00077dfeea 100644
--- a/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
+++ b/Tests/Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
@@ -80,9 +80,6 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="TestRoot.cs" />
     <Compile Include="TestVisual.cs" />
@@ -91,35 +88,35 @@
     <Compile Include="VisualTree\BoundsTrackerTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
diff --git a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
index e63e599713..d68f1ddf71 100644
--- a/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
+++ b/Tests/Perspex.Styling.UnitTests/Perspex.Styling.UnitTests.csproj
@@ -84,9 +84,6 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SelectorTests_Class.cs" />
@@ -107,35 +104,35 @@
     <Compile Include="TestTemplatedControl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
diff --git a/TestFiles/.gitignore b/Tests/TestFiles/.gitignore
similarity index 100%
rename from TestFiles/.gitignore
rename to Tests/TestFiles/.gitignore
diff --git a/TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_1px_Border.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_2px_Border.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Brush_Offsets_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Fill.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Fill.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Fill.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Fill.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Margin_Offsets_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Nested_Rotate.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Padding_Offsets_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Stretches_Content_Vertically.expected.png
diff --git a/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png b/Tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png
rename to Tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png
diff --git a/TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png b/Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png
rename to Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Fill.expected.png
diff --git a/TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png b/Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png
rename to Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_None.expected.png
diff --git a/TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png b/Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png
rename to Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_Uniform.expected.png
diff --git a/TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png b/Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png
rename to Tests/TestFiles/Cairo/Controls/Image/Image_Stretch_UniformToFill.expected.png
diff --git a/TestFiles/Cairo/Controls/Image/test.png b/Tests/TestFiles/Cairo/Controls/Image/test.png
similarity index 100%
rename from TestFiles/Cairo/Controls/Image/test.png
rename to Tests/TestFiles/Cairo/Controls/Image/test.png
diff --git a/TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png b/Tests/TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Ellipse/Circle_1px_Stroke.expected.png
diff --git a/TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png b/Tests/TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Path/Path_100px_Triangle_Centered.expected.png
diff --git a/TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png b/Tests/TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Path/Path_Expander_With_Border.expected.png
diff --git a/TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png b/Tests/TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Path/Path_Tick_Scaled.expected.png
diff --git a/TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png b/Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
diff --git a/TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png b/Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
diff --git a/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png b/Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
similarity index 100%
rename from TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
rename to Tests/TestFiles/Cairo/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_1px_Border.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_2px_Border.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Bottom_Aligns_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Brush_Offsets_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Horizontally.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Centers_Content_Vertically.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Fill.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Left_Aligns_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Margin_Offsets_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Nested_Rotate.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Padding_Offsets_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Right_Aligns_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Horizontally.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Stretches_Content_Vertically.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png b/Tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Border/Border_Top_Aligns_Content.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png b/Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Fill.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png b/Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_None.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png b/Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_Uniform.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png b/Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png
rename to Tests/TestFiles/Direct2D1/Controls/Image/Image_Stretch_UniformToFill.expected.png
diff --git a/TestFiles/Direct2D1/Controls/Image/test.png b/Tests/TestFiles/Direct2D1/Controls/Image/test.png
similarity index 100%
rename from TestFiles/Direct2D1/Controls/Image/test.png
rename to Tests/TestFiles/Direct2D1/Controls/Image/test.png
diff --git a/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Ellipse/Circle_1px_Stroke.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Path/Path_100px_Triangle_Centered.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Path/Path_Expander_With_Border.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Path/Path_Tick_Scaled_Stroke_8px.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_1px_Stroke.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_2px_Stroke.expected.png
diff --git a/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png b/Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
similarity index 100%
rename from TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
rename to Tests/TestFiles/Direct2D1/Shapes/Rectangle/Rectangle_Stroke_Fill.expected.png
diff --git a/Demos/TestApplication/App.config b/samples/TestApplication/App.config
similarity index 100%
rename from Demos/TestApplication/App.config
rename to samples/TestApplication/App.config
diff --git a/Demos/TestApplication/App.cs b/samples/TestApplication/App.cs
similarity index 100%
rename from Demos/TestApplication/App.cs
rename to samples/TestApplication/App.cs
diff --git a/Demos/TestApplication/Program.cs b/samples/TestApplication/Program.cs
similarity index 100%
rename from Demos/TestApplication/Program.cs
rename to samples/TestApplication/Program.cs
diff --git a/Demos/TestApplication/Properties/AssemblyInfo.cs b/samples/TestApplication/Properties/AssemblyInfo.cs
similarity index 100%
rename from Demos/TestApplication/Properties/AssemblyInfo.cs
rename to samples/TestApplication/Properties/AssemblyInfo.cs
diff --git a/Demos/TestApplication/TestApplication-Mono.csproj b/samples/TestApplication/TestApplication-Mono.csproj
similarity index 100%
rename from Demos/TestApplication/TestApplication-Mono.csproj
rename to samples/TestApplication/TestApplication-Mono.csproj
diff --git a/Demos/TestApplication/TestApplication.csproj b/samples/TestApplication/TestApplication.csproj
similarity index 86%
rename from Demos/TestApplication/TestApplication.csproj
rename to samples/TestApplication/TestApplication.csproj
index 36b3739d26..7976de3883 100644
--- a/Demos/TestApplication/TestApplication.csproj
+++ b/samples/TestApplication/TestApplication.csproj
@@ -86,55 +86,55 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Application\Perspex.Application.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Application\Perspex.Application.csproj">
       <Project>{799A7BB5-3C2C-48B6-85A7-406A12C420DA}</Project>
       <Name>Perspex.Application</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
       <Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
       <Name>Perspex.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6B0ED19D-A08B-461C-A9D9-A9EE40B0C06B}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4C81-8AFF-9F27B8E31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{EB582467-6ABB-43A1-B052-E981BA910E3A}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{F1BAA01A-F176-4C6A-B39D-5B40BB1B148F}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
       <Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
       <Name>Perspex.Themes.Default</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Win32\Perspex.Win32.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Win32\Perspex.Win32.csproj">
       <Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
       <Name>Perspex.Win32</Name>
     </ProjectReference>
diff --git a/Demos/TestApplication/github_icon.png b/samples/TestApplication/github_icon.png
similarity index 100%
rename from Demos/TestApplication/github_icon.png
rename to samples/TestApplication/github_icon.png
diff --git a/Demos/TestApplication/packages.config b/samples/TestApplication/packages.config
similarity index 100%
rename from Demos/TestApplication/packages.config
rename to samples/TestApplication/packages.config
diff --git a/Demos/XamlTestApplication/App.config b/samples/XamlTestApplication/App.config
similarity index 100%
rename from Demos/XamlTestApplication/App.config
rename to samples/XamlTestApplication/App.config
diff --git a/Demos/XamlTestApplication/App.cs b/samples/XamlTestApplication/App.cs
similarity index 100%
rename from Demos/XamlTestApplication/App.cs
rename to samples/XamlTestApplication/App.cs
diff --git a/Demos/XamlTestApplication/MainViewModel.cs b/samples/XamlTestApplication/MainViewModel.cs
similarity index 100%
rename from Demos/XamlTestApplication/MainViewModel.cs
rename to samples/XamlTestApplication/MainViewModel.cs
diff --git a/Demos/XamlTestApplication/Program.cs b/samples/XamlTestApplication/Program.cs
similarity index 100%
rename from Demos/XamlTestApplication/Program.cs
rename to samples/XamlTestApplication/Program.cs
diff --git a/Demos/XamlTestApplication/Properties/AssemblyInfo.cs b/samples/XamlTestApplication/Properties/AssemblyInfo.cs
similarity index 100%
rename from Demos/XamlTestApplication/Properties/AssemblyInfo.cs
rename to samples/XamlTestApplication/Properties/AssemblyInfo.cs
diff --git a/Demos/XamlTestApplication/Views/MainWindow.cs b/samples/XamlTestApplication/Views/MainWindow.cs
similarity index 100%
rename from Demos/XamlTestApplication/Views/MainWindow.cs
rename to samples/XamlTestApplication/Views/MainWindow.cs
diff --git a/Demos/XamlTestApplication/Views/MainWindow.xaml b/samples/XamlTestApplication/Views/MainWindow.xaml
similarity index 100%
rename from Demos/XamlTestApplication/Views/MainWindow.xaml
rename to samples/XamlTestApplication/Views/MainWindow.xaml
diff --git a/Demos/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj
similarity index 88%
rename from Demos/XamlTestApplication/XamlTestApplication.csproj
rename to samples/XamlTestApplication/XamlTestApplication.csproj
index 608d1bfb9b..ef9447af18 100644
--- a/Demos/XamlTestApplication/XamlTestApplication.csproj
+++ b/samples/XamlTestApplication/XamlTestApplication.csproj
@@ -129,67 +129,67 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NGenerics\NGenerics.csproj">
+    <ProjectReference Include="..\..\src\NGenerics\NGenerics.csproj">
       <Project>{415e048e-4611-4815-9cf2-d774e29079ac}</Project>
       <Name>NGenerics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Application\Perspex.Application.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Application\Perspex.Application.csproj">
       <Project>{799a7bb5-3c2c-48b6-85a7-406a12c420da}</Project>
       <Name>Perspex.Application</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Diagnostics\Perspex.Diagnostics.csproj">
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Perspex.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\src\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
+    <ProjectReference Include="..\..\src\Perspex.Themes.Default\Perspex.Themes.Default.csproj">
       <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
       <Name>Perspex.Themes.Default</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj">
+    <ProjectReference Include="..\..\src\Markup\Perspex.Xaml.Desktop\Perspex.Xaml.Desktop.csproj">
       <Project>{eb468c39-aac4-4963-a7b2-0a405ea63edd}</Project>
       <Name>Perspex.Xaml.Desktop</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Perspex.Xaml\Perspex.Xaml.csproj">
+    <ProjectReference Include="..\..\src\Markup\Perspex.Xaml\Perspex.Xaml.csproj">
       <Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
       <Name>Perspex.Xaml</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Windows\Perspex.Win32\Perspex.Win32.csproj">
+    <ProjectReference Include="..\..\src\Windows\Perspex.Win32\Perspex.Win32.csproj">
       <Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
       <Name>Perspex.Win32</Name>
     </ProjectReference>
diff --git a/Demos/XamlTestApplication/github_icon.png b/samples/XamlTestApplication/github_icon.png
similarity index 100%
rename from Demos/XamlTestApplication/github_icon.png
rename to samples/XamlTestApplication/github_icon.png
diff --git a/Demos/XamlTestApplication/packages.config b/samples/XamlTestApplication/packages.config
similarity index 100%
rename from Demos/XamlTestApplication/packages.config
rename to samples/XamlTestApplication/packages.config
diff --git a/Cairo/Perspex.Cairo/CairoExtensions.cs b/src/Cairo/Perspex.Cairo/CairoExtensions.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/CairoExtensions.cs
rename to src/Cairo/Perspex.Cairo/CairoExtensions.cs
diff --git a/Cairo/Perspex.Cairo/CairoPlatform.cs b/src/Cairo/Perspex.Cairo/CairoPlatform.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/CairoPlatform.cs
rename to src/Cairo/Perspex.Cairo/CairoPlatform.cs
diff --git a/Cairo/Perspex.Cairo/Media/DrawingContext.cs b/src/Cairo/Perspex.Cairo/Media/DrawingContext.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/DrawingContext.cs
rename to src/Cairo/Perspex.Cairo/Media/DrawingContext.cs
diff --git a/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
rename to src/Cairo/Perspex.Cairo/Media/FormattedTextImpl.cs
diff --git a/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs b/src/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
rename to src/Cairo/Perspex.Cairo/Media/Imaging/BitmapImpl.cs
diff --git a/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
rename to src/Cairo/Perspex.Cairo/Media/Imaging/RenderTargetBitmapImpl.cs
diff --git a/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs b/src/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
rename to src/Cairo/Perspex.Cairo/Media/StreamGeometryContextImpl.cs
diff --git a/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs b/src/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
rename to src/Cairo/Perspex.Cairo/Media/StreamGeometryImpl.cs
diff --git a/Cairo/Perspex.Cairo/Perspex.Cairo.csproj b/src/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
similarity index 100%
rename from Cairo/Perspex.Cairo/Perspex.Cairo.csproj
rename to src/Cairo/Perspex.Cairo/Perspex.Cairo.csproj
diff --git a/Cairo/Perspex.Cairo/Properties/AssemblyInfo.cs b/src/Cairo/Perspex.Cairo/Properties/AssemblyInfo.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Properties/AssemblyInfo.cs
rename to src/Cairo/Perspex.Cairo/Properties/AssemblyInfo.cs
diff --git a/Cairo/Perspex.Cairo/Renderer.cs b/src/Cairo/Perspex.Cairo/Renderer.cs
similarity index 100%
rename from Cairo/Perspex.Cairo/Renderer.cs
rename to src/Cairo/Perspex.Cairo/Renderer.cs
diff --git a/Cairo/Perspex.Cairo/packages.config b/src/Cairo/Perspex.Cairo/packages.config
similarity index 100%
rename from Cairo/Perspex.Cairo/packages.config
rename to src/Cairo/Perspex.Cairo/packages.config
diff --git a/Gtk/Perspex.Gtk/GtkExtensions.cs b/src/Gtk/Perspex.Gtk/GtkExtensions.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/GtkExtensions.cs
rename to src/Gtk/Perspex.Gtk/GtkExtensions.cs
diff --git a/Gtk/Perspex.Gtk/GtkPlatform.cs b/src/Gtk/Perspex.Gtk/GtkPlatform.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/GtkPlatform.cs
rename to src/Gtk/Perspex.Gtk/GtkPlatform.cs
diff --git a/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs b/src/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
rename to src/Gtk/Perspex.Gtk/Input/GtkKeyboardDevice.cs
diff --git a/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs b/src/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
rename to src/Gtk/Perspex.Gtk/Input/GtkMouseDevice.cs
diff --git a/Gtk/Perspex.Gtk/MyClass.cs b/src/Gtk/Perspex.Gtk/MyClass.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/MyClass.cs
rename to src/Gtk/Perspex.Gtk/MyClass.cs
diff --git a/Gtk/Perspex.Gtk/Perspex.Gtk.csproj b/src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
similarity index 100%
rename from Gtk/Perspex.Gtk/Perspex.Gtk.csproj
rename to src/Gtk/Perspex.Gtk/Perspex.Gtk.csproj
diff --git a/Gtk/Perspex.Gtk/PopupImpl.cs b/src/Gtk/Perspex.Gtk/PopupImpl.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/PopupImpl.cs
rename to src/Gtk/Perspex.Gtk/PopupImpl.cs
diff --git a/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs b/src/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
rename to src/Gtk/Perspex.Gtk/Properties/AssemblyInfo.cs
diff --git a/Gtk/Perspex.Gtk/WindowImpl.cs b/src/Gtk/Perspex.Gtk/WindowImpl.cs
similarity index 100%
rename from Gtk/Perspex.Gtk/WindowImpl.cs
rename to src/Gtk/Perspex.Gtk/WindowImpl.cs
diff --git a/Gtk/Perspex.Gtk/packages.config b/src/Gtk/Perspex.Gtk/packages.config
similarity index 100%
rename from Gtk/Perspex.Gtk/packages.config
rename to src/Gtk/Perspex.Gtk/packages.config
diff --git a/Perspex.Xaml.Desktop/InflatableResourceTranslator.cs b/src/Markup/Perspex.Xaml.Desktop/InflatableResourceTranslator.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/InflatableResourceTranslator.cs
rename to src/Markup/Perspex.Xaml.Desktop/InflatableResourceTranslator.cs
diff --git a/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj b/src/Markup/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj
similarity index 75%
rename from Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj
rename to src/Markup/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj
index 9c4425267e..b8f40befc2 100644
--- a/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj
+++ b/src/Markup/Perspex.Xaml.Desktop/Perspex.Xaml.Desktop.csproj
@@ -34,35 +34,35 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Glass, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
+      <HintPath>..\..\..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OmniXaml, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
+      <HintPath>..\..\..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OmniXaml.AppServices, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OmniXaml.AppServices.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.AppServices.dll</HintPath>
+      <HintPath>..\..\..\packages\OmniXaml.AppServices.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.AppServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OmniXaml.AppServices.Mvvm, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OmniXaml.AppServices.Mvvm.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.AppServices.Mvvm.dll</HintPath>
+      <HintPath>..\..\..\packages\OmniXaml.AppServices.Mvvm.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.AppServices.Mvvm.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OmniXaml.AppServices.NetCore, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OmniXaml.AppServices.NetCore.1.4.4.0\lib\net46\OmniXaml.AppServices.NetCore.dll</HintPath>
+      <HintPath>..\..\..\packages\OmniXaml.AppServices.NetCore.1.4.4.0\lib\net46\OmniXaml.AppServices.NetCore.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ReactiveUI, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\reactiveui-core.6.5.0\lib\Net45\ReactiveUI.dll</HintPath>
+      <HintPath>..\..\..\packages\reactiveui-core.6.5.0\lib\Net45\ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\net45\Serilog.dll</HintPath>
+      <HintPath>..\..\..\packages\Serilog.1.5.9\lib\net45\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog.FullNetFx, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll</HintPath>
+      <HintPath>..\..\..\packages\Serilog.1.5.9\lib\net45\Serilog.FullNetFx.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
@@ -78,34 +78,34 @@
       <HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Sprache, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
+      <HintPath>..\..\..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
@@ -118,7 +118,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
+    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="PerspexInflatableTypeFactory.cs" />
@@ -129,35 +129,35 @@
     <Compile Include="InflatableResourceTranslator.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
       <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
@@ -170,12 +170,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
+  <Import Project="..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Perspex.Xaml.Desktop/PerspexInflatableTypeFactory.cs b/src/Markup/Perspex.Xaml.Desktop/PerspexInflatableTypeFactory.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/PerspexInflatableTypeFactory.cs
rename to src/Markup/Perspex.Xaml.Desktop/PerspexInflatableTypeFactory.cs
diff --git a/Perspex.Xaml.Desktop/PerspexParserFactory.cs b/src/Markup/Perspex.Xaml.Desktop/PerspexParserFactory.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/PerspexParserFactory.cs
rename to src/Markup/Perspex.Xaml.Desktop/PerspexParserFactory.cs
diff --git a/Perspex.Xaml.Desktop/PerspexWindow.cs b/src/Markup/Perspex.Xaml.Desktop/PerspexWindow.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/PerspexWindow.cs
rename to src/Markup/Perspex.Xaml.Desktop/PerspexWindow.cs
diff --git a/Perspex.Xaml.Desktop/PerspexXamlLoader.cs b/src/Markup/Perspex.Xaml.Desktop/PerspexXamlLoader.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/PerspexXamlLoader.cs
rename to src/Markup/Perspex.Xaml.Desktop/PerspexXamlLoader.cs
diff --git a/Perspex.Xaml.Desktop/Properties/AssemblyInfo.cs b/src/Markup/Perspex.Xaml.Desktop/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Xaml.Desktop/Properties/AssemblyInfo.cs
rename to src/Markup/Perspex.Xaml.Desktop/Properties/AssemblyInfo.cs
diff --git a/Perspex.Xaml.Desktop/packages.config b/src/Markup/Perspex.Xaml.Desktop/packages.config
similarity index 100%
rename from Perspex.Xaml.Desktop/packages.config
rename to src/Markup/Perspex.Xaml.Desktop/packages.config
diff --git a/Perspex.Xaml/Context/PerspexObjectAssembler.cs b/src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexObjectAssembler.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs
diff --git a/Perspex.Xaml/Context/PerspexTypeRepository.cs b/src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexTypeRepository.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs
diff --git a/Perspex.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexWiringContext.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs
diff --git a/Perspex.Xaml/Context/PerspexXamlMember.cs b/src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexXamlMember.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs
diff --git a/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs b/src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs
diff --git a/Perspex.Xaml/Context/PerspexXamlType.cs b/src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs
similarity index 100%
rename from Perspex.Xaml/Context/PerspexXamlType.cs
rename to src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs
diff --git a/Perspex.Xaml/Converters/BitmapConverter.cs b/src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs
similarity index 100%
rename from Perspex.Xaml/Converters/BitmapConverter.cs
rename to src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs
diff --git a/Perspex.Xaml/Converters/BrushConverter.cs b/src/Markup/Perspex.Xaml/Converters/BrushConverter.cs
similarity index 100%
rename from Perspex.Xaml/Converters/BrushConverter.cs
rename to src/Markup/Perspex.Xaml/Converters/BrushConverter.cs
diff --git a/Perspex.Xaml/Converters/GridLengthTypeConverter.cs b/src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs
similarity index 100%
rename from Perspex.Xaml/Converters/GridLengthTypeConverter.cs
rename to src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs
diff --git a/Perspex.Xaml/Converters/ThicknessConverter.cs b/src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs
similarity index 100%
rename from Perspex.Xaml/Converters/ThicknessConverter.cs
rename to src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs
diff --git a/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs b/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
rename to src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
diff --git a/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs b/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
rename to src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
diff --git a/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs b/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
rename to src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
diff --git a/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs b/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
rename to src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
diff --git a/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs b/src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs
rename to src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs
diff --git a/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs b/src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs
rename to src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs
diff --git a/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs b/src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs
rename to src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs
diff --git a/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs b/src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs
rename to src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs
diff --git a/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs b/src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs
rename to src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs
diff --git a/Perspex.Xaml/DataBinding/XamlBinding.cs b/src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/XamlBinding.cs
rename to src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs
diff --git a/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs b/src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs
similarity index 100%
rename from Perspex.Xaml/DataBinding/XamlBindingDefinition.cs
rename to src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs
diff --git a/Perspex.Xaml/HighLevel/IResourceProvider.cs b/src/Markup/Perspex.Xaml/HighLevel/IResourceProvider.cs
similarity index 100%
rename from Perspex.Xaml/HighLevel/IResourceProvider.cs
rename to src/Markup/Perspex.Xaml/HighLevel/IResourceProvider.cs
diff --git a/Perspex.Xaml/HighLevel/PerspexLoaderFactory.cs b/src/Markup/Perspex.Xaml/HighLevel/PerspexLoaderFactory.cs
similarity index 100%
rename from Perspex.Xaml/HighLevel/PerspexLoaderFactory.cs
rename to src/Markup/Perspex.Xaml/HighLevel/PerspexLoaderFactory.cs
diff --git a/Perspex.Xaml/HighLevel/PerspexObjectAssemblerFactory.cs b/src/Markup/Perspex.Xaml/HighLevel/PerspexObjectAssemblerFactory.cs
similarity index 100%
rename from Perspex.Xaml/HighLevel/PerspexObjectAssemblerFactory.cs
rename to src/Markup/Perspex.Xaml/HighLevel/PerspexObjectAssemblerFactory.cs
diff --git a/Perspex.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs
similarity index 100%
rename from Perspex.Xaml/MarkupExtensions/BindingExtension.cs
rename to src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs
diff --git a/Perspex.Xaml/MarkupExtensions/TypeExtension.cs b/src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs
similarity index 100%
rename from Perspex.Xaml/MarkupExtensions/TypeExtension.cs
rename to src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs
diff --git a/Perspex.Xaml/Perspex.Xaml.csproj b/src/Markup/Perspex.Xaml/Perspex.Xaml.csproj
similarity index 79%
rename from Perspex.Xaml/Perspex.Xaml.csproj
rename to src/Markup/Perspex.Xaml/Perspex.Xaml.csproj
index d881af3714..00ae1936a3 100644
--- a/Perspex.Xaml/Perspex.Xaml.csproj
+++ b/src/Markup/Perspex.Xaml/Perspex.Xaml.csproj
@@ -34,7 +34,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Shared\SharedAssemblyInfo.cs">
+    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="Converters\ThicknessConverter.cs" />
@@ -74,78 +74,78 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Perspex.Animation\Perspex.Animation.csproj">
+    <ProjectReference Include="..\..\Perspex.Animation\Perspex.Animation.csproj">
       <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project>
       <Name>Perspex.Animation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Base\Perspex.Base.csproj">
+    <ProjectReference Include="..\..\Perspex.Base\Perspex.Base.csproj">
       <Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
       <Name>Perspex.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Controls\Perspex.Controls.csproj">
+    <ProjectReference Include="..\..\Perspex.Controls\Perspex.Controls.csproj">
       <Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
       <Name>Perspex.Controls</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Input\Perspex.Input.csproj">
+    <ProjectReference Include="..\..\Perspex.Input\Perspex.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Perspex.Input</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Interactivity\Perspex.Interactivity.csproj">
+    <ProjectReference Include="..\..\Perspex.Interactivity\Perspex.Interactivity.csproj">
       <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project>
       <Name>Perspex.Interactivity</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Layout\Perspex.Layout.csproj">
+    <ProjectReference Include="..\..\Perspex.Layout\Perspex.Layout.csproj">
       <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project>
       <Name>Perspex.Layout</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Styling\Perspex.Styling.csproj">
+    <ProjectReference Include="..\..\Perspex.Styling\Perspex.Styling.csproj">
       <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project>
       <Name>Perspex.Styling</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Glass, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
+      <HintPath>..\..\..\packages\Glass.1.4.4.0\lib\portable-net451+win81+wpa81\Glass.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="OmniXaml, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
+      <HintPath>..\..\..\packages\OmniXaml.1.4.4.0\lib\portable-net451+win81+wpa81\OmniXaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ReactiveUI, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\reactiveui-core.6.5.0\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
+      <HintPath>..\..\..\packages\reactiveui-core.6.5.0\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
+      <HintPath>..\..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Sprache, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
+      <HintPath>..\..\..\packages\Sprache.SuperJMN.2.0.0.46\lib\portable-net451+win81+wpa81\Sprache.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Perspex.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Xaml/Properties/AssemblyInfo.cs
rename to src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs
diff --git a/Perspex.Xaml/Templates/Template.cs b/src/Markup/Perspex.Xaml/Templates/Template.cs
similarity index 100%
rename from Perspex.Xaml/Templates/Template.cs
rename to src/Markup/Perspex.Xaml/Templates/Template.cs
diff --git a/Perspex.Xaml/Templates/TemplateContent.cs b/src/Markup/Perspex.Xaml/Templates/TemplateContent.cs
similarity index 100%
rename from Perspex.Xaml/Templates/TemplateContent.cs
rename to src/Markup/Perspex.Xaml/Templates/TemplateContent.cs
diff --git a/Perspex.Xaml/Templates/TemplateLoader.cs b/src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs
similarity index 100%
rename from Perspex.Xaml/Templates/TemplateLoader.cs
rename to src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs
diff --git a/Perspex.Xaml/Templates/XamlDataTemplate.cs b/src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs
similarity index 100%
rename from Perspex.Xaml/Templates/XamlDataTemplate.cs
rename to src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs
diff --git a/Perspex.Xaml/app.config b/src/Markup/Perspex.Xaml/app.config
similarity index 100%
rename from Perspex.Xaml/app.config
rename to src/Markup/Perspex.Xaml/app.config
diff --git a/Perspex.Xaml/packages.config b/src/Markup/Perspex.Xaml/packages.config
similarity index 100%
rename from Perspex.Xaml/packages.config
rename to src/Markup/Perspex.Xaml/packages.config
diff --git a/NGenerics/Constants.cs b/src/NGenerics/Constants.cs
similarity index 100%
rename from NGenerics/Constants.cs
rename to src/NGenerics/Constants.cs
diff --git a/NGenerics/DataStructures/Comparers/ComparisonComparer.cs b/src/NGenerics/DataStructures/Comparers/ComparisonComparer.cs
similarity index 100%
rename from NGenerics/DataStructures/Comparers/ComparisonComparer.cs
rename to src/NGenerics/DataStructures/Comparers/ComparisonComparer.cs
diff --git a/NGenerics/DataStructures/Comparers/KeyValuePairComparer.cs b/src/NGenerics/DataStructures/Comparers/KeyValuePairComparer.cs
similarity index 100%
rename from NGenerics/DataStructures/Comparers/KeyValuePairComparer.cs
rename to src/NGenerics/DataStructures/Comparers/KeyValuePairComparer.cs
diff --git a/NGenerics/DataStructures/Comparers/ReverseComparer.cs b/src/NGenerics/DataStructures/Comparers/ReverseComparer.cs
similarity index 100%
rename from NGenerics/DataStructures/Comparers/ReverseComparer.cs
rename to src/NGenerics/DataStructures/Comparers/ReverseComparer.cs
diff --git a/NGenerics/DataStructures/General/Heap.cs b/src/NGenerics/DataStructures/General/Heap.cs
similarity index 100%
rename from NGenerics/DataStructures/General/Heap.cs
rename to src/NGenerics/DataStructures/General/Heap.cs
diff --git a/NGenerics/DataStructures/General/HeapType.cs b/src/NGenerics/DataStructures/General/HeapType.cs
similarity index 100%
rename from NGenerics/DataStructures/General/HeapType.cs
rename to src/NGenerics/DataStructures/General/HeapType.cs
diff --git a/NGenerics/DataStructures/General/IHeap.cs b/src/NGenerics/DataStructures/General/IHeap.cs
similarity index 100%
rename from NGenerics/DataStructures/General/IHeap.cs
rename to src/NGenerics/DataStructures/General/IHeap.cs
diff --git a/NGenerics/DataStructures/Queues/IQueue.cs b/src/NGenerics/DataStructures/Queues/IQueue.cs
similarity index 100%
rename from NGenerics/DataStructures/Queues/IQueue.cs
rename to src/NGenerics/DataStructures/Queues/IQueue.cs
diff --git a/NGenerics/DataStructures/Queues/PriorityQueue.cs b/src/NGenerics/DataStructures/Queues/PriorityQueue.cs
similarity index 100%
rename from NGenerics/DataStructures/Queues/PriorityQueue.cs
rename to src/NGenerics/DataStructures/Queues/PriorityQueue.cs
diff --git a/NGenerics/DataStructures/Queues/PriorityQueueType.cs b/src/NGenerics/DataStructures/Queues/PriorityQueueType.cs
similarity index 100%
rename from NGenerics/DataStructures/Queues/PriorityQueueType.cs
rename to src/NGenerics/DataStructures/Queues/PriorityQueueType.cs
diff --git a/NGenerics/DataStructures/Trees/BinarySearchTreeBase.cs b/src/NGenerics/DataStructures/Trees/BinarySearchTreeBase.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/BinarySearchTreeBase.cs
rename to src/NGenerics/DataStructures/Trees/BinarySearchTreeBase.cs
diff --git a/NGenerics/DataStructures/Trees/BinaryTree.cs b/src/NGenerics/DataStructures/Trees/BinaryTree.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/BinaryTree.cs
rename to src/NGenerics/DataStructures/Trees/BinaryTree.cs
diff --git a/NGenerics/DataStructures/Trees/ISearchTree.cs b/src/NGenerics/DataStructures/Trees/ISearchTree.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/ISearchTree.cs
rename to src/NGenerics/DataStructures/Trees/ISearchTree.cs
diff --git a/NGenerics/DataStructures/Trees/ITree.cs b/src/NGenerics/DataStructures/Trees/ITree.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/ITree.cs
rename to src/NGenerics/DataStructures/Trees/ITree.cs
diff --git a/NGenerics/DataStructures/Trees/NodeColor.cs b/src/NGenerics/DataStructures/Trees/NodeColor.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/NodeColor.cs
rename to src/NGenerics/DataStructures/Trees/NodeColor.cs
diff --git a/NGenerics/DataStructures/Trees/RedBlackTree.cs b/src/NGenerics/DataStructures/Trees/RedBlackTree.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/RedBlackTree.cs
rename to src/NGenerics/DataStructures/Trees/RedBlackTree.cs
diff --git a/NGenerics/DataStructures/Trees/RedBlackTreeDictionary.cs b/src/NGenerics/DataStructures/Trees/RedBlackTreeDictionary.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/RedBlackTreeDictionary.cs
rename to src/NGenerics/DataStructures/Trees/RedBlackTreeDictionary.cs
diff --git a/NGenerics/DataStructures/Trees/RedBlackTreeList.cs b/src/NGenerics/DataStructures/Trees/RedBlackTreeList.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/RedBlackTreeList.cs
rename to src/NGenerics/DataStructures/Trees/RedBlackTreeList.cs
diff --git a/NGenerics/DataStructures/Trees/RedBlackTreeNode.cs b/src/NGenerics/DataStructures/Trees/RedBlackTreeNode.cs
similarity index 100%
rename from NGenerics/DataStructures/Trees/RedBlackTreeNode.cs
rename to src/NGenerics/DataStructures/Trees/RedBlackTreeNode.cs
diff --git a/NGenerics/NGenerics.csproj b/src/NGenerics/NGenerics.csproj
similarity index 100%
rename from NGenerics/NGenerics.csproj
rename to src/NGenerics/NGenerics.csproj
diff --git a/NGenerics/Patterns/Visitor/IVisitor.cs b/src/NGenerics/Patterns/Visitor/IVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/IVisitor.cs
rename to src/NGenerics/Patterns/Visitor/IVisitor.cs
diff --git a/NGenerics/Patterns/Visitor/InOrderVisitor.cs b/src/NGenerics/Patterns/Visitor/InOrderVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/InOrderVisitor.cs
rename to src/NGenerics/Patterns/Visitor/InOrderVisitor.cs
diff --git a/NGenerics/Patterns/Visitor/KeyTrackingVisitor.cs b/src/NGenerics/Patterns/Visitor/KeyTrackingVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/KeyTrackingVisitor.cs
rename to src/NGenerics/Patterns/Visitor/KeyTrackingVisitor.cs
diff --git a/NGenerics/Patterns/Visitor/OrderedVisitor.cs b/src/NGenerics/Patterns/Visitor/OrderedVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/OrderedVisitor.cs
rename to src/NGenerics/Patterns/Visitor/OrderedVisitor.cs
diff --git a/NGenerics/Patterns/Visitor/TrackingVisitor.cs b/src/NGenerics/Patterns/Visitor/TrackingVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/TrackingVisitor.cs
rename to src/NGenerics/Patterns/Visitor/TrackingVisitor.cs
diff --git a/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs b/src/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs
similarity index 100%
rename from NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs
rename to src/NGenerics/Patterns/Visitor/ValueTrackingVisitor.cs
diff --git a/NGenerics/Properties/AssemblyInfo.cs b/src/NGenerics/Properties/AssemblyInfo.cs
similarity index 100%
rename from NGenerics/Properties/AssemblyInfo.cs
rename to src/NGenerics/Properties/AssemblyInfo.cs
diff --git a/NGenerics/Util/Guard.cs b/src/NGenerics/Util/Guard.cs
similarity index 100%
rename from NGenerics/Util/Guard.cs
rename to src/NGenerics/Util/Guard.cs
diff --git a/Perspex.Animation/Animatable.cs b/src/Perspex.Animation/Animatable.cs
similarity index 100%
rename from Perspex.Animation/Animatable.cs
rename to src/Perspex.Animation/Animatable.cs
diff --git a/Perspex.Animation/Animate.cs b/src/Perspex.Animation/Animate.cs
similarity index 100%
rename from Perspex.Animation/Animate.cs
rename to src/Perspex.Animation/Animate.cs
diff --git a/Perspex.Animation/Animation.cs b/src/Perspex.Animation/Animation.cs
similarity index 100%
rename from Perspex.Animation/Animation.cs
rename to src/Perspex.Animation/Animation.cs
diff --git a/Perspex.Animation/AnimationExtensions.cs b/src/Perspex.Animation/AnimationExtensions.cs
similarity index 100%
rename from Perspex.Animation/AnimationExtensions.cs
rename to src/Perspex.Animation/AnimationExtensions.cs
diff --git a/Perspex.Animation/Animation`1.cs b/src/Perspex.Animation/Animation`1.cs
similarity index 100%
rename from Perspex.Animation/Animation`1.cs
rename to src/Perspex.Animation/Animation`1.cs
diff --git a/Perspex.Animation/IEasing.cs b/src/Perspex.Animation/IEasing.cs
similarity index 100%
rename from Perspex.Animation/IEasing.cs
rename to src/Perspex.Animation/IEasing.cs
diff --git a/Perspex.Animation/IEasing`1.cs b/src/Perspex.Animation/IEasing`1.cs
similarity index 100%
rename from Perspex.Animation/IEasing`1.cs
rename to src/Perspex.Animation/IEasing`1.cs
diff --git a/Perspex.Animation/LinearDoubleEasing.cs b/src/Perspex.Animation/LinearDoubleEasing.cs
similarity index 100%
rename from Perspex.Animation/LinearDoubleEasing.cs
rename to src/Perspex.Animation/LinearDoubleEasing.cs
diff --git a/Perspex.Animation/LinearEasing.cs b/src/Perspex.Animation/LinearEasing.cs
similarity index 100%
rename from Perspex.Animation/LinearEasing.cs
rename to src/Perspex.Animation/LinearEasing.cs
diff --git a/Perspex.Animation/Perspex.Animation.csproj b/src/Perspex.Animation/Perspex.Animation.csproj
similarity index 85%
rename from Perspex.Animation/Perspex.Animation.csproj
rename to src/Perspex.Animation/Perspex.Animation.csproj
index 7ee17b24e0..47f4072067 100644
--- a/Perspex.Animation/Perspex.Animation.csproj
+++ b/src/Perspex.Animation/Perspex.Animation.csproj
@@ -60,23 +60,23 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Animation/Properties/AssemblyInfo.cs b/src/Perspex.Animation/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Animation/Properties/AssemblyInfo.cs
rename to src/Perspex.Animation/Properties/AssemblyInfo.cs
diff --git a/Perspex.Animation/PropertyTransition.cs b/src/Perspex.Animation/PropertyTransition.cs
similarity index 100%
rename from Perspex.Animation/PropertyTransition.cs
rename to src/Perspex.Animation/PropertyTransition.cs
diff --git a/Perspex.Animation/PropertyTransitions.cs b/src/Perspex.Animation/PropertyTransitions.cs
similarity index 100%
rename from Perspex.Animation/PropertyTransitions.cs
rename to src/Perspex.Animation/PropertyTransitions.cs
diff --git a/Perspex.Animation/packages.config b/src/Perspex.Animation/packages.config
similarity index 100%
rename from Perspex.Animation/packages.config
rename to src/Perspex.Animation/packages.config
diff --git a/Perspex.Application/Application.cs b/src/Perspex.Application/Application.cs
similarity index 100%
rename from Perspex.Application/Application.cs
rename to src/Perspex.Application/Application.cs
diff --git a/Perspex.Application/Perspex.Application.csproj b/src/Perspex.Application/Perspex.Application.csproj
similarity index 86%
rename from Perspex.Application/Perspex.Application.csproj
rename to src/Perspex.Application/Perspex.Application.csproj
index 37980c6bea..6f47a06bda 100644
--- a/Perspex.Application/Perspex.Application.csproj
+++ b/src/Perspex.Application/Perspex.Application.csproj
@@ -76,20 +76,20 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -97,7 +97,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Application/Properties/AssemblyInfo.cs b/src/Perspex.Application/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Application/Properties/AssemblyInfo.cs
rename to src/Perspex.Application/Properties/AssemblyInfo.cs
diff --git a/Perspex.Application/app.config b/src/Perspex.Application/app.config
similarity index 100%
rename from Perspex.Application/app.config
rename to src/Perspex.Application/app.config
diff --git a/Perspex.Application/packages.config b/src/Perspex.Application/packages.config
similarity index 100%
rename from Perspex.Application/packages.config
rename to src/Perspex.Application/packages.config
diff --git a/Perspex.Base/BindingDescriptor.cs b/src/Perspex.Base/BindingDescriptor.cs
similarity index 100%
rename from Perspex.Base/BindingDescriptor.cs
rename to src/Perspex.Base/BindingDescriptor.cs
diff --git a/Perspex.Base/Collections/IPerspexList.cs b/src/Perspex.Base/Collections/IPerspexList.cs
similarity index 100%
rename from Perspex.Base/Collections/IPerspexList.cs
rename to src/Perspex.Base/Collections/IPerspexList.cs
diff --git a/Perspex.Base/Collections/IPerspexReadOnlyList.cs b/src/Perspex.Base/Collections/IPerspexReadOnlyList.cs
similarity index 100%
rename from Perspex.Base/Collections/IPerspexReadOnlyList.cs
rename to src/Perspex.Base/Collections/IPerspexReadOnlyList.cs
diff --git a/Perspex.Base/Collections/PerspexList.cs b/src/Perspex.Base/Collections/PerspexList.cs
similarity index 100%
rename from Perspex.Base/Collections/PerspexList.cs
rename to src/Perspex.Base/Collections/PerspexList.cs
diff --git a/Perspex.Base/Collections/PerspexListExtensions.cs b/src/Perspex.Base/Collections/PerspexListExtensions.cs
similarity index 100%
rename from Perspex.Base/Collections/PerspexListExtensions.cs
rename to src/Perspex.Base/Collections/PerspexListExtensions.cs
diff --git a/Perspex.Base/Contract.cs b/src/Perspex.Base/Contract.cs
similarity index 100%
rename from Perspex.Base/Contract.cs
rename to src/Perspex.Base/Contract.cs
diff --git a/Perspex.Base/Diagnostics/PerspexObjectExtensions.cs b/src/Perspex.Base/Diagnostics/PerspexObjectExtensions.cs
similarity index 100%
rename from Perspex.Base/Diagnostics/PerspexObjectExtensions.cs
rename to src/Perspex.Base/Diagnostics/PerspexObjectExtensions.cs
diff --git a/Perspex.Base/Diagnostics/PerspexPropertyValue.cs b/src/Perspex.Base/Diagnostics/PerspexPropertyValue.cs
similarity index 100%
rename from Perspex.Base/Diagnostics/PerspexPropertyValue.cs
rename to src/Perspex.Base/Diagnostics/PerspexPropertyValue.cs
diff --git a/Perspex.Base/GlobalSuppressions.cs b/src/Perspex.Base/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Base/GlobalSuppressions.cs
rename to src/Perspex.Base/GlobalSuppressions.cs
diff --git a/Perspex.Base/IDescription.cs b/src/Perspex.Base/IDescription.cs
similarity index 100%
rename from Perspex.Base/IDescription.cs
rename to src/Perspex.Base/IDescription.cs
diff --git a/Perspex.Base/IObservablePropertyBag.cs b/src/Perspex.Base/IObservablePropertyBag.cs
similarity index 100%
rename from Perspex.Base/IObservablePropertyBag.cs
rename to src/Perspex.Base/IObservablePropertyBag.cs
diff --git a/Perspex.Base/IPropertyBag.cs b/src/Perspex.Base/IPropertyBag.cs
similarity index 100%
rename from Perspex.Base/IPropertyBag.cs
rename to src/Perspex.Base/IPropertyBag.cs
diff --git a/Perspex.Base/Perspex.Base.csproj b/src/Perspex.Base/Perspex.Base.csproj
similarity index 85%
rename from Perspex.Base/Perspex.Base.csproj
rename to src/Perspex.Base/Perspex.Base.csproj
index 636cb0c4b9..fb34c0b4dc 100644
--- a/Perspex.Base/Perspex.Base.csproj
+++ b/src/Perspex.Base/Perspex.Base.csproj
@@ -75,24 +75,24 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -106,7 +106,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Base/PerspexObject.cs b/src/Perspex.Base/PerspexObject.cs
similarity index 100%
rename from Perspex.Base/PerspexObject.cs
rename to src/Perspex.Base/PerspexObject.cs
diff --git a/Perspex.Base/PerspexObjectExtensions.cs b/src/Perspex.Base/PerspexObjectExtensions.cs
similarity index 100%
rename from Perspex.Base/PerspexObjectExtensions.cs
rename to src/Perspex.Base/PerspexObjectExtensions.cs
diff --git a/Perspex.Base/PerspexProperty.cs b/src/Perspex.Base/PerspexProperty.cs
similarity index 100%
rename from Perspex.Base/PerspexProperty.cs
rename to src/Perspex.Base/PerspexProperty.cs
diff --git a/Perspex.Base/PerspexPropertyChangedEventArgs.cs b/src/Perspex.Base/PerspexPropertyChangedEventArgs.cs
similarity index 100%
rename from Perspex.Base/PerspexPropertyChangedEventArgs.cs
rename to src/Perspex.Base/PerspexPropertyChangedEventArgs.cs
diff --git a/Perspex.Base/PerspexProperty`1.cs b/src/Perspex.Base/PerspexProperty`1.cs
similarity index 100%
rename from Perspex.Base/PerspexProperty`1.cs
rename to src/Perspex.Base/PerspexProperty`1.cs
diff --git a/Perspex.Base/Platform/IPlatformHandle.cs b/src/Perspex.Base/Platform/IPlatformHandle.cs
similarity index 100%
rename from Perspex.Base/Platform/IPlatformHandle.cs
rename to src/Perspex.Base/Platform/IPlatformHandle.cs
diff --git a/Perspex.Base/Platform/IPlatformThreadingInterface.cs b/src/Perspex.Base/Platform/IPlatformThreadingInterface.cs
similarity index 100%
rename from Perspex.Base/Platform/IPlatformThreadingInterface.cs
rename to src/Perspex.Base/Platform/IPlatformThreadingInterface.cs
diff --git a/Perspex.Base/Platform/PlatformHandle.cs b/src/Perspex.Base/Platform/PlatformHandle.cs
similarity index 100%
rename from Perspex.Base/Platform/PlatformHandle.cs
rename to src/Perspex.Base/Platform/PlatformHandle.cs
diff --git a/Perspex.Base/PriorityBindingEntry.cs b/src/Perspex.Base/PriorityBindingEntry.cs
similarity index 100%
rename from Perspex.Base/PriorityBindingEntry.cs
rename to src/Perspex.Base/PriorityBindingEntry.cs
diff --git a/Perspex.Base/PriorityLevel.cs b/src/Perspex.Base/PriorityLevel.cs
similarity index 100%
rename from Perspex.Base/PriorityLevel.cs
rename to src/Perspex.Base/PriorityLevel.cs
diff --git a/Perspex.Base/PriorityValue.cs b/src/Perspex.Base/PriorityValue.cs
similarity index 100%
rename from Perspex.Base/PriorityValue.cs
rename to src/Perspex.Base/PriorityValue.cs
diff --git a/Perspex.Base/Properties/AssemblyInfo.cs b/src/Perspex.Base/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Base/Properties/AssemblyInfo.cs
rename to src/Perspex.Base/Properties/AssemblyInfo.cs
diff --git a/Perspex.Base/Reactive/PerspexObservable.cs b/src/Perspex.Base/Reactive/PerspexObservable.cs
similarity index 100%
rename from Perspex.Base/Reactive/PerspexObservable.cs
rename to src/Perspex.Base/Reactive/PerspexObservable.cs
diff --git a/Perspex.Base/Settings.StyleCop b/src/Perspex.Base/Settings.StyleCop
similarity index 100%
rename from Perspex.Base/Settings.StyleCop
rename to src/Perspex.Base/Settings.StyleCop
diff --git a/Perspex.Base/Threading/Dispatcher.cs b/src/Perspex.Base/Threading/Dispatcher.cs
similarity index 100%
rename from Perspex.Base/Threading/Dispatcher.cs
rename to src/Perspex.Base/Threading/Dispatcher.cs
diff --git a/Perspex.Base/Threading/DispatcherPriority.cs b/src/Perspex.Base/Threading/DispatcherPriority.cs
similarity index 100%
rename from Perspex.Base/Threading/DispatcherPriority.cs
rename to src/Perspex.Base/Threading/DispatcherPriority.cs
diff --git a/Perspex.Base/Threading/DispatcherTimer.cs b/src/Perspex.Base/Threading/DispatcherTimer.cs
similarity index 100%
rename from Perspex.Base/Threading/DispatcherTimer.cs
rename to src/Perspex.Base/Threading/DispatcherTimer.cs
diff --git a/Perspex.Base/Threading/MainLoop.cs b/src/Perspex.Base/Threading/MainLoop.cs
similarity index 100%
rename from Perspex.Base/Threading/MainLoop.cs
rename to src/Perspex.Base/Threading/MainLoop.cs
diff --git a/Perspex.Base/Threading/PerspexScheduler.cs b/src/Perspex.Base/Threading/PerspexScheduler.cs
similarity index 100%
rename from Perspex.Base/Threading/PerspexScheduler.cs
rename to src/Perspex.Base/Threading/PerspexScheduler.cs
diff --git a/Perspex.Base/Utilities/MathUtilities.cs b/src/Perspex.Base/Utilities/MathUtilities.cs
similarity index 100%
rename from Perspex.Base/Utilities/MathUtilities.cs
rename to src/Perspex.Base/Utilities/MathUtilities.cs
diff --git a/Perspex.Base/Utilities/TypeUtilities.cs b/src/Perspex.Base/Utilities/TypeUtilities.cs
similarity index 100%
rename from Perspex.Base/Utilities/TypeUtilities.cs
rename to src/Perspex.Base/Utilities/TypeUtilities.cs
diff --git a/Perspex.Base/app.config b/src/Perspex.Base/app.config
similarity index 100%
rename from Perspex.Base/app.config
rename to src/Perspex.Base/app.config
diff --git a/Perspex.Base/packages.config b/src/Perspex.Base/packages.config
similarity index 100%
rename from Perspex.Base/packages.config
rename to src/Perspex.Base/packages.config
diff --git a/Perspex.Controls/AdornerTemplate.cs b/src/Perspex.Controls/AdornerTemplate.cs
similarity index 100%
rename from Perspex.Controls/AdornerTemplate.cs
rename to src/Perspex.Controls/AdornerTemplate.cs
diff --git a/Perspex.Controls/Border.cs b/src/Perspex.Controls/Border.cs
similarity index 100%
rename from Perspex.Controls/Border.cs
rename to src/Perspex.Controls/Border.cs
diff --git a/Perspex.Controls/Button.cs b/src/Perspex.Controls/Button.cs
similarity index 100%
rename from Perspex.Controls/Button.cs
rename to src/Perspex.Controls/Button.cs
diff --git a/Perspex.Controls/CheckBox.cs b/src/Perspex.Controls/CheckBox.cs
similarity index 100%
rename from Perspex.Controls/CheckBox.cs
rename to src/Perspex.Controls/CheckBox.cs
diff --git a/Perspex.Controls/ColumnDefinition.cs b/src/Perspex.Controls/ColumnDefinition.cs
similarity index 100%
rename from Perspex.Controls/ColumnDefinition.cs
rename to src/Perspex.Controls/ColumnDefinition.cs
diff --git a/Perspex.Controls/ColumnDefinitions.cs b/src/Perspex.Controls/ColumnDefinitions.cs
similarity index 100%
rename from Perspex.Controls/ColumnDefinitions.cs
rename to src/Perspex.Controls/ColumnDefinitions.cs
diff --git a/Perspex.Controls/ContentControl.cs b/src/Perspex.Controls/ContentControl.cs
similarity index 100%
rename from Perspex.Controls/ContentControl.cs
rename to src/Perspex.Controls/ContentControl.cs
diff --git a/Perspex.Controls/Control.cs b/src/Perspex.Controls/Control.cs
similarity index 100%
rename from Perspex.Controls/Control.cs
rename to src/Perspex.Controls/Control.cs
diff --git a/Perspex.Controls/ControlExtensions.cs b/src/Perspex.Controls/ControlExtensions.cs
similarity index 100%
rename from Perspex.Controls/ControlExtensions.cs
rename to src/Perspex.Controls/ControlExtensions.cs
diff --git a/Perspex.Controls/Controls.cs b/src/Perspex.Controls/Controls.cs
similarity index 100%
rename from Perspex.Controls/Controls.cs
rename to src/Perspex.Controls/Controls.cs
diff --git a/Perspex.Controls/Deck.cs b/src/Perspex.Controls/Deck.cs
similarity index 100%
rename from Perspex.Controls/Deck.cs
rename to src/Perspex.Controls/Deck.cs
diff --git a/Perspex.Controls/Decorator.cs b/src/Perspex.Controls/Decorator.cs
similarity index 100%
rename from Perspex.Controls/Decorator.cs
rename to src/Perspex.Controls/Decorator.cs
diff --git a/Perspex.Controls/DefinitionBase.cs b/src/Perspex.Controls/DefinitionBase.cs
similarity index 100%
rename from Perspex.Controls/DefinitionBase.cs
rename to src/Perspex.Controls/DefinitionBase.cs
diff --git a/Perspex.Controls/DropDown.cs b/src/Perspex.Controls/DropDown.cs
similarity index 100%
rename from Perspex.Controls/DropDown.cs
rename to src/Perspex.Controls/DropDown.cs
diff --git a/Perspex.Controls/Generators/IItemContainerGenerator.cs b/src/Perspex.Controls/Generators/IItemContainerGenerator.cs
similarity index 100%
rename from Perspex.Controls/Generators/IItemContainerGenerator.cs
rename to src/Perspex.Controls/Generators/IItemContainerGenerator.cs
diff --git a/Perspex.Controls/Generators/ITreeItemContainerGenerator.cs b/src/Perspex.Controls/Generators/ITreeItemContainerGenerator.cs
similarity index 100%
rename from Perspex.Controls/Generators/ITreeItemContainerGenerator.cs
rename to src/Perspex.Controls/Generators/ITreeItemContainerGenerator.cs
diff --git a/Perspex.Controls/Generators/ItemContainerGenerator.cs b/src/Perspex.Controls/Generators/ItemContainerGenerator.cs
similarity index 100%
rename from Perspex.Controls/Generators/ItemContainerGenerator.cs
rename to src/Perspex.Controls/Generators/ItemContainerGenerator.cs
diff --git a/Perspex.Controls/Generators/ItemContainerGenerator`1.cs b/src/Perspex.Controls/Generators/ItemContainerGenerator`1.cs
similarity index 100%
rename from Perspex.Controls/Generators/ItemContainerGenerator`1.cs
rename to src/Perspex.Controls/Generators/ItemContainerGenerator`1.cs
diff --git a/Perspex.Controls/Generators/ItemContainers.cs b/src/Perspex.Controls/Generators/ItemContainers.cs
similarity index 100%
rename from Perspex.Controls/Generators/ItemContainers.cs
rename to src/Perspex.Controls/Generators/ItemContainers.cs
diff --git a/Perspex.Controls/Generators/TreeItemContainerGenerator.cs b/src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs
similarity index 100%
rename from Perspex.Controls/Generators/TreeItemContainerGenerator.cs
rename to src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs
diff --git a/Perspex.Controls/GlobalSuppressions.cs b/src/Perspex.Controls/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Controls/GlobalSuppressions.cs
rename to src/Perspex.Controls/GlobalSuppressions.cs
diff --git a/Perspex.Controls/Grid.cs b/src/Perspex.Controls/Grid.cs
similarity index 100%
rename from Perspex.Controls/Grid.cs
rename to src/Perspex.Controls/Grid.cs
diff --git a/Perspex.Controls/GridLength.cs b/src/Perspex.Controls/GridLength.cs
similarity index 100%
rename from Perspex.Controls/GridLength.cs
rename to src/Perspex.Controls/GridLength.cs
diff --git a/Perspex.Controls/GridSplitter.cs b/src/Perspex.Controls/GridSplitter.cs
similarity index 100%
rename from Perspex.Controls/GridSplitter.cs
rename to src/Perspex.Controls/GridSplitter.cs
diff --git a/Perspex.Controls/IContentControl.cs b/src/Perspex.Controls/IContentControl.cs
similarity index 100%
rename from Perspex.Controls/IContentControl.cs
rename to src/Perspex.Controls/IContentControl.cs
diff --git a/Perspex.Controls/IControl.cs b/src/Perspex.Controls/IControl.cs
similarity index 100%
rename from Perspex.Controls/IControl.cs
rename to src/Perspex.Controls/IControl.cs
diff --git a/Perspex.Controls/IGlobalDataTemplates.cs b/src/Perspex.Controls/IGlobalDataTemplates.cs
similarity index 100%
rename from Perspex.Controls/IGlobalDataTemplates.cs
rename to src/Perspex.Controls/IGlobalDataTemplates.cs
diff --git a/Perspex.Controls/IHeadered.cs b/src/Perspex.Controls/IHeadered.cs
similarity index 100%
rename from Perspex.Controls/IHeadered.cs
rename to src/Perspex.Controls/IHeadered.cs
diff --git a/Perspex.Controls/IReparentingControl.cs b/src/Perspex.Controls/IReparentingControl.cs
similarity index 100%
rename from Perspex.Controls/IReparentingControl.cs
rename to src/Perspex.Controls/IReparentingControl.cs
diff --git a/Perspex.Controls/IReparentingHost.cs b/src/Perspex.Controls/IReparentingHost.cs
similarity index 100%
rename from Perspex.Controls/IReparentingHost.cs
rename to src/Perspex.Controls/IReparentingHost.cs
diff --git a/Perspex.Controls/ISelectable.cs b/src/Perspex.Controls/ISelectable.cs
similarity index 100%
rename from Perspex.Controls/ISelectable.cs
rename to src/Perspex.Controls/ISelectable.cs
diff --git a/Perspex.Controls/ISetLogicalParent.cs b/src/Perspex.Controls/ISetLogicalParent.cs
similarity index 100%
rename from Perspex.Controls/ISetLogicalParent.cs
rename to src/Perspex.Controls/ISetLogicalParent.cs
diff --git a/Perspex.Controls/Image.cs b/src/Perspex.Controls/Image.cs
similarity index 100%
rename from Perspex.Controls/Image.cs
rename to src/Perspex.Controls/Image.cs
diff --git a/Perspex.Controls/ItemsControl.cs b/src/Perspex.Controls/ItemsControl.cs
similarity index 100%
rename from Perspex.Controls/ItemsControl.cs
rename to src/Perspex.Controls/ItemsControl.cs
diff --git a/Perspex.Controls/ItemsPanelTemplate.cs b/src/Perspex.Controls/ItemsPanelTemplate.cs
similarity index 100%
rename from Perspex.Controls/ItemsPanelTemplate.cs
rename to src/Perspex.Controls/ItemsPanelTemplate.cs
diff --git a/Perspex.Controls/ListBox.cs b/src/Perspex.Controls/ListBox.cs
similarity index 100%
rename from Perspex.Controls/ListBox.cs
rename to src/Perspex.Controls/ListBox.cs
diff --git a/Perspex.Controls/ListBoxItem.cs b/src/Perspex.Controls/ListBoxItem.cs
similarity index 100%
rename from Perspex.Controls/ListBoxItem.cs
rename to src/Perspex.Controls/ListBoxItem.cs
diff --git a/Perspex.Controls/Menu.cs b/src/Perspex.Controls/Menu.cs
similarity index 100%
rename from Perspex.Controls/Menu.cs
rename to src/Perspex.Controls/Menu.cs
diff --git a/Perspex.Controls/MenuItem.cs b/src/Perspex.Controls/MenuItem.cs
similarity index 100%
rename from Perspex.Controls/MenuItem.cs
rename to src/Perspex.Controls/MenuItem.cs
diff --git a/Perspex.Controls/MenuItemAccessKeyHandler.cs b/src/Perspex.Controls/MenuItemAccessKeyHandler.cs
similarity index 100%
rename from Perspex.Controls/MenuItemAccessKeyHandler.cs
rename to src/Perspex.Controls/MenuItemAccessKeyHandler.cs
diff --git a/Perspex.Controls/Mixins/SelectableMixin.cs b/src/Perspex.Controls/Mixins/SelectableMixin.cs
similarity index 100%
rename from Perspex.Controls/Mixins/SelectableMixin.cs
rename to src/Perspex.Controls/Mixins/SelectableMixin.cs
diff --git a/Perspex.Controls/Panel.cs b/src/Perspex.Controls/Panel.cs
similarity index 100%
rename from Perspex.Controls/Panel.cs
rename to src/Perspex.Controls/Panel.cs
diff --git a/Perspex.Controls/Parsers/GridLengthsParser.cs b/src/Perspex.Controls/Parsers/GridLengthsParser.cs
similarity index 100%
rename from Perspex.Controls/Parsers/GridLengthsParser.cs
rename to src/Perspex.Controls/Parsers/GridLengthsParser.cs
diff --git a/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj
similarity index 92%
rename from Perspex.Controls/Perspex.Controls.csproj
rename to src/Perspex.Controls/Perspex.Controls.csproj
index 83f3929f9d..6485f9a5e6 100644
--- a/Perspex.Controls/Perspex.Controls.csproj
+++ b/src/Perspex.Controls/Perspex.Controls.csproj
@@ -155,24 +155,24 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -210,7 +210,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Controls/PlacementMode.cs b/src/Perspex.Controls/PlacementMode.cs
similarity index 100%
rename from Perspex.Controls/PlacementMode.cs
rename to src/Perspex.Controls/PlacementMode.cs
diff --git a/Perspex.Controls/Platform/IPopupImpl.cs b/src/Perspex.Controls/Platform/IPopupImpl.cs
similarity index 100%
rename from Perspex.Controls/Platform/IPopupImpl.cs
rename to src/Perspex.Controls/Platform/IPopupImpl.cs
diff --git a/Perspex.Controls/Platform/ITopLevelImpl.cs b/src/Perspex.Controls/Platform/ITopLevelImpl.cs
similarity index 100%
rename from Perspex.Controls/Platform/ITopLevelImpl.cs
rename to src/Perspex.Controls/Platform/ITopLevelImpl.cs
diff --git a/Perspex.Controls/Platform/IWindowImpl.cs b/src/Perspex.Controls/Platform/IWindowImpl.cs
similarity index 100%
rename from Perspex.Controls/Platform/IWindowImpl.cs
rename to src/Perspex.Controls/Platform/IWindowImpl.cs
diff --git a/Perspex.Controls/Presenters/ContentPresenter.cs b/src/Perspex.Controls/Presenters/ContentPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/ContentPresenter.cs
rename to src/Perspex.Controls/Presenters/ContentPresenter.cs
diff --git a/Perspex.Controls/Presenters/DeckPresenter.cs b/src/Perspex.Controls/Presenters/DeckPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/DeckPresenter.cs
rename to src/Perspex.Controls/Presenters/DeckPresenter.cs
diff --git a/Perspex.Controls/Presenters/IContentPresenter.cs b/src/Perspex.Controls/Presenters/IContentPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/IContentPresenter.cs
rename to src/Perspex.Controls/Presenters/IContentPresenter.cs
diff --git a/Perspex.Controls/Presenters/IItemsPresenter.cs b/src/Perspex.Controls/Presenters/IItemsPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/IItemsPresenter.cs
rename to src/Perspex.Controls/Presenters/IItemsPresenter.cs
diff --git a/Perspex.Controls/Presenters/IPresenter.cs b/src/Perspex.Controls/Presenters/IPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/IPresenter.cs
rename to src/Perspex.Controls/Presenters/IPresenter.cs
diff --git a/Perspex.Controls/Presenters/ItemsPresenter.cs b/src/Perspex.Controls/Presenters/ItemsPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/ItemsPresenter.cs
rename to src/Perspex.Controls/Presenters/ItemsPresenter.cs
diff --git a/Perspex.Controls/Presenters/ScrollContentPresenter.cs b/src/Perspex.Controls/Presenters/ScrollContentPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/ScrollContentPresenter.cs
rename to src/Perspex.Controls/Presenters/ScrollContentPresenter.cs
diff --git a/Perspex.Controls/Presenters/TextPresenter.cs b/src/Perspex.Controls/Presenters/TextPresenter.cs
similarity index 100%
rename from Perspex.Controls/Presenters/TextPresenter.cs
rename to src/Perspex.Controls/Presenters/TextPresenter.cs
diff --git a/Perspex.Controls/Primitives/AccessText.cs b/src/Perspex.Controls/Primitives/AccessText.cs
similarity index 100%
rename from Perspex.Controls/Primitives/AccessText.cs
rename to src/Perspex.Controls/Primitives/AccessText.cs
diff --git a/Perspex.Controls/Primitives/AdornerDecorator.cs b/src/Perspex.Controls/Primitives/AdornerDecorator.cs
similarity index 100%
rename from Perspex.Controls/Primitives/AdornerDecorator.cs
rename to src/Perspex.Controls/Primitives/AdornerDecorator.cs
diff --git a/Perspex.Controls/Primitives/AdornerLayer.cs b/src/Perspex.Controls/Primitives/AdornerLayer.cs
similarity index 100%
rename from Perspex.Controls/Primitives/AdornerLayer.cs
rename to src/Perspex.Controls/Primitives/AdornerLayer.cs
diff --git a/Perspex.Controls/Primitives/HeaderedContentControl.cs b/src/Perspex.Controls/Primitives/HeaderedContentControl.cs
similarity index 100%
rename from Perspex.Controls/Primitives/HeaderedContentControl.cs
rename to src/Perspex.Controls/Primitives/HeaderedContentControl.cs
diff --git a/Perspex.Controls/Primitives/HeaderedItemsControl.cs b/src/Perspex.Controls/Primitives/HeaderedItemsControl.cs
similarity index 100%
rename from Perspex.Controls/Primitives/HeaderedItemsControl.cs
rename to src/Perspex.Controls/Primitives/HeaderedItemsControl.cs
diff --git a/Perspex.Controls/Primitives/Popup.cs b/src/Perspex.Controls/Primitives/Popup.cs
similarity index 100%
rename from Perspex.Controls/Primitives/Popup.cs
rename to src/Perspex.Controls/Primitives/Popup.cs
diff --git a/Perspex.Controls/Primitives/PopupRoot.cs b/src/Perspex.Controls/Primitives/PopupRoot.cs
similarity index 100%
rename from Perspex.Controls/Primitives/PopupRoot.cs
rename to src/Perspex.Controls/Primitives/PopupRoot.cs
diff --git a/Perspex.Controls/Primitives/RangeBase.cs b/src/Perspex.Controls/Primitives/RangeBase.cs
similarity index 100%
rename from Perspex.Controls/Primitives/RangeBase.cs
rename to src/Perspex.Controls/Primitives/RangeBase.cs
diff --git a/Perspex.Controls/Primitives/ScrollBar.cs b/src/Perspex.Controls/Primitives/ScrollBar.cs
similarity index 100%
rename from Perspex.Controls/Primitives/ScrollBar.cs
rename to src/Perspex.Controls/Primitives/ScrollBar.cs
diff --git a/Perspex.Controls/Primitives/ScrollBarVisibility.cs b/src/Perspex.Controls/Primitives/ScrollBarVisibility.cs
similarity index 100%
rename from Perspex.Controls/Primitives/ScrollBarVisibility.cs
rename to src/Perspex.Controls/Primitives/ScrollBarVisibility.cs
diff --git a/Perspex.Controls/Primitives/SelectingItemsControl.cs b/src/Perspex.Controls/Primitives/SelectingItemsControl.cs
similarity index 100%
rename from Perspex.Controls/Primitives/SelectingItemsControl.cs
rename to src/Perspex.Controls/Primitives/SelectingItemsControl.cs
diff --git a/Perspex.Controls/Primitives/TabStrip.cs b/src/Perspex.Controls/Primitives/TabStrip.cs
similarity index 100%
rename from Perspex.Controls/Primitives/TabStrip.cs
rename to src/Perspex.Controls/Primitives/TabStrip.cs
diff --git a/Perspex.Controls/Primitives/TemplatedControl.cs b/src/Perspex.Controls/Primitives/TemplatedControl.cs
similarity index 100%
rename from Perspex.Controls/Primitives/TemplatedControl.cs
rename to src/Perspex.Controls/Primitives/TemplatedControl.cs
diff --git a/Perspex.Controls/Primitives/Thumb.cs b/src/Perspex.Controls/Primitives/Thumb.cs
similarity index 100%
rename from Perspex.Controls/Primitives/Thumb.cs
rename to src/Perspex.Controls/Primitives/Thumb.cs
diff --git a/Perspex.Controls/Primitives/ToggleButton.cs b/src/Perspex.Controls/Primitives/ToggleButton.cs
similarity index 100%
rename from Perspex.Controls/Primitives/ToggleButton.cs
rename to src/Perspex.Controls/Primitives/ToggleButton.cs
diff --git a/Perspex.Controls/Primitives/Track.cs b/src/Perspex.Controls/Primitives/Track.cs
similarity index 100%
rename from Perspex.Controls/Primitives/Track.cs
rename to src/Perspex.Controls/Primitives/Track.cs
diff --git a/Perspex.Controls/ProgressBar.cs b/src/Perspex.Controls/ProgressBar.cs
similarity index 100%
rename from Perspex.Controls/ProgressBar.cs
rename to src/Perspex.Controls/ProgressBar.cs
diff --git a/Perspex.Controls/Properties/AssemblyInfo.cs b/src/Perspex.Controls/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Controls/Properties/AssemblyInfo.cs
rename to src/Perspex.Controls/Properties/AssemblyInfo.cs
diff --git a/Perspex.Controls/RadioButton.cs b/src/Perspex.Controls/RadioButton.cs
similarity index 100%
rename from Perspex.Controls/RadioButton.cs
rename to src/Perspex.Controls/RadioButton.cs
diff --git a/Perspex.Controls/RequestBringIntoViewEventArgs.cs b/src/Perspex.Controls/RequestBringIntoViewEventArgs.cs
similarity index 100%
rename from Perspex.Controls/RequestBringIntoViewEventArgs.cs
rename to src/Perspex.Controls/RequestBringIntoViewEventArgs.cs
diff --git a/Perspex.Controls/RowDefinition.cs b/src/Perspex.Controls/RowDefinition.cs
similarity index 100%
rename from Perspex.Controls/RowDefinition.cs
rename to src/Perspex.Controls/RowDefinition.cs
diff --git a/Perspex.Controls/RowDefinitions.cs b/src/Perspex.Controls/RowDefinitions.cs
similarity index 100%
rename from Perspex.Controls/RowDefinitions.cs
rename to src/Perspex.Controls/RowDefinitions.cs
diff --git a/Perspex.Controls/ScrollViewer.cs b/src/Perspex.Controls/ScrollViewer.cs
similarity index 100%
rename from Perspex.Controls/ScrollViewer.cs
rename to src/Perspex.Controls/ScrollViewer.cs
diff --git a/Perspex.Controls/Shapes/Ellipse.cs b/src/Perspex.Controls/Shapes/Ellipse.cs
similarity index 100%
rename from Perspex.Controls/Shapes/Ellipse.cs
rename to src/Perspex.Controls/Shapes/Ellipse.cs
diff --git a/Perspex.Controls/Shapes/Path.cs b/src/Perspex.Controls/Shapes/Path.cs
similarity index 100%
rename from Perspex.Controls/Shapes/Path.cs
rename to src/Perspex.Controls/Shapes/Path.cs
diff --git a/Perspex.Controls/Shapes/Rectangle.cs b/src/Perspex.Controls/Shapes/Rectangle.cs
similarity index 100%
rename from Perspex.Controls/Shapes/Rectangle.cs
rename to src/Perspex.Controls/Shapes/Rectangle.cs
diff --git a/Perspex.Controls/Shapes/Shape.cs b/src/Perspex.Controls/Shapes/Shape.cs
similarity index 100%
rename from Perspex.Controls/Shapes/Shape.cs
rename to src/Perspex.Controls/Shapes/Shape.cs
diff --git a/Perspex.Controls/StackPanel.cs b/src/Perspex.Controls/StackPanel.cs
similarity index 100%
rename from Perspex.Controls/StackPanel.cs
rename to src/Perspex.Controls/StackPanel.cs
diff --git a/Perspex.Controls/TabControl.cs b/src/Perspex.Controls/TabControl.cs
similarity index 100%
rename from Perspex.Controls/TabControl.cs
rename to src/Perspex.Controls/TabControl.cs
diff --git a/Perspex.Controls/TabItem.cs b/src/Perspex.Controls/TabItem.cs
similarity index 100%
rename from Perspex.Controls/TabItem.cs
rename to src/Perspex.Controls/TabItem.cs
diff --git a/Perspex.Controls/Templates/ControlTemplate.cs b/src/Perspex.Controls/Templates/ControlTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/ControlTemplate.cs
rename to src/Perspex.Controls/Templates/ControlTemplate.cs
diff --git a/Perspex.Controls/Templates/ControlTemplate`2.cs b/src/Perspex.Controls/Templates/ControlTemplate`2.cs
similarity index 100%
rename from Perspex.Controls/Templates/ControlTemplate`2.cs
rename to src/Perspex.Controls/Templates/ControlTemplate`2.cs
diff --git a/Perspex.Controls/Templates/DataTemplate.cs b/src/Perspex.Controls/Templates/DataTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/DataTemplate.cs
rename to src/Perspex.Controls/Templates/DataTemplate.cs
diff --git a/Perspex.Controls/Templates/DataTemplateExtensions.cs b/src/Perspex.Controls/Templates/DataTemplateExtensions.cs
similarity index 100%
rename from Perspex.Controls/Templates/DataTemplateExtensions.cs
rename to src/Perspex.Controls/Templates/DataTemplateExtensions.cs
diff --git a/Perspex.Controls/Templates/DataTemplate`1.cs b/src/Perspex.Controls/Templates/DataTemplate`1.cs
similarity index 100%
rename from Perspex.Controls/Templates/DataTemplate`1.cs
rename to src/Perspex.Controls/Templates/DataTemplate`1.cs
diff --git a/Perspex.Controls/Templates/DataTemplates.cs b/src/Perspex.Controls/Templates/DataTemplates.cs
similarity index 100%
rename from Perspex.Controls/Templates/DataTemplates.cs
rename to src/Perspex.Controls/Templates/DataTemplates.cs
diff --git a/Perspex.Controls/Templates/FuncTemplate`1.cs b/src/Perspex.Controls/Templates/FuncTemplate`1.cs
similarity index 100%
rename from Perspex.Controls/Templates/FuncTemplate`1.cs
rename to src/Perspex.Controls/Templates/FuncTemplate`1.cs
diff --git a/Perspex.Controls/Templates/FuncTemplate`2.cs b/src/Perspex.Controls/Templates/FuncTemplate`2.cs
similarity index 100%
rename from Perspex.Controls/Templates/FuncTemplate`2.cs
rename to src/Perspex.Controls/Templates/FuncTemplate`2.cs
diff --git a/Perspex.Controls/Templates/IControlTemplate.cs b/src/Perspex.Controls/Templates/IControlTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/IControlTemplate.cs
rename to src/Perspex.Controls/Templates/IControlTemplate.cs
diff --git a/Perspex.Controls/Templates/IDataTemplate.cs b/src/Perspex.Controls/Templates/IDataTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/IDataTemplate.cs
rename to src/Perspex.Controls/Templates/IDataTemplate.cs
diff --git a/Perspex.Controls/Templates/ITemplate`1.cs b/src/Perspex.Controls/Templates/ITemplate`1.cs
similarity index 100%
rename from Perspex.Controls/Templates/ITemplate`1.cs
rename to src/Perspex.Controls/Templates/ITemplate`1.cs
diff --git a/Perspex.Controls/Templates/ITemplate`2.cs b/src/Perspex.Controls/Templates/ITemplate`2.cs
similarity index 100%
rename from Perspex.Controls/Templates/ITemplate`2.cs
rename to src/Perspex.Controls/Templates/ITemplate`2.cs
diff --git a/Perspex.Controls/Templates/ITreeDataTemplate.cs b/src/Perspex.Controls/Templates/ITreeDataTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/ITreeDataTemplate.cs
rename to src/Perspex.Controls/Templates/ITreeDataTemplate.cs
diff --git a/Perspex.Controls/Templates/TemplateExtensions.cs b/src/Perspex.Controls/Templates/TemplateExtensions.cs
similarity index 100%
rename from Perspex.Controls/Templates/TemplateExtensions.cs
rename to src/Perspex.Controls/Templates/TemplateExtensions.cs
diff --git a/Perspex.Controls/Templates/TreeDataTemplate.cs b/src/Perspex.Controls/Templates/TreeDataTemplate.cs
similarity index 100%
rename from Perspex.Controls/Templates/TreeDataTemplate.cs
rename to src/Perspex.Controls/Templates/TreeDataTemplate.cs
diff --git a/Perspex.Controls/Templates/TreeDataTemplate`1.cs b/src/Perspex.Controls/Templates/TreeDataTemplate`1.cs
similarity index 100%
rename from Perspex.Controls/Templates/TreeDataTemplate`1.cs
rename to src/Perspex.Controls/Templates/TreeDataTemplate`1.cs
diff --git a/Perspex.Controls/TextBlock.cs b/src/Perspex.Controls/TextBlock.cs
similarity index 100%
rename from Perspex.Controls/TextBlock.cs
rename to src/Perspex.Controls/TextBlock.cs
diff --git a/Perspex.Controls/TextBox.cs b/src/Perspex.Controls/TextBox.cs
similarity index 100%
rename from Perspex.Controls/TextBox.cs
rename to src/Perspex.Controls/TextBox.cs
diff --git a/Perspex.Controls/TextWrapping.cs b/src/Perspex.Controls/TextWrapping.cs
similarity index 100%
rename from Perspex.Controls/TextWrapping.cs
rename to src/Perspex.Controls/TextWrapping.cs
diff --git a/Perspex.Controls/ToolTip.cs b/src/Perspex.Controls/ToolTip.cs
similarity index 100%
rename from Perspex.Controls/ToolTip.cs
rename to src/Perspex.Controls/ToolTip.cs
diff --git a/Perspex.Controls/TopLevel.cs b/src/Perspex.Controls/TopLevel.cs
similarity index 100%
rename from Perspex.Controls/TopLevel.cs
rename to src/Perspex.Controls/TopLevel.cs
diff --git a/Perspex.Controls/TreeView.cs b/src/Perspex.Controls/TreeView.cs
similarity index 100%
rename from Perspex.Controls/TreeView.cs
rename to src/Perspex.Controls/TreeView.cs
diff --git a/Perspex.Controls/TreeViewItem.cs b/src/Perspex.Controls/TreeViewItem.cs
similarity index 100%
rename from Perspex.Controls/TreeViewItem.cs
rename to src/Perspex.Controls/TreeViewItem.cs
diff --git a/Perspex.Controls/UserControl.cs b/src/Perspex.Controls/UserControl.cs
similarity index 100%
rename from Perspex.Controls/UserControl.cs
rename to src/Perspex.Controls/UserControl.cs
diff --git a/Perspex.Controls/Utils/IEnumerableUtils.cs b/src/Perspex.Controls/Utils/IEnumerableUtils.cs
similarity index 100%
rename from Perspex.Controls/Utils/IEnumerableUtils.cs
rename to src/Perspex.Controls/Utils/IEnumerableUtils.cs
diff --git a/Perspex.Controls/Utils/StringUtils.cs b/src/Perspex.Controls/Utils/StringUtils.cs
similarity index 100%
rename from Perspex.Controls/Utils/StringUtils.cs
rename to src/Perspex.Controls/Utils/StringUtils.cs
diff --git a/Perspex.Controls/Window.cs b/src/Perspex.Controls/Window.cs
similarity index 100%
rename from Perspex.Controls/Window.cs
rename to src/Perspex.Controls/Window.cs
diff --git a/Perspex.Controls/app.config b/src/Perspex.Controls/app.config
similarity index 100%
rename from Perspex.Controls/app.config
rename to src/Perspex.Controls/app.config
diff --git a/Perspex.Controls/packages.config b/src/Perspex.Controls/packages.config
similarity index 100%
rename from Perspex.Controls/packages.config
rename to src/Perspex.Controls/packages.config
diff --git a/Perspex.Diagnostics/Debug.cs b/src/Perspex.Diagnostics/Debug.cs
similarity index 100%
rename from Perspex.Diagnostics/Debug.cs
rename to src/Perspex.Diagnostics/Debug.cs
diff --git a/Perspex.Diagnostics/DevTools.cs b/src/Perspex.Diagnostics/DevTools.cs
similarity index 100%
rename from Perspex.Diagnostics/DevTools.cs
rename to src/Perspex.Diagnostics/DevTools.cs
diff --git a/Perspex.Diagnostics/LogManager.cs b/src/Perspex.Diagnostics/LogManager.cs
similarity index 100%
rename from Perspex.Diagnostics/LogManager.cs
rename to src/Perspex.Diagnostics/LogManager.cs
diff --git a/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
similarity index 87%
rename from Perspex.Diagnostics/Perspex.Diagnostics.csproj
rename to src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index 1bc9a2ead4..8314534f20 100644
--- a/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -96,23 +96,23 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ReactiveUI, Version=6.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\reactiveui-core.6.5.0\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
+      <HintPath>..\..\packages\reactiveui-core.6.5.0\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -120,7 +120,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Diagnostics/Properties/AssemblyInfo.cs b/src/Perspex.Diagnostics/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Diagnostics/Properties/AssemblyInfo.cs
rename to src/Perspex.Diagnostics/Properties/AssemblyInfo.cs
diff --git a/Perspex.Diagnostics/ViewLocator.cs b/src/Perspex.Diagnostics/ViewLocator.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewLocator.cs
rename to src/Perspex.Diagnostics/ViewLocator.cs
diff --git a/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
rename to src/Perspex.Diagnostics/ViewModels/ControlDetailsViewModel.cs
diff --git a/Perspex.Diagnostics/ViewModels/DevToolsViewModel.cs b/src/Perspex.Diagnostics/ViewModels/DevToolsViewModel.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/DevToolsViewModel.cs
rename to src/Perspex.Diagnostics/ViewModels/DevToolsViewModel.cs
diff --git a/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs b/src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
rename to src/Perspex.Diagnostics/ViewModels/LogicalTreeNode.cs
diff --git a/Perspex.Diagnostics/ViewModels/LogicalTreeViewModel.cs b/src/Perspex.Diagnostics/ViewModels/LogicalTreeViewModel.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/LogicalTreeViewModel.cs
rename to src/Perspex.Diagnostics/ViewModels/LogicalTreeViewModel.cs
diff --git a/Perspex.Diagnostics/ViewModels/PropertyDetails.cs b/src/Perspex.Diagnostics/ViewModels/PropertyDetails.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/PropertyDetails.cs
rename to src/Perspex.Diagnostics/ViewModels/PropertyDetails.cs
diff --git a/Perspex.Diagnostics/ViewModels/TreeNode.cs b/src/Perspex.Diagnostics/ViewModels/TreeNode.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/TreeNode.cs
rename to src/Perspex.Diagnostics/ViewModels/TreeNode.cs
diff --git a/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs b/src/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
rename to src/Perspex.Diagnostics/ViewModels/VisualTreeNode.cs
diff --git a/Perspex.Diagnostics/ViewModels/VisualTreeViewModel.cs b/src/Perspex.Diagnostics/ViewModels/VisualTreeViewModel.cs
similarity index 100%
rename from Perspex.Diagnostics/ViewModels/VisualTreeViewModel.cs
rename to src/Perspex.Diagnostics/ViewModels/VisualTreeViewModel.cs
diff --git a/Perspex.Diagnostics/Views/ControlDetailsView.cs b/src/Perspex.Diagnostics/Views/ControlDetailsView.cs
similarity index 100%
rename from Perspex.Diagnostics/Views/ControlDetailsView.cs
rename to src/Perspex.Diagnostics/Views/ControlDetailsView.cs
diff --git a/Perspex.Diagnostics/Views/GridRepeater.cs b/src/Perspex.Diagnostics/Views/GridRepeater.cs
similarity index 100%
rename from Perspex.Diagnostics/Views/GridRepeater.cs
rename to src/Perspex.Diagnostics/Views/GridRepeater.cs
diff --git a/Perspex.Diagnostics/Views/LogicalTreeView.cs b/src/Perspex.Diagnostics/Views/LogicalTreeView.cs
similarity index 100%
rename from Perspex.Diagnostics/Views/LogicalTreeView.cs
rename to src/Perspex.Diagnostics/Views/LogicalTreeView.cs
diff --git a/Perspex.Diagnostics/Views/TreePage.cs b/src/Perspex.Diagnostics/Views/TreePage.cs
similarity index 100%
rename from Perspex.Diagnostics/Views/TreePage.cs
rename to src/Perspex.Diagnostics/Views/TreePage.cs
diff --git a/Perspex.Diagnostics/Views/VisualTreeView.cs b/src/Perspex.Diagnostics/Views/VisualTreeView.cs
similarity index 100%
rename from Perspex.Diagnostics/Views/VisualTreeView.cs
rename to src/Perspex.Diagnostics/Views/VisualTreeView.cs
diff --git a/Perspex.Diagnostics/app.config b/src/Perspex.Diagnostics/app.config
similarity index 100%
rename from Perspex.Diagnostics/app.config
rename to src/Perspex.Diagnostics/app.config
diff --git a/Perspex.Diagnostics/packages.config b/src/Perspex.Diagnostics/packages.config
similarity index 100%
rename from Perspex.Diagnostics/packages.config
rename to src/Perspex.Diagnostics/packages.config
diff --git a/Perspex.Input/AccessKeyHandler.cs b/src/Perspex.Input/AccessKeyHandler.cs
similarity index 100%
rename from Perspex.Input/AccessKeyHandler.cs
rename to src/Perspex.Input/AccessKeyHandler.cs
diff --git a/Perspex.Input/FocusManager.cs b/src/Perspex.Input/FocusManager.cs
similarity index 100%
rename from Perspex.Input/FocusManager.cs
rename to src/Perspex.Input/FocusManager.cs
diff --git a/Perspex.Input/FocusNavigationDirection.cs b/src/Perspex.Input/FocusNavigationDirection.cs
similarity index 100%
rename from Perspex.Input/FocusNavigationDirection.cs
rename to src/Perspex.Input/FocusNavigationDirection.cs
diff --git a/Perspex.Input/GlobalSuppressions.cs b/src/Perspex.Input/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Input/GlobalSuppressions.cs
rename to src/Perspex.Input/GlobalSuppressions.cs
diff --git a/Perspex.Input/GotFocusEventArgs.cs b/src/Perspex.Input/GotFocusEventArgs.cs
similarity index 100%
rename from Perspex.Input/GotFocusEventArgs.cs
rename to src/Perspex.Input/GotFocusEventArgs.cs
diff --git a/Perspex.Input/IAccessKeyHandler.cs b/src/Perspex.Input/IAccessKeyHandler.cs
similarity index 100%
rename from Perspex.Input/IAccessKeyHandler.cs
rename to src/Perspex.Input/IAccessKeyHandler.cs
diff --git a/Perspex.Input/ICloseable.cs b/src/Perspex.Input/ICloseable.cs
similarity index 100%
rename from Perspex.Input/ICloseable.cs
rename to src/Perspex.Input/ICloseable.cs
diff --git a/Perspex.Input/IFocusManager.cs b/src/Perspex.Input/IFocusManager.cs
similarity index 100%
rename from Perspex.Input/IFocusManager.cs
rename to src/Perspex.Input/IFocusManager.cs
diff --git a/Perspex.Input/IFocusScope.cs b/src/Perspex.Input/IFocusScope.cs
similarity index 100%
rename from Perspex.Input/IFocusScope.cs
rename to src/Perspex.Input/IFocusScope.cs
diff --git a/Perspex.Input/IInputDevice.cs b/src/Perspex.Input/IInputDevice.cs
similarity index 100%
rename from Perspex.Input/IInputDevice.cs
rename to src/Perspex.Input/IInputDevice.cs
diff --git a/Perspex.Input/IInputElement.cs b/src/Perspex.Input/IInputElement.cs
similarity index 100%
rename from Perspex.Input/IInputElement.cs
rename to src/Perspex.Input/IInputElement.cs
diff --git a/Perspex.Input/IInputManager.cs b/src/Perspex.Input/IInputManager.cs
similarity index 100%
rename from Perspex.Input/IInputManager.cs
rename to src/Perspex.Input/IInputManager.cs
diff --git a/Perspex.Input/IInputRoot.cs b/src/Perspex.Input/IInputRoot.cs
similarity index 100%
rename from Perspex.Input/IInputRoot.cs
rename to src/Perspex.Input/IInputRoot.cs
diff --git a/Perspex.Input/IKeyboardDevice.cs b/src/Perspex.Input/IKeyboardDevice.cs
similarity index 100%
rename from Perspex.Input/IKeyboardDevice.cs
rename to src/Perspex.Input/IKeyboardDevice.cs
diff --git a/Perspex.Input/IKeyboardNavigationHandler.cs b/src/Perspex.Input/IKeyboardNavigationHandler.cs
similarity index 100%
rename from Perspex.Input/IKeyboardNavigationHandler.cs
rename to src/Perspex.Input/IKeyboardNavigationHandler.cs
diff --git a/Perspex.Input/IMainMenu.cs b/src/Perspex.Input/IMainMenu.cs
similarity index 100%
rename from Perspex.Input/IMainMenu.cs
rename to src/Perspex.Input/IMainMenu.cs
diff --git a/Perspex.Input/IMouseDevice.cs b/src/Perspex.Input/IMouseDevice.cs
similarity index 100%
rename from Perspex.Input/IMouseDevice.cs
rename to src/Perspex.Input/IMouseDevice.cs
diff --git a/Perspex.Input/INavigableContainer.cs b/src/Perspex.Input/INavigableContainer.cs
similarity index 100%
rename from Perspex.Input/INavigableContainer.cs
rename to src/Perspex.Input/INavigableContainer.cs
diff --git a/Perspex.Input/IPointerDevice.cs b/src/Perspex.Input/IPointerDevice.cs
similarity index 100%
rename from Perspex.Input/IPointerDevice.cs
rename to src/Perspex.Input/IPointerDevice.cs
diff --git a/Perspex.Input/InputElement.cs b/src/Perspex.Input/InputElement.cs
similarity index 100%
rename from Perspex.Input/InputElement.cs
rename to src/Perspex.Input/InputElement.cs
diff --git a/Perspex.Input/InputExtensions.cs b/src/Perspex.Input/InputExtensions.cs
similarity index 100%
rename from Perspex.Input/InputExtensions.cs
rename to src/Perspex.Input/InputExtensions.cs
diff --git a/Perspex.Input/InputManager.cs b/src/Perspex.Input/InputManager.cs
similarity index 100%
rename from Perspex.Input/InputManager.cs
rename to src/Perspex.Input/InputManager.cs
diff --git a/Perspex.Input/Key.cs b/src/Perspex.Input/Key.cs
similarity index 100%
rename from Perspex.Input/Key.cs
rename to src/Perspex.Input/Key.cs
diff --git a/Perspex.Input/KeyEventArgs.cs b/src/Perspex.Input/KeyEventArgs.cs
similarity index 100%
rename from Perspex.Input/KeyEventArgs.cs
rename to src/Perspex.Input/KeyEventArgs.cs
diff --git a/Perspex.Input/KeyboardDevice.cs b/src/Perspex.Input/KeyboardDevice.cs
similarity index 100%
rename from Perspex.Input/KeyboardDevice.cs
rename to src/Perspex.Input/KeyboardDevice.cs
diff --git a/Perspex.Input/KeyboardNavigation.cs b/src/Perspex.Input/KeyboardNavigation.cs
similarity index 100%
rename from Perspex.Input/KeyboardNavigation.cs
rename to src/Perspex.Input/KeyboardNavigation.cs
diff --git a/Perspex.Input/KeyboardNavigationHandler.cs b/src/Perspex.Input/KeyboardNavigationHandler.cs
similarity index 100%
rename from Perspex.Input/KeyboardNavigationHandler.cs
rename to src/Perspex.Input/KeyboardNavigationHandler.cs
diff --git a/Perspex.Input/KeyboardNavigationMode.cs b/src/Perspex.Input/KeyboardNavigationMode.cs
similarity index 100%
rename from Perspex.Input/KeyboardNavigationMode.cs
rename to src/Perspex.Input/KeyboardNavigationMode.cs
diff --git a/Perspex.Input/MouseDevice.cs b/src/Perspex.Input/MouseDevice.cs
similarity index 100%
rename from Perspex.Input/MouseDevice.cs
rename to src/Perspex.Input/MouseDevice.cs
diff --git a/Perspex.Input/Navigation/DirectionalNavigation.cs b/src/Perspex.Input/Navigation/DirectionalNavigation.cs
similarity index 100%
rename from Perspex.Input/Navigation/DirectionalNavigation.cs
rename to src/Perspex.Input/Navigation/DirectionalNavigation.cs
diff --git a/Perspex.Input/Navigation/FocusExtensions.cs b/src/Perspex.Input/Navigation/FocusExtensions.cs
similarity index 100%
rename from Perspex.Input/Navigation/FocusExtensions.cs
rename to src/Perspex.Input/Navigation/FocusExtensions.cs
diff --git a/Perspex.Input/Navigation/TabNavigation.cs b/src/Perspex.Input/Navigation/TabNavigation.cs
similarity index 100%
rename from Perspex.Input/Navigation/TabNavigation.cs
rename to src/Perspex.Input/Navigation/TabNavigation.cs
diff --git a/Perspex.Input/NavigationMethod.cs b/src/Perspex.Input/NavigationMethod.cs
similarity index 100%
rename from Perspex.Input/NavigationMethod.cs
rename to src/Perspex.Input/NavigationMethod.cs
diff --git a/Perspex.Input/Perspex.Input.csproj b/src/Perspex.Input/Perspex.Input.csproj
similarity index 89%
rename from Perspex.Input/Perspex.Input.csproj
rename to src/Perspex.Input/Perspex.Input.csproj
index 26643b58fc..b5495ed798 100644
--- a/Perspex.Input/Perspex.Input.csproj
+++ b/src/Perspex.Input/Perspex.Input.csproj
@@ -110,20 +110,20 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -131,7 +131,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Input/Platform/IPlatformSettings.cs b/src/Perspex.Input/Platform/IPlatformSettings.cs
similarity index 100%
rename from Perspex.Input/Platform/IPlatformSettings.cs
rename to src/Perspex.Input/Platform/IPlatformSettings.cs
diff --git a/Perspex.Input/PointerEventArgs.cs b/src/Perspex.Input/PointerEventArgs.cs
similarity index 100%
rename from Perspex.Input/PointerEventArgs.cs
rename to src/Perspex.Input/PointerEventArgs.cs
diff --git a/Perspex.Input/PointerPressEventArgs.cs b/src/Perspex.Input/PointerPressEventArgs.cs
similarity index 100%
rename from Perspex.Input/PointerPressEventArgs.cs
rename to src/Perspex.Input/PointerPressEventArgs.cs
diff --git a/Perspex.Input/PointerWheelEventArgs.cs b/src/Perspex.Input/PointerWheelEventArgs.cs
similarity index 100%
rename from Perspex.Input/PointerWheelEventArgs.cs
rename to src/Perspex.Input/PointerWheelEventArgs.cs
diff --git a/Perspex.Input/Properties/AssemblyInfo.cs b/src/Perspex.Input/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Input/Properties/AssemblyInfo.cs
rename to src/Perspex.Input/Properties/AssemblyInfo.cs
diff --git a/Perspex.Input/Raw/RawInputEventArgs.cs b/src/Perspex.Input/Raw/RawInputEventArgs.cs
similarity index 100%
rename from Perspex.Input/Raw/RawInputEventArgs.cs
rename to src/Perspex.Input/Raw/RawInputEventArgs.cs
diff --git a/Perspex.Input/Raw/RawKeyEventArgs.cs b/src/Perspex.Input/Raw/RawKeyEventArgs.cs
similarity index 100%
rename from Perspex.Input/Raw/RawKeyEventArgs.cs
rename to src/Perspex.Input/Raw/RawKeyEventArgs.cs
diff --git a/Perspex.Input/Raw/RawMouseEventArgs.cs b/src/Perspex.Input/Raw/RawMouseEventArgs.cs
similarity index 100%
rename from Perspex.Input/Raw/RawMouseEventArgs.cs
rename to src/Perspex.Input/Raw/RawMouseEventArgs.cs
diff --git a/Perspex.Input/Raw/RawMouseWheelEventArgs.cs b/src/Perspex.Input/Raw/RawMouseWheelEventArgs.cs
similarity index 100%
rename from Perspex.Input/Raw/RawMouseWheelEventArgs.cs
rename to src/Perspex.Input/Raw/RawMouseWheelEventArgs.cs
diff --git a/Perspex.Input/Raw/RawSizeEventArgs.cs b/src/Perspex.Input/Raw/RawSizeEventArgs.cs
similarity index 100%
rename from Perspex.Input/Raw/RawSizeEventArgs.cs
rename to src/Perspex.Input/Raw/RawSizeEventArgs.cs
diff --git a/Perspex.Input/VectorEventArgs.cs b/src/Perspex.Input/VectorEventArgs.cs
similarity index 100%
rename from Perspex.Input/VectorEventArgs.cs
rename to src/Perspex.Input/VectorEventArgs.cs
diff --git a/Perspex.Input/app.config b/src/Perspex.Input/app.config
similarity index 100%
rename from Perspex.Input/app.config
rename to src/Perspex.Input/app.config
diff --git a/Perspex.Input/packages.config b/src/Perspex.Input/packages.config
similarity index 100%
rename from Perspex.Input/packages.config
rename to src/Perspex.Input/packages.config
diff --git a/Perspex.Interactivity/EventSubscription.cs b/src/Perspex.Interactivity/EventSubscription.cs
similarity index 100%
rename from Perspex.Interactivity/EventSubscription.cs
rename to src/Perspex.Interactivity/EventSubscription.cs
diff --git a/Perspex.Interactivity/GlobalSuppressions.cs b/src/Perspex.Interactivity/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Interactivity/GlobalSuppressions.cs
rename to src/Perspex.Interactivity/GlobalSuppressions.cs
diff --git a/Perspex.Interactivity/IInteractive.cs b/src/Perspex.Interactivity/IInteractive.cs
similarity index 100%
rename from Perspex.Interactivity/IInteractive.cs
rename to src/Perspex.Interactivity/IInteractive.cs
diff --git a/Perspex.Interactivity/Interactive.cs b/src/Perspex.Interactivity/Interactive.cs
similarity index 100%
rename from Perspex.Interactivity/Interactive.cs
rename to src/Perspex.Interactivity/Interactive.cs
diff --git a/Perspex.Interactivity/InteractiveExtensions.cs b/src/Perspex.Interactivity/InteractiveExtensions.cs
similarity index 100%
rename from Perspex.Interactivity/InteractiveExtensions.cs
rename to src/Perspex.Interactivity/InteractiveExtensions.cs
diff --git a/Perspex.Interactivity/Perspex.Interactivity.csproj b/src/Perspex.Interactivity/Perspex.Interactivity.csproj
similarity index 86%
rename from Perspex.Interactivity/Perspex.Interactivity.csproj
rename to src/Perspex.Interactivity/Perspex.Interactivity.csproj
index c98b61c6a5..6356557395 100644
--- a/Perspex.Interactivity/Perspex.Interactivity.csproj
+++ b/src/Perspex.Interactivity/Perspex.Interactivity.csproj
@@ -70,20 +70,20 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -91,7 +91,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Interactivity/Properties/AssemblyInfo.cs b/src/Perspex.Interactivity/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Interactivity/Properties/AssemblyInfo.cs
rename to src/Perspex.Interactivity/Properties/AssemblyInfo.cs
diff --git a/Perspex.Interactivity/RoutedEvent.cs b/src/Perspex.Interactivity/RoutedEvent.cs
similarity index 100%
rename from Perspex.Interactivity/RoutedEvent.cs
rename to src/Perspex.Interactivity/RoutedEvent.cs
diff --git a/Perspex.Interactivity/RoutedEventArgs.cs b/src/Perspex.Interactivity/RoutedEventArgs.cs
similarity index 100%
rename from Perspex.Interactivity/RoutedEventArgs.cs
rename to src/Perspex.Interactivity/RoutedEventArgs.cs
diff --git a/Perspex.Interactivity/app.config b/src/Perspex.Interactivity/app.config
similarity index 100%
rename from Perspex.Interactivity/app.config
rename to src/Perspex.Interactivity/app.config
diff --git a/Perspex.Interactivity/packages.config b/src/Perspex.Interactivity/packages.config
similarity index 100%
rename from Perspex.Interactivity/packages.config
rename to src/Perspex.Interactivity/packages.config
diff --git a/Perspex.Layout/GlobalSuppressions.cs b/src/Perspex.Layout/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Layout/GlobalSuppressions.cs
rename to src/Perspex.Layout/GlobalSuppressions.cs
diff --git a/Perspex.Layout/ILayoutManager.cs b/src/Perspex.Layout/ILayoutManager.cs
similarity index 100%
rename from Perspex.Layout/ILayoutManager.cs
rename to src/Perspex.Layout/ILayoutManager.cs
diff --git a/Perspex.Layout/ILayoutRoot.cs b/src/Perspex.Layout/ILayoutRoot.cs
similarity index 100%
rename from Perspex.Layout/ILayoutRoot.cs
rename to src/Perspex.Layout/ILayoutRoot.cs
diff --git a/Perspex.Layout/ILayoutable.cs b/src/Perspex.Layout/ILayoutable.cs
similarity index 100%
rename from Perspex.Layout/ILayoutable.cs
rename to src/Perspex.Layout/ILayoutable.cs
diff --git a/Perspex.Layout/LayoutHelper.cs b/src/Perspex.Layout/LayoutHelper.cs
similarity index 100%
rename from Perspex.Layout/LayoutHelper.cs
rename to src/Perspex.Layout/LayoutHelper.cs
diff --git a/Perspex.Layout/LayoutManager.cs b/src/Perspex.Layout/LayoutManager.cs
similarity index 100%
rename from Perspex.Layout/LayoutManager.cs
rename to src/Perspex.Layout/LayoutManager.cs
diff --git a/Perspex.Layout/Layoutable.cs b/src/Perspex.Layout/Layoutable.cs
similarity index 100%
rename from Perspex.Layout/Layoutable.cs
rename to src/Perspex.Layout/Layoutable.cs
diff --git a/Perspex.Layout/Perspex.Layout.csproj b/src/Perspex.Layout/Perspex.Layout.csproj
similarity index 84%
rename from Perspex.Layout/Perspex.Layout.csproj
rename to src/Perspex.Layout/Perspex.Layout.csproj
index 0d159a0d7e..5da696808d 100644
--- a/Perspex.Layout/Perspex.Layout.csproj
+++ b/src/Perspex.Layout/Perspex.Layout.csproj
@@ -70,24 +70,24 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -95,7 +95,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Layout/Properties/AssemblyInfo.cs b/src/Perspex.Layout/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Layout/Properties/AssemblyInfo.cs
rename to src/Perspex.Layout/Properties/AssemblyInfo.cs
diff --git a/Perspex.Layout/app.config b/src/Perspex.Layout/app.config
similarity index 100%
rename from Perspex.Layout/app.config
rename to src/Perspex.Layout/app.config
diff --git a/Perspex.Layout/packages.config b/src/Perspex.Layout/packages.config
similarity index 100%
rename from Perspex.Layout/packages.config
rename to src/Perspex.Layout/packages.config
diff --git a/Perspex.SceneGraph/Animation/CrossFade.cs b/src/Perspex.SceneGraph/Animation/CrossFade.cs
similarity index 100%
rename from Perspex.SceneGraph/Animation/CrossFade.cs
rename to src/Perspex.SceneGraph/Animation/CrossFade.cs
diff --git a/Perspex.SceneGraph/Animation/IPageTransition.cs b/src/Perspex.SceneGraph/Animation/IPageTransition.cs
similarity index 100%
rename from Perspex.SceneGraph/Animation/IPageTransition.cs
rename to src/Perspex.SceneGraph/Animation/IPageTransition.cs
diff --git a/Perspex.SceneGraph/Animation/PageSlide.cs b/src/Perspex.SceneGraph/Animation/PageSlide.cs
similarity index 100%
rename from Perspex.SceneGraph/Animation/PageSlide.cs
rename to src/Perspex.SceneGraph/Animation/PageSlide.cs
diff --git a/Perspex.SceneGraph/GlobalSuppressions.cs b/src/Perspex.SceneGraph/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.SceneGraph/GlobalSuppressions.cs
rename to src/Perspex.SceneGraph/GlobalSuppressions.cs
diff --git a/Perspex.SceneGraph/IVisual.cs b/src/Perspex.SceneGraph/IVisual.cs
similarity index 100%
rename from Perspex.SceneGraph/IVisual.cs
rename to src/Perspex.SceneGraph/IVisual.cs
diff --git a/Perspex.SceneGraph/Matrix.cs b/src/Perspex.SceneGraph/Matrix.cs
similarity index 100%
rename from Perspex.SceneGraph/Matrix.cs
rename to src/Perspex.SceneGraph/Matrix.cs
diff --git a/Perspex.SceneGraph/Media/Brush.cs b/src/Perspex.SceneGraph/Media/Brush.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Brush.cs
rename to src/Perspex.SceneGraph/Media/Brush.cs
diff --git a/Perspex.SceneGraph/Media/Brushes.cs b/src/Perspex.SceneGraph/Media/Brushes.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Brushes.cs
rename to src/Perspex.SceneGraph/Media/Brushes.cs
diff --git a/Perspex.SceneGraph/Media/Color.cs b/src/Perspex.SceneGraph/Media/Color.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Color.cs
rename to src/Perspex.SceneGraph/Media/Color.cs
diff --git a/Perspex.SceneGraph/Media/Colors.cs b/src/Perspex.SceneGraph/Media/Colors.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Colors.cs
rename to src/Perspex.SceneGraph/Media/Colors.cs
diff --git a/Perspex.SceneGraph/Media/EllipseGeometry.cs b/src/Perspex.SceneGraph/Media/EllipseGeometry.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/EllipseGeometry.cs
rename to src/Perspex.SceneGraph/Media/EllipseGeometry.cs
diff --git a/Perspex.SceneGraph/Media/FontStyle.cs b/src/Perspex.SceneGraph/Media/FontStyle.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/FontStyle.cs
rename to src/Perspex.SceneGraph/Media/FontStyle.cs
diff --git a/Perspex.SceneGraph/Media/FontWeight.cs b/src/Perspex.SceneGraph/Media/FontWeight.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/FontWeight.cs
rename to src/Perspex.SceneGraph/Media/FontWeight.cs
diff --git a/Perspex.SceneGraph/Media/FormattedText.cs b/src/Perspex.SceneGraph/Media/FormattedText.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/FormattedText.cs
rename to src/Perspex.SceneGraph/Media/FormattedText.cs
diff --git a/Perspex.SceneGraph/Media/FormattedTextLine.cs b/src/Perspex.SceneGraph/Media/FormattedTextLine.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/FormattedTextLine.cs
rename to src/Perspex.SceneGraph/Media/FormattedTextLine.cs
diff --git a/Perspex.SceneGraph/Media/Geometry.cs b/src/Perspex.SceneGraph/Media/Geometry.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Geometry.cs
rename to src/Perspex.SceneGraph/Media/Geometry.cs
diff --git a/Perspex.SceneGraph/Media/IDrawingContext.cs b/src/Perspex.SceneGraph/Media/IDrawingContext.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/IDrawingContext.cs
rename to src/Perspex.SceneGraph/Media/IDrawingContext.cs
diff --git a/Perspex.SceneGraph/Media/Imaging/Bitmap.cs b/src/Perspex.SceneGraph/Media/Imaging/Bitmap.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Imaging/Bitmap.cs
rename to src/Perspex.SceneGraph/Media/Imaging/Bitmap.cs
diff --git a/Perspex.SceneGraph/Media/Imaging/IBitmap.cs b/src/Perspex.SceneGraph/Media/Imaging/IBitmap.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Imaging/IBitmap.cs
rename to src/Perspex.SceneGraph/Media/Imaging/IBitmap.cs
diff --git a/Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs b/src/Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs
rename to src/Perspex.SceneGraph/Media/Imaging/RenderTargetBitmap.cs
diff --git a/Perspex.SceneGraph/Media/MatrixTransform.cs b/src/Perspex.SceneGraph/Media/MatrixTransform.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/MatrixTransform.cs
rename to src/Perspex.SceneGraph/Media/MatrixTransform.cs
diff --git a/Perspex.SceneGraph/Media/PathMarkupParser.cs b/src/Perspex.SceneGraph/Media/PathMarkupParser.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/PathMarkupParser.cs
rename to src/Perspex.SceneGraph/Media/PathMarkupParser.cs
diff --git a/Perspex.SceneGraph/Media/Pen.cs b/src/Perspex.SceneGraph/Media/Pen.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Pen.cs
rename to src/Perspex.SceneGraph/Media/Pen.cs
diff --git a/Perspex.SceneGraph/Media/RectangleGeometry.cs b/src/Perspex.SceneGraph/Media/RectangleGeometry.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/RectangleGeometry.cs
rename to src/Perspex.SceneGraph/Media/RectangleGeometry.cs
diff --git a/Perspex.SceneGraph/Media/RotateTransform.cs b/src/Perspex.SceneGraph/Media/RotateTransform.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/RotateTransform.cs
rename to src/Perspex.SceneGraph/Media/RotateTransform.cs
diff --git a/Perspex.SceneGraph/Media/SolidColorBrush.cs b/src/Perspex.SceneGraph/Media/SolidColorBrush.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/SolidColorBrush.cs
rename to src/Perspex.SceneGraph/Media/SolidColorBrush.cs
diff --git a/Perspex.SceneGraph/Media/StreamGeometry.cs b/src/Perspex.SceneGraph/Media/StreamGeometry.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/StreamGeometry.cs
rename to src/Perspex.SceneGraph/Media/StreamGeometry.cs
diff --git a/Perspex.SceneGraph/Media/StreamGeometryContext.cs b/src/Perspex.SceneGraph/Media/StreamGeometryContext.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/StreamGeometryContext.cs
rename to src/Perspex.SceneGraph/Media/StreamGeometryContext.cs
diff --git a/Perspex.SceneGraph/Media/Stretch.cs b/src/Perspex.SceneGraph/Media/Stretch.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Stretch.cs
rename to src/Perspex.SceneGraph/Media/Stretch.cs
diff --git a/Perspex.SceneGraph/Media/SweepDirection.cs b/src/Perspex.SceneGraph/Media/SweepDirection.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/SweepDirection.cs
rename to src/Perspex.SceneGraph/Media/SweepDirection.cs
diff --git a/Perspex.SceneGraph/Media/TextAlignment.cs b/src/Perspex.SceneGraph/Media/TextAlignment.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/TextAlignment.cs
rename to src/Perspex.SceneGraph/Media/TextAlignment.cs
diff --git a/Perspex.SceneGraph/Media/TextHitTestResult.cs b/src/Perspex.SceneGraph/Media/TextHitTestResult.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/TextHitTestResult.cs
rename to src/Perspex.SceneGraph/Media/TextHitTestResult.cs
diff --git a/Perspex.SceneGraph/Media/Transform.cs b/src/Perspex.SceneGraph/Media/Transform.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/Transform.cs
rename to src/Perspex.SceneGraph/Media/Transform.cs
diff --git a/Perspex.SceneGraph/Media/TranslateTransform.cs b/src/Perspex.SceneGraph/Media/TranslateTransform.cs
similarity index 100%
rename from Perspex.SceneGraph/Media/TranslateTransform.cs
rename to src/Perspex.SceneGraph/Media/TranslateTransform.cs
diff --git a/Perspex.SceneGraph/Origin.cs b/src/Perspex.SceneGraph/Origin.cs
similarity index 100%
rename from Perspex.SceneGraph/Origin.cs
rename to src/Perspex.SceneGraph/Origin.cs
diff --git a/Perspex.SceneGraph/Perspex.SceneGraph.csproj b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
similarity index 88%
rename from Perspex.SceneGraph/Perspex.SceneGraph.csproj
rename to src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
index f53cbb49fb..d4915d8cda 100644
--- a/Perspex.SceneGraph/Perspex.SceneGraph.csproj
+++ b/src/Perspex.SceneGraph/Perspex.SceneGraph.csproj
@@ -113,24 +113,24 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Serilog.1.5.9\lib\portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10\Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -138,7 +138,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.SceneGraph/Platform/IBitmapImpl.cs b/src/Perspex.SceneGraph/Platform/IBitmapImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IBitmapImpl.cs
rename to src/Perspex.SceneGraph/Platform/IBitmapImpl.cs
diff --git a/Perspex.SceneGraph/Platform/IFormattedTextImpl.cs b/src/Perspex.SceneGraph/Platform/IFormattedTextImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IFormattedTextImpl.cs
rename to src/Perspex.SceneGraph/Platform/IFormattedTextImpl.cs
diff --git a/Perspex.SceneGraph/Platform/IGeometryImpl.cs b/src/Perspex.SceneGraph/Platform/IGeometryImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IGeometryImpl.cs
rename to src/Perspex.SceneGraph/Platform/IGeometryImpl.cs
diff --git a/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs b/src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs
rename to src/Perspex.SceneGraph/Platform/IPlatformRenderInterface.cs
diff --git a/Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs b/src/Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs
rename to src/Perspex.SceneGraph/Platform/IRenderTargetBitmapImpl.cs
diff --git a/Perspex.SceneGraph/Platform/IRenderer.cs b/src/Perspex.SceneGraph/Platform/IRenderer.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IRenderer.cs
rename to src/Perspex.SceneGraph/Platform/IRenderer.cs
diff --git a/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs b/src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs
rename to src/Perspex.SceneGraph/Platform/IStreamGeometryContextImpl.cs
diff --git a/Perspex.SceneGraph/Platform/IStreamGeometryImpl.cs b/src/Perspex.SceneGraph/Platform/IStreamGeometryImpl.cs
similarity index 100%
rename from Perspex.SceneGraph/Platform/IStreamGeometryImpl.cs
rename to src/Perspex.SceneGraph/Platform/IStreamGeometryImpl.cs
diff --git a/Perspex.SceneGraph/Point.cs b/src/Perspex.SceneGraph/Point.cs
similarity index 100%
rename from Perspex.SceneGraph/Point.cs
rename to src/Perspex.SceneGraph/Point.cs
diff --git a/Perspex.SceneGraph/Properties/AssemblyInfo.cs b/src/Perspex.SceneGraph/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.SceneGraph/Properties/AssemblyInfo.cs
rename to src/Perspex.SceneGraph/Properties/AssemblyInfo.cs
diff --git a/Perspex.SceneGraph/Rect.cs b/src/Perspex.SceneGraph/Rect.cs
similarity index 100%
rename from Perspex.SceneGraph/Rect.cs
rename to src/Perspex.SceneGraph/Rect.cs
diff --git a/Perspex.SceneGraph/Rendering/IRenderManager.cs b/src/Perspex.SceneGraph/Rendering/IRenderManager.cs
similarity index 100%
rename from Perspex.SceneGraph/Rendering/IRenderManager.cs
rename to src/Perspex.SceneGraph/Rendering/IRenderManager.cs
diff --git a/Perspex.SceneGraph/Rendering/IRenderRoot.cs b/src/Perspex.SceneGraph/Rendering/IRenderRoot.cs
similarity index 100%
rename from Perspex.SceneGraph/Rendering/IRenderRoot.cs
rename to src/Perspex.SceneGraph/Rendering/IRenderRoot.cs
diff --git a/Perspex.SceneGraph/Rendering/RenderManager.cs b/src/Perspex.SceneGraph/Rendering/RenderManager.cs
similarity index 100%
rename from Perspex.SceneGraph/Rendering/RenderManager.cs
rename to src/Perspex.SceneGraph/Rendering/RenderManager.cs
diff --git a/Perspex.SceneGraph/Rendering/RendererBase.cs b/src/Perspex.SceneGraph/Rendering/RendererBase.cs
similarity index 100%
rename from Perspex.SceneGraph/Rendering/RendererBase.cs
rename to src/Perspex.SceneGraph/Rendering/RendererBase.cs
diff --git a/Perspex.SceneGraph/Size.cs b/src/Perspex.SceneGraph/Size.cs
similarity index 100%
rename from Perspex.SceneGraph/Size.cs
rename to src/Perspex.SceneGraph/Size.cs
diff --git a/Perspex.SceneGraph/Thickness.cs b/src/Perspex.SceneGraph/Thickness.cs
similarity index 100%
rename from Perspex.SceneGraph/Thickness.cs
rename to src/Perspex.SceneGraph/Thickness.cs
diff --git a/Perspex.SceneGraph/Vector.cs b/src/Perspex.SceneGraph/Vector.cs
similarity index 100%
rename from Perspex.SceneGraph/Vector.cs
rename to src/Perspex.SceneGraph/Vector.cs
diff --git a/Perspex.SceneGraph/Visual.cs b/src/Perspex.SceneGraph/Visual.cs
similarity index 100%
rename from Perspex.SceneGraph/Visual.cs
rename to src/Perspex.SceneGraph/Visual.cs
diff --git a/Perspex.SceneGraph/VisualTree/BoundsTracker.cs b/src/Perspex.SceneGraph/VisualTree/BoundsTracker.cs
similarity index 100%
rename from Perspex.SceneGraph/VisualTree/BoundsTracker.cs
rename to src/Perspex.SceneGraph/VisualTree/BoundsTracker.cs
diff --git a/Perspex.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs b/src/Perspex.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs
similarity index 100%
rename from Perspex.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs
rename to src/Perspex.SceneGraph/VisualTree/IHostedVisualTreeRoot.cs
diff --git a/Perspex.SceneGraph/VisualTree/IVisualTreeHost.cs b/src/Perspex.SceneGraph/VisualTree/IVisualTreeHost.cs
similarity index 100%
rename from Perspex.SceneGraph/VisualTree/IVisualTreeHost.cs
rename to src/Perspex.SceneGraph/VisualTree/IVisualTreeHost.cs
diff --git a/Perspex.SceneGraph/VisualTree/TransformedBounds.cs b/src/Perspex.SceneGraph/VisualTree/TransformedBounds.cs
similarity index 100%
rename from Perspex.SceneGraph/VisualTree/TransformedBounds.cs
rename to src/Perspex.SceneGraph/VisualTree/TransformedBounds.cs
diff --git a/Perspex.SceneGraph/VisualTree/VisualExtensions.cs b/src/Perspex.SceneGraph/VisualTree/VisualExtensions.cs
similarity index 100%
rename from Perspex.SceneGraph/VisualTree/VisualExtensions.cs
rename to src/Perspex.SceneGraph/VisualTree/VisualExtensions.cs
diff --git a/Perspex.SceneGraph/app.config b/src/Perspex.SceneGraph/app.config
similarity index 100%
rename from Perspex.SceneGraph/app.config
rename to src/Perspex.SceneGraph/app.config
diff --git a/Perspex.SceneGraph/packages.config b/src/Perspex.SceneGraph/packages.config
similarity index 100%
rename from Perspex.SceneGraph/packages.config
rename to src/Perspex.SceneGraph/packages.config
diff --git a/Perspex.Styling/GlobalSuppressions.cs b/src/Perspex.Styling/GlobalSuppressions.cs
similarity index 100%
rename from Perspex.Styling/GlobalSuppressions.cs
rename to src/Perspex.Styling/GlobalSuppressions.cs
diff --git a/Perspex.Styling/ILogical.cs b/src/Perspex.Styling/ILogical.cs
similarity index 100%
rename from Perspex.Styling/ILogical.cs
rename to src/Perspex.Styling/ILogical.cs
diff --git a/Perspex.Styling/LogicalTree/LogicalExtensions.cs b/src/Perspex.Styling/LogicalTree/LogicalExtensions.cs
similarity index 100%
rename from Perspex.Styling/LogicalTree/LogicalExtensions.cs
rename to src/Perspex.Styling/LogicalTree/LogicalExtensions.cs
diff --git a/Perspex.Styling/Perspex.Styling.csproj b/src/Perspex.Styling/Perspex.Styling.csproj
similarity index 86%
rename from Perspex.Styling/Perspex.Styling.csproj
rename to src/Perspex.Styling/Perspex.Styling.csproj
index 6727589b9c..64d208d74c 100644
--- a/Perspex.Styling/Perspex.Styling.csproj
+++ b/src/Perspex.Styling/Perspex.Styling.csproj
@@ -64,20 +64,20 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -96,7 +96,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Styling/Properties/AssemblyInfo.cs b/src/Perspex.Styling/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Styling/Properties/AssemblyInfo.cs
rename to src/Perspex.Styling/Properties/AssemblyInfo.cs
diff --git a/Perspex.Styling/Styling/Classes.cs b/src/Perspex.Styling/Styling/Classes.cs
similarity index 100%
rename from Perspex.Styling/Styling/Classes.cs
rename to src/Perspex.Styling/Styling/Classes.cs
diff --git a/Perspex.Styling/Styling/IGlobalStyles.cs b/src/Perspex.Styling/Styling/IGlobalStyles.cs
similarity index 100%
rename from Perspex.Styling/Styling/IGlobalStyles.cs
rename to src/Perspex.Styling/Styling/IGlobalStyles.cs
diff --git a/Perspex.Styling/Styling/INamed.cs b/src/Perspex.Styling/Styling/INamed.cs
similarity index 100%
rename from Perspex.Styling/Styling/INamed.cs
rename to src/Perspex.Styling/Styling/INamed.cs
diff --git a/Perspex.Styling/Styling/IStyle.cs b/src/Perspex.Styling/Styling/IStyle.cs
similarity index 100%
rename from Perspex.Styling/Styling/IStyle.cs
rename to src/Perspex.Styling/Styling/IStyle.cs
diff --git a/Perspex.Styling/Styling/IStyleHost.cs b/src/Perspex.Styling/Styling/IStyleHost.cs
similarity index 100%
rename from Perspex.Styling/Styling/IStyleHost.cs
rename to src/Perspex.Styling/Styling/IStyleHost.cs
diff --git a/Perspex.Styling/Styling/IStyleable.cs b/src/Perspex.Styling/Styling/IStyleable.cs
similarity index 100%
rename from Perspex.Styling/Styling/IStyleable.cs
rename to src/Perspex.Styling/Styling/IStyleable.cs
diff --git a/Perspex.Styling/Styling/IStyler.cs b/src/Perspex.Styling/Styling/IStyler.cs
similarity index 100%
rename from Perspex.Styling/Styling/IStyler.cs
rename to src/Perspex.Styling/Styling/IStyler.cs
diff --git a/Perspex.Styling/Styling/ITemplatedControl.cs b/src/Perspex.Styling/Styling/ITemplatedControl.cs
similarity index 100%
rename from Perspex.Styling/Styling/ITemplatedControl.cs
rename to src/Perspex.Styling/Styling/ITemplatedControl.cs
diff --git a/Perspex.Styling/Styling/Selector.cs b/src/Perspex.Styling/Styling/Selector.cs
similarity index 100%
rename from Perspex.Styling/Styling/Selector.cs
rename to src/Perspex.Styling/Styling/Selector.cs
diff --git a/Perspex.Styling/Styling/SelectorMatch.cs b/src/Perspex.Styling/Styling/SelectorMatch.cs
similarity index 100%
rename from Perspex.Styling/Styling/SelectorMatch.cs
rename to src/Perspex.Styling/Styling/SelectorMatch.cs
diff --git a/Perspex.Styling/Styling/Selectors.cs b/src/Perspex.Styling/Styling/Selectors.cs
similarity index 100%
rename from Perspex.Styling/Styling/Selectors.cs
rename to src/Perspex.Styling/Styling/Selectors.cs
diff --git a/Perspex.Styling/Styling/Setter.cs b/src/Perspex.Styling/Styling/Setter.cs
similarity index 100%
rename from Perspex.Styling/Styling/Setter.cs
rename to src/Perspex.Styling/Styling/Setter.cs
diff --git a/Perspex.Styling/Styling/Style.cs b/src/Perspex.Styling/Styling/Style.cs
similarity index 100%
rename from Perspex.Styling/Styling/Style.cs
rename to src/Perspex.Styling/Styling/Style.cs
diff --git a/Perspex.Styling/Styling/StyleActivator.cs b/src/Perspex.Styling/Styling/StyleActivator.cs
similarity index 100%
rename from Perspex.Styling/Styling/StyleActivator.cs
rename to src/Perspex.Styling/Styling/StyleActivator.cs
diff --git a/Perspex.Styling/Styling/StyleBinding.cs b/src/Perspex.Styling/Styling/StyleBinding.cs
similarity index 100%
rename from Perspex.Styling/Styling/StyleBinding.cs
rename to src/Perspex.Styling/Styling/StyleBinding.cs
diff --git a/Perspex.Styling/Styling/Styler.cs b/src/Perspex.Styling/Styling/Styler.cs
similarity index 100%
rename from Perspex.Styling/Styling/Styler.cs
rename to src/Perspex.Styling/Styling/Styler.cs
diff --git a/Perspex.Styling/Styling/Styles.cs b/src/Perspex.Styling/Styling/Styles.cs
similarity index 100%
rename from Perspex.Styling/Styling/Styles.cs
rename to src/Perspex.Styling/Styling/Styles.cs
diff --git a/Perspex.Styling/Styling/packages.config b/src/Perspex.Styling/Styling/packages.config
similarity index 100%
rename from Perspex.Styling/Styling/packages.config
rename to src/Perspex.Styling/Styling/packages.config
diff --git a/Perspex.Styling/app.config b/src/Perspex.Styling/app.config
similarity index 100%
rename from Perspex.Styling/app.config
rename to src/Perspex.Styling/app.config
diff --git a/Perspex.Styling/packages.config b/src/Perspex.Styling/packages.config
similarity index 100%
rename from Perspex.Styling/packages.config
rename to src/Perspex.Styling/packages.config
diff --git a/Perspex.Themes.Default/ButtonStyle.cs b/src/Perspex.Themes.Default/ButtonStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ButtonStyle.cs
rename to src/Perspex.Themes.Default/ButtonStyle.cs
diff --git a/Perspex.Themes.Default/CheckBoxStyle.cs b/src/Perspex.Themes.Default/CheckBoxStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/CheckBoxStyle.cs
rename to src/Perspex.Themes.Default/CheckBoxStyle.cs
diff --git a/Perspex.Themes.Default/ContentControlStyle.cs b/src/Perspex.Themes.Default/ContentControlStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ContentControlStyle.cs
rename to src/Perspex.Themes.Default/ContentControlStyle.cs
diff --git a/Perspex.Themes.Default/DeckStyle.cs b/src/Perspex.Themes.Default/DeckStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/DeckStyle.cs
rename to src/Perspex.Themes.Default/DeckStyle.cs
diff --git a/Perspex.Themes.Default/DefaultTheme.cs b/src/Perspex.Themes.Default/DefaultTheme.cs
similarity index 100%
rename from Perspex.Themes.Default/DefaultTheme.cs
rename to src/Perspex.Themes.Default/DefaultTheme.cs
diff --git a/Perspex.Themes.Default/DropDownStyle.cs b/src/Perspex.Themes.Default/DropDownStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/DropDownStyle.cs
rename to src/Perspex.Themes.Default/DropDownStyle.cs
diff --git a/Perspex.Themes.Default/FocusAdornerStyle.cs b/src/Perspex.Themes.Default/FocusAdornerStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/FocusAdornerStyle.cs
rename to src/Perspex.Themes.Default/FocusAdornerStyle.cs
diff --git a/Perspex.Themes.Default/GridSplitterStyle.cs b/src/Perspex.Themes.Default/GridSplitterStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/GridSplitterStyle.cs
rename to src/Perspex.Themes.Default/GridSplitterStyle.cs
diff --git a/Perspex.Themes.Default/ItemsControlStyle.cs b/src/Perspex.Themes.Default/ItemsControlStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ItemsControlStyle.cs
rename to src/Perspex.Themes.Default/ItemsControlStyle.cs
diff --git a/Perspex.Themes.Default/ListBoxItemStyle.cs b/src/Perspex.Themes.Default/ListBoxItemStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ListBoxItemStyle.cs
rename to src/Perspex.Themes.Default/ListBoxItemStyle.cs
diff --git a/Perspex.Themes.Default/ListBoxStyle.cs b/src/Perspex.Themes.Default/ListBoxStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ListBoxStyle.cs
rename to src/Perspex.Themes.Default/ListBoxStyle.cs
diff --git a/Perspex.Themes.Default/MenuItemStyle.cs b/src/Perspex.Themes.Default/MenuItemStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/MenuItemStyle.cs
rename to src/Perspex.Themes.Default/MenuItemStyle.cs
diff --git a/Perspex.Themes.Default/MenuStyle.cs b/src/Perspex.Themes.Default/MenuStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/MenuStyle.cs
rename to src/Perspex.Themes.Default/MenuStyle.cs
diff --git a/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
similarity index 89%
rename from Perspex.Themes.Default/Perspex.Themes.Default.csproj
rename to src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index 60b50f90c8..40eeb2c76d 100644
--- a/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -106,20 +106,20 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.6.2\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -127,7 +127,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Perspex.Themes.Default/PopupRootStyle.cs b/src/Perspex.Themes.Default/PopupRootStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/PopupRootStyle.cs
rename to src/Perspex.Themes.Default/PopupRootStyle.cs
diff --git a/Perspex.Themes.Default/ProgressBarStyle.cs b/src/Perspex.Themes.Default/ProgressBarStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ProgressBarStyle.cs
rename to src/Perspex.Themes.Default/ProgressBarStyle.cs
diff --git a/Perspex.Themes.Default/Properties/AssemblyInfo.cs b/src/Perspex.Themes.Default/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Themes.Default/Properties/AssemblyInfo.cs
rename to src/Perspex.Themes.Default/Properties/AssemblyInfo.cs
diff --git a/Perspex.Themes.Default/RadioButtonStyle.cs b/src/Perspex.Themes.Default/RadioButtonStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/RadioButtonStyle.cs
rename to src/Perspex.Themes.Default/RadioButtonStyle.cs
diff --git a/Perspex.Themes.Default/ScrollBarStyle.cs b/src/Perspex.Themes.Default/ScrollBarStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ScrollBarStyle.cs
rename to src/Perspex.Themes.Default/ScrollBarStyle.cs
diff --git a/Perspex.Themes.Default/ScrollViewerStyle.cs b/src/Perspex.Themes.Default/ScrollViewerStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ScrollViewerStyle.cs
rename to src/Perspex.Themes.Default/ScrollViewerStyle.cs
diff --git a/Perspex.Themes.Default/TabControlStyle.cs b/src/Perspex.Themes.Default/TabControlStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TabControlStyle.cs
rename to src/Perspex.Themes.Default/TabControlStyle.cs
diff --git a/Perspex.Themes.Default/TabItemStyle.cs b/src/Perspex.Themes.Default/TabItemStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TabItemStyle.cs
rename to src/Perspex.Themes.Default/TabItemStyle.cs
diff --git a/Perspex.Themes.Default/TabStripStyle.cs b/src/Perspex.Themes.Default/TabStripStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TabStripStyle.cs
rename to src/Perspex.Themes.Default/TabStripStyle.cs
diff --git a/Perspex.Themes.Default/TextBoxStyle.cs b/src/Perspex.Themes.Default/TextBoxStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TextBoxStyle.cs
rename to src/Perspex.Themes.Default/TextBoxStyle.cs
diff --git a/Perspex.Themes.Default/ToggleButtonStyle.cs b/src/Perspex.Themes.Default/ToggleButtonStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ToggleButtonStyle.cs
rename to src/Perspex.Themes.Default/ToggleButtonStyle.cs
diff --git a/Perspex.Themes.Default/ToolTipStyle.cs b/src/Perspex.Themes.Default/ToolTipStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/ToolTipStyle.cs
rename to src/Perspex.Themes.Default/ToolTipStyle.cs
diff --git a/Perspex.Themes.Default/TreeViewItemStyle.cs b/src/Perspex.Themes.Default/TreeViewItemStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TreeViewItemStyle.cs
rename to src/Perspex.Themes.Default/TreeViewItemStyle.cs
diff --git a/Perspex.Themes.Default/TreeViewStyle.cs b/src/Perspex.Themes.Default/TreeViewStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/TreeViewStyle.cs
rename to src/Perspex.Themes.Default/TreeViewStyle.cs
diff --git a/Perspex.Themes.Default/WindowStyle.cs b/src/Perspex.Themes.Default/WindowStyle.cs
similarity index 100%
rename from Perspex.Themes.Default/WindowStyle.cs
rename to src/Perspex.Themes.Default/WindowStyle.cs
diff --git a/Perspex.Themes.Default/app.config b/src/Perspex.Themes.Default/app.config
similarity index 100%
rename from Perspex.Themes.Default/app.config
rename to src/Perspex.Themes.Default/app.config
diff --git a/Perspex.Themes.Default/packages.config b/src/Perspex.Themes.Default/packages.config
similarity index 100%
rename from Perspex.Themes.Default/packages.config
rename to src/Perspex.Themes.Default/packages.config
diff --git a/Shared/SharedAssemblyInfo.cs b/src/Shared/SharedAssemblyInfo.cs
similarity index 100%
rename from Shared/SharedAssemblyInfo.cs
rename to src/Shared/SharedAssemblyInfo.cs
diff --git a/Windows/Perspex.Direct2D1/Direct2D1Platform.cs b/src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Direct2D1Platform.cs
rename to src/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
diff --git a/Windows/Perspex.Direct2D1/GlobalSuppressions.cs b/src/Windows/Perspex.Direct2D1/GlobalSuppressions.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/GlobalSuppressions.cs
rename to src/Windows/Perspex.Direct2D1/GlobalSuppressions.cs
diff --git a/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs b/src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
rename to src/Windows/Perspex.Direct2D1/Media/BrushWrapper.cs
diff --git a/Windows/Perspex.Direct2D1/Media/DrawingContext.cs b/src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/DrawingContext.cs
rename to src/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
diff --git a/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/FormattedTextImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs b/src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs b/src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
rename to src/Windows/Perspex.Direct2D1/Media/PerspexTextRenderer.cs
diff --git a/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
rename to src/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
diff --git a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
similarity index 86%
rename from Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
rename to src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index df39c233ac..061fd5cb1e 100644
--- a/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/src/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -46,7 +46,7 @@
       <HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
     </Reference>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -59,13 +59,13 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -106,15 +106,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
+  <Import Project="..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs b/src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
rename to src/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
diff --git a/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs b/src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
rename to src/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
diff --git a/Windows/Perspex.Direct2D1/Renderer.cs b/src/Windows/Perspex.Direct2D1/Renderer.cs
similarity index 100%
rename from Windows/Perspex.Direct2D1/Renderer.cs
rename to src/Windows/Perspex.Direct2D1/Renderer.cs
diff --git a/Windows/Perspex.Direct2D1/app.config b/src/Windows/Perspex.Direct2D1/app.config
similarity index 100%
rename from Windows/Perspex.Direct2D1/app.config
rename to src/Windows/Perspex.Direct2D1/app.config
diff --git a/Windows/Perspex.Direct2D1/packages.config b/src/Windows/Perspex.Direct2D1/packages.config
similarity index 100%
rename from Windows/Perspex.Direct2D1/packages.config
rename to src/Windows/Perspex.Direct2D1/packages.config
diff --git a/Windows/Perspex.Win32/Input/KeyInterop.cs b/src/Windows/Perspex.Win32/Input/KeyInterop.cs
similarity index 100%
rename from Windows/Perspex.Win32/Input/KeyInterop.cs
rename to src/Windows/Perspex.Win32/Input/KeyInterop.cs
diff --git a/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs b/src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
similarity index 100%
rename from Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
rename to src/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
diff --git a/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs b/src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
similarity index 100%
rename from Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
rename to src/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
diff --git a/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
similarity index 100%
rename from Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
rename to src/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
diff --git a/Windows/Perspex.Win32/Perspex.Win32.csproj b/src/Windows/Perspex.Win32/Perspex.Win32.csproj
similarity index 89%
rename from Windows/Perspex.Win32/Perspex.Win32.csproj
rename to src/Windows/Perspex.Win32/Perspex.Win32.csproj
index f2508bea5a..3f8486b194 100644
--- a/Windows/Perspex.Win32/Perspex.Win32.csproj
+++ b/src/Windows/Perspex.Win32/Perspex.Win32.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -47,16 +47,16 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\..\..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -115,7 +115,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.0.0-beta008\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Windows/Perspex.Win32/PopupImpl.cs b/src/Windows/Perspex.Win32/PopupImpl.cs
similarity index 100%
rename from Windows/Perspex.Win32/PopupImpl.cs
rename to src/Windows/Perspex.Win32/PopupImpl.cs
diff --git a/Windows/Perspex.Win32/Properties/AssemblyInfo.cs b/src/Windows/Perspex.Win32/Properties/AssemblyInfo.cs
similarity index 100%
rename from Windows/Perspex.Win32/Properties/AssemblyInfo.cs
rename to src/Windows/Perspex.Win32/Properties/AssemblyInfo.cs
diff --git a/Windows/Perspex.Win32/Settings.StyleCop b/src/Windows/Perspex.Win32/Settings.StyleCop
similarity index 100%
rename from Windows/Perspex.Win32/Settings.StyleCop
rename to src/Windows/Perspex.Win32/Settings.StyleCop
diff --git a/Windows/Perspex.Win32/Win32Platform.cs b/src/Windows/Perspex.Win32/Win32Platform.cs
similarity index 100%
rename from Windows/Perspex.Win32/Win32Platform.cs
rename to src/Windows/Perspex.Win32/Win32Platform.cs
diff --git a/Windows/Perspex.Win32/WindowImpl.cs b/src/Windows/Perspex.Win32/WindowImpl.cs
similarity index 100%
rename from Windows/Perspex.Win32/WindowImpl.cs
rename to src/Windows/Perspex.Win32/WindowImpl.cs
diff --git a/Windows/Perspex.Win32/app.config b/src/Windows/Perspex.Win32/app.config
similarity index 100%
rename from Windows/Perspex.Win32/app.config
rename to src/Windows/Perspex.Win32/app.config
diff --git a/Windows/Perspex.Win32/packages.config b/src/Windows/Perspex.Win32/packages.config
similarity index 100%
rename from Windows/Perspex.Win32/packages.config
rename to src/Windows/Perspex.Win32/packages.config