diff --git a/csharp/Facebook.Yoga/ios/CustomBuildAction.targets b/csharp/Facebook.Yoga/ios/CustomBuildAction.targets
deleted file mode 100644
index 442590ed..00000000
--- a/csharp/Facebook.Yoga/ios/CustomBuildAction.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<PropertyGroup>
-	    <CompileDependsOn>CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
-	</PropertyGroup>
-
-	<!-- The # and , in this path does not play nice with the binding project logic, so make a copy -->
-	<Target Name="CopyInNativeLib" Inputs="..\..\..\buck-out\gen\yoga#default,static\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
-	    <Copy SourceFiles="..\..\..\buck-out\gen\yoga#default,static\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
-	</Target>
-</Project>
diff --git a/csharp/Facebook.Yoga/ios/ApiDefinition.cs b/csharp/Xamarin.iOS/ApiDefinition.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/ApiDefinition.cs
rename to csharp/Xamarin.iOS/ApiDefinition.cs
diff --git a/csharp/Xamarin.iOS/CustomBuildAction.targets b/csharp/Xamarin.iOS/CustomBuildAction.targets
new file mode 100644
index 00000000..3f17efb8
--- /dev/null
+++ b/csharp/Xamarin.iOS/CustomBuildAction.targets
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<CompileDependsOn>CopyInNativeLib;$(CompileDependsOn)</CompileDependsOn>
+	</PropertyGroup>
+	<!-- The # and , in this path does not play nice with the binding project logic, so make a copy -->
+	<Target Name="CopyInNativeLib" Inputs="..\..\buck-out\get\csharp\yoganet-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
+		<Copy SourceFiles="..\..\buck-out\get\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/AppDelegate.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/AppDelegate.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/AppDelegate.cs
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/AppDelegate.cs
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Assets.xcassets/AppIcon.appiconset/Contents.json b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Assets.xcassets/Contents.json b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Assets.xcassets/Contents.json
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Assets.xcassets/Contents.json
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Assets.xcassets/Contents.json
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Entitlements.plist b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Entitlements.plist
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Entitlements.plist
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Entitlements.plist
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Facebook.Yoga.iOS.Test.csproj b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Facebook.Yoga.iOS.Test.csproj
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Facebook.Yoga.iOS.Test.csproj
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Facebook.Yoga.iOS.Test.csproj
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Info.plist b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Info.plist
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Info.plist
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Info.plist
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/LaunchScreen.storyboard b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/LaunchScreen.storyboard
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/LaunchScreen.storyboard
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/LaunchScreen.storyboard
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Main.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Main.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Main.cs
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Main.cs
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Main.storyboard b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Main.storyboard
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/Main.storyboard
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/Main.storyboard
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/ViewController.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/ViewController.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/ViewController.cs
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/ViewController.cs
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/ViewController.designer.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/ViewController.designer.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.Test/ViewController.designer.cs
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.Test/ViewController.designer.cs
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.csproj b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj
similarity index 53%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.csproj
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj
index 0c0461e9..b4df590c 100644
--- a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.csproj
+++ b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj
@@ -34,74 +34,74 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="Properties\AssemblyInfo.cs" />
-		<Compile Include="..\MeasureFunction.cs">
-			<Link>MeasureFunction.cs</Link>
+		<Compile Include="..\Facebook.Yoga\MeasureFunction.cs">
+		  <Link>MeasureFunction.cs</Link>
 		</Compile>
-		<Compile Include="..\MeasureOutput.cs">
-			<Link>MeasureOutput.cs</Link>
+		<Compile Include="..\Facebook.Yoga\MeasureOutput.cs">
+		  <Link>MeasureOutput.cs</Link>
 		</Compile>
-		<Compile Include="..\Native.cs">
-			<Link>Native.cs</Link>
+		<Compile Include="..\Facebook.Yoga\Native.cs">
+		  <Link>Native.cs</Link>
 		</Compile>
-		<Compile Include="..\Spacing.cs">
-			<Link>Spacing.cs</Link>
+		<Compile Include="..\Facebook.Yoga\Spacing.cs">
+		  <Link>Spacing.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaAlign.cs">
-			<Link>YogaAlign.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaAlign.cs">
+		  <Link>YogaAlign.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaConstants.cs">
-			<Link>YogaConstants.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaConstants.cs">
+		  <Link>YogaConstants.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaDimension.cs">
-			<Link>YogaDimension.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaDimension.cs">
+		  <Link>YogaDimension.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaDirection.cs">
-			<Link>YogaDirection.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaDirection.cs">
+		  <Link>YogaDirection.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaEdge.cs">
-			<Link>YogaEdge.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaEdge.cs">
+		  <Link>YogaEdge.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaExperimentalFeature.cs">
-			<Link>YogaExperimentalFeature.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaExperimentalFeature.cs">
+		  <Link>YogaExperimentalFeature.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaFlexDirection.cs">
-			<Link>YogaFlexDirection.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaFlexDirection.cs">
+		  <Link>YogaFlexDirection.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaJustify.cs">
-			<Link>YogaJustify.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaJustify.cs">
+		  <Link>YogaJustify.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaLogger.cs">
-			<Link>YogaLogger.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaLogger.cs">
+		  <Link>YogaLogger.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaLogLevel.cs">
-			<Link>YogaLogLevel.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaLogLevel.cs">
+		  <Link>YogaLogLevel.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaMeasureFunc.cs">
-			<Link>YogaMeasureFunc.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaMeasureFunc.cs">
+		  <Link>YogaMeasureFunc.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaMeasureMode.cs">
-			<Link>YogaMeasureMode.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaMeasureMode.cs">
+		  <Link>YogaMeasureMode.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaNode.Create.cs">
-			<Link>YogaNode.Create.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaNode.Create.cs">
+		  <Link>YogaNode.Create.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaNode.cs">
-			<Link>YogaNode.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaNode.cs">
+		  <Link>YogaNode.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaOverflow.cs">
-			<Link>YogaOverflow.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaOverflow.cs">
+		  <Link>YogaOverflow.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaPositionType.cs">
-			<Link>YogaPositionType.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaPositionType.cs">
+		  <Link>YogaPositionType.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaPrintOptions.cs">
-			<Link>YogaPrintOptions.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaPrintOptions.cs">
+		  <Link>YogaPrintOptions.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaSize.cs">
-			<Link>YogaSize.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaSize.cs">
+		  <Link>YogaSize.cs</Link>
 		</Compile>
-		<Compile Include="..\YogaWrap.cs">
-			<Link>YogaWrap.cs</Link>
+		<Compile Include="..\Facebook.Yoga\YogaWrap.cs">
+		  <Link>YogaWrap.cs</Link>
 		</Compile>
 	</ItemGroup>
 	<ItemGroup>
diff --git a/csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.sln b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.Yoga.iOS.sln
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln
diff --git a/csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/Facebook.YogaKit.iOS.csproj b/csharp/Xamarin.iOS/Facebook.YogaKit.iOS/Facebook.YogaKit.iOS.csproj
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/Facebook.YogaKit.iOS.csproj
rename to csharp/Xamarin.iOS/Facebook.YogaKit.iOS/Facebook.YogaKit.iOS.csproj
diff --git a/csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/Properties/AssemblyInfo.cs b/csharp/Xamarin.iOS/Facebook.YogaKit.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/Properties/AssemblyInfo.cs
rename to csharp/Xamarin.iOS/Facebook.YogaKit.iOS/Properties/AssemblyInfo.cs
diff --git a/csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/YogaKit.cs b/csharp/Xamarin.iOS/Facebook.YogaKit.iOS/YogaKit.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Facebook.YogaKit.iOS/YogaKit.cs
rename to csharp/Xamarin.iOS/Facebook.YogaKit.iOS/YogaKit.cs
diff --git a/csharp/Facebook.Yoga/ios/Properties/AssemblyInfo.cs b/csharp/Xamarin.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/Facebook.Yoga/ios/Properties/AssemblyInfo.cs
rename to csharp/Xamarin.iOS/Properties/AssemblyInfo.cs