diff --git a/Perspex.sln b/Perspex.sln
index 9a5c7a668f..b26d59b654 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.30723.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Windows", "Perspex.Windows\Perspex.Windows.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Windows", "Windows\Perspex.Win32\Perspex.Win32.csproj", "{811A76CF-1CF6-440F-963B-BBE31BD72A82}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApplication", "TestApplication\TestApplication.csproj", "{E3A1060B-50D0-44E8-88B6-F44EF2E5BD72}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.UnitTests", "Perspex.UnitTests\Perspex.UnitTests.csproj", "{2905FF23-53FB-45E6-AA49-6AF47A172056}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1", "Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj", "{3E908F67-5543-4879-A1DC-08EACE79B3CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Perspex.Direct2D1.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.RenderTests", "Windows\Perspex.Direct2D1.RenderTests\Perspex.Direct2D1.RenderTests.csproj", "{DABFD304-D6A4-4752-8123-C2CCF7AC7831}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
diff --git a/TestApplication/App.cs b/TestApplication/App.cs
index 3a5e00903a..f9357754a0 100644
--- a/TestApplication/App.cs
+++ b/TestApplication/App.cs
@@ -3,7 +3,7 @@
     using Perspex;
     using Perspex.Direct2D1;
     using Perspex.Themes.Default;
-    using Perspex.Windows;
+    using Perspex.Win32;
 
     public class App : Application
     {
@@ -12,7 +12,7 @@
         {
             this.RegisterServices();
             Direct2D1Platform.Initialize();
-            WindowsPlatform.Initialize();
+            Win32Platform.Initialize();
         }
     }
 }
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index 6a78e637fe..f0b4ed11a9 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -6,7 +6,7 @@ using Perspex.Diagnostics;
 using Perspex.Layout;
 using Perspex.Media;
 using Perspex.Media.Imaging;
-using Perspex.Windows;
+using Perspex.Win32;
 using Splat;
 
 namespace TestApplication
diff --git a/TestApplication/TestApplication.csproj b/TestApplication/TestApplication.csproj
index ff3cecb64a..1726e900fc 100644
--- a/TestApplication/TestApplication.csproj
+++ b/TestApplication/TestApplication.csproj
@@ -112,7 +112,7 @@
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Perspex.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
+    <ProjectReference Include="..\Windows\Perspex.Direct2D1\Perspex.Direct2D1.csproj">
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</Name>
     </ProjectReference>
@@ -140,7 +140,7 @@
       <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
       <Name>Perspex.Themes.Default</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Perspex.Windows\Perspex.Windows.csproj">
+    <ProjectReference Include="..\Windows\Perspex.Win32\Perspex.Win32.csproj">
       <Project>{811a76cf-1cf6-440f-963b-bbe31bd72a82}</Project>
       <Name>Perspex.Windows</Name>
     </ProjectReference>
diff --git a/Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs b/Windows/Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs
rename to Windows/Perspex.Direct2D1.RenderTests/Controls/BorderTests.cs
diff --git a/Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs b/Windows/Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs
rename to Windows/Perspex.Direct2D1.RenderTests/Controls/ImageTests.cs
diff --git a/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj b/Windows/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
similarity index 89%
rename from Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
rename to Windows/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
index 477fb4df16..1eebdb3a00 100644
--- a/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
+++ b/Windows/Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
@@ -37,11 +37,11 @@
   <ItemGroup>
     <Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath>
     </Reference>
     <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -67,11 +67,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <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>
@@ -79,23 +79,23 @@
       <Project>{3e908f67-5543-4879-a1dc-08eace79b3cd}</Project>
       <Name>Perspex.Direct2D1</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>
