diff --git a/detours/lib.X64/detours.lib b/detours/lib.X64/detours.lib
deleted file mode 100644
index 11ec64a0..00000000
Binary files a/detours/lib.X64/detours.lib and /dev/null differ
diff --git a/detours/lib.X64/detours_trace.lib b/detours/lib.X64/detours_trace.lib
deleted file mode 100644
index 1bda1142..00000000
Binary files a/detours/lib.X64/detours_trace.lib and /dev/null differ
diff --git a/detours/lib.X64/syelog.lib b/detours/lib.X64/syelog.lib
deleted file mode 100644
index 418b6fda..00000000
Binary files a/detours/lib.X64/syelog.lib and /dev/null differ
diff --git a/detours/include/detours.h b/external/detours/include/detours.h
similarity index 100%
rename from detours/include/detours.h
rename to external/detours/include/detours.h
diff --git a/detours/include/detver.h b/external/detours/include/detver.h
similarity index 100%
rename from detours/include/detver.h
rename to external/detours/include/detver.h
diff --git a/detours/include/syelog.h b/external/detours/include/syelog.h
similarity index 100%
rename from detours/include/syelog.h
rename to external/detours/include/syelog.h
diff --git a/imgui/include/imconfig.h b/external/imgui/include/imconfig.h
similarity index 100%
rename from imgui/include/imconfig.h
rename to external/imgui/include/imconfig.h
diff --git a/imgui/include/imgui.h b/external/imgui/include/imgui.h
similarity index 100%
rename from imgui/include/imgui.h
rename to external/imgui/include/imgui.h
diff --git a/imgui/include/imgui_impl_dx11.h b/external/imgui/include/imgui_impl_dx11.h
similarity index 100%
rename from imgui/include/imgui_impl_dx11.h
rename to external/imgui/include/imgui_impl_dx11.h
diff --git a/imgui/include/imgui_impl_win32.h b/external/imgui/include/imgui_impl_win32.h
similarity index 100%
rename from imgui/include/imgui_impl_win32.h
rename to external/imgui/include/imgui_impl_win32.h
diff --git a/imgui/include/imgui_internal.h b/external/imgui/include/imgui_internal.h
similarity index 100%
rename from imgui/include/imgui_internal.h
rename to external/imgui/include/imgui_internal.h
diff --git a/imgui/include/imstb_rectpack.h b/external/imgui/include/imstb_rectpack.h
similarity index 100%
rename from imgui/include/imstb_rectpack.h
rename to external/imgui/include/imstb_rectpack.h
diff --git a/imgui/include/imstb_textedit.h b/external/imgui/include/imstb_textedit.h
similarity index 100%
rename from imgui/include/imstb_textedit.h
rename to external/imgui/include/imstb_textedit.h
diff --git a/imgui/include/imstb_truetype.h b/external/imgui/include/imstb_truetype.h
similarity index 100%
rename from imgui/include/imstb_truetype.h
rename to external/imgui/include/imstb_truetype.h
diff --git a/imgui/src/imgui.cpp b/external/imgui/src/imgui.cpp
similarity index 100%
rename from imgui/src/imgui.cpp
rename to external/imgui/src/imgui.cpp
diff --git a/imgui/src/imgui_demo.cpp b/external/imgui/src/imgui_demo.cpp
similarity index 100%
rename from imgui/src/imgui_demo.cpp
rename to external/imgui/src/imgui_demo.cpp
diff --git a/imgui/src/imgui_draw.cpp b/external/imgui/src/imgui_draw.cpp
similarity index 100%
rename from imgui/src/imgui_draw.cpp
rename to external/imgui/src/imgui_draw.cpp
diff --git a/imgui/src/imgui_impl_dx11.cpp b/external/imgui/src/imgui_impl_dx11.cpp
similarity index 100%
rename from imgui/src/imgui_impl_dx11.cpp
rename to external/imgui/src/imgui_impl_dx11.cpp
diff --git a/imgui/src/imgui_impl_win32.cpp b/external/imgui/src/imgui_impl_win32.cpp
similarity index 100%
rename from imgui/src/imgui_impl_win32.cpp
rename to external/imgui/src/imgui_impl_win32.cpp
diff --git a/imgui/src/imgui_tables.cpp b/external/imgui/src/imgui_tables.cpp
similarity index 100%
rename from imgui/src/imgui_tables.cpp
rename to external/imgui/src/imgui_tables.cpp
diff --git a/imgui/src/imgui_widgets.cpp b/external/imgui/src/imgui_widgets.cpp
similarity index 100%
rename from imgui/src/imgui_widgets.cpp
rename to external/imgui/src/imgui_widgets.cpp
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index 396ad026..d1ade516 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -52,7 +52,7 @@
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -82,13 +82,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(SolutionDir)imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)external\detours\include;$(SolutionDir)external\imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)external\detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(SolutionDir)imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)external\detours\include;$(SolutionDir)external\imgui\include;$(SolutionDir)r5dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)external\detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -182,17 +182,17 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\detours\include\detours.h" />
-    <ClInclude Include="..\detours\include\detver.h" />
-    <ClInclude Include="..\detours\include\syelog.h" />
-    <ClInclude Include="..\imgui\include\imconfig.h" />
-    <ClInclude Include="..\imgui\include\imgui.h" />
-    <ClInclude Include="..\imgui\include\imgui_impl_dx11.h" />
-    <ClInclude Include="..\imgui\include\imgui_impl_win32.h" />
-    <ClInclude Include="..\imgui\include\imgui_internal.h" />
-    <ClInclude Include="..\imgui\include\imstb_rectpack.h" />
-    <ClInclude Include="..\imgui\include\imstb_textedit.h" />
-    <ClInclude Include="..\imgui\include\imstb_truetype.h" />
+    <ClInclude Include="..\external\detours\include\detours.h" />
+    <ClInclude Include="..\external\detours\include\detver.h" />
+    <ClInclude Include="..\external\detours\include\syelog.h" />
+    <ClInclude Include="..\external\imgui\include\imconfig.h" />
+    <ClInclude Include="..\external\imgui\include\imgui.h" />
+    <ClInclude Include="..\external\imgui\include\imgui_impl_dx11.h" />
+    <ClInclude Include="..\external\imgui\include\imgui_impl_win32.h" />
+    <ClInclude Include="..\external\imgui\include\imgui_internal.h" />
+    <ClInclude Include="..\external\imgui\include\imstb_rectpack.h" />
+    <ClInclude Include="..\external\imgui\include\imstb_textedit.h" />
+    <ClInclude Include="..\external\imgui\include\imstb_truetype.h" />
     <ClInclude Include="include\console.h" />
     <ClInclude Include="include\enums.h" />
     <ClInclude Include="include\hooks.h" />
@@ -206,13 +206,13 @@
     <ClInclude Include="include\utility.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\imgui\src\imgui.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_demo.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_draw.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_impl_dx11.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_impl_win32.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_tables.cpp" />
-    <ClCompile Include="..\imgui\src\imgui_widgets.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_demo.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_draw.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_impl_dx11.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_impl_win32.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_tables.cpp" />
+    <ClCompile Include="..\external\imgui\src\imgui_widgets.cpp" />
     <ClCompile Include="src\console.cpp" />
     <ClCompile Include="src\dllmain.cpp" />
     <ClCompile Include="src\hooks.cpp" />
diff --git a/r5dev/r5dev.vcxproj.filters b/r5dev/r5dev.vcxproj.filters
index e62156fb..2b688cd7 100644
--- a/r5dev/r5dev.vcxproj.filters
+++ b/r5dev/r5dev.vcxproj.filters
@@ -48,25 +48,25 @@
     <ClCompile Include="src\opcptc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_draw.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_draw.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_impl_dx11.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_impl_dx11.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_impl_win32.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_impl_win32.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_tables.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_tables.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_widgets.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_widgets.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\imgui\src\imgui_demo.cpp">
+    <ClCompile Include="..\external\imgui\src\imgui_demo.cpp">
       <Filter>External Libraries\ImGui\Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\id3dx.cpp">
@@ -101,37 +101,37 @@
     <ClInclude Include="include\utility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\detours\include\detver.h">
+    <ClInclude Include="..\external\detours\include\detver.h">
       <Filter>External Libraries\Detours\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\detours\include\syelog.h">
+    <ClInclude Include="..\external\detours\include\syelog.h">
       <Filter>External Libraries\Detours\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\detours\include\detours.h">
+    <ClInclude Include="..\external\detours\include\detours.h">
       <Filter>External Libraries\Detours\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imgui_impl_win32.h">
+    <ClInclude Include="..\external\imgui\include\imgui_impl_win32.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imgui_internal.h">
+    <ClInclude Include="..\external\imgui\include\imgui_internal.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imstb_rectpack.h">
+    <ClInclude Include="..\external\imgui\include\imstb_rectpack.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imstb_textedit.h">
+    <ClInclude Include="..\external\imgui\include\imstb_textedit.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imstb_truetype.h">
+    <ClInclude Include="..\external\imgui\include\imstb_truetype.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imconfig.h">
+    <ClInclude Include="..\external\imgui\include\imconfig.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imgui.h">
+    <ClInclude Include="..\external\imgui\include\imgui.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\imgui\include\imgui_impl_dx11.h">
+    <ClInclude Include="..\external\imgui\include\imgui_impl_dx11.h">
       <Filter>External Libraries\ImGui\Header Files</Filter>
     </ClInclude>
     <ClInclude Include="include\id3dx.h">
diff --git a/r5launcher/r5launcher.vcxproj b/r5launcher/r5launcher.vcxproj
index 9b79364d..eb3be715 100644
--- a/r5launcher/r5launcher.vcxproj
+++ b/r5launcher/r5launcher.vcxproj
@@ -51,7 +51,7 @@
     <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>false</UseOfMfc>
+    <UseOfMfc>Static</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,13 +81,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)external\detours\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)external\detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)detours\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)detours\lib.X64;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(SolutionDir)external\detours\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)external\detours\lib.X64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>