diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems
new file mode 100644
index 00000000..708ce7d2
--- /dev/null
+++ b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>91c42d32-291d-4b72-90b4-551663d60b8b</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Facebook.Yoga.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureOutput.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Native.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Spacing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaAlign.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaConstants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDimension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaEdge.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaExperimentalFeature.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaFlexDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaJustify.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogLevel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureMode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Create.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaOverflow.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPositionType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPrintOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaSize.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaWrap.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj
new file mode 100644
index 00000000..6d2da463
--- /dev/null
+++ b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>91c42d32-291d-4b72-90b4-551663d60b8b</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Facebook.Yoga.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/csharp/Build/Facebook.Yoga.NativeInterop.targets b/csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets
similarity index 99%
rename from csharp/Build/Facebook.Yoga.NativeInterop.targets
rename to csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets
index 00d0ba90..9681d324 100644
--- a/csharp/Build/Facebook.Yoga.NativeInterop.targets
+++ b/csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NativeRootPath>$(SolutionDir)Yoga\bin\</NativeRootPath>
+    <NativeRootPath>$(SolutionDir)..\Yoga\bin\</NativeRootPath>
     <NativeX86Path>$(NativeRootPath)x86\</NativeX86Path>
     <NativeX64Path>$(NativeRootPath)x64\</NativeX64Path>
     <NativeARMPath>$(NativeRootPath)ARM\</NativeARMPath>
diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj
similarity index 95%
rename from csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj
rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj
index 5f18c30a..f37faf07 100644
--- a/csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj
+++ b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -83,7 +83,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Facebook.Yoga\Facebook.Yoga.csproj">
+    <ProjectReference Include="..\Facebook.Yoga\Facebook.Yoga.csproj">
       <Project>{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}</Project>
       <Name>Facebook.Yoga</Name>
     </ProjectReference>
@@ -91,7 +91,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="..\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets" Condition="Exists('$(SolutionDir)Build\Facebook.Yoga.NativeInterop.targets')" Label="ImportNativeInteropTargets" />
   <Target Name="EnsureNativeInteropImports" BeforeTargets="PrepareForBuild">
diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs
rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs
diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/packages.config b/csharp/Windows/Facebook.Yoga.Desktop.Tests/packages.config
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Desktop.Tests/packages.config
rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/packages.config
diff --git a/csharp/Facebook.Yoga.Desktop.sln b/csharp/Windows/Facebook.Yoga.Desktop.sln
similarity index 75%
rename from csharp/Facebook.Yoga.Desktop.sln
rename to csharp/Windows/Facebook.Yoga.Desktop.sln
index 0c1fb81c..5738d062 100644
--- a/csharp/Facebook.Yoga.Desktop.sln
+++ b/csharp/Windows/Facebook.Yoga.Desktop.sln
@@ -3,36 +3,33 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "tests\Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec
-		NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets
-		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
-		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
-		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13
-		tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,7 +43,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
@@ -54,7 +50,8 @@ Global
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
@@ -69,21 +66,24 @@ Global
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|x86
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86
@@ -94,8 +94,9 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
-		{320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45}
 	EndGlobalSection
 EndGlobal
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png
similarity index 86%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png
index 735f57ad..428cabb6 100644
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png differ
diff --git a/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png
new file mode 100644
index 00000000..d1937479
Binary files /dev/null and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png
similarity index 60%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png
index af49fec1..eb507ab9 100644
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png
similarity index 80%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png
index ce342a2e..2121ca58 100644
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 84%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
index f6c02ce9..69053b72 100644
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png
similarity index 86%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png
index 7385b56c..8f628550 100644
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png differ
diff --git a/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..6429d986
Binary files /dev/null and b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj b/csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj
similarity index 96%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj
index de5f710d..d83cf0d9 100644
--- a/csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj
+++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{0856757B-1671-4E43-AF41-4AEA53988796}</ProjectGuid>
+    <ProjectGuid>{0C76D2FE-6767-44FE-B03D-21B2076BAA73}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Facebook.Yoga.Universal.Tests</RootNamespace>
@@ -124,14 +124,11 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Facebook.Yoga\Facebook.Yoga.csproj">
+    <ProjectReference Include="..\Facebook.Yoga\Facebook.Yoga.csproj">
       <Project>{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}</Project>
       <Name>Facebook.Yoga</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest b/csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest
