diff --git a/dirs.proj b/dirs.proj
index eac8e13870..cd3faf07a6 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -6,7 +6,6 @@
     <ProjectReference Include="packages/**/*.*proj" />
     <ProjectReference Remove="**/*.shproj" />
     <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
-    <ProjectReference Remove="**/*.pbxproj" />
   </ItemGroup>
   <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\Android')">
     <ProjectReference Remove="src/Android/**/*.*proj" />
diff --git a/src/Avalonia.Native/headers/avalonia-native-guids.h b/native/Avalonia.Native/inc/avalonia-native-guids.h
similarity index 100%
rename from src/Avalonia.Native/headers/avalonia-native-guids.h
rename to native/Avalonia.Native/inc/avalonia-native-guids.h
diff --git a/src/Avalonia.Native/headers/avalonia-native.h b/native/Avalonia.Native/inc/avalonia-native.h
similarity index 100%
rename from src/Avalonia.Native/headers/avalonia-native.h
rename to native/Avalonia.Native/inc/avalonia-native.h
diff --git a/src/Avalonia.Native/headers/com.h b/native/Avalonia.Native/inc/com.h
similarity index 100%
rename from src/Avalonia.Native/headers/com.h
rename to native/Avalonia.Native/inc/com.h
diff --git a/src/Avalonia.Native/headers/comimpl.h b/native/Avalonia.Native/inc/comimpl.h
similarity index 100%
rename from src/Avalonia.Native/headers/comimpl.h
rename to native/Avalonia.Native/inc/comimpl.h
diff --git a/src/Avalonia.Native/headers/key.h b/native/Avalonia.Native/inc/key.h
similarity index 100%
rename from src/Avalonia.Native/headers/key.h
rename to native/Avalonia.Native/inc/key.h
diff --git a/src/Avalonia.Native.OSX/.gitignore b/native/Avalonia.Native/src/OSX/.gitignore
similarity index 100%
rename from src/Avalonia.Native.OSX/.gitignore
rename to native/Avalonia.Native/src/OSX/.gitignore
diff --git a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
similarity index 98%
rename from src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
rename to native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
index 8d36bf3b8f..bd8ac481a8 100644
--- a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj
@@ -22,7 +22,7 @@
 
 /* Begin PBXFileReference section */
 		379860FE214DA0C000CD0246 /* KeyTransform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeyTransform.h; sourceTree = "<group>"; };
-		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../Avalonia.Native/headers; sourceTree = "<group>"; };
+		37A4E71A2178846A00EACBCD /* headers */ = {isa = PBXFileReference; lastKnownFileType = folder; name = headers; path = ../../inc; sourceTree = "<group>"; };
 		37A517B22159597E00FBA241 /* Screens.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = Screens.mm; sourceTree = "<group>"; };
 		37C09D8721580FE4006A6758 /* SystemDialogs.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SystemDialogs.mm; sourceTree = "<group>"; };
 		37C09D8A21581EF2006A6758 /* window.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
@@ -285,7 +285,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_PREFIX = lib;
-				HEADER_SEARCH_PATHS = ../Avalonia.Native/headers;
+				HEADER_SEARCH_PATHS = ../../inc;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -296,7 +296,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				EXECUTABLE_PREFIX = lib;
-				HEADER_SEARCH_PATHS = ../Avalonia.Native/headers;
+				HEADER_SEARCH_PATHS = ../../inc;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
diff --git a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
similarity index 97%
rename from src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
rename to native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
index 96588581bf..c1cc9b4887 100644
--- a/src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
+++ b/native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/xcshareddata/xcschemes/Avalonia.Native.OSX.xcscheme
@@ -38,7 +38,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "YES"
-      customWorkingDirectory = "$PROJECT_DIR/../../samples/ControlCatalog"
+      customWorkingDirectory = "$PROJECT_DIR/../../../../samples/ControlCatalog"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
diff --git a/src/Avalonia.Native.OSX/KeyTransform.h b/native/Avalonia.Native/src/OSX/KeyTransform.h
similarity index 100%
rename from src/Avalonia.Native.OSX/KeyTransform.h
rename to native/Avalonia.Native/src/OSX/KeyTransform.h
diff --git a/src/Avalonia.Native.OSX/KeyTransform.mm b/native/Avalonia.Native/src/OSX/KeyTransform.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/KeyTransform.mm
rename to native/Avalonia.Native/src/OSX/KeyTransform.mm
diff --git a/src/Avalonia.Native.OSX/Screens.mm b/native/Avalonia.Native/src/OSX/Screens.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/Screens.mm
rename to native/Avalonia.Native/src/OSX/Screens.mm
diff --git a/src/Avalonia.Native.OSX/SystemDialogs.mm b/native/Avalonia.Native/src/OSX/SystemDialogs.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/SystemDialogs.mm
rename to native/Avalonia.Native/src/OSX/SystemDialogs.mm
diff --git a/src/Avalonia.Native.OSX/clipboard.mm b/native/Avalonia.Native/src/OSX/clipboard.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/clipboard.mm
rename to native/Avalonia.Native/src/OSX/clipboard.mm
diff --git a/src/Avalonia.Native.OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
similarity index 100%
rename from src/Avalonia.Native.OSX/common.h
rename to native/Avalonia.Native/src/OSX/common.h
diff --git a/src/Avalonia.Native.OSX/cursor.h b/native/Avalonia.Native/src/OSX/cursor.h
similarity index 100%
rename from src/Avalonia.Native.OSX/cursor.h
rename to native/Avalonia.Native/src/OSX/cursor.h
diff --git a/src/Avalonia.Native.OSX/cursor.mm b/native/Avalonia.Native/src/OSX/cursor.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/cursor.mm
rename to native/Avalonia.Native/src/OSX/cursor.mm
diff --git a/src/Avalonia.Native.OSX/gl.mm b/native/Avalonia.Native/src/OSX/gl.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/gl.mm
rename to native/Avalonia.Native/src/OSX/gl.mm
diff --git a/src/Avalonia.Native.OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/main.mm
rename to native/Avalonia.Native/src/OSX/main.mm
diff --git a/src/Avalonia.Native.OSX/platformthreading.mm b/native/Avalonia.Native/src/OSX/platformthreading.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/platformthreading.mm
rename to native/Avalonia.Native/src/OSX/platformthreading.mm
diff --git a/src/Avalonia.Native.OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
similarity index 100%
rename from src/Avalonia.Native.OSX/window.h
rename to native/Avalonia.Native/src/OSX/window.h
diff --git a/src/Avalonia.Native.OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
similarity index 100%
rename from src/Avalonia.Native.OSX/window.mm
rename to native/Avalonia.Native/src/OSX/window.mm
diff --git a/src/Avalonia.Native/Avalonia.Native.targets b/src/Avalonia.Native/Avalonia.Native.targets
deleted file mode 100644
index 07c1e17c53..0000000000
--- a/src/Avalonia.Native/Avalonia.Native.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup>
-        <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx-x64\native\libAvalonia.Native.OSX.dylib">
-            <Link>libAvalonia.Native.OSX.dylib</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Avalonia.Native/Mappings.xml b/src/Avalonia.Native/Mappings.xml
index e870f7594e..7ac6377f78 100644
--- a/src/Avalonia.Native/Mappings.xml
+++ b/src/Avalonia.Native/Mappings.xml
@@ -3,7 +3,7 @@
     <assembly>Avalonia.Native</assembly>
     <namespace>Avalonia.Native.Interop</namespace>
     <depends>SharpGen.Runtime.COM</depends>
-    <include-dir>$(THIS_CONFIG_PATH)/headers</include-dir>
+    <include-dir>$(THIS_CONFIG_PATH)/../../native/Avalonia.Native/inc</include-dir>
     <include file="avalonia-native.h" 
              namespace="Avalonia.Native.Interop"
              attach="true"