diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef00ae8f5a..1a64e93b3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ add_custom_target(
 
     # copy LUS default shaders into assets/custom
     COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
 
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root assets/xml --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
@@ -224,7 +224,7 @@ add_custom_target(
 
     # copy LUS default shaders into assets/custom
     COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
 
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
diff --git a/OTRExporter b/OTRExporter
index 33f20ca367..32e088e28c 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 33f20ca367dc036291df9cb9a9304c542deb66f9
+Subproject commit 32e088e28c8cdd055d4bb8f3f219d33ad37963f3
diff --git a/libultraship b/libultraship
index 1972d91f0b..2782e554d9 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 1972d91f0bf7338aa896d63d40210ef465a17ef6
+Subproject commit 2782e554d961be13db8d862c6ab48839b82f30ee
diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
index e6e2a3181e..711dd8cb2c 100644
--- a/soh/CMakeLists.txt
+++ b/soh/CMakeLists.txt
@@ -319,31 +319,7 @@ endif()
 target_include_directories(${PROJECT_NAME} PRIVATE assets
 	${CMAKE_CURRENT_SOURCE_DIR}/include/
 	${CMAKE_CURRENT_SOURCE_DIR}/src/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/include
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/log
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/debug
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/menu
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils/binarytools
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/type
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/factory
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/audio
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window/gui
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/libultra
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/bridge
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/tinyxml2
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/
-	${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/libjpeg/include/
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
     ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
 	${SDL2-INCLUDE}
     ${SDL2-NET-INCLUDE}
diff --git a/soh/Resource.rc b/soh/Resource.rc
index 7d9f356d02..59702663fa 100644
--- a/soh/Resource.rc
+++ b/soh/Resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include <ship/resource/Resource.h>
 #include "properties.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 8deb369534..75797401e0 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -10,7 +10,7 @@ extern "C"
 {
 #endif
 
-#include "luslog.h"
+#include <libultraship/log/luslog.h>
 #include <soh/Enhancements/item-tables/ItemTableTypes.h>
 
 #if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)
diff --git a/soh/include/macros.h b/soh/include/macros.h
index 325fb91b6a..acac5cd49d 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include <endianness.h>
+#include <ship/utils/binarytools/endianness.h>
 
 // Upstream TODO: Document reasoning for change
 // #ifndef __GNUC__
diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
index c562b820fc..cbd82fcf2b 100644
--- a/soh/include/z64audio.h
+++ b/soh/include/z64audio.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include <endianness.h>
+#include <ship/utils/binarytools/endianness.h>
 
 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
 
diff --git a/soh/soh/Enhancements/Presets/Presets.cpp b/soh/soh/Enhancements/Presets/Presets.cpp
index b8503cbc67..75ff9aabdd 100644
--- a/soh/soh/Enhancements/Presets/Presets.cpp
+++ b/soh/soh/Enhancements/Presets/Presets.cpp
@@ -2,11 +2,11 @@
 #include <variant>
 #include <string>
 #include <fstream>
-#include <config/Config.h>
+#include <ship/config/Config.h>
 #include <libultraship/classes.h>
 #include <nlohmann/json.hpp>
 #include <libultraship/libultraship.h>
-#include <Json.h>
+#include <ship/resource/type/Json.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/SohMenu.h"
diff --git a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
index 32157b5ce1..760c3c903f 100644
--- a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
+++ b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
@@ -1,4 +1,4 @@
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
diff --git a/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp b/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
index 0e6b1cbf38..33bf12c3c0 100644
--- a/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
+++ b/soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
@@ -1,4 +1,4 @@
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
index bd812c658a..c4cbc4bfec 100644
--- a/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
+++ b/soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
@@ -1,7 +1,7 @@
 #include "WeirdAnimation.h"
 
-#include "resource/ResourceManager.h"
-#include "Context.h"
+#include <ship/resource/ResourceManager.h>
+#include <ship/Context.h>
 
 #include <cassert>
 #include <cstring>
diff --git a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
index 8f5fc4f30d..78339a48b1 100644
--- a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
+++ b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
@@ -1,4 +1,4 @@
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index a30d3f0868..ab7a8d95ad 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -4,7 +4,7 @@
 #include "soh/cvar_prefixes.h"
 #include "soh/Notification/Notification.h"
 #include <vector>
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 #include <libultraship/bridge.h>
 #include <libultraship/classes.h>
 #include <soh/OTRGlobals.h>
diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp
index c64ed7b42b..5a7fb14144 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.cpp
+++ b/soh/soh/Enhancements/audio/AudioEditor.cpp
@@ -10,7 +10,7 @@
 #include "../randomizer/3drando/random.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
 #include "AudioCollection.h"
diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp
index 1fbab40c21..2f73fb057c 100644
--- a/soh/soh/Enhancements/controls/InputViewer.cpp
+++ b/soh/soh/Enhancements/controls/InputViewer.cpp
@@ -1,8 +1,9 @@
 #include "InputViewer.h"
 
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "libultraship/libultra/controller.h"
-#include "Context.h"
+#include <ship/Context.h>
+#include <libultraship/controller/controldeck/ControlDeck.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 #include <imgui.h>
diff --git a/soh/soh/Enhancements/controls/Mouse.cpp b/soh/soh/Enhancements/controls/Mouse.cpp
index 4ad9d11d0d..87af5168b2 100644
--- a/soh/soh/Enhancements/controls/Mouse.cpp
+++ b/soh/soh/Enhancements/controls/Mouse.cpp
@@ -2,7 +2,7 @@
 #include "soh/OTRGlobals.h"
 #include "z64player.h"
 #include "global.h"
-#include <Window.h>
+#include <ship/window/Window.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
index 95af88a74c..bdfe6c1c10 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
@@ -1,13 +1,13 @@
 #include "SohInputEditorWindow.h"
-#include <utils/StringHelper.h>
-#include "graphic/Fast3D/Fast3dWindow.h"
+#include <ship/utils/StringHelper.h>
+#include <fast/Fast3dWindow.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
 #include "z64.h"
 #include "soh/cvar_prefixes.h"
 #ifndef __WIIU__
-#include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h"
+#include <ship/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h>
 #endif
 
 #define SCALE_IMGUI_SIZE(value) ((value / 13.0f) * ImGui::GetFontSize())
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 7713b48b89..ff40f149a0 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1,5 +1,5 @@
 #include "debugconsole.h"
-#include <Utils.h>
+#include <ship/utils/Utils.h>
 #include "savestates.h"
 #include "soh/ActorDB.h"
 
@@ -15,10 +15,10 @@
 
 #define Path _Path
 #define PATH_HACK
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 
-#include <Window.h>
-#include <Context.h>
+#include <ship/window/Window.h>
+#include <ship/Context.h>
 #include <imgui.h>
 #include <imgui_internal.h>
 #undef PATH_HACK
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.h b/soh/soh/Enhancements/debugger/MessageViewer.h
index 9ce8eab05b..1d2c8fa830 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.h
+++ b/soh/soh/Enhancements/debugger/MessageViewer.h
@@ -3,7 +3,7 @@
 #include "z64.h"
 
 #ifdef __cplusplus
-#include "GuiWindow.h"
+#include <ship/window/gui/GuiWindow.h>
 #include <unordered_map>
 extern "C" {
 #endif
diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.h b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
index db039625b7..b84399ad63 100644
--- a/soh/soh/Enhancements/debugger/SohConsoleWindow.h
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
@@ -1,8 +1,8 @@
 #ifndef SOH_CONSOLE_H
 #define SOH_CONSOLE_H
 
-#include "window/gui/GuiWindow.h"
-#include "window/gui/ConsoleWindow.h"
+#include <ship/window/gui/GuiWindow.h>
+#include <ship/window/gui/ConsoleWindow.h>
 
 class SohConsoleWindow : public Ship::ConsoleWindow {
   public:
diff --git a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
index 789173b88c..7b9267693a 100644
--- a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
+++ b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
@@ -1,8 +1,8 @@
 #ifndef SOH_GFX_DEBUGGER_H
 #define SOH_GFX_DEBUGGER_H
 
-#include "window/gui/GuiWindow.h"
-#include "window/gui/GfxDebuggerWindow.h"
+#include <ship/window/gui/GuiWindow.h>
+#include <libultraship/window/gui/GfxDebuggerWindow.h>
 
 class SohGfxDebuggerWindow : public LUS::GfxDebuggerWindow {
   public:
diff --git a/soh/soh/Enhancements/debugger/dlViewer.cpp b/soh/soh/Enhancements/debugger/dlViewer.cpp
index a02aa7d95d..60a6e07c87 100644
--- a/soh/soh/Enhancements/debugger/dlViewer.cpp
+++ b/soh/soh/Enhancements/debugger/dlViewer.cpp
@@ -2,8 +2,9 @@
 #include "soh/util.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
-#include "ResourceManager.h"
-#include "DisplayList.h"
+#include <ship/resource/ResourceManager.h>
+#include <fast/resource/ResourceType.h>
+#include <fast/resource/type/DisplayList.h>
 #include "soh/OTRGlobals.h"
 
 #include <array>
diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp
index eef19b4952..2b95522633 100644
--- a/soh/soh/Enhancements/kaleido.cpp
+++ b/soh/soh/Enhancements/kaleido.cpp
@@ -16,7 +16,7 @@ extern PlayState* gPlayState;
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh_assets.h"
 #include "textures/icon_item_static/icon_item_static.h"
-#include "consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 
 #include <sstream>
diff --git a/soh/soh/Enhancements/mod_menu.cpp b/soh/soh/Enhancements/mod_menu.cpp
index 427f5b2b41..feb4123508 100644
--- a/soh/soh/Enhancements/mod_menu.cpp
+++ b/soh/soh/Enhancements/mod_menu.cpp
@@ -1,5 +1,5 @@
 #include "mod_menu.h"
-#include "utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include <libultraship/classes.h>
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/OTRGlobals.h"
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
index 51cfdd535f..28f8537b4e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -5,7 +5,7 @@
 #include "rando_main.hpp"
 #include "../context.h"
 #include <libultraship/bridge.h>
-#include <Context.h>
+#include <ship/Context.h>
 #include <libultraship/libultra/types.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 3c91a1f704..b3e71e8f0b 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -26,10 +26,10 @@
 #include <filesystem>
 #include <variables.h>
 
-#include <Context.h>
+#include <ship/Context.h>
 #include <soh/OTRGlobals.h>
 
-#include "consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 
 using json = nlohmann::ordered_json;
 using namespace Rando;
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index e347991561..83d326384b 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -5,7 +5,7 @@
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-#include <consolevariablebridge.h>
+#include <libultraship/bridge/consolevariablebridge.h>
 
 extern "C" {
 #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index a42f7af206..17a665624b 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -13,7 +13,7 @@
 #include "macros.h"
 #include "variables.h"
 #include <spdlog/spdlog.h>
-#include "StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "soh/resource/type/Scene.h"
 #include "soh/resource/type/scenecommand/SetTransitionActorList.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index f027fd0668..bfdecd861d 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,6 +1,6 @@
 #include "option.h"
 #include "libultraship/bridge.h"
-#include <Context.h>
+#include <ship/Context.h>
 #include <imgui.h>
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/UIWidgets.hpp"
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 345c27ab89..6d0047ec92 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -27,7 +27,7 @@
 #include <functional>
 #include "draw.h"
 #include "soh/OTRGlobals.h"
-#include "window/FileDropMgr.h"
+#include <ship/window/FileDropMgr.h>
 #include "soh/SohGui/UIWidgets.hpp"
 #include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index aab6710889..a907fdab46 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -20,6 +20,7 @@
 #include <vector>
 #include <set>
 #include <libultraship/libultraship.h>
+#include <libultraship/controller/controldeck/ControlDeck.h>
 #include "location.h"
 #include "item_location.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 9e5a9be89e..b3acc96d5d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -4,6 +4,7 @@
 #include <vector>
 
 #include <libultraship/libultraship.h>
+#include <libultraship/controller/controldeck/ControlDeck.h>
 
 #include "randomizer_check_tracker.h"
 #include "randomizer_item_tracker.h"
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 73ab7aa9e1..8efd6c1f9f 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -8,7 +8,7 @@
 
 #include <utility>
 
-#include "consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 
 namespace Rando {
 std::shared_ptr<Settings> Settings::mInstance;
diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
index e6515ed82b..3f06450f7d 100644
--- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp
+++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <filesystem>
 
-#include "Context.h"
+#include <ship/Context.h>
 #include "TimeSplits.h"
 #include "soh/Enhancements/gameplaystats.h"
 #include "soh/SaveManager.h"
diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp
index 1dc8a1ba67..612d4172c1 100644
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@@ -2,8 +2,8 @@
 #include "soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h"
 
 #include <cassert>
-#include <File.h>
-#include <Json.h>
+#include <ship/resource/File.h>
+#include <ship/resource/type/Json.h>
 #include <libultraship/classes.h>
 #include <nlohmann/json.hpp>
 #include <spdlog/fmt/fmt.h>
diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp
index a12be6264b..fecf9b7415 100644
--- a/soh/soh/Extractor/Extract.cpp
+++ b/soh/soh/Extractor/Extract.cpp
@@ -6,7 +6,7 @@
 #endif
 #include "Extract.h"
 #include "portable-file-dialogs.h"
-#include <utils/binarytools/BitConverter.h>
+#include <ship/utils/binarytools/BitConverter.h>
 #include "variables.h"
 
 #ifdef unix
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index a0ffdc1d1c..3358d85855 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -7,10 +7,10 @@
 #include <chrono>
 
 #include "ResourceManagerHelpers.h"
-#include "graphic/Fast3D/Fast3dWindow.h"
-#include <File.h>
-#include <DisplayList.h>
-#include <Window.h>
+#include <fast/Fast3dWindow.h>
+#include <ship/resource/File.h>
+#include <fast/resource/type/DisplayList.h>
+#include <ship/window/Window.h>
 #include <soh/GameVersions.h>
 
 #include "Enhancements/gameconsole.h"
@@ -19,7 +19,7 @@
 #else
 #include <time.h>
 #endif
-#include <AudioPlayer.h>
+#include <ship/audio/AudioPlayer.h>
 #include "Enhancements/speechsynthesizer/SpeechSynthesizer.h"
 #include "Enhancements/controls/SohInputEditorWindow.h"
 #include "Enhancements/cosmetics/CosmeticsEditor.h"
@@ -40,10 +40,10 @@
 #include "variables.h"
 #include "z64.h"
 #include "macros.h"
-#include "Fonts.h"
-#include "window/FileDropMgr.h"
-#include "window/gui/resource/Font.h"
-#include <utils/StringHelper.h>
+#include <ship/window/gui/Fonts.h>
+#include <ship/window/FileDropMgr.h>
+#include <ship/window/gui/resource/Font.h>
+#include <ship/utils/StringHelper.h>
 #include "Enhancements/custom-message/CustomMessageManager.h"
 #include "Enhancements/Presets/Presets.h"
 #include "util.h"
@@ -52,7 +52,7 @@
 #include "Extractor/Extract.h"
 #endif
 
-#include <Fast3D/interpreter.h>
+#include <fast/interpreter.h>
 
 #ifdef __APPLE__
 #include <SDL_scancode.h>
@@ -86,14 +86,16 @@ Sail* Sail::Instance;
 #include "Enhancements/game-interactor/GameInteractor.h"
 #include "Enhancements/randomizer/draw.h"
 #include <libultraship/libultraship.h>
+#include <libultraship/controller/controldeck/ControlDeck.h>
+#include <fast/resource/ResourceType.h>
 
 // Resource Types/Factories
-#include "resource/type/Array.h"
-#include "resource/type/Blob.h"
-#include "resource/type/DisplayList.h"
-#include "resource/type/Matrix.h"
-#include "resource/type/Texture.h"
-#include "resource/type/Vertex.h"
+#include "soh/resource/type/Array.h"
+#include <ship/resource/type/Blob.h>
+#include <fast/resource/type/DisplayList.h>
+#include <fast/resource/type/Matrix.h>
+#include <fast/resource/type/Texture.h>
+#include <fast/resource/type/Vertex.h>
 #include "soh/resource/type/SohResourceType.h"
 #include "soh/resource/type/Animation.h"
 #include "soh/resource/type/AudioSample.h"
@@ -107,11 +109,11 @@ Sail* Sail::Instance;
 #include "soh/resource/type/Skeleton.h"
 #include "soh/resource/type/SkeletonLimb.h"
 #include "soh/resource/type/Text.h"
-#include "resource/factory/BlobFactory.h"
-#include "resource/factory/DisplayListFactory.h"
-#include "resource/factory/MatrixFactory.h"
-#include "resource/factory/TextureFactory.h"
-#include "resource/factory/VertexFactory.h"
+#include <ship/resource/factory/BlobFactory.h>
+#include <fast/resource/factory/DisplayListFactory.h>
+#include <fast/resource/factory/MatrixFactory.h>
+#include <fast/resource/factory/TextureFactory.h>
+#include <fast/resource/factory/VertexFactory.h>
 #include "soh/resource/importer/ArrayFactory.h"
 #include "soh/resource/importer/AnimationFactory.h"
 #include "soh/resource/importer/AudioSampleFactory.h"
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 032686f8eb..b653e9edfd 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -21,7 +21,7 @@
 #define M_SQRT1_2f 0.70710678118654752440f /* 1/sqrt(2) */
 
 #ifdef __cplusplus
-#include <Context.h>
+#include <ship/Context.h>
 #include "Enhancements/savestates.h"
 #include "Enhancements/randomizer/randomizer.h"
 #include <vector>
diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp
index a9ec6fc253..127378da77 100644
--- a/soh/soh/ResourceManagerHelpers.cpp
+++ b/soh/soh/ResourceManagerHelpers.cpp
@@ -11,8 +11,9 @@
 #include "resource/type/Array.h"
 #include "resource/type/Skeleton.h"
 #include "resource/type/PlayerAnimation.h"
-#include <Fast3D/Fast3dWindow.h>
-#include <DisplayList.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/resource/ResourceType.h>
+#include <fast/resource/type/DisplayList.h>
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/ResourceManagerHelpers.h b/soh/soh/ResourceManagerHelpers.h
index b760feae3f..8562a3e0e3 100644
--- a/soh/soh/ResourceManagerHelpers.h
+++ b/soh/soh/ResourceManagerHelpers.h
@@ -10,7 +10,7 @@
 
 #ifdef __cplusplus
 #include <memory>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 std::shared_ptr<Ship::IResource> ResourceMgr_GetResourceByNameHandlingMQ(const char* path);
 
diff --git a/soh/soh/SohGui/ImGuiUtils.cpp b/soh/soh/SohGui/ImGuiUtils.cpp
index ab3d8f59c5..c80293a53c 100644
--- a/soh/soh/SohGui/ImGuiUtils.cpp
+++ b/soh/soh/SohGui/ImGuiUtils.cpp
@@ -1,6 +1,6 @@
 #include "ImGuiUtils.h"
-#include <Context.h>
-#include <Window.h>
+#include <ship/Context.h>
+#include <ship/window/Window.h>
 #include "assets/soh_assets.h"
 #include "soh/Enhancements/randomizer/rando_hash.h"
 
diff --git a/soh/soh/SohGui/Menu.cpp b/soh/soh/SohGui/Menu.cpp
index aa83c314b7..592c0c5e67 100644
--- a/soh/soh/SohGui/Menu.cpp
+++ b/soh/soh/SohGui/Menu.cpp
@@ -2,8 +2,8 @@
 #include "UIWidgets.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/controls/SohInputEditorWindow.h"
-#include "window/gui/GuiMenuBar.h"
-#include "window/gui/GuiElement.h"
+#include <ship/window/gui/GuiMenuBar.h>
+#include <ship/window/gui/GuiElement.h>
 #include "SohModals.h"
 #include <variant>
 #include <spdlog/fmt/fmt.h>
diff --git a/soh/soh/SohGui/Menu.h b/soh/soh/SohGui/Menu.h
index 1af541b8d4..a39d485107 100644
--- a/soh/soh/SohGui/Menu.h
+++ b/soh/soh/SohGui/Menu.h
@@ -2,7 +2,7 @@
 #define MENU_H
 
 #include <libultraship/libultraship.h>
-#include "graphic/Fast3D/backends/gfx_rendering_api.h"
+#include <fast/backends/gfx_rendering_api.h>
 #include "MenuTypes.h"
 
 namespace Ship {
diff --git a/soh/soh/SohGui/ResolutionEditor.cpp b/soh/soh/SohGui/ResolutionEditor.cpp
index e568287b2f..232458d9aa 100644
--- a/soh/soh/SohGui/ResolutionEditor.cpp
+++ b/soh/soh/SohGui/ResolutionEditor.cpp
@@ -3,8 +3,8 @@
 #include <libultraship/libultraship.h>
 
 #include "soh/SohGui/UIWidgets.hpp"
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp
index cf9182a62b..23befb2f33 100644
--- a/soh/soh/SohGui/SohGui.cpp
+++ b/soh/soh/SohGui/SohGui.cpp
@@ -13,7 +13,7 @@
 #include <libultraship/libultraship.h>
 
 #ifdef __APPLE__
-#include "graphic/Fast3D/backends/gfx_metal.h"
+#include <fast/backends/gfx_metal.h>
 #endif
 
 #ifdef __SWITCH__
diff --git a/soh/soh/SohGui/SohMenu.cpp b/soh/soh/SohGui/SohMenu.cpp
index 5470253919..78616be7e6 100644
--- a/soh/soh/SohGui/SohMenu.cpp
+++ b/soh/soh/SohGui/SohMenu.cpp
@@ -1,10 +1,10 @@
 #include "SohMenu.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/controls/SohInputEditorWindow.h"
-#include "window/gui/GuiMenuBar.h"
-#include "window/gui/GuiElement.h"
+#include <ship/window/gui/GuiMenuBar.h>
+#include <ship/window/gui/GuiElement.h>
 #include <variant>
-#include "StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include <spdlog/fmt/fmt.h>
 #include <tuple>
 
diff --git a/soh/soh/SohGui/SohMenu.h b/soh/soh/SohGui/SohMenu.h
index ec5f7705c2..d6833f28b8 100644
--- a/soh/soh/SohGui/SohMenu.h
+++ b/soh/soh/SohGui/SohMenu.h
@@ -4,7 +4,7 @@
 #include <libultraship/libultraship.h>
 #include "UIWidgets.hpp"
 #include "Menu.h"
-#include "graphic/Fast3D/backends/gfx_rendering_api.h"
+#include <fast/backends/gfx_rendering_api.h>
 #include "soh/cvar_prefixes.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/Presets/Presets.h"
diff --git a/soh/soh/SohGui/SohMenuBar.cpp b/soh/soh/SohGui/SohMenuBar.cpp
index 418d02eb58..debfc9cf5a 100644
--- a/soh/soh/SohGui/SohMenuBar.cpp
+++ b/soh/soh/SohGui/SohMenuBar.cpp
@@ -1,11 +1,11 @@
 #include "SohMenuBar.h"
 #include <imgui.h>
 #include "regex"
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include <libultraship/libultraship.h>
 #include "UIWidgets.hpp"
 #include "include/z64audio.h"
-#include "graphic/Fast3D/backends/gfx_rendering_api.h"
+#include <fast/backends/gfx_rendering_api.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
 #include "z64.h"
diff --git a/soh/soh/SohGui/SohMenuBar.h b/soh/soh/SohGui/SohMenuBar.h
index 8c078e08f3..56d0c1c6a8 100644
--- a/soh/soh/SohGui/SohMenuBar.h
+++ b/soh/soh/SohGui/SohMenuBar.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <libultraship/libultraship.h>
-#include "window/gui/GuiMenuBar.h"
-#include "window/gui/GuiElement.h"
+#include <ship/window/gui/GuiMenuBar.h>
+#include <ship/window/gui/GuiElement.h>
 
 namespace SohGui {
 class SohMenuBar : public Ship::GuiMenuBar {
diff --git a/soh/soh/SohGui/SohModals.h b/soh/soh/SohGui/SohModals.h
index f74f0b1bfb..68a9b85106 100644
--- a/soh/soh/SohGui/SohModals.h
+++ b/soh/soh/SohGui/SohModals.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <libultraship/libultraship.h>
-#include "window/gui/GuiMenuBar.h"
-#include "window/gui/GuiElement.h"
+#include <ship/window/gui/GuiMenuBar.h>
+#include <ship/window/gui/GuiElement.h>
 
 class SohModalWindow final : public Ship::GuiWindow {
   public:
diff --git a/soh/soh/resource/importer/AnimationFactory.cpp b/soh/soh/resource/importer/AnimationFactory.cpp
index d6adfb66c0..99507e4f3a 100644
--- a/soh/soh/resource/importer/AnimationFactory.cpp
+++ b/soh/soh/resource/importer/AnimationFactory.cpp
@@ -1,8 +1,8 @@
 #include "soh/resource/importer/AnimationFactory.h"
 #include "soh/resource/type/Animation.h"
-#include "ResourceManager.h"
+#include <ship/resource/ResourceManager.h>
 #include "spdlog/spdlog.h"
-#include "Context.h"
+#include <ship/Context.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/AnimationFactory.h b/soh/soh/resource/importer/AnimationFactory.h
index 2312d7ad37..a28d7512cb 100644
--- a/soh/soh/resource/importer/AnimationFactory.h
+++ b/soh/soh/resource/importer/AnimationFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SOH {
 class ResourceFactoryBinaryAnimationV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/ArrayFactory.cpp b/soh/soh/resource/importer/ArrayFactory.cpp
index 0762704ffd..0e1b2ac044 100644
--- a/soh/soh/resource/importer/ArrayFactory.cpp
+++ b/soh/soh/resource/importer/ArrayFactory.cpp
@@ -1,7 +1,7 @@
 #include "soh/resource/importer/ArrayFactory.h"
 #include "soh/resource/type/Array.h"
 #include "spdlog/spdlog.h"
-#include "graphic/Fast3D/lus_gbi.h"
+#include <fast/lus_gbi.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/ArrayFactory.h b/soh/soh/resource/importer/ArrayFactory.h
index a64b7a8213..aae282754e 100644
--- a/soh/soh/resource/importer/ArrayFactory.h
+++ b/soh/soh/resource/importer/ArrayFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "resource/Resource.h"
-#include "resource/ResourceFactoryBinary.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SOH {
 class ResourceFactoryBinaryArrayV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/AudioSampleFactory.cpp b/soh/soh/resource/importer/AudioSampleFactory.cpp
index 9fd8d746a0..098efd2363 100644
--- a/soh/soh/resource/importer/AudioSampleFactory.cpp
+++ b/soh/soh/resource/importer/AudioSampleFactory.cpp
@@ -4,9 +4,9 @@
 #include "spdlog/spdlog.h"
 #include "z64.h"
 #include "z64audio.h"
-#include "Context.h"
-#include "resource/archive/Archive.h"
-#include "resource/ResourceManager.h"
+#include <ship/Context.h>
+#include <ship/resource/archive/Archive.h>
+#include <ship/resource/ResourceManager.h>
 #define DR_WAV_IMPLEMENTATION
 #include <dr_wav.h>
 
diff --git a/soh/soh/resource/importer/AudioSampleFactory.h b/soh/soh/resource/importer/AudioSampleFactory.h
index b750da4f1c..e48d21be28 100644
--- a/soh/soh/resource/importer/AudioSampleFactory.h
+++ b/soh/soh/resource/importer/AudioSampleFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinaryAudioSampleV2 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/AudioSequenceFactory.cpp b/soh/soh/resource/importer/AudioSequenceFactory.cpp
index 850c27c16c..313284f6a0 100644
--- a/soh/soh/resource/importer/AudioSequenceFactory.cpp
+++ b/soh/soh/resource/importer/AudioSequenceFactory.cpp
@@ -2,12 +2,12 @@
 #include "soh/resource/importer/AudioSoundFontFactory.h"
 #include "soh/resource/type/AudioSequence.h"
 #include "spdlog/spdlog.h"
-#include "resource/ResourceManager.h"
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
 
-#include "Context.h"
-#include "resource/archive/Archive.h"
-#include "BinaryWriter.h"
+#include <ship/Context.h>
+#include <ship/resource/archive/Archive.h>
+#include <ship/utils/binarytools/BinaryWriter.h>
 #include <type_traits>
 
 namespace SOH {
diff --git a/soh/soh/resource/importer/AudioSequenceFactory.h b/soh/soh/resource/importer/AudioSequenceFactory.h
index 4ae249ec35..897b49c50a 100644
--- a/soh/soh/resource/importer/AudioSequenceFactory.h
+++ b/soh/soh/resource/importer/AudioSequenceFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinaryAudioSequenceV2 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/AudioSoundFontFactory.cpp b/soh/soh/resource/importer/AudioSoundFontFactory.cpp
index 1150b2b69a..f71f31d145 100644
--- a/soh/soh/resource/importer/AudioSoundFontFactory.cpp
+++ b/soh/soh/resource/importer/AudioSoundFontFactory.cpp
@@ -3,9 +3,9 @@
 #include <tinyxml2.h>
 #include <z64.h>
 #include "z64audio.h"
-#include "Context.h"
-#include "resource/archive/Archive.h"
-#include "resource/ResourceManager.h"
+#include <ship/Context.h>
+#include <ship/resource/archive/Archive.h>
+#include <ship/resource/ResourceManager.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/AudioSoundFontFactory.h b/soh/soh/resource/importer/AudioSoundFontFactory.h
index 0a56769cd1..30d3e620f8 100644
--- a/soh/soh/resource/importer/AudioSoundFontFactory.h
+++ b/soh/soh/resource/importer/AudioSoundFontFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 #include "soh/resource/type/AudioSoundFont.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/importer/BackgroundFactory.h b/soh/soh/resource/importer/BackgroundFactory.h
index e9a47a9529..645174c697 100644
--- a/soh/soh/resource/importer/BackgroundFactory.h
+++ b/soh/soh/resource/importer/BackgroundFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "resource/Resource.h"
-#include "resource/ResourceFactoryBinary.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SOH {
 class ResourceFactoryBinaryBackgroundV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.h b/soh/soh/resource/importer/CollisionHeaderFactory.h
index 4db21d3513..45076f1a6d 100644
--- a/soh/soh/resource/importer/CollisionHeaderFactory.h
+++ b/soh/soh/resource/importer/CollisionHeaderFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinaryCollisionHeaderV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/CutsceneFactory.h b/soh/soh/resource/importer/CutsceneFactory.h
index 95a6f379ea..be44c46865 100644
--- a/soh/soh/resource/importer/CutsceneFactory.h
+++ b/soh/soh/resource/importer/CutsceneFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SOH {
 class ResourceFactoryBinaryCutsceneV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/PathFactory.h b/soh/soh/resource/importer/PathFactory.h
index f94a201c59..9c83f51832 100644
--- a/soh/soh/resource/importer/PathFactory.h
+++ b/soh/soh/resource/importer/PathFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinaryPathV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/PlayerAnimationFactory.h b/soh/soh/resource/importer/PlayerAnimationFactory.h
index 7761c63b66..09cbb33580 100644
--- a/soh/soh/resource/importer/PlayerAnimationFactory.h
+++ b/soh/soh/resource/importer/PlayerAnimationFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
 
 namespace SOH {
 class ResourceFactoryBinaryPlayerAnimationV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/SceneFactory.h b/soh/soh/resource/importer/SceneFactory.h
index a22291d51b..11de07520d 100644
--- a/soh/soh/resource/importer/SceneFactory.h
+++ b/soh/soh/resource/importer/SceneFactory.h
@@ -3,9 +3,9 @@
 #include "soh/resource/type/Scene.h"
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinarySceneV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/SkeletonFactory.h b/soh/soh/resource/importer/SkeletonFactory.h
index b7c90443fc..209e2380d5 100644
--- a/soh/soh/resource/importer/SkeletonFactory.h
+++ b/soh/soh/resource/importer/SkeletonFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinarySkeletonV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.h b/soh/soh/resource/importer/SkeletonLimbFactory.h
index bcf1fd4d5a..3f1b76b1ca 100644
--- a/soh/soh/resource/importer/SkeletonLimbFactory.h
+++ b/soh/soh/resource/importer/SkeletonLimbFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinarySkeletonLimbV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/TextFactory.h b/soh/soh/resource/importer/TextFactory.h
index b67f07cbbc..5025496002 100644
--- a/soh/soh/resource/importer/TextFactory.h
+++ b/soh/soh/resource/importer/TextFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "ResourceFactoryXML.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactoryBinary.h>
+#include <ship/resource/ResourceFactoryXML.h>
 
 namespace SOH {
 class ResourceFactoryBinaryTextV0 final : public Ship::ResourceFactoryBinary {
diff --git a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
index b1cd67ae6e..6a038fa839 100644
--- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <memory>
-#include "Resource.h"
-#include "ResourceFactory.h"
+#include <ship/resource/Resource.h>
+#include <ship/resource/ResourceFactory.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
-#include "public/bridge/consolevariablebridge.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 
 namespace SOH {
 class SceneCommandFactoryBinaryV0 {
diff --git a/soh/soh/resource/logging/PathLogger.h b/soh/soh/resource/logging/PathLogger.h
index f239d5747d..23f4f0d30f 100644
--- a/soh/soh/resource/logging/PathLogger.h
+++ b/soh/soh/resource/logging/PathLogger.h
@@ -1,4 +1,4 @@
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/resource/logging/SceneCommandLoggers.h b/soh/soh/resource/logging/SceneCommandLoggers.h
index b006b9c0a0..64dc1d9952 100644
--- a/soh/soh/resource/logging/SceneCommandLoggers.h
+++ b/soh/soh/resource/logging/SceneCommandLoggers.h
@@ -1,4 +1,4 @@
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/resource/type/Animation.h b/soh/soh/resource/type/Animation.h
index e4ca4295f4..9603e54773 100644
--- a/soh/soh/resource/type/Animation.h
+++ b/soh/soh/resource/type/Animation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/Array.cpp b/soh/soh/resource/type/Array.cpp
index a4bbc0e5ee..8a02faad74 100644
--- a/soh/soh/resource/type/Array.cpp
+++ b/soh/soh/resource/type/Array.cpp
@@ -1,5 +1,5 @@
 #include "Array.h"
-#include "graphic/Fast3D/lus_gbi.h"
+#include <fast/lus_gbi.h>
 namespace SOH {
 Array::Array() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
 }
diff --git a/soh/soh/resource/type/Array.h b/soh/soh/resource/type/Array.h
index c7d15a22a9..23d0b7e53e 100644
--- a/soh/soh/resource/type/Array.h
+++ b/soh/soh/resource/type/Array.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include <ship/resource/Resource.h>
 
 namespace Fast {
 union F3DVtx;
diff --git a/soh/soh/resource/type/AudioSample.h b/soh/soh/resource/type/AudioSample.h
index 84e623781e..eb29bc5bce 100644
--- a/soh/soh/resource/type/AudioSample.h
+++ b/soh/soh/resource/type/AudioSample.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/AudioSequence.h b/soh/soh/resource/type/AudioSequence.h
index b76645deef..90d5dd15e0 100644
--- a/soh/soh/resource/type/AudioSequence.h
+++ b/soh/soh/resource/type/AudioSequence.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 
 namespace SOH {
 
diff --git a/soh/soh/resource/type/AudioSoundFont.h b/soh/soh/resource/type/AudioSoundFont.h
index e387ede5f5..0e07c03083 100644
--- a/soh/soh/resource/type/AudioSoundFont.h
+++ b/soh/soh/resource/type/AudioSoundFont.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "soh/resource/type/AudioSample.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/Background.h b/soh/soh/resource/type/Background.h
index 728e0207e3..bd14e15095 100644
--- a/soh/soh/resource/type/Background.h
+++ b/soh/soh/resource/type/Background.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include <ship/resource/Resource.h>
 
 namespace SOH {
 class Background : public Ship::Resource<uint8_t> {
diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h
index 151437442d..d6cd3c6fd8 100644
--- a/soh/soh/resource/type/CollisionHeader.h
+++ b/soh/soh/resource/type/CollisionHeader.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra.h>
 #include "z64math.h"
 
diff --git a/soh/soh/resource/type/Cutscene.h b/soh/soh/resource/type/Cutscene.h
index e1f786ea53..59475d1cf9 100644
--- a/soh/soh/resource/type/Cutscene.h
+++ b/soh/soh/resource/type/Cutscene.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 
 namespace SOH {
 
diff --git a/soh/soh/resource/type/Path.h b/soh/soh/resource/type/Path.h
index baef6519c9..42fc2946fb 100644
--- a/soh/soh/resource/type/Path.h
+++ b/soh/soh/resource/type/Path.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 #include "z64math.h"
 
diff --git a/soh/soh/resource/type/PlayerAnimation.h b/soh/soh/resource/type/PlayerAnimation.h
index db8e8ccf95..66cac19e04 100644
--- a/soh/soh/resource/type/PlayerAnimation.h
+++ b/soh/soh/resource/type/PlayerAnimation.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 
 namespace SOH {
 class PlayerAnimation : public Ship::Resource<int16_t> {
diff --git a/soh/soh/resource/type/Scene.h b/soh/soh/resource/type/Scene.h
index 73fcd57a90..371890e764 100644
--- a/soh/soh/resource/type/Scene.h
+++ b/soh/soh/resource/type/Scene.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "scenecommand/SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp
index 027da1790f..f2541dd063 100644
--- a/soh/soh/resource/type/Skeleton.cpp
+++ b/soh/soh/resource/type/Skeleton.cpp
@@ -1,4 +1,4 @@
-#include "resource/ResourceManager.h"
+#include <ship/resource/ResourceManager.h>
 #include "Skeleton.h"
 #include "soh/OTRGlobals.h"
 #include "libultraship/libultraship.h"
diff --git a/soh/soh/resource/type/Skeleton.h b/soh/soh/resource/type/Skeleton.h
index 4d5dc01196..c3fd6f1812 100644
--- a/soh/soh/resource/type/Skeleton.h
+++ b/soh/soh/resource/type/Skeleton.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SkeletonLimb.h"
 #include <z64animation.h>
 
diff --git a/soh/soh/resource/type/SkeletonLimb.h b/soh/soh/resource/type/SkeletonLimb.h
index 5ee73b99a2..84acd77415 100644
--- a/soh/soh/resource/type/SkeletonLimb.h
+++ b/soh/soh/resource/type/SkeletonLimb.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "libultraship/libultra.h"
 #include "z64math.h"
 
diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h
index 5352037162..ff921e7317 100644
--- a/soh/soh/resource/type/Text.h
+++ b/soh/soh/resource/type/Text.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include <vector>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h
index 37b06911d0..5d3a0f7dfb 100644
--- a/soh/soh/resource/type/scenecommand/EndMarker.h
+++ b/soh/soh/resource/type/scenecommand/EndMarker.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SceneCommand.h b/soh/soh/resource/type/scenecommand/SceneCommand.h
index 99234b24a9..1e71599dc1 100644
--- a/soh/soh/resource/type/scenecommand/SceneCommand.h
+++ b/soh/soh/resource/type/scenecommand/SceneCommand.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/scenecommand/SetActorList.h b/soh/soh/resource/type/scenecommand/SetActorList.h
index d4ee3a9025..b444aadd0b 100644
--- a/soh/soh/resource/type/scenecommand/SetActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetActorList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
index 11dabd31f3..38817d1a6c 100644
--- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
+++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "soh/resource/type/Scene.h"
 #include "RomFile.h"
diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
index ad674d3062..0cc03cfd56 100644
--- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
index b246732428..283a8bc0a2 100644
--- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
+++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/type/CollisionHeader.h"
 // #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h
index fbd51e06ca..42db077544 100644
--- a/soh/soh/resource/type/scenecommand/SetCsCamera.h
+++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.h b/soh/soh/resource/type/scenecommand/SetCutscenes.h
index 5ad28d4ae1..0988b2027b 100644
--- a/soh/soh/resource/type/scenecommand/SetCutscenes.h
+++ b/soh/soh/resource/type/scenecommand/SetCutscenes.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/type/Cutscene.h"
 // #include <libultraship/libultra.h>
diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
index 2d17a879e0..dfa0538a48 100644
--- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h
index e41050c87f..08fcf9fca0 100644
--- a/soh/soh/resource/type/scenecommand/SetEntranceList.h
+++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetExitList.h b/soh/soh/resource/type/scenecommand/SetExitList.h
index 56026075fd..d9598c3cd6 100644
--- a/soh/soh/resource/type/scenecommand/SetExitList.h
+++ b/soh/soh/resource/type/scenecommand/SetExitList.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h
index d79a73aecf..3a95a4f8fd 100644
--- a/soh/soh/resource/type/scenecommand/SetLightList.h
+++ b/soh/soh/resource/type/scenecommand/SetLightList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.h b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
index cb20895175..ca9282225e 100644
--- a/soh/soh/resource/type/scenecommand/SetLightingSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h
index d96661c438..1ab86530a9 100644
--- a/soh/soh/resource/type/scenecommand/SetMesh.h
+++ b/soh/soh/resource/type/scenecommand/SetMesh.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "libultraship/libultra.h"
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h
index 74081763ad..5650f6d947 100644
--- a/soh/soh/resource/type/scenecommand/SetObjectList.h
+++ b/soh/soh/resource/type/scenecommand/SetObjectList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetPathways.h b/soh/soh/resource/type/scenecommand/SetPathways.h
index 377b5923de..ec20113670 100644
--- a/soh/soh/resource/type/scenecommand/SetPathways.h
+++ b/soh/soh/resource/type/scenecommand/SetPathways.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 // #include <libultraship/libultra/types.h>
 #include "soh/resource/type/Path.h"
diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
index db59fa76b2..8a1c2b832a 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h
index b60a75dbe8..6fe6d33ff3 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomList.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "RomFile.h"
 #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
index 7ed86ddc5b..189e4ab3d7 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
index d3d7b5a4c1..cf3bbfbad0 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
index 57e3beaae6..ba180d8232 100644
--- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
index 51a57c5996..1e9e44e9f0 100644
--- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
+++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.h b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
index f2b097b0c7..2b1ddce893 100644
--- a/soh/soh/resource/type/scenecommand/SetStartPositionList.h
+++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "soh/resource/type/scenecommand/SetActorList.h"
 // #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.h b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
index ca95841e77..c5b63283ba 100644
--- a/soh/soh/resource/type/scenecommand/SetTimeSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
index e740f128ad..0b7149fa64 100644
--- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h
index 755ad0d0da..87e0a3039a 100644
--- a/soh/soh/resource/type/scenecommand/SetWindSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <vector>
 #include <memory>
-#include "Resource.h"
+#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index ea849af059..4035419480 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -1,7 +1,7 @@
 #include "OTRGlobals.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 #include "global.h"
 #include "vt.h"
 #include "soh/resource/type/Text.h"
diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp
index 5055b969b8..8864351b4b 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -2,11 +2,11 @@
 #include "ResourceManagerHelpers.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "global.h"
 #include "vt.h"
-#include <Vertex.h>
+#include <fast/resource/type/Vertex.h>
 
 extern "C" void Play_InitScene(PlayState* play, s32 spawn);
 extern "C" void Play_InitEnvironment(PlayState* play, s16 skyboxId);
diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp
index 1baf6151d8..d49367024f 100644
--- a/soh/soh/z_scene_otr.cpp
+++ b/soh/soh/z_scene_otr.cpp
@@ -2,15 +2,15 @@
 #include "ResourceManagerHelpers.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
-#include <utils/StringHelper.h>
+#include <ship/utils/StringHelper.h>
 #include "global.h"
 #include "vt.h"
 #include "soh/resource/type/CollisionHeader.h"
-#include <DisplayList.h>
+#include <fast/resource/type/DisplayList.h>
 #include "soh/resource/type/Cutscene.h"
 #include "soh/resource/type/Path.h"
 #include "soh/resource/type/Text.h"
-#include <Blob.h>
+#include <ship/resource/type/Blob.h>
 #include <memory>
 #include <cassert>
 #include "soh/resource/type/scenecommand/SetCameraSettings.h"
diff --git a/soh/src/code/sys_ucode.c b/soh/src/code/sys_ucode.c
index 39bbe35315..678c58c367 100644
--- a/soh/src/code/sys_ucode.c
+++ b/soh/src/code/sys_ucode.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "public/bridge/gfxbridge.h"
+#include <libultraship/bridge/gfxbridge.h>
 
 UcodeHandlers sDefaultGSPUCodeText = ucode_f3dex2;
 // u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index 493752555e..172111b505 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "public/bridge/gfxbridge.h"
+#include <libultraship/bridge/gfxbridge.h>
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
index 3e79eb6ad0..5b5665dab8 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
@@ -8,7 +8,7 @@
 #include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
 #include "textures/icon_item_nes_static/icon_item_nes_static.h"
 
-#include "public/bridge/gfxbridge.h"
+#include <libultraship/bridge/gfxbridge.h>
 
 void KaleidoScope_DrawDungeonMap(PlayState* play, GraphicsContext* gfxCtx) {
     static void* dungeonItemTexs[] = {