similarity index 83%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest
index a12355dc..d4ec072f 100644
--- a/csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest
+++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest
@@ -5,15 +5,15 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   IgnorableNamespaces="uap mp">
 
-  <Identity Name="d1de6e91-6781-489c-958a-1a12f9e305dc"
-            Publisher="CN=blue"
+  <Identity Name="6797a00b-cf19-41b1-bd06-467391a2a6e3"
+            Publisher="CN=anforste"
             Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="d1de6e91-6781-489c-958a-1a12f9e305dc" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="6797a00b-cf19-41b1-bd06-467391a2a6e3" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>Facebook.Yoga.Universal.Tests</DisplayName>
-    <PublisherDisplayName>blue</PublisherDisplayName>
+    <PublisherDisplayName>anforste</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs
similarity index 91%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs
index 719f6a3c..2f35c3d3 100644
--- a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs
+++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Facebook.Yoga.Universal.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("BlueJeans")]
 [assembly: AssemblyProduct("Facebook.Yoga.Universal.Tests")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright © BlueJeans 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyMetadata("TargetPlatform","UAP")]
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml b/csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/project.json b/csharp/Windows/Facebook.Yoga.Universal.Tests/project.json
similarity index 100%
rename from csharp/tests/Facebook.Yoga.Universal.Tests/project.json
rename to csharp/Windows/Facebook.Yoga.Universal.Tests/project.json
diff --git a/csharp/Facebook.Yoga.Universal.sln b/csharp/Windows/Facebook.Yoga.Universal.sln
similarity index 58%
rename from csharp/Facebook.Yoga.Universal.sln
rename to csharp/Windows/Facebook.Yoga.Universal.sln
index a55c0466..6fadb752 100644
--- a/csharp/Facebook.Yoga.Universal.sln
+++ b/csharp/Windows/Facebook.Yoga.Universal.sln
@@ -3,35 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec
-		NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets
-		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
-		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
-		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,7 +42,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
@@ -53,7 +49,8 @@ Global
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|Win32
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
+		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
@@ -68,44 +65,41 @@ Global
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.ActiveCfg = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Build.0 = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Deploy.0 = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.ActiveCfg = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Build.0 = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Deploy.0 = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.ActiveCfg = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Build.0 = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Deploy.0 = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.ActiveCfg = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Build.0 = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Deploy.0 = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.ActiveCfg = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Build.0 = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Deploy.0 = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.ActiveCfg = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Build.0 = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Deploy.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
-		{320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45}
-		{0856757B-1671-4E43-AF41-4AEA53988796} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
 	EndGlobalSection
 EndGlobal