diff --git a/Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs b/Windows/Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs
rename to Windows/Perspex.Direct2D1.RenderTests/Properties/AssemblyInfo.cs
diff --git a/Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs b/Windows/Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs
rename to Windows/Perspex.Direct2D1.RenderTests/Shapes/PathTests.cs
diff --git a/Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs b/Windows/Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs
rename to Windows/Perspex.Direct2D1.RenderTests/Shapes/RectangleTests.cs
diff --git a/Perspex.Direct2D1.RenderTests/TestBase.cs b/Windows/Perspex.Direct2D1.RenderTests/TestBase.cs
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/TestBase.cs
rename to Windows/Perspex.Direct2D1.RenderTests/TestBase.cs
diff --git a/Perspex.Direct2D1.RenderTests/app.config b/Windows/Perspex.Direct2D1.RenderTests/app.config
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/app.config
rename to Windows/Perspex.Direct2D1.RenderTests/app.config
diff --git a/Perspex.Direct2D1.RenderTests/packages.config b/Windows/Perspex.Direct2D1.RenderTests/packages.config
similarity index 100%
rename from Perspex.Direct2D1.RenderTests/packages.config
rename to Windows/Perspex.Direct2D1.RenderTests/packages.config
diff --git a/Perspex.Direct2D1/Direct2D1Platform.cs b/Windows/Perspex.Direct2D1/Direct2D1Platform.cs
similarity index 100%
rename from Perspex.Direct2D1/Direct2D1Platform.cs
rename to Windows/Perspex.Direct2D1/Direct2D1Platform.cs
diff --git a/Perspex.Direct2D1/Media/DrawingContext.cs b/Windows/Perspex.Direct2D1/Media/DrawingContext.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/DrawingContext.cs
rename to Windows/Perspex.Direct2D1/Media/DrawingContext.cs
diff --git a/Perspex.Direct2D1/Media/GeometryImpl.cs b/Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/GeometryImpl.cs
rename to Windows/Perspex.Direct2D1/Media/GeometryImpl.cs
diff --git a/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs b/Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
rename to Windows/Perspex.Direct2D1/Media/Imaging/BitmapImpl.cs
diff --git a/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs b/Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
rename to Windows/Perspex.Direct2D1/Media/Imaging/RenderTargetBitmapImpl.cs
diff --git a/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs b/Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
rename to Windows/Perspex.Direct2D1/Media/StreamGeometryContextImpl.cs
diff --git a/Perspex.Direct2D1/Media/StreamGeometryImpl.cs b/Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
similarity index 100%
rename from Perspex.Direct2D1/Media/StreamGeometryImpl.cs
rename to Windows/Perspex.Direct2D1/Media/StreamGeometryImpl.cs
diff --git a/Perspex.Direct2D1/Perspex.Direct2D1.csproj b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
similarity index 85%
rename from Perspex.Direct2D1/Perspex.Direct2D1.csproj
rename to Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
index dcd8e4c777..1077b46351 100644
--- a/Perspex.Direct2D1/Perspex.Direct2D1.csproj
+++ b/Windows/Perspex.Direct2D1/Perspex.Direct2D1.csproj
@@ -45,22 +45,22 @@
     </Reference>
     <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
     </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">
       <SpecificVersion>False</SpecificVersion>
-      <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, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -87,22 +87,22 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <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.SceneGraph\Perspex.SceneGraph.csproj">
+    <ProjectReference Include="..\..\Perspex.SceneGraph\Perspex.SceneGraph.csproj">
       <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project>
       <Name>Perspex.SceneGraph</Name>
     </ProjectReference>
   </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/Perspex.Direct2D1/PrimitiveExtensions.cs b/Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
similarity index 100%
rename from Perspex.Direct2D1/PrimitiveExtensions.cs
rename to Windows/Perspex.Direct2D1/PrimitiveExtensions.cs
diff --git a/Perspex.Direct2D1/Properties/AssemblyInfo.cs b/Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
similarity index 100%
rename from Perspex.Direct2D1/Properties/AssemblyInfo.cs
rename to Windows/Perspex.Direct2D1/Properties/AssemblyInfo.cs
diff --git a/Perspex.Direct2D1/Renderer.cs b/Windows/Perspex.Direct2D1/Renderer.cs
similarity index 100%
rename from Perspex.Direct2D1/Renderer.cs
rename to Windows/Perspex.Direct2D1/Renderer.cs
diff --git a/Perspex.Direct2D1/TextService.cs b/Windows/Perspex.Direct2D1/TextService.cs
similarity index 100%
rename from Perspex.Direct2D1/TextService.cs
rename to Windows/Perspex.Direct2D1/TextService.cs
diff --git a/Perspex.Direct2D1/app.config b/Windows/Perspex.Direct2D1/app.config
similarity index 100%
rename from Perspex.Direct2D1/app.config
rename to Windows/Perspex.Direct2D1/app.config
diff --git a/Perspex.Direct2D1/packages.config b/Windows/Perspex.Direct2D1/packages.config
similarity index 100%
rename from Perspex.Direct2D1/packages.config
rename to Windows/Perspex.Direct2D1/packages.config
diff --git a/Perspex.Windows/Input/KeyInterop.cs b/Windows/Perspex.Win32/Input/KeyInterop.cs
similarity index 99%
rename from Perspex.Windows/Input/KeyInterop.cs
rename to Windows/Perspex.Win32/Input/KeyInterop.cs
index 966b7b83ba..8b4d04e2c2 100644
--- a/Perspex.Windows/Input/KeyInterop.cs
+++ b/Windows/Perspex.Win32/Input/KeyInterop.cs
@@ -4,12 +4,12 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows.Input
+namespace Perspex.Win32.Input
 {
     using System.Collections.Generic;
     using System.Text;
     using Perspex.Input;
-    using Perspex.Windows.Interop;
+    using Perspex.Win32.Interop;
 
     public static class KeyInterop
     {
diff --git a/Perspex.Windows/Input/WindowsKeyboardDevice.cs b/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
similarity index 97%
rename from Perspex.Windows/Input/WindowsKeyboardDevice.cs
rename to Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
index 63927affdd..df190b0a9d 100644
--- a/Perspex.Windows/Input/WindowsKeyboardDevice.cs
+++ b/Windows/Perspex.Win32/Input/WindowsKeyboardDevice.cs
@@ -4,11 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows.Input
+namespace Perspex.Win32.Input
 {
     using System.Text;
     using Perspex.Input;
-    using Perspex.Windows.Interop;
+    using Perspex.Win32.Interop;
 
     public class WindowsKeyboardDevice : KeyboardDevice
     {
diff --git a/Perspex.Windows/Input/WindowsMouseDevice.cs b/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
similarity index 94%
rename from Perspex.Windows/Input/WindowsMouseDevice.cs
rename to Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
index 3ff7ef5de8..ade33bbd01 100644
--- a/Perspex.Windows/Input/WindowsMouseDevice.cs
+++ b/Windows/Perspex.Win32/Input/WindowsMouseDevice.cs
@@ -4,11 +4,11 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows.Input
+namespace Perspex.Win32.Input
 {
     using System;
     using Perspex.Input;
-    using Perspex.Windows.Interop;
+    using Perspex.Win32.Interop;
 
     public class WindowsMouseDevice : MouseDevice
     {
diff --git a/Perspex.Windows/Interop/UnmanagedMethods.cs b/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
similarity index 99%
rename from Perspex.Windows/Interop/UnmanagedMethods.cs
rename to Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
index bd59f9a573..bd26a5ca98 100644
--- a/Perspex.Windows/Interop/UnmanagedMethods.cs
+++ b/Windows/Perspex.Win32/Interop/UnmanagedMethods.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows.Interop
+namespace Perspex.Win32.Interop
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
diff --git a/Perspex.Windows/Perspex.Windows.csproj b/Windows/Perspex.Win32/Perspex.Win32.csproj
similarity index 83%
rename from Perspex.Windows/Perspex.Windows.csproj
rename to Windows/Perspex.Win32/Perspex.Win32.csproj
index e1cef4621f..9a05bea322 100644
--- a/Perspex.Windows/Perspex.Windows.csproj
+++ b/Windows/Perspex.Win32/Perspex.Win32.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{811A76CF-1CF6-440F-963B-BBE31BD72A82}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Perspex.Windows</RootNamespace>
-    <AssemblyName>Perspex.Windows</AssemblyName>
+    <RootNamespace>Perspex.Win32</RootNamespace>
+    <AssemblyName>Perspex.Win32</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -32,26 +32,26 @@
   <ItemGroup>
     <Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
+      <HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
     </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">
       <SpecificVersion>False</SpecificVersion>
-      <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, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <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>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -68,42 +68,42 @@
     <Compile Include="Interop\UnmanagedMethods.cs" />
     <Compile Include="Window.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WindowsPlatform.cs" />
+    <Compile Include="Win32Platform.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <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.Diagnostics\Perspex.Diagnostics.csproj">
+    <ProjectReference Include="..\..\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="..\..\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>
@@ -117,7 +117,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <StyleCopMSBuildTargetsFile>..\packages\StyleCop.MSBuild.4.7.46.0\tools\StyleCop.targets</StyleCopMSBuildTargetsFile>
+    <StyleCopMSBuildTargetsFile>..\..\packages\StyleCop.MSBuild.4.7.46.0\tools\StyleCop.targets</StyleCopMSBuildTargetsFile>
   </PropertyGroup>
   <Import Condition="Exists('$(StyleCopMSBuildTargetsFile)')" Project="$(StyleCopMSBuildTargetsFile)" />
   <PropertyGroup>
@@ -139,11 +139,11 @@
   <PropertyGroup>
     <PrepareForBuildDependsOn Condition="!Exists('$(StyleCopMSBuildTargetsFile)')">StyleCopMSBuildTargetsNotFound;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
   </PropertyGroup>
-  <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
+  <Import Project="..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.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\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
+    <Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Perspex.Windows/Properties/AssemblyInfo.cs b/Windows/Perspex.Win32/Properties/AssemblyInfo.cs
similarity index 93%
rename from Perspex.Windows/Properties/AssemblyInfo.cs
rename to Windows/Perspex.Win32/Properties/AssemblyInfo.cs
index de730fb1ee..16a3451f98 100644
--- a/Perspex.Windows/Properties/AssemblyInfo.cs
+++ b/Windows/Perspex.Win32/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Perspex.Windows")]
+[assembly: AssemblyTitle("Perspex.Win32")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Perspex.Windows")]
+[assembly: AssemblyProduct("Perspex.Win32")]
 [assembly: AssemblyCopyright("Copyright ©  2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Perspex.Windows/Settings.StyleCop b/Windows/Perspex.Win32/Settings.StyleCop
similarity index 100%
rename from Perspex.Windows/Settings.StyleCop
rename to Windows/Perspex.Win32/Settings.StyleCop
diff --git a/Perspex.Windows/Threading/WindowsDispatcher.cs b/Windows/Perspex.Win32/Threading/WindowsDispatcher.cs
similarity index 99%
rename from Perspex.Windows/Threading/WindowsDispatcher.cs
rename to Windows/Perspex.Win32/Threading/WindowsDispatcher.cs
index 14d50f81c4..9abce33504 100644
--- a/Perspex.Windows/Threading/WindowsDispatcher.cs
+++ b/Windows/Perspex.Win32/Threading/WindowsDispatcher.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows.Threading
+namespace Perspex.Win32.Threading
 {
     using System;
     using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace Perspex.Windows.Threading
     using System.Security;
     using System.Threading;
     using Perspex.Threading;
-    using Perspex.Windows.Interop;
+    using Perspex.Win32.Interop;
 
     [Flags]
     internal enum Flags
diff --git a/Perspex.Windows/WindowsPlatform.cs b/Windows/Perspex.Win32/Win32Platform.cs
similarity index 86%
rename from Perspex.Windows/WindowsPlatform.cs
rename to Windows/Perspex.Win32/Win32Platform.cs
index a04c5f1872..76d58bb07f 100644
--- a/Perspex.Windows/WindowsPlatform.cs
+++ b/Windows/Perspex.Win32/Win32Platform.cs
@@ -4,21 +4,21 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows
+namespace Perspex.Win32
 {
     using System;
     using System.Collections.Generic;
     using Perspex.Input;
     using Perspex.Platform;
     using Perspex.Threading;
-    using Perspex.Windows.Input;
-    using Perspex.Windows.Interop;
-    using Perspex.Windows.Threading;
+    using Perspex.Win32.Input;
+    using Perspex.Win32.Interop;
+    using Perspex.Win32.Threading;
     using Splat;
 
-    public class WindowsPlatform : IPlatformThreadingInterface
+    public class Win32Platform : IPlatformThreadingInterface
     {
-        private static WindowsPlatform instance = new WindowsPlatform();
+        private static Win32Platform instance = new Win32Platform();
 
         private Dictionary<IntPtr, UnmanagedMethods.TimerProc> timerCallbacks =
             new Dictionary<IntPtr, UnmanagedMethods.TimerProc>();
diff --git a/Perspex.Windows/Window.cs b/Windows/Perspex.Win32/Window.cs
similarity index 98%
rename from Perspex.Windows/Window.cs
rename to Windows/Perspex.Win32/Window.cs
index a9df9ed39f..44cee12b42 100644
--- a/Perspex.Windows/Window.cs
+++ b/Windows/Perspex.Win32/Window.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Windows
+namespace Perspex.Win32
 {
     using System;
     using System.ComponentModel;
@@ -20,9 +20,9 @@ namespace Perspex.Windows
     using Perspex.Platform;
     using Perspex.Rendering;
     using Perspex.Threading;
-    using Perspex.Windows.Input;
-    using Perspex.Windows.Interop;
-    using Perspex.Windows.Threading;
+    using Perspex.Win32.Input;
+    using Perspex.Win32.Interop;
+    using Perspex.Win32.Threading;
     using Splat;
 
     public class Window : ContentControl, ILayoutRoot, IRenderRoot, ICloseable
diff --git a/Perspex.Windows/app.config b/Windows/Perspex.Win32/app.config
similarity index 100%
rename from Perspex.Windows/app.config
rename to Windows/Perspex.Win32/app.config
diff --git a/Perspex.Windows/packages.config b/Windows/Perspex.Win32/packages.config
similarity index 100%
rename from Perspex.Windows/packages.config
rename to Windows/Perspex.Win32/packages.config