diff --git a/.nuget/directxtex_desktop_2017.nuspec b/.nuget/directxtex_desktop_2017.nuspec
index 6dd80af..59e9c5b 100644
--- a/.nuget/directxtex_desktop_2017.nuspec
+++ b/.nuget/directxtex_desktop_2017.nuspec
@@ -26,17 +26,17 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="include" src="DirectXTex\DirectXTex.h" />
         <file target="include" src="DirectXTex\DirectXTex.inl" />
 
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017\Win32\Debug\*.lib" />
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017\Win32\Debug\*.pdb" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017\Win32\Debug\*.lib" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017\Win32\Debug\*.pdb" />
 
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017\Win32\Release\*.lib" />
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017\Win32\Release\*.pdb" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017\Win32\Release\*.lib" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017\Win32\Release\*.pdb" />
 
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017\x64\Debug\*.lib" />
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017\x64\Debug\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017\x64\Debug\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017\x64\Debug\*.pdb" />
 
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Desktop_2017\x64\Release\*.lib" />
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Desktop_2017\x64\Release\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2017\x64\Release\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2017\x64\Release\*.pdb" />
 
         <file src=".nuget/directxtex_desktop_2017.targets" target="build\native" />
       
diff --git a/.nuget/directxtex_desktop_2017.targets b/.nuget/directxtex_desktop_2017.targets
index 1be9ac8..de43df5 100644
--- a/.nuget/directxtex_desktop_2017.targets
+++ b/.nuget/directxtex_desktop_2017.targets
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\lib\$(Platform)\$(NuGetConfiguration)</directxtex-LibPath>
+    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(Platform)\$(NuGetConfiguration)</directxtex-LibPath>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
diff --git a/.nuget/directxtex_desktop_win10.nuspec b/.nuget/directxtex_desktop_win10.nuspec
index db88585..2c91d67 100644
--- a/.nuget/directxtex_desktop_win10.nuspec
+++ b/.nuget/directxtex_desktop_win10.nuspec
@@ -26,23 +26,23 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="include" src="DirectXTex\DirectXTex.h" />
         <file target="include" src="DirectXTex\DirectXTex.inl" />
 
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Debug\*.lib" />
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Debug\*.pdb" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Debug\*.lib" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Debug\*.pdb" />
 
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Release\*.lib" />
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Release\*.pdb" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Release\*.lib" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Desktop_2017_Win10\Win32\Release\*.pdb" />
 
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Debug\*.lib" />
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Debug\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Debug\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Debug\*.pdb" />
 
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Release\*.lib" />
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Release\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Release\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\x64\Release\*.pdb" />
 
-        <file target="lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.lib" />
-        <file target="lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Debug\*.pdb" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\ARM64\Debug\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Desktop_2017_Win10\ARM64\Debug\*.pdb" />
 
-        <file target="lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.lib" />
-        <file target="lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2019_Win10\ARM64\Release\*.pdb" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\ARM64\Release\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Desktop_2017_Win10\ARM64\Release\*.pdb" />
 
         <file src=".nuget/directxtex_desktop_win10.targets" target="build\native" />
       
diff --git a/.nuget/directxtex_desktop_win10.targets b/.nuget/directxtex_desktop_win10.targets
index 8a0ca39..92f38b8 100644
--- a/.nuget/directxtex_desktop_win10.targets
+++ b/.nuget/directxtex_desktop_win10.targets
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\lib\$(_NuGetPlatform)\$(_NuGetConfiguration)</directxtex-LibPath>
+    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(_NuGetPlatform)\$(_NuGetConfiguration)</directxtex-LibPath>
   </PropertyGroup>
 
   <ItemDefinitionGroup>
diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec
index 75a5cca..1c93457 100644
--- a/.nuget/directxtex_uwp.nuspec
+++ b/.nuget/directxtex_uwp.nuspec
@@ -26,29 +26,29 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
         <file target="include" src="DirectXTex\DirectXTex.h" />
         <file target="include" src="DirectXTex\DirectXTex.inl" />
 
-        <file target="lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2017\ARM\Debug\*.lib" />
-        <file target="lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2017\ARM\Debug\*.pdb" />
+        <file target="native\lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2017\ARM\Debug\*.lib" />
+        <file target="native\lib\ARM\Debug" src="DirectXTex\Bin\Windows10_2017\ARM\Debug\*.pdb" />
 
-        <file target="lib\ARM\Release" src="DirectXTex\Bin\Windows10_2017\ARM\Release\*.lib" />
-        <file target="lib\ARM\Release" src="DirectXTex\Bin\Windows10_2017\ARM\Release\*.pdb" />
+        <file target="native\lib\ARM\Release" src="DirectXTex\Bin\Windows10_2017\ARM\Release\*.lib" />
+        <file target="native\lib\ARM\Release" src="DirectXTex\Bin\Windows10_2017\ARM\Release\*.pdb" />
 
-        <file target="lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2017\ARM64\Debug\*.lib" />
-        <file target="lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2017\ARM64\Debug\*.pdb" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2017\ARM64\Debug\*.lib" />
+        <file target="native\lib\ARM64\Debug" src="DirectXTex\Bin\Windows10_2017\ARM64\Debug\*.pdb" />
 
-        <file target="lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2017\ARM64\Release\*.lib" />
-        <file target="lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2017\ARM64\Release\*.pdb" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2017\ARM64\Release\*.lib" />
+        <file target="native\lib\ARM64\Release" src="DirectXTex\Bin\Windows10_2017\ARM64\Release\*.pdb" />
       
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Windows10_2017\Win32\Debug\*.lib" />
-        <file target="lib\Win32\Debug" src="DirectXTex\Bin\Windows10_2017\Win32\Debug\*.pdb" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Windows10_2017\Win32\Debug\*.lib" />
+        <file target="native\lib\Win32\Debug" src="DirectXTex\Bin\Windows10_2017\Win32\Debug\*.pdb" />
 
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Windows10_2017\Win32\Release\*.lib" />
-        <file target="lib\Win32\Release" src="DirectXTex\Bin\Windows10_2017\Win32\Release\*.pdb" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Windows10_2017\Win32\Release\*.lib" />
+        <file target="native\lib\Win32\Release" src="DirectXTex\Bin\Windows10_2017\Win32\Release\*.pdb" />
 
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Windows10_2017\x64\Debug\*.lib" />
-        <file target="lib\x64\Debug" src="DirectXTex\Bin\Windows10_2017\x64\Debug\*.pdb" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2017\x64\Debug\*.lib" />
+        <file target="native\lib\x64\Debug" src="DirectXTex\Bin\Windows10_2017\x64\Debug\*.pdb" />
 
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Windows10_2017\x64\Release\*.lib" />
-        <file target="lib\x64\Release" src="DirectXTex\Bin\Windows10_2017\x64\Release\*.pdb" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2017\x64\Release\*.lib" />
+        <file target="native\lib\x64\Release" src="DirectXTex\Bin\Windows10_2017\x64\Release\*.pdb" />
 
         <file src=".nuget/directxtex_uwp.targets" target="build\native" />
       
diff --git a/.nuget/directxtex_uwp.targets b/.nuget/directxtex_uwp.targets
index 1be9ac8..de43df5 100644
--- a/.nuget/directxtex_uwp.targets
+++ b/.nuget/directxtex_uwp.targets
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\lib\$(Platform)\$(NuGetConfiguration)</directxtex-LibPath>
+    <directxtex-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(Platform)\$(NuGetConfiguration)</directxtex-LibPath>
   </PropertyGroup>
 
   <ItemDefinitionGroup>