diff --git a/csharp/Facebook.Yoga.sln b/csharp/Windows/Facebook.Yoga.sln
similarity index 64%
rename from csharp/Facebook.Yoga.sln
rename to csharp/Windows/Facebook.Yoga.sln
index a9ae1dc7..5326a92a 100644
--- a/csharp/Facebook.Yoga.sln
+++ b/csharp/Windows/Facebook.Yoga.sln
@@ -3,38 +3,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "tests\Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}"
-	ProjectSection(SolutionItems) = preProject
-		NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec
-		NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets
-		Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets
-		NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec
-		NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13
-		tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,7 +45,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
@@ -56,7 +52,6 @@ Global
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.Build.0 = Release|Win32
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
@@ -73,55 +68,58 @@ Global
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
+		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|x86
-		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|x86
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.Build.0 = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.ActiveCfg = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Build.0 = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Deploy.0 = Debug|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.ActiveCfg = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Build.0 = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Deploy.0 = Debug|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.ActiveCfg = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Build.0 = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Deploy.0 = Debug|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.ActiveCfg = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Build.0 = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.ActiveCfg = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Build.0 = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Deploy.0 = Release|ARM
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.ActiveCfg = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Build.0 = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Deploy.0 = Release|x64
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.ActiveCfg = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Build.0 = Release|x86
-		{0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Deploy.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
-		{320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45}
-		{0856757B-1671-4E43-AF41-4AEA53988796} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
 	EndGlobalSection
 EndGlobal
diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.csproj b/csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj
similarity index 84%
rename from csharp/Facebook.Yoga/Facebook.Yoga.csproj
rename to csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj
index 2ef3d80f..1fe5a144 100644
--- a/csharp/Facebook.Yoga/Facebook.Yoga.csproj
+++ b/csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj
@@ -99,31 +99,9 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MeasureFunction.cs" />
-    <Compile Include="MeasureOutput.cs" />
-    <Compile Include="Native.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Spacing.cs" />
-    <Compile Include="YogaAlign.cs" />
-    <Compile Include="YogaConstants.cs" />
-    <Compile Include="YogaDimension.cs" />
-    <Compile Include="YogaDirection.cs" />
-    <Compile Include="YogaEdge.cs" />
-    <Compile Include="YogaExperimentalFeature.cs" />
-    <Compile Include="YogaFlexDirection.cs" />
-    <Compile Include="YogaJustify.cs" />
-    <Compile Include="YogaLogger.cs" />
-    <Compile Include="YogaLogLevel.cs" />
-    <Compile Include="YogaMeasureFunc.cs" />
-    <Compile Include="YogaMeasureMode.cs" />
-    <Compile Include="YogaNode.Create.cs" />
-    <Compile Include="YogaNode.cs" />
-    <Compile Include="YogaOverflow.cs" />
-    <Compile Include="YogaPositionType.cs" />
-    <Compile Include="YogaPrintOptions.cs" />
-    <Compile Include="YogaSize.cs" />
-    <Compile Include="YogaWrap.cs" />
   </ItemGroup>
+  <Import Project="..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" />
   <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. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/csharp/Facebook.Yoga/Properties/AssemblyInfo.cs b/csharp/Windows/Facebook.Yoga/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/Facebook.Yoga/Properties/AssemblyInfo.cs
rename to csharp/Windows/Facebook.Yoga/Properties/AssemblyInfo.cs
diff --git a/csharp/Facebook.Yoga/project.json b/csharp/Windows/Facebook.Yoga/project.json
similarity index 100%
rename from csharp/Facebook.Yoga/project.json
rename to csharp/Windows/Facebook.Yoga/project.json
diff --git a/csharp/nuget/Facebook.Yoga.nuspec b/csharp/nuget/Facebook.Yoga.nuspec
index 42b1f6fa..c62e8933 100644
--- a/csharp/nuget/Facebook.Yoga.nuspec
+++ b/csharp/nuget/Facebook.Yoga.nuspec
@@ -21,17 +21,17 @@
     <file src="Facebook.Yoga.targets" target="build\netstandard"/>
 
     <!-- lib -->
-    <file src="..\Facebook.Yoga\bin\Release\Facebook.Yoga.dll" target="lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\Release\Facebook.Yoga.dll" target="lib\netstandard"/>
 
     <!-- runtimes -->
-    <file src="..\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win-x86\lib\netstandard"/>
-    <file src="..\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win-x86\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win-x86\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win-x86\lib\netstandard"/>
     
-    <file src="..\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard"/>
-    <file src="..\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard"/>
     
-    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard"/>
-    <file src="..\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard"/>    
+    <file src="..\Windows\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard"/>
+    <file src="..\Windows\Facebook.Yoga\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard"/>    
 
     <!-- Native -->
     <file src="..\Yoga\bin\x86\Release\Yoga.dll" target="runtimes\win-x86\native"/>
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png b/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 023e7f1f..00000000
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png b/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 288995b3..00000000
Binary files a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems
index 1b6d68df..e593c942 100644
--- a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems
+++ b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>320eb7b7-ce99-4382-b145-bdd49f33c7b2</SharedGUID>
+    <SharedGUID>4edc82d9-a201-4831-8fe0-98f468f8e4ae</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>Facebook.Yoga.Shared.Tests</Import_RootNamespace>
diff --git a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj
index 2ec37894..75c61845 100644
--- a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj
+++ b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj
@@ -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">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>320eb7b7-ce99-4382-b145-bdd49f33c7b2</ProjectGuid>
+    <ProjectGuid>4edc82d9-a201-4831-8fe0-98f468f8e4ae</ProjectGuid>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />