diff --git a/csharp/Xamarin.iOS/ApiDefinition.cs b/csharp/Xamarin.iOS/ApiDefinition.cs
deleted file mode 100644
index 25726739..00000000
--- a/csharp/Xamarin.iOS/ApiDefinition.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-
-using UIKit;
-using Foundation;
-using ObjCRuntime;
-using CoreGraphics;
-
-namespace Facebook.Yoga.iOS
-{
-	// We're actually abusing the Xamarin.iOS binding project
-	// to bundle in the static lib for us. There is no objective-c
-	// lib to bind, but the build will fail without ApiDefinition.cs
-}
diff --git a/csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln
index f741ff63..cec625fe 100644
--- a/csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln
+++ b/csharp/Xamarin.iOS/Facebook.Yoga.iOS.sln
@@ -1,12 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.iOS", "Facebook.Yoga.iOS.csproj", "{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.iOS.Test", "Facebook.Yoga.iOS.Test\Facebook.Yoga.iOS.Test.csproj", "{3B27656A-129D-4779-BDAD-1A088DFDD9C5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.YogaKit.iOS", "Facebook.YogaKit.iOS\Facebook.YogaKit.iOS.csproj", "{33B1B6BE-F415-4819-A5FB-CFFE2E40AD6E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.iOS", "Facebook.Yoga.iOS\Facebook.Yoga.iOS.csproj", "{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,18 +17,6 @@ Global
 		Debug|iPhone = Debug|iPhone
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhone.Build.0 = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhone.Build.0 = Debug|Any CPU
 		{3B27656A-129D-4779-BDAD-1A088DFDD9C5}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{3B27656A-129D-4779-BDAD-1A088DFDD9C5}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
 		{3B27656A-129D-4779-BDAD-1A088DFDD9C5}.Release|Any CPU.ActiveCfg = Release|iPhone
@@ -53,5 +41,17 @@ Global
 		{33B1B6BE-F415-4819-A5FB-CFFE2E40AD6E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{33B1B6BE-F415-4819-A5FB-CFFE2E40AD6E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{33B1B6BE-F415-4819-A5FB-CFFE2E40AD6E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhone.Build.0 = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BE4CBFDA-02E2-4DF0-A81A-CEFB7987A708}.Debug|iPhone.Build.0 = Debug|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/csharp/Xamarin.iOS/Facebook.Yoga.iOS/ApiDefinition.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/ApiDefinition.cs
new file mode 100644
index 00000000..2d178004
--- /dev/null
+++ b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/ApiDefinition.cs
@@ -0,0 +1,11 @@
+using System;
+
+using UIKit;
+using Foundation;
+using ObjCRuntime;
+using CoreGraphics;
+
+namespace Facebook.Yoga.iOS
+{
+	// The build will fail without ApiDefinition.cs
+}
diff --git a/csharp/Xamarin.iOS/CustomBuildAction.targets b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
similarity index 59%
rename from csharp/Xamarin.iOS/CustomBuildAction.targets
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
index 41fed939..d29173f2 100644
--- a/csharp/Xamarin.iOS/CustomBuildAction.targets
+++ b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/CustomBuildAction.targets
@@ -4,7 +4,7 @@
 		<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\csharp\yoganet-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
-		<Copy SourceFiles="..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
+	<Target Name="CopyInNativeLib" Inputs="..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" Outputs="$(ProjectDir)libyoga.a">
+		<Copy SourceFiles="..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)/libyoga.a" />
 	</Target>
 </Project>
\ No newline at end of file
diff --git a/csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/Facebook.Yoga.iOS.csproj
similarity index 70%
rename from csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS/Facebook.Yoga.iOS.csproj
index b4df590c..21d5f45d 100644
--- a/csharp/Xamarin.iOS/Facebook.Yoga.iOS.csproj
+++ b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/Facebook.Yoga.iOS.csproj
@@ -34,73 +34,73 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="Properties\AssemblyInfo.cs" />
-		<Compile Include="..\Facebook.Yoga\MeasureFunction.cs">
+		<Compile Include="..\..\Facebook.Yoga\MeasureFunction.cs">
 		  <Link>MeasureFunction.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\MeasureOutput.cs">
+		<Compile Include="..\..\Facebook.Yoga\MeasureOutput.cs">
 		  <Link>MeasureOutput.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\Native.cs">
+		<Compile Include="..\..\Facebook.Yoga\Native.cs">
 		  <Link>Native.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\Spacing.cs">
+		<Compile Include="..\..\Facebook.Yoga\Spacing.cs">
 		  <Link>Spacing.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaAlign.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaAlign.cs">
 		  <Link>YogaAlign.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaConstants.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaConstants.cs">
 		  <Link>YogaConstants.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaDimension.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaDimension.cs">
 		  <Link>YogaDimension.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaDirection.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaDirection.cs">
 		  <Link>YogaDirection.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaEdge.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaEdge.cs">
 		  <Link>YogaEdge.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaExperimentalFeature.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaExperimentalFeature.cs">
 		  <Link>YogaExperimentalFeature.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaFlexDirection.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaFlexDirection.cs">
 		  <Link>YogaFlexDirection.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaJustify.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaJustify.cs">
 		  <Link>YogaJustify.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaLogger.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaLogger.cs">
 		  <Link>YogaLogger.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaLogLevel.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaLogLevel.cs">
 		  <Link>YogaLogLevel.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaMeasureFunc.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaMeasureFunc.cs">
 		  <Link>YogaMeasureFunc.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaMeasureMode.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaMeasureMode.cs">
 		  <Link>YogaMeasureMode.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaNode.Create.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaNode.Create.cs">
 		  <Link>YogaNode.Create.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaNode.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaNode.cs">
 		  <Link>YogaNode.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaOverflow.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaOverflow.cs">
 		  <Link>YogaOverflow.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaPositionType.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaPositionType.cs">
 		  <Link>YogaPositionType.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaPrintOptions.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaPrintOptions.cs">
 		  <Link>YogaPrintOptions.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaSize.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaSize.cs">
 		  <Link>YogaSize.cs</Link>
 		</Compile>
-		<Compile Include="..\Facebook.Yoga\YogaWrap.cs">
+		<Compile Include="..\..\Facebook.Yoga\YogaWrap.cs">
 		  <Link>YogaWrap.cs</Link>
 		</Compile>
 	</ItemGroup>
diff --git a/csharp/Xamarin.iOS/Properties/AssemblyInfo.cs b/csharp/Xamarin.iOS/Facebook.Yoga.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from csharp/Xamarin.iOS/Properties/AssemblyInfo.cs
rename to csharp/Xamarin.iOS/Facebook.Yoga.iOS/Properties/AssemblyInfo.cs