diff --git a/.gitignore b/.gitignore
index 2671f2e..b9fd950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ Debug
 Profile
 Release
 x64
+packages
 /Tests
 /wiki
 /out
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3cb6ff..c66e73e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,15 @@ cmake_minimum_required (VERSION 3.11)
 
 project (UVAtlas LANGUAGES CXX)
 
+# To build this tool, you need the DirectXTex (http://go.microsoft.com/fwlink/?LinkId=248926) and
+# DirectXMesh (http://go.microsoft.com/fwlink/?LinkID=324981) libraries in the following directory structure:
+#
+# .\DirectXTex\DirectXTex
+# .\DirectXMesh\DirectXMesh
+# .\DirectXMesh\Utilities
+# .\UVAtlas\UVAtlas
+# .\UVAtlas\UVAtlasTool
+#
 option(BUILD_TOOLS "Build UVAtlasTool" ON)
 
 # Enable the use of OpenMP
diff --git a/README.md b/README.md
index 3f27a84..4a41423 100644
--- a/README.md
+++ b/README.md
@@ -38,14 +38,6 @@ These components are designed to work without requiring any content from the leg
 
   + Command line tool and sample for UVAtlas library
 
-> To build this tool, you need the DirectXTex (http://go.microsoft.com/fwlink/?LinkId=248926) and DirectXMesh (http://go.microsoft.com/fwlink/?LinkID=324981) libraries in the following directory structure:
-
-    .\DirectXTex\DirectXTex
-    .\DirectXMesh\DirectXMesh
-    .\DirectXMesh\Utilities
-    .\UVAtlas\UVAtlas
-    .\UVAtlas\UVAtlasTool
-
 ## Documentation
 
 Documentation is available on the [GitHub wiki](https://github.com/Microsoft/UVAtlas/wiki).
diff --git a/UVAtlasTool/UVAtlasTool_2017.sln b/UVAtlasTool/UVAtlasTool_2017.sln
deleted file mode 100644
index 4337d72..0000000
--- a/UVAtlasTool/UVAtlasTool_2017.sln
+++ /dev/null
@@ -1,83 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlasTool", "UVAtlasTool_2017.vcxproj", "{A7969CB3-E89B-49B9-96E7-8A219785A7CB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\..\DirectXTex\DirectXTex\DirectXTex_Desktop_2017.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "..\..\DirectXMesh\DirectXMesh\DirectXMesh_Desktop_2017.vcxproj", "{6857F086-F6FE-4150-9ED7-7446F1C1C220}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017_Win10", "..\UVAtlas\UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E8D0984-C342-4C66-B288-23D5D44F531E}"
-	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Profile|x86 = Profile|x86
-		Profile|x64 = Profile|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.ActiveCfg = Debug|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.Build.0 = Debug|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.ActiveCfg = Debug|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.Build.0 = Debug|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.ActiveCfg = Profile|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.Build.0 = Profile|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.ActiveCfg = Profile|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.Build.0 = Profile|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.ActiveCfg = Release|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.Build.0 = Release|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.ActiveCfg = Release|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.Build.0 = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.ActiveCfg = Debug|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.Build.0 = Debug|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.ActiveCfg = Debug|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.Build.0 = Debug|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.ActiveCfg = Profile|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.Build.0 = Profile|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.ActiveCfg = Profile|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.Build.0 = Profile|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.ActiveCfg = Release|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.Build.0 = Release|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.ActiveCfg = Release|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.Build.0 = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.ActiveCfg = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Build.0 = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.ActiveCfg = Debug|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Build.0 = Debug|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.ActiveCfg = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.Build.0 = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.ActiveCfg = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.Build.0 = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.ActiveCfg = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Build.0 = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.ActiveCfg = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F576ED7C-BC0D-42CD-90EB-0E206EEA9F74}
-	EndGlobalSection
-EndGlobal
diff --git a/UVAtlasTool/UVAtlasTool_2017.vcxproj b/UVAtlasTool/UVAtlasTool_2017.vcxproj
index eb364a9..ff552c6 100644
--- a/UVAtlasTool/UVAtlasTool_2017.vcxproj
+++ b/UVAtlasTool/UVAtlasTool_2017.vcxproj
@@ -132,7 +132,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -164,7 +164,7 @@
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -195,7 +195,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -228,7 +228,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -261,7 +261,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -293,7 +293,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -320,12 +320,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\DirectXMesh\DirectXMesh\DirectXMesh_Desktop_2017.vcxproj">
-      <Project>{6857f086-f6fe-4150-9ed7-7446f1c1c220}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DirectXTex\DirectXTex\DirectXTex_Desktop_2017.vcxproj">
-      <Project>{371b9fa9-4c90-4ac6-a123-aced756d6c77}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\UVAtlas\UVAtlas_2017_Win10.vcxproj">
       <Project>{10359e70-6a7f-4433-8ef1-b0fb688d830e}</Project>
     </ProjectReference>
@@ -334,11 +328,11 @@
     <ClCompile Include="MeshOBJ.cpp" />
     <ClCompile Include="UVAtlas.cpp" />
     <ClCompile Include="Mesh.cpp" />
-    <ClInclude Include="..\..\DirectXMesh\Utilities\WaveFrontReader.h" />
     <CLInclude Include="Mesh.h" />
     <ClInclude Include="SDKMesh.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UVAtlas.rc" />
@@ -348,5 +342,15 @@
   <ItemGroup>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2017.vcxproj.filters b/UVAtlasTool/UVAtlasTool_2017.vcxproj.filters
index 9e627d5..771a84a 100644
--- a/UVAtlasTool/UVAtlasTool_2017.vcxproj.filters
+++ b/UVAtlasTool/UVAtlasTool_2017.vcxproj.filters
@@ -18,9 +18,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\DirectXMesh\Utilities\WaveFrontReader.h">
-      <Filter>Wavefront OBJ</Filter>
-    </ClInclude>
     <ClInclude Include="SDKMesh.h" />
   </ItemGroup>
   <ItemGroup>
@@ -29,5 +26,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2019.sln b/UVAtlasTool/UVAtlasTool_2019.sln
deleted file mode 100644
index c2c207e..0000000
--- a/UVAtlasTool/UVAtlasTool_2019.sln
+++ /dev/null
@@ -1,83 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 16
-VisualStudioVersion = 15.0.27703.2000
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlasTool", "UVAtlasTool_2019.vcxproj", "{A7969CB3-E89B-49B9-96E7-8A219785A7CB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "..\..\DirectXTex\DirectXTex\DirectXTex_Desktop_2019.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXMesh", "..\..\DirectXMesh\DirectXMesh\DirectXMesh_Desktop_2019.vcxproj", "{6857F086-F6FE-4150-9ED7-7446F1C1C220}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2019_Win10", "..\UVAtlas\UVAtlas_2019_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E8D0984-C342-4C66-B288-23D5D44F531E}"
-	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Profile|x86 = Profile|x86
-		Profile|x64 = Profile|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.ActiveCfg = Debug|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.Build.0 = Debug|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.ActiveCfg = Debug|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.Build.0 = Debug|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.ActiveCfg = Profile|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.Build.0 = Profile|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.ActiveCfg = Profile|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.Build.0 = Profile|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.ActiveCfg = Release|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.Build.0 = Release|Win32
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.ActiveCfg = Release|x64
-		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.Build.0 = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.ActiveCfg = Debug|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x86.Build.0 = Debug|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.ActiveCfg = Debug|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Debug|x64.Build.0 = Debug|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.ActiveCfg = Profile|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x86.Build.0 = Profile|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.ActiveCfg = Profile|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Profile|x64.Build.0 = Profile|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.ActiveCfg = Release|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x86.Build.0 = Release|Win32
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.ActiveCfg = Release|x64
-		{6857F086-F6FE-4150-9ED7-7446F1C1C220}.Release|x64.Build.0 = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.ActiveCfg = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Build.0 = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.ActiveCfg = Debug|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Build.0 = Debug|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.ActiveCfg = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.Build.0 = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.ActiveCfg = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.Build.0 = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.ActiveCfg = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Build.0 = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.ActiveCfg = Release|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F576ED7C-BC0D-42CD-90EB-0E206EEA9F74}
-	EndGlobalSection
-EndGlobal
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj b/UVAtlasTool/UVAtlasTool_2019.vcxproj
index aabe053..2e94b92 100644
--- a/UVAtlasTool/UVAtlasTool_2019.vcxproj
+++ b/UVAtlasTool/UVAtlasTool_2019.vcxproj
@@ -132,7 +132,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -164,7 +164,7 @@
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -195,7 +195,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -228,7 +228,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -261,7 +261,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -293,7 +293,7 @@
       <WarningLevel>Level4</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FloatingPointModel>Fast</FloatingPointModel>
-      <AdditionalIncludeDirectories>..\UVAtlas\inc;..\..\DirectXMesh\DirectXMesh;..\..\DirectXMesh\Utilities;..\..\DirectXTex\DirectXTex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\UVAtlas\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
@@ -320,12 +320,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\DirectXMesh\DirectXMesh\DirectXMesh_Desktop_2019.vcxproj">
-      <Project>{6857f086-f6fe-4150-9ed7-7446f1c1c220}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DirectXTex\DirectXTex\DirectXTex_Desktop_2019.vcxproj">
-      <Project>{371b9fa9-4c90-4ac6-a123-aced756d6c77}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\UVAtlas\UVAtlas_2019_Win10.vcxproj">
       <Project>{10359e70-6a7f-4433-8ef1-b0fb688d830e}</Project>
     </ProjectReference>
@@ -334,11 +328,11 @@
     <ClCompile Include="MeshOBJ.cpp" />
     <ClCompile Include="UVAtlas.cpp" />
     <ClCompile Include="Mesh.cpp" />
-    <ClInclude Include="..\..\DirectXMesh\Utilities\WaveFrontReader.h" />
     <CLInclude Include="Mesh.h" />
     <ClInclude Include="SDKMesh.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="UVAtlas.rc" />
@@ -348,5 +342,15 @@
   <ItemGroup>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.2.15.2\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.2.15.1\build\native\directxtex_desktop_2017.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters b/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
index 9e627d5..771a84a 100644
--- a/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
+++ b/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
@@ -18,9 +18,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\DirectXMesh\Utilities\WaveFrontReader.h">
-      <Filter>Wavefront OBJ</Filter>
-    </ClInclude>
     <ClInclude Include="SDKMesh.h" />
   </ItemGroup>
   <ItemGroup>
@@ -29,5 +26,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/packages.config b/UVAtlasTool/packages.config
new file mode 100644
index 0000000..284ee74
--- /dev/null
+++ b/UVAtlasTool/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="directxmesh_desktop_2017" version="2020.2.15.2" targetFramework="native" />
+  <package id="directxtex_desktop_2017" version="2020.2.15.1" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/UVAtlas/UVAtlas_2017_Win10.sln b/UVAtlas_2017_Win10.sln
similarity index 53%
rename from UVAtlas/UVAtlas_2017_Win10.sln
rename to UVAtlas_2017_Win10.sln
index b4c218a..88871b6 100644
--- a/UVAtlas/UVAtlas_2017_Win10.sln
+++ b/UVAtlas_2017_Win10.sln
@@ -1,35 +1,55 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Version 15
 VisualStudioVersion = 15.0.27703.2000
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017_Win10", "UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlasTool", "UVAtlasTool\UVAtlasTool_2017.vcxproj", "{A7969CB3-E89B-49B9-96E7-8A219785A7CB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2017_Win10", "UVAtlas\UVAtlas_2017_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{092D565A-3AC4-479C-B3A6-D5D0C83E6881}"
 	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
 		Debug|x64 = Debug|x64
-		Release|x86 = Release|x86
+		Debug|x86 = Debug|x86
+		Profile|x64 = Profile|x64
+		Profile|x86 = Profile|x86
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.ActiveCfg = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Build.0 = Debug|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Deploy.0 = Debug|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.ActiveCfg = Debug|x64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Build.0 = Debug|x64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x64.Deploy.0 = Debug|x64
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.ActiveCfg = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Build.0 = Release|Win32
-		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Deploy.0 = Release|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.ActiveCfg = Debug|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Build.0 = Debug|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Deploy.0 = Debug|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.ActiveCfg = Release|x64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.Build.0 = Release|x64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.ActiveCfg = Release|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.Build.0 = Release|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.ActiveCfg = Release|x64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Build.0 = Release|x64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.Deploy.0 = Release|x64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.ActiveCfg = Release|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Build.0 = Release|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Deploy.0 = Release|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.ActiveCfg = Debug|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.Build.0 = Debug|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.ActiveCfg = Debug|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.Build.0 = Debug|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.ActiveCfg = Profile|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.Build.0 = Profile|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.ActiveCfg = Profile|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.Build.0 = Profile|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.ActiveCfg = Release|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.Build.0 = Release|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.ActiveCfg = Release|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UVAtlas/UVAtlas_2019_Win10.sln b/UVAtlas_2019_Win10.sln
similarity index 52%
rename from UVAtlas/UVAtlas_2019_Win10.sln
rename to UVAtlas_2019_Win10.sln
index c9247ec..876ef5d 100644
--- a/UVAtlas/UVAtlas_2019_Win10.sln
+++ b/UVAtlas_2019_Win10.sln
@@ -3,11 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2019_Win10", "UVAtlas_2019_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlasTool", "UVAtlasTool\UVAtlasTool_2019.vcxproj", "{A7969CB3-E89B-49B9-96E7-8A219785A7CB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_2019_Win10", "UVAtlas\UVAtlas_2019_Win10.vcxproj", "{10359E70-6A7F-4433-8EF1-B0FB688D830E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{092D565A-3AC4-479C-B3A6-D5D0C83E6881}"
 	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Global
@@ -15,6 +17,9 @@ Global
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Profile|ARM64 = Profile|ARM64
+		Profile|x64 = Profile|x64
+		Profile|x86 = Profile|x86
 		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
@@ -28,6 +33,12 @@ Global
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.ActiveCfg = Debug|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Build.0 = Debug|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Debug|x86.Deploy.0 = Debug|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|ARM64.ActiveCfg = Release|ARM64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|ARM64.Build.0 = Release|ARM64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.ActiveCfg = Release|x64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x64.Build.0 = Release|x64
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.ActiveCfg = Release|Win32
+		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Profile|x86.Build.0 = Release|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|ARM64.Build.0 = Release|ARM64
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x64.ActiveCfg = Release|x64
@@ -36,6 +47,21 @@ Global
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.ActiveCfg = Release|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Build.0 = Release|Win32
 		{10359E70-6A7F-4433-8EF1-B0FB688D830E}.Release|x86.Deploy.0 = Release|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|ARM64.ActiveCfg = Debug|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.ActiveCfg = Debug|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x64.Build.0 = Debug|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.ActiveCfg = Debug|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Debug|x86.Build.0 = Debug|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|ARM64.ActiveCfg = Profile|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.ActiveCfg = Profile|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x64.Build.0 = Profile|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.ActiveCfg = Profile|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Profile|x86.Build.0 = Profile|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|ARM64.ActiveCfg = Release|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.ActiveCfg = Release|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x64.Build.0 = Release|x64
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.ActiveCfg = Release|Win32
+		{A7969CB3-E89B-49B9-96E7-8A219785A7CB}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UVAtlas/UVAtlas_Windows10_2017.sln b/UVAtlas_Windows10_2017.sln
similarity index 95%
rename from UVAtlas/UVAtlas_Windows10_2017.sln
rename to UVAtlas_Windows10_2017.sln
index 5e2b8a6..bb7b082 100644
--- a/UVAtlas/UVAtlas_Windows10_2017.sln
+++ b/UVAtlas_Windows10_2017.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2000
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas_Windows10_2017.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas\UVAtlas_Windows10_2017.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BEADBA94-103D-4BBE-BA6D-76280354E51D}"
 	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Global
diff --git a/UVAtlas/UVAtlas_Windows10_2019.sln b/UVAtlas_Windows10_2019.sln
similarity index 95%
rename from UVAtlas/UVAtlas_Windows10_2019.sln
rename to UVAtlas_Windows10_2019.sln
index 53af879..f280eb1 100644
--- a/UVAtlas/UVAtlas_Windows10_2019.sln
+++ b/UVAtlas_Windows10_2019.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas_Windows10_2019.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas\UVAtlas_Windows10_2019.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BEADBA94-103D-4BBE-BA6D-76280354E51D}"
 	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Global
diff --git a/UVAtlas/UVAtlas_XboxOneXDK_2017.sln b/UVAtlas_XboxOneXDK_2017.sln
similarity index 87%
rename from UVAtlas/UVAtlas_XboxOneXDK_2017.sln
rename to UVAtlas_XboxOneXDK_2017.sln
index 4c0f43a..59b4588 100644
--- a/UVAtlas/UVAtlas_XboxOneXDK_2017.sln
+++ b/UVAtlas_XboxOneXDK_2017.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27703.2000
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas_XboxOneXDK_2017", "UVAtlas_XboxOneXDK_2017.vcxproj", "{5959D651-867B-4AD9-BABD-4265310B6D5D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas\UVAtlas_XboxOneXDK_2017", "UVAtlas_XboxOneXDK_2017.vcxproj", "{5959D651-867B-4AD9-BABD-4265310B6D5D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6F8C099A-349F-40E8-8D9F-D0B3B6CDCB49}"
 	ProjectSection(SolutionItems) = preProject
-		..\.editorconfig = ..\.editorconfig
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Global