diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index 8ec9d89e1..1468b706d 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -173,37 +173,37 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="include\randomizer\cosmetics.cpp" />
-    <ClCompile Include="include\randomizer\custom_messages.cpp" />
-    <ClCompile Include="include\randomizer\debug.cpp" />
-    <ClCompile Include="include\randomizer\dungeon.cpp" />
-    <ClCompile Include="include\randomizer\entrance.cpp" />
-    <ClCompile Include="include\randomizer\fill.cpp" />
-    <ClCompile Include="include\randomizer\hints.cpp" />
-    <ClCompile Include="include\randomizer\hint_list.cpp" />
-    <ClCompile Include="include\randomizer\item.cpp" />
-    <ClCompile Include="include\randomizer\item_list.cpp" />
-    <ClCompile Include="include\randomizer\item_location.cpp" />
-    <ClCompile Include="include\randomizer\item_pool.cpp" />
-    <ClCompile Include="include\randomizer\location_access.cpp" />
-    <ClCompile Include="include\randomizer\logic.cpp" />
-    <ClCompile Include="include\randomizer\menu.cpp" />
-    <ClCompile Include="include\randomizer\music.cpp" />
-    <ClCompile Include="include\randomizer\patch.cpp" />
-    <ClCompile Include="include\randomizer\playthrough.cpp" />
-    <ClCompile Include="include\randomizer\preset.cpp" />
-    <ClCompile Include="include\randomizer\random.cpp" />
-    <ClCompile Include="include\randomizer\rando_main.cpp" />
-    <ClCompile Include="include\randomizer\settings.cpp" />
-    <ClCompile Include="include\randomizer\setting_descriptions.cpp" />
-    <ClCompile Include="include\randomizer\shops.cpp" />
-    <ClCompile Include="include\randomizer\sound_effects.cpp" />
-    <ClCompile Include="include\randomizer\spoiler_log.cpp" />
-    <ClCompile Include="include\randomizer\starting_inventory.cpp" />
-    <ClCompile Include="include\randomizer\tinyxml2.cpp" />
-    <ClCompile Include="include\randomizer\trial.cpp" />
-    <ClCompile Include="include\randomizer\utils.cpp" />
-    <ClCompile Include="soh\Enhancements\randomizer.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\cosmetics.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\custom_messages.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\debug.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\dungeon.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\entrance.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\fill.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\hints.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\hint_list.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\item.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\item_list.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\item_location.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\item_pool.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\location_access.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\logic.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\menu.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\music.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\patch.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\playthrough.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\preset.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\random.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\rando_main.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\settings.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\setting_descriptions.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\shops.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\sound_effects.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\spoiler_log.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\starting_inventory.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\tinyxml2.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\trial.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\3drando\utils.cpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\randomizer.cpp" />
     <ClCompile Include="soh\frame_interpolation.cpp" />
     <ClCompile Include="soh\Enhancements\bootcommands.c" />
     <ClCompile Include="soh\Enhancements\debugconsole.cpp" />
@@ -910,42 +910,42 @@
     <ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="soh\Enhancements\randomizer.h" />
-    <ClInclude Include="include\randomizer\category.hpp" />
-    <ClInclude Include="include\randomizer\cosmetics.hpp" />
-    <ClInclude Include="include\randomizer\custom_messages.hpp" />
-    <ClInclude Include="include\randomizer\debug.hpp" />
-    <ClInclude Include="include\randomizer\dungeon.hpp" />
-    <ClInclude Include="include\randomizer\entrance.hpp" />
-    <ClInclude Include="include\randomizer\fill.hpp" />
-    <ClInclude Include="include\randomizer\hints.hpp" />
-    <ClInclude Include="include\randomizer\hint_list.hpp" />
-    <ClInclude Include="include\randomizer\item.hpp" />
-    <ClInclude Include="include\randomizer\item_list.hpp" />
-    <ClInclude Include="include\randomizer\item_location.hpp" />
-    <ClInclude Include="include\randomizer\item_pool.hpp" />
-    <ClInclude Include="include\randomizer\keys.hpp" />
-    <ClInclude Include="include\randomizer\location_access.hpp" />
-    <ClInclude Include="include\randomizer\logic.hpp" />
-    <ClInclude Include="include\randomizer\menu.hpp" />
-    <ClInclude Include="include\randomizer\music.hpp" />
-    <ClInclude Include="include\randomizer\patch.hpp" />
-    <ClInclude Include="include\randomizer\playthrough.hpp" />
-    <ClInclude Include="include\randomizer\pool_functions.hpp" />
-    <ClInclude Include="include\randomizer\preset.hpp" />
-    <ClInclude Include="include\randomizer\random.hpp" />
-    <ClInclude Include="include\randomizer\randomizer.hpp" />
-    <ClInclude Include="include\randomizer\rando_main.hpp" />
-    <ClInclude Include="include\randomizer\settings.hpp" />
-    <ClInclude Include="include\randomizer\setting_descriptions.hpp" />
-    <ClInclude Include="include\randomizer\shops.hpp" />
-    <ClInclude Include="include\randomizer\sound_effects.hpp" />
-    <ClInclude Include="include\randomizer\spoiler_log.hpp" />
-    <ClInclude Include="include\randomizer\starting_inventory.hpp" />
-    <ClInclude Include="include\randomizer\text.hpp" />
-    <ClInclude Include="include\randomizer\tinyxml2.h" />
-    <ClInclude Include="include\randomizer\trial.hpp" />
-    <ClInclude Include="include\randomizer\utils.hpp" />
+    <ClCompile Include="soh\Enhancements\randomizer\randomizer.h" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\category.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\cosmetics.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\custom_messages.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\debug.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\dungeon.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\entrance.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\fill.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\hints.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\hint_list.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\item.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\item_list.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\item_location.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\item_pool.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\keys.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\location_access.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\logic.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\menu.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\music.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\patch.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\playthrough.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\pool_functions.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\preset.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\random.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\randomizer.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\rando_main.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\settings.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\setting_descriptions.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\shops.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\sound_effects.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\spoiler_log.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\starting_inventory.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\text.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\tinyxml2.h" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\trial.hpp" />
+    <ClInclude Include="soh\Enhancements\randomizer\3drando\utils.hpp" />
     <ClInclude Include="randomizerTypes.h" />
     <ClInclude Include="soh\frame_interpolation.h" />
     <ClInclude Include="include\alloca.h" />