diff --git a/CMakeLists.txt b/CMakeLists.txt
index 878a5cbe4..f3f2e660a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,34 +389,8 @@ endif()
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/src
-  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include
   ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship
-  ${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/libultraship/Lib/spdlog/include/
-  ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/U64/PR
-  ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic
   ${SDL2_INCLUDE_DIRS}
   ${GLEW_INCLUDE_DIRS}
   ${dr_libs_SOURCE_DIR}
diff --git a/libultraship b/libultraship
index d1bbd53e8..3ef24c3d1 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit d1bbd53e8a1d2a4d6cfcce588ed13aa8d0686909
+Subproject commit 3ef24c3d1645fe1fc2a7065d1c2e132973ebc151
diff --git a/src/engine/editor/Editor.cpp b/src/engine/editor/Editor.cpp
index 2fada8a29..911cc9a8c 100644
--- a/src/engine/editor/Editor.cpp
+++ b/src/engine/editor/Editor.cpp
@@ -9,8 +9,8 @@
 #include "Light.h"
 
 #include "port/Engine.h"
-#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
-#include <window/Window.h>
+#include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
+#include <ship/window/Window.h>
 
 #include "engine/actors/Ship.h"
 #include "port/Game.h"
diff --git a/src/engine/editor/EditorMath.cpp b/src/engine/editor/EditorMath.cpp
index dc93de4c2..93d826ace 100644
--- a/src/engine/editor/EditorMath.cpp
+++ b/src/engine/editor/EditorMath.cpp
@@ -10,8 +10,8 @@
 #include <limits>
 #include <cmath>
 
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 
 extern "C" {
 #include "common_structs.h"
diff --git a/src/engine/editor/EditorMath.h b/src/engine/editor/EditorMath.h
index d5d75fe13..7f1aef2c0 100644
--- a/src/engine/editor/EditorMath.h
+++ b/src/engine/editor/EditorMath.h
@@ -6,8 +6,8 @@
 #include "../CoreMath.h"
 #include <vector>
 #include "GameObject.h"
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 
 extern "C" {
 #include "common_structs.h"
diff --git a/src/engine/editor/Gizmo.cpp b/src/engine/editor/Gizmo.cpp
index 9c518b53b..6cb4c74a8 100644
--- a/src/engine/editor/Gizmo.cpp
+++ b/src/engine/editor/Gizmo.cpp
@@ -8,8 +8,8 @@
 #include "Gizmo.h"
 #include "Collision.h"
 #include "port/Engine.h"
-#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
-#include <window/Window.h>
+#include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
+#include <ship/window/Window.h>
 #include "engine/Matrix.h"
 #include "engine/Actor.h"
 #include "engine/objects/Object.h"
diff --git a/src/engine/editor/Light.cpp b/src/engine/editor/Light.cpp
index abd9ee85e..6aa332d6e 100644
--- a/src/engine/editor/Light.cpp
+++ b/src/engine/editor/Light.cpp
@@ -8,8 +8,8 @@
 
 #include "Light.h"
 #include "port/Engine.h"
-#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
-#include <window/Window.h>
+#include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
+#include <ship/window/Window.h>
 
 #include "engine/actors/Ship.h"
 #include "port/Game.h"
diff --git a/src/engine/editor/ObjectPicker.cpp b/src/engine/editor/ObjectPicker.cpp
index a59cd507a..0d88db35c 100644
--- a/src/engine/editor/ObjectPicker.cpp
+++ b/src/engine/editor/ObjectPicker.cpp
@@ -8,8 +8,8 @@
 
 #include "ObjectPicker.h"
 #include "port/Engine.h"
-#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
-#include <window/Window.h>
+#include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
+#include <ship/window/Window.h>
 
 #include "engine/actors/Ship.h"
 #include "port/Game.h"
diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp
index 1c4edb407..0165f5c81 100644
--- a/src/engine/editor/SceneManager.cpp
+++ b/src/engine/editor/SceneManager.cpp
@@ -10,9 +10,9 @@
 #include <optional> // Must be before json.hpp
 #include <nlohmann/json.hpp>
 #include "port/Engine.h"
-#include <libultraship/src/resource/type/Json.h>
+#include <ship/resource/type/Json.h>
 #include "port/resource/type/Minimap.h"
-#include <libultraship/src/resource/File.h>
+#include <ship/resource/File.h>
 #include "port/resource/type/ResourceType.h"
 
 #include "engine/vehicles/Train.h"
diff --git a/src/engine/mods/ModManager.cpp b/src/engine/mods/ModManager.cpp
index 0d66b8e09..91fdbc0e9 100644
--- a/src/engine/mods/ModManager.cpp
+++ b/src/engine/mods/ModManager.cpp
@@ -1,7 +1,7 @@
-#include "archive/Archive.h"
+#include "ship/resource/archive/Archive.h"
 #include "ModMetadata.h"
-#include "libultraship/src/resource/archive/FolderArchive.h"
-#include "libultraship/src/resource/archive/O2rArchive.h"
+#include "ship/resource/archive/FolderArchive.h"
+#include "ship/resource/archive/O2rArchive.h"
 #include "port/Engine.h"
 #include "semver.hpp"
 #include "utils/StringHelper.h"
diff --git a/src/engine/tracks/SherbetLand.cpp b/src/engine/tracks/SherbetLand.cpp
index 3c893069e..8f2781027 100644
--- a/src/engine/tracks/SherbetLand.cpp
+++ b/src/engine/tracks/SherbetLand.cpp
@@ -10,7 +10,7 @@
 #include "assets/models/tracks/sherbet_land/sherbet_land_data.h"
 #include "assets/other/tracks/sherbet_land/sherbet_land_data.h"
 #include "engine/objects/Penguin.h"
-#include "resourcebridge.h"
+#include "libultraship/bridge/resourcebridge.h"
 
 extern "C" {
     #include "main.h"
diff --git a/src/engine/tracks/Track.cpp b/src/engine/tracks/Track.cpp
index ddcbcd9ff..978b1ca99 100644
--- a/src/engine/tracks/Track.cpp
+++ b/src/engine/tracks/Track.cpp
@@ -10,7 +10,7 @@
 #include "port/resource/type/TrackPathPointData.h"
 #include "engine/editor/SceneManager.h"
 #include "Registry.h"
-#include "resourcebridge.h"
+#include "libultraship/bridge/resourcebridge.h"
 #include "align_asset_macro.h"
 
 extern "C" {
diff --git a/src/enhancements/freecam/freecam.cpp b/src/enhancements/freecam/freecam.cpp
index 2f49cf83a..dadecc1c7 100644
--- a/src/enhancements/freecam/freecam.cpp
+++ b/src/enhancements/freecam/freecam.cpp
@@ -1,9 +1,9 @@
 #include <libultraship.h>
-#include <window/Window.h>
+#include <ship/window/Window.h>
 #include "port/Engine.h"
 #include "port/Game.h"
-#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
-#include <window/Window.h>
+#include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
+#include <ship/window/Window.h>
 #include "port/interpolation/FrameInterpolation.h"
 #include "engine/Matrix.h"
 
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index ff476592e..9729d9a5b 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -1,12 +1,13 @@
 #include "Engine.h"
 
-#include "StringHelper.h"
+#include "ship/utils/StringHelper.h"
 #include "GameExtractor.h"
 #include "mods/ModManager.h"
 #include "ui/ImguiUI.h"
-#include "libultraship/src/Context.h"
-#include "libultraship/src/controller/controldevice/controller/mapping/ControllerDefaultMappings.h"
+#include "ship/Context.h"
+#include "ship/controller/controldevice/controller/mapping/ControllerDefaultMappings.h"
 #include "resource/type/ResourceType.h"
+#include "fast/resource/ResourceType.h"
 #include "resource/importers/GenericArrayFactory.h"
 #include "resource/importers/AudioBankFactory.h"
 #include "resource/importers/AudioSampleFactory.h"
@@ -22,14 +23,15 @@
 #include "resource/importers/ArrayFactory.h"
 #include "resource/importers/MinimapFactory.h"
 #include "resource/importers/BetterTextureFactory.h"
-#include <Fonts.h>
-#include "window/gui/resource/Font.h"
-#include "window/gui/resource/FontFactory.h"
+#include <ship/window/gui/Fonts.h>
+#include "ship/window/gui/resource/Font.h"
+#include "ship/window/gui/resource/FontFactory.h"
+#include "libultraship/controller/controldeck/ControlDeck.h"
 #include "SpaghettiGui.h"
 
 #include "port/interpolation/FrameInterpolation.h"
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 // #include <Fast3D/gfx_rendering_api.h>
 #include <SDL2/SDL.h>
 
@@ -43,12 +45,12 @@ extern "C" {
 bool prevAltAssets = false;
 float gInterpolationStep = 0.0f;
 #include <macros.h>
-#include <DisplayListFactory.h>
-#include <TextureFactory.h>
-#include <MatrixFactory.h>
-#include <BlobFactory.h>
-#include <VertexFactory.h>
-#include <LightFactory.h>
+#include <fast/resource/factory/DisplayListFactory.h>
+#include <fast/resource/factory/TextureFactory.h>
+#include <fast/resource/factory/MatrixFactory.h>
+#include <ship/resource/factory/BlobFactory.h>
+#include <fast/resource/factory/VertexFactory.h>
+#include <fast/resource/factory/LightFactory.h>
 // #include <PngFactory.h>
 #include "audio/internal.h"
 #include "audio/GameAudio.h"
@@ -93,7 +95,7 @@ GameEngine::GameEngine() {
     this->context->InitConsoleVariables(); // without this line the controldeck constructor failes in
                                            // ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig()
 
-        auto defaultMappings = std::make_shared<Ship::ControllerDefaultMappings>(
+    auto defaultMappings = std::make_shared<Ship::ControllerDefaultMappings>(
         // KeyboardKeyToButtonMappings
         std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<Ship::KbScancode>>{
             { BTN_A, { Ship::KbScancode::LUS_KB_SHIFT} },
@@ -146,7 +148,24 @@ GameEngine::GameEngine() {
         // SDLAxisDirectionToAxisDirectionMappings - use built-in LUS defaults
         std::unordered_map<Ship::StickIndex, std::vector<std::pair<Ship::Direction, std::pair<SDL_GameControllerAxis, int32_t>>>>()
     );
-    auto controlDeck = std::make_shared<LUS::ControlDeck>(std::vector<CONTROLLERBUTTONS_T>(), defaultMappings);
+
+    auto buttonNames = std::unordered_map<CONTROLLERBUTTONS_T, std::string>({
+                      { BTN_A, "A" },
+                      { BTN_B, "B" },
+                      { BTN_L, "L" },
+                      { BTN_R, "R" },
+                      { BTN_Z, "Z" },
+                      { BTN_START, "Start" },
+                      { BTN_CLEFT, "CLeft" },
+                      { BTN_CRIGHT, "CRight" },
+                      { BTN_CUP, "CUp" },
+                      { BTN_CDOWN, "CDown" },
+                      { BTN_DLEFT, "DLeft" },
+                      { BTN_DRIGHT, "DRight" },
+                      { BTN_DUP, "DUp" },
+                      { BTN_DDOWN, "DDown" },
+                  });
+    auto controlDeck = std::make_shared<LUS::ControlDeck>(std::vector<CONTROLLERBUTTONS_T>(), defaultMappings, buttonNames);
 
     this->context->InitResourceManager({}, {}, 3); // without this line InitWindow fails in Gui::Init()
     this->context->InitConsole(); // without this line the GuiWindow constructor fails in ConsoleWindow::InitElement()
diff --git a/src/port/Engine.h b/src/port/Engine.h
index 088be41fe..16efa2fda 100644
--- a/src/port/Engine.h
+++ b/src/port/Engine.h
@@ -10,9 +10,9 @@
   #ifdef __cplusplus
   #include <vector>
   #include <SDL2/SDL.h>
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
-#include "libultraship/src/Context.h"
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
+#include "ship/Context.h"
 
 #ifndef IDYES
 #define IDYES 6
diff --git a/src/port/GBIMiddleware.cpp b/src/port/GBIMiddleware.cpp
index 26ab8d08c..4f0a3b8a3 100644
--- a/src/port/GBIMiddleware.cpp
+++ b/src/port/GBIMiddleware.cpp
@@ -1,7 +1,8 @@
 #include <libultraship.h>
 
 #include "Engine.h"
-#include "DisplayList.h"
+#include "fast/resource/type/DisplayList.h"
+#include "fast/resource/ResourceType.h"
 #include "resource/type/ResourceType.h"
 #include "resource/type/Array.h"
 extern "C" {
diff --git a/src/port/Game.cpp b/src/port/Game.cpp
index 1a822712b..f860d4555 100644
--- a/src/port/Game.cpp
+++ b/src/port/Game.cpp
@@ -3,7 +3,7 @@
 #include "Game.h"
 #include "port/Engine.h"
 
-#include <graphic/Fast3D/Fast3dWindow.h>
+#include <fast/Fast3dWindow.h>
 #include "engine/World.h"
 #include "engine/tracks/Track.h"
 #include "engine/tracks/MarioRaceway.h"
diff --git a/src/port/GameExtractor.cpp b/src/port/GameExtractor.cpp
index c40a443cf..4e8b4dfae 100644
--- a/src/port/GameExtractor.cpp
+++ b/src/port/GameExtractor.cpp
@@ -7,12 +7,11 @@
 #include "GameExtractor.h"
 #include <cstdio>
 #include <unordered_map>
-#include <Companion.h>
 
 #include <fstream>
 
 #include "Companion.h"
-#include "Context.h"
+#include "ship/Context.h"
 #include "spdlog/spdlog.h"
 #include <port/Engine.h>
 
diff --git a/src/port/SpaghettiGui.cpp b/src/port/SpaghettiGui.cpp
index 6c703456d..d9c957d3f 100644
--- a/src/port/SpaghettiGui.cpp
+++ b/src/port/SpaghettiGui.cpp
@@ -1,18 +1,18 @@
 #include <libultraship.h>
 #include "SpaghettiGui.h"
-#include <libultraship/src/window/gui/Gui.h>
-#include <libultraship/src/window/Window.h>
+#include <ship/window/gui/Gui.h>
+#include <ship/window/Window.h>
 #ifdef __SWITCH__
 #include "ConfigVersion.h"
 #else
-#include "Config.h"
+#include "ship/config/Config.h"
 #endif
 
 #ifdef __APPLE__
 #include <SDL_hints.h>
 #include <SDL_video.h>
 
-#include "graphic/Fast3D/backends/gfx_metal.h"
+#include "fast/backends/gfx_metal.h"
 #include <imgui_impl_metal.h>
 #include <imgui_impl_sdl2.h>
 #else
@@ -31,7 +31,7 @@
 #endif
 
 #if defined(ENABLE_DX11) || defined(ENABLE_DX12)
-#include <graphic/Fast3D/backends/gfx_direct3d11.h>
+#include <fast/backends/gfx_direct3d11.h>
 #include <imgui_impl_dx11.h>
 #include <imgui_impl_win32.h>
 
diff --git a/src/port/SpaghettiGui.h b/src/port/SpaghettiGui.h
index aa9988784..a4381ea1c 100644
--- a/src/port/SpaghettiGui.h
+++ b/src/port/SpaghettiGui.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <libultraship.h>
-#include "libultraship/src/window/gui/Gui.h"
-#include "libultraship/src/window/Window.h"
+#include "ship/window/gui/Gui.h"
+#include "ship/window/Window.h"
 
 class Gui; // <-- forward declare
 //class Window;
diff --git a/src/port/Variables.cpp b/src/port/Variables.cpp
index 9609f1b45..34e94e940 100644
--- a/src/port/Variables.cpp
+++ b/src/port/Variables.cpp
@@ -1,5 +1,5 @@
 #include <libultraship.h>
-#include <graphic/Fast3D/Fast3dWindow.h>
+#include <fast/Fast3dWindow.h>
 
 extern "C" {
 
diff --git a/src/port/resource/importers/ActorSpawnDataFactory.h b/src/port/resource/importers/ActorSpawnDataFactory.h
index 1c05c3ef2..a16f133c4 100644
--- a/src/port/resource/importers/ActorSpawnDataFactory.h
+++ b/src/port/resource/importers/ActorSpawnDataFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryActorSpawnDataV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/ArrayFactory.cpp b/src/port/resource/importers/ArrayFactory.cpp
index dfec6bc86..960790f6d 100644
--- a/src/port/resource/importers/ArrayFactory.cpp
+++ b/src/port/resource/importers/ArrayFactory.cpp
@@ -1,7 +1,7 @@
 #include "ArrayFactory.h"
 #include "../type/Array.h"
 #include "spdlog/spdlog.h"
-#include "graphic/Fast3D/lus_gbi.h"
+#include "fast/lus_gbi.h"
 
 namespace MK64 {
 std::shared_ptr<Ship::IResource>
diff --git a/src/port/resource/importers/ArrayFactory.h b/src/port/resource/importers/ArrayFactory.h
index 5b1fff4cb..8b8cc74f8 100644
--- a/src/port/resource/importers/ArrayFactory.h
+++ b/src/port/resource/importers/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 MK64 {
 class ResourceFactoryBinaryArrayV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/AudioBankFactory.cpp b/src/port/resource/importers/AudioBankFactory.cpp
index 650767881..9fa669d94 100644
--- a/src/port/resource/importers/AudioBankFactory.cpp
+++ b/src/port/resource/importers/AudioBankFactory.cpp
@@ -1,7 +1,7 @@
 #include "AudioBankFactory.h"
 #include "../type/AudioBank.h"
 #include "spdlog/spdlog.h"
-#include "resourcebridge.h"
+#include "libultraship/bridge/resourcebridge.h"
 #include "ResourceUtil.h"
 
 std::shared_ptr<Ship::IResource>
diff --git a/src/port/resource/importers/AudioBankFactory.h b/src/port/resource/importers/AudioBankFactory.h
index 49796dace..693555f92 100644
--- a/src/port/resource/importers/AudioBankFactory.h
+++ b/src/port/resource/importers/AudioBankFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace SM64 {
 class AudioBankFactoryV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/AudioSampleFactory.h b/src/port/resource/importers/AudioSampleFactory.h
index 5c46449bf..3ae3da001 100644
--- a/src/port/resource/importers/AudioSampleFactory.h
+++ b/src/port/resource/importers/AudioSampleFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace SM64 {
 class AudioSampleFactoryV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/AudioSequenceFactory.h b/src/port/resource/importers/AudioSequenceFactory.h
index b65c33a80..7ac8100b8 100644
--- a/src/port/resource/importers/AudioSequenceFactory.h
+++ b/src/port/resource/importers/AudioSequenceFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 #include "../type/AudioSequence.h"
 
 namespace SM64 {
diff --git a/src/port/resource/importers/BetterTextureFactory.cpp b/src/port/resource/importers/BetterTextureFactory.cpp
index 40fe92eef..3d323b6e6 100644
--- a/src/port/resource/importers/BetterTextureFactory.cpp
+++ b/src/port/resource/importers/BetterTextureFactory.cpp
@@ -1,10 +1,10 @@
 #include "BetterTextureFactory.h"
-#include "resource/type/Texture.h"
+#include "fast/resource/type/Texture.h"
 #include "spdlog/spdlog.h"
 #include <stb_image.h>
-#include <Context.h>
-#include "resource/archive/ArchiveManager.h"
-#include "resource/ResourceManager.h"
+#include <ship/Context.h>
+#include "ship/resource/archive/ArchiveManager.h"
+#include "ship/resource/ResourceManager.h"
 
 namespace MK64 {
 
diff --git a/src/port/resource/importers/BetterTextureFactory.h b/src/port/resource/importers/BetterTextureFactory.h
index 68e7e2d20..a65a0029b 100644
--- a/src/port/resource/importers/BetterTextureFactory.h
+++ b/src/port/resource/importers/BetterTextureFactory.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 MK64 {
 class ResourceFactoryBinaryTextureV0 final : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/CPUFactory.h b/src/port/resource/importers/CPUFactory.h
index c4c29d421..4cee21393 100644
--- a/src/port/resource/importers/CPUFactory.h
+++ b/src/port/resource/importers/CPUFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryCPUV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/CourseVtxFactory.h b/src/port/resource/importers/CourseVtxFactory.h
index e26088ef2..0ed467742 100644
--- a/src/port/resource/importers/CourseVtxFactory.h
+++ b/src/port/resource/importers/CourseVtxFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryCourseVtxV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/GenericArrayFactory.h b/src/port/resource/importers/GenericArrayFactory.h
index 9f21d44e6..4a9b90ebe 100644
--- a/src/port/resource/importers/GenericArrayFactory.h
+++ b/src/port/resource/importers/GenericArrayFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace SF64 {
 class ResourceFactoryBinaryGenericArrayV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/MinimapFactory.h b/src/port/resource/importers/MinimapFactory.h
index 04346176d..74f821d0b 100644
--- a/src/port/resource/importers/MinimapFactory.h
+++ b/src/port/resource/importers/MinimapFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "resource/Resource.h"
-#include "resource/ResourceFactoryBinary.h"
-#include "resource/ResourceFactoryXML.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
+#include "ship/resource/ResourceFactoryXML.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryMinimapV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/ResourceUtil.h b/src/port/resource/importers/ResourceUtil.h
index 55ab0624a..d27512e52 100644
--- a/src/port/resource/importers/ResourceUtil.h
+++ b/src/port/resource/importers/ResourceUtil.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "resourcebridge.h"
-#include "libultraship/src/resource/ResourceManager.h"
-#include "Context.h"
+#include "libultraship/bridge/resourcebridge.h"
+#include "ship/resource/ResourceManager.h"
+#include "ship/Context.h"
 
 namespace SM64 {
 template <typename T> T LoadChild(uint64_t crc) {
diff --git a/src/port/resource/importers/TrackPathPointFactory.h b/src/port/resource/importers/TrackPathPointFactory.h
index 57de8f418..47cbe49b1 100644
--- a/src/port/resource/importers/TrackPathPointFactory.h
+++ b/src/port/resource/importers/TrackPathPointFactory.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 MK64 {
 class ResourceFactoryBinaryTrackPathPointsV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/TrackSectionsFactory.cpp b/src/port/resource/importers/TrackSectionsFactory.cpp
index b6cf8fe9f..9cee94725 100644
--- a/src/port/resource/importers/TrackSectionsFactory.cpp
+++ b/src/port/resource/importers/TrackSectionsFactory.cpp
@@ -2,7 +2,7 @@
 #include "../type/TrackSections.h"
 #include "spdlog/spdlog.h"
 #include "libultraship/libultra/gbi.h"
-#include "StrHash64.h"
+#include "ship/utils/StrHash64.h"
 #include "tinyxml2.h"
 #include "src/engine/tracks/Track.h"
 
diff --git a/src/port/resource/importers/TrackSectionsFactory.h b/src/port/resource/importers/TrackSectionsFactory.h
index 0f1891043..c8728fe8e 100644
--- a/src/port/resource/importers/TrackSectionsFactory.h
+++ b/src/port/resource/importers/TrackSectionsFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "resource/ResourceFactoryXML.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
+#include "ship/resource/ResourceFactoryXML.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryTrackSectionsV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/UnkActorSpawnDataFactory.h b/src/port/resource/importers/UnkActorSpawnDataFactory.h
index 991fa54bf..20afe4a64 100644
--- a/src/port/resource/importers/UnkActorSpawnDataFactory.h
+++ b/src/port/resource/importers/UnkActorSpawnDataFactory.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
-#include "File.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
+#include "ship/resource/File.h"
 
 namespace MK64 {
 class ResourceFactoryBinaryUnkActorSpawnDataV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/Vec3fFactory.h b/src/port/resource/importers/Vec3fFactory.h
index c1ed3749d..bb24cb62a 100644
--- a/src/port/resource/importers/Vec3fFactory.h
+++ b/src/port/resource/importers/Vec3fFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace SF64 {
 class ResourceFactoryBinaryVec3fV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/importers/Vec3sFactory.h b/src/port/resource/importers/Vec3sFactory.h
index 5a05ec3ea..3065b97d2 100644
--- a/src/port/resource/importers/Vec3sFactory.h
+++ b/src/port/resource/importers/Vec3sFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Resource.h"
-#include "ResourceFactoryBinary.h"
+#include "ship/resource/Resource.h"
+#include "ship/resource/ResourceFactoryBinary.h"
 
 namespace SF64 {
 class ResourceFactoryBinaryVec3sV0 : public Ship::ResourceFactoryBinary {
diff --git a/src/port/resource/type/Animation.h b/src/port/resource/type/Animation.h
index e35d01ea6..235ec0891 100644
--- a/src/port/resource/type/Animation.h
+++ b/src/port/resource/type/Animation.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/resource/type/Array.cpp b/src/port/resource/type/Array.cpp
index 81839e8ae..19ffac9fc 100644
--- a/src/port/resource/type/Array.cpp
+++ b/src/port/resource/type/Array.cpp
@@ -1,5 +1,5 @@
 #include "Array.h"
-#include "graphic/Fast3D/lus_gbi.h"
+#include "fast/lus_gbi.h"
 namespace MK64 {
 Array::Array() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
 }
diff --git a/src/port/resource/type/Array.h b/src/port/resource/type/Array.h
index 2dbb7a8ed..5b8b61695 100644
--- a/src/port/resource/type/Array.h
+++ b/src/port/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/src/port/resource/type/AudioBank.h b/src/port/resource/type/AudioBank.h
index b9beefa78..778e2fc40 100644
--- a/src/port/resource/type/AudioBank.h
+++ b/src/port/resource/type/AudioBank.h
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 #include "AudioSample.h"
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 
 struct AudioBankSound {
     AudioBankSample *sample;
diff --git a/src/port/resource/type/AudioSample.h b/src/port/resource/type/AudioSample.h
index 2d6f46c96..6f758dacf 100644
--- a/src/port/resource/type/AudioSample.h
+++ b/src/port/resource/type/AudioSample.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 
 struct AdpcmLoop {
     uint32_t start;
diff --git a/src/port/resource/type/AudioSequence.h b/src/port/resource/type/AudioSequence.h
index 44ab130eb..a8ead7943 100644
--- a/src/port/resource/type/AudioSequence.h
+++ b/src/port/resource/type/AudioSequence.h
@@ -12,7 +12,7 @@ struct AudioSequenceData {
 };
 
 #ifdef __cplusplus
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 namespace SM64 {
 
 class AudioSequence : public Ship::Resource<AudioSequenceData> {
diff --git a/src/port/resource/type/CPU.h b/src/port/resource/type/CPU.h
index 1c064d5f9..47e95390e 100644
--- a/src/port/resource/type/CPU.h
+++ b/src/port/resource/type/CPU.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 
 struct CPUBehaviour {
diff --git a/src/port/resource/type/ColPoly.h b/src/port/resource/type/ColPoly.h
index 1491ae45f..78b780f73 100644
--- a/src/port/resource/type/ColPoly.h
+++ b/src/port/resource/type/ColPoly.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/resource/type/CourseVtx.h b/src/port/resource/type/CourseVtx.h
index df13d2f51..7882ee659 100644
--- a/src/port/resource/type/CourseVtx.h
+++ b/src/port/resource/type/CourseVtx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <libultra/gbi.h>
 
diff --git a/src/port/resource/type/EnvSettings.h b/src/port/resource/type/EnvSettings.h
index d67902ba9..227bb2156 100644
--- a/src/port/resource/type/EnvSettings.h
+++ b/src/port/resource/type/EnvSettings.h
@@ -3,7 +3,7 @@
 #include "Limb.h"
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 
diff --git a/src/port/resource/type/GenericArray.h b/src/port/resource/type/GenericArray.h
index 289fe730e..7db8cfe37 100644
--- a/src/port/resource/type/GenericArray.h
+++ b/src/port/resource/type/GenericArray.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/resource/type/Hitbox.h b/src/port/resource/type/Hitbox.h
index 2cf2d0516..7a319862c 100644
--- a/src/port/resource/type/Hitbox.h
+++ b/src/port/resource/type/Hitbox.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 class Hitbox : public Ship::Resource<float> {
diff --git a/src/port/resource/type/Limb.h b/src/port/resource/type/Limb.h
index bcccd7e65..60f236c6a 100644
--- a/src/port/resource/type/Limb.h
+++ b/src/port/resource/type/Limb.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 
diff --git a/src/port/resource/type/Message.h b/src/port/resource/type/Message.h
index 5e5a50f61..572898dcf 100644
--- a/src/port/resource/type/Message.h
+++ b/src/port/resource/type/Message.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/resource/type/Minimap.h b/src/port/resource/type/Minimap.h
index ea88d3d2f..eaa163dd0 100644
--- a/src/port/resource/type/Minimap.h
+++ b/src/port/resource/type/Minimap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <cstdint>
 
diff --git a/src/port/resource/type/ObjectInit.h b/src/port/resource/type/ObjectInit.h
index 16c32554c..9ae85af21 100644
--- a/src/port/resource/type/ObjectInit.h
+++ b/src/port/resource/type/ObjectInit.h
@@ -3,7 +3,7 @@
 #include "Limb.h"
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 
diff --git a/src/port/resource/type/Script.h b/src/port/resource/type/Script.h
index ac5d3ade2..fbe72a007 100644
--- a/src/port/resource/type/Script.h
+++ b/src/port/resource/type/Script.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 class Script : public Ship::Resource<uint16_t*> {
diff --git a/src/port/resource/type/Skeleton.h b/src/port/resource/type/Skeleton.h
index 991154974..07b4e8be6 100644
--- a/src/port/resource/type/Skeleton.h
+++ b/src/port/resource/type/Skeleton.h
@@ -2,7 +2,7 @@
 
 #include "Limb.h"
 
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 
 namespace SF64 {
 class Skeleton : public Ship::Resource<LimbData*> {
diff --git a/src/port/resource/type/SpawnData.h b/src/port/resource/type/SpawnData.h
index 21a672c95..2483d3f4e 100644
--- a/src/port/resource/type/SpawnData.h
+++ b/src/port/resource/type/SpawnData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <libultra/gbi.h>
 #include <common_structs.h>
diff --git a/src/port/resource/type/TrackPathPointData.h b/src/port/resource/type/TrackPathPointData.h
index 9ffe564c5..b5ed56351 100644
--- a/src/port/resource/type/TrackPathPointData.h
+++ b/src/port/resource/type/TrackPathPointData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <libultra/gbi.h>
 #include <waypoints.h>
diff --git a/src/port/resource/type/TrackSections.h b/src/port/resource/type/TrackSections.h
index d8da4a292..abd457e10 100644
--- a/src/port/resource/type/TrackSections.h
+++ b/src/port/resource/type/TrackSections.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <libultra/gbi.h>
 #include "src/engine/tracks/Track.h"
diff --git a/src/port/resource/type/UnkSpawnData.h b/src/port/resource/type/UnkSpawnData.h
index 6d4539d9a..1a69a7b0a 100644
--- a/src/port/resource/type/UnkSpawnData.h
+++ b/src/port/resource/type/UnkSpawnData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "resource/Resource.h"
+#include "ship/resource/Resource.h"
 #include <vector>
 #include <libultra/gbi.h>
 #include <common_structs.h>
diff --git a/src/port/resource/type/Vec3fArray.h b/src/port/resource/type/Vec3fArray.h
index 1900418f3..89c6eedd2 100644
--- a/src/port/resource/type/Vec3fArray.h
+++ b/src/port/resource/type/Vec3fArray.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/resource/type/Vec3sArray.h b/src/port/resource/type/Vec3sArray.h
index d4ff2c7e9..06c86ea0d 100644
--- a/src/port/resource/type/Vec3sArray.h
+++ b/src/port/resource/type/Vec3sArray.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <Resource.h>
+#include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
 namespace SF64 {
diff --git a/src/port/ui/ContentBrowser.cpp b/src/port/ui/ContentBrowser.cpp
index 7ae4e333d..74158c675 100644
--- a/src/port/ui/ContentBrowser.cpp
+++ b/src/port/ui/ContentBrowser.cpp
@@ -1,7 +1,7 @@
 #include "ContentBrowser.h"
 #include "port/ui/PortMenu.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 #include "port/Engine.h"
 #include "SpawnParams.h"
 
diff --git a/src/port/ui/FreecamWindow.cpp b/src/port/ui/FreecamWindow.cpp
index 1e9ff1a7e..f7202f65a 100644
--- a/src/port/ui/FreecamWindow.cpp
+++ b/src/port/ui/FreecamWindow.cpp
@@ -2,7 +2,7 @@
 #include "port/ui/PortMenu.h"
 #include "port/Game.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 
 #include <imgui.h>
 #include <map>
diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp
index 02aaaed70..ddfde0781 100644
--- a/src/port/ui/ImguiUI.cpp
+++ b/src/port/ui/ImguiUI.cpp
@@ -11,11 +11,11 @@
 #include <spdlog/spdlog.h>
 #include <imgui.h>
 #define IMGUI_DEFINE_MATH_OPERATORS
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 
 #include <imgui_internal.h>
 #include <libultraship/libultraship.h>
-#include <graphic/Fast3D/Fast3dWindow.h>
+#include <fast/Fast3dWindow.h>
 #include "port/Engine.h"
 #include "PortMenu.h"
 
diff --git a/src/port/ui/Menu.cpp b/src/port/ui/Menu.cpp
index 44471b431..8a4f26104 100644
--- a/src/port/ui/Menu.cpp
+++ b/src/port/ui/Menu.cpp
@@ -1,8 +1,8 @@
 #include "Menu.h"
 #include "UIWidgets.h"
 #include "port/Engine.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 <spdlog/fmt/fmt.h>
 #include <variant>
diff --git a/src/port/ui/PortMenu.cpp b/src/port/ui/PortMenu.cpp
index 9ac89dc2f..c4bb89dc8 100644
--- a/src/port/ui/PortMenu.cpp
+++ b/src/port/ui/PortMenu.cpp
@@ -1,10 +1,10 @@
 #include "PortMenu.h"
 #include "UIWidgets.h"
 #include "port/Game.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 <variant>
 #include <tuple>
diff --git a/src/port/ui/PortMenu.h b/src/port/ui/PortMenu.h
index a5540776f..e6f0a1d04 100644
--- a/src/port/ui/PortMenu.h
+++ b/src/port/ui/PortMenu.h
@@ -4,7 +4,7 @@
 #include <libultraship/libultraship.h>
 #include "UIWidgets.h"
 #include "Menu.h"
-#include "Fast3D/backends/gfx_rendering_api.h"
+#include "fast/backends/gfx_rendering_api.h"
 
 
 namespace GameUI {
diff --git a/src/port/ui/Properties.cpp b/src/port/ui/Properties.cpp
index f74f093fc..216efa2c1 100644
--- a/src/port/ui/Properties.cpp
+++ b/src/port/ui/Properties.cpp
@@ -1,7 +1,7 @@
 #include "Properties.h"
 #include "port/ui/PortMenu.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 #include <variant>
 
 #include <imgui.h>
diff --git a/src/port/ui/ResolutionEditor.cpp b/src/port/ui/ResolutionEditor.cpp
index d3d894c58..57fa558ee 100644
--- a/src/port/ui/ResolutionEditor.cpp
+++ b/src/port/ui/ResolutionEditor.cpp
@@ -3,8 +3,8 @@
 #include <libultraship/libultraship.h>
 
 #include "UIWidgets.h"
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 #include "port/Engine.h"
 #include "PortMenu.h"
 
diff --git a/src/port/ui/ResolutionEditor.h b/src/port/ui/ResolutionEditor.h
index 6a1cff80b..c0a9af96c 100644
--- a/src/port/ui/ResolutionEditor.h
+++ b/src/port/ui/ResolutionEditor.h
@@ -2,8 +2,8 @@
 #define RESOLUTIONEDITOR_H
 
 #include <libultraship/libultraship.h>
-#include <graphic/Fast3D/Fast3dWindow.h>
-#include <graphic/Fast3D/interpreter.h>
+#include <fast/Fast3dWindow.h>
+#include <fast/interpreter.h>
 
 namespace GameUI {
 bool IsDroppingFrames();
diff --git a/src/port/ui/SceneExplorer.cpp b/src/port/ui/SceneExplorer.cpp
index ef2809871..1d322cbb3 100644
--- a/src/port/ui/SceneExplorer.cpp
+++ b/src/port/ui/SceneExplorer.cpp
@@ -1,7 +1,7 @@
 #include "SceneExplorer.h"
 #include "port/ui/PortMenu.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 
 #include <imgui.h>
 #include <map>
diff --git a/src/port/ui/Tools.cpp b/src/port/ui/Tools.cpp
index 56a744009..5852c4358 100644
--- a/src/port/ui/Tools.cpp
+++ b/src/port/ui/Tools.cpp
@@ -1,7 +1,7 @@
 #include "Tools.h"
 #include "port/ui/PortMenu.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 
 #include <imgui.h>
 #include <map>
diff --git a/src/port/ui/TrackProperties.cpp b/src/port/ui/TrackProperties.cpp
index 02536fe5e..8f0813191 100644
--- a/src/port/ui/TrackProperties.cpp
+++ b/src/port/ui/TrackProperties.cpp
@@ -1,7 +1,7 @@
 #include "TrackProperties.h"
 #include "port/ui/PortMenu.h"
 #include "UIWidgets.h"
-#include "libultraship/src/Context.h"
+#include "ship/Context.h"
 
 #include <imgui.h>
 #include <map>
diff --git a/src/racing/collision.c b/src/racing/collision.c
index 09f8d8ab2..505f600f6 100644
--- a/src/racing/collision.c
+++ b/src/racing/collision.c
@@ -13,7 +13,7 @@
 #include <defines.h>
 #include "port/Engine.h"
 #include "port/Game.h"
-#include "resourcebridge.h"
+#include "libultraship/bridge/resourcebridge.h"
 #include <stdio.h>
 #include "RaceManager.h"
 
diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c
index 0995f5800..1f6362d96 100644
--- a/src/racing/render_courses.c
+++ b/src/racing/render_courses.c
@@ -17,7 +17,7 @@
 #include "memory.h"
 #include "code_80281780.h"
 #include "collision.h"
-#include "resourcebridge.h"
+#include "libultraship/bridge/resourcebridge.h"
 #include "skybox_and_splitscreen.h"
 #include "courses/all_course_data.h"
 #include "courses/all_course_packed.h"
diff --git a/torch b/torch
index c3fdb5d5e..0c6e9523b 160000
--- a/torch
+++ b/torch
@@ -1 +1 @@
-Subproject commit c3fdb5d5e3f172bdce468a6ff63fa9e496e0ce66
+Subproject commit 0c6e9523b332fa8a23bb82d25ff2e2bfa8b33b1d