Move GameInteractor & NameTag src up to root of 2s2h (#799)

89 files changed, 92 insertions, 92 deletions

diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp
index 26113a1d2..0c3c9dda8 100644
--- a/mm/2s2h/BenPort.cpp
+++ b/mm/2s2h/BenPort.cpp
@@ -49,8 +49,8 @@ CrowdControl* CrowdControl::Instance;
 #include <libultraship/libultraship.h>
 #include <BenGui/BenGui.hpp>
 
-#include "Enhancements/GameInteractor/GameInteractor.h"
-#include "Enhancements/Enhancements.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/Enhancements/Enhancements.h"
 #include "2s2h/Enhancements/GfxPatcher/AuthenticGfxPatches.h"
 #include "2s2h/DeveloperTools/DebugConsole.h"
 #include "2s2h/DeveloperTools/DeveloperTools.h"
diff --git a/mm/2s2h/DeveloperTools/ActorViewer.cpp b/mm/2s2h/DeveloperTools/ActorViewer.cpp
index a3542960e..545a10d9d 100644
--- a/mm/2s2h/DeveloperTools/ActorViewer.cpp
+++ b/mm/2s2h/DeveloperTools/ActorViewer.cpp
@@ -1,7 +1,7 @@
 #include "ActorViewer.h"
 #include "2s2h/BenGui/UIWidgets.hpp"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
-#include "2s2h/Enhancements/NameTag/NameTag.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/NameTag/NameTag.h"
 #include <spdlog/fmt/fmt.h>
 #include <string>
 #include <vector>
diff --git a/mm/2s2h/DeveloperTools/CollisionViewer.cpp b/mm/2s2h/DeveloperTools/CollisionViewer.cpp
index efbc9f77a..6e6dd56e8 100644
--- a/mm/2s2h/DeveloperTools/CollisionViewer.cpp
+++ b/mm/2s2h/DeveloperTools/CollisionViewer.cpp
@@ -8,7 +8,7 @@
 #include <random>
 #include <libultraship/bridge.h>
 #include <libultraship/libultraship.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <z64.h>
diff --git a/mm/2s2h/DeveloperTools/DeveloperTools.cpp b/mm/2s2h/DeveloperTools/DeveloperTools.cpp
index 316d851e5..5dd04fe61 100644
--- a/mm/2s2h/DeveloperTools/DeveloperTools.cpp
+++ b/mm/2s2h/DeveloperTools/DeveloperTools.cpp
@@ -1,7 +1,7 @@
 #include "DeveloperTools.h"
 #include "BenPort.h"
 #include <libultraship/libultraship.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/mm/2s2h/DeveloperTools/EventLog.cpp b/mm/2s2h/DeveloperTools/EventLog.cpp
index 2cd60f733..6eacb3b03 100644
--- a/mm/2s2h/DeveloperTools/EventLog.cpp
+++ b/mm/2s2h/DeveloperTools/EventLog.cpp
@@ -6,7 +6,7 @@
 #include <sstream>
 
 #include "2s2h/BenGui/UIWidgets.hpp"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <z64.h>
diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp
index 8d6811628..1853abe3d 100644
--- a/mm/2s2h/DeveloperTools/SaveEditor.cpp
+++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp
@@ -1,6 +1,6 @@
 #include "SaveEditor.h"
 #include "2s2h/BenGui/UIWidgets.hpp"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #include "interface/icon_item_dungeon_static/icon_item_dungeon_static.h"
 #include "archives/icon_item_24_static/icon_item_24_static_yar.h"
diff --git a/mm/2s2h/DeveloperTools/WarpPoint.cpp b/mm/2s2h/DeveloperTools/WarpPoint.cpp
index bb556eeb6..fa0de177e 100644
--- a/mm/2s2h/DeveloperTools/WarpPoint.cpp
+++ b/mm/2s2h/DeveloperTools/WarpPoint.cpp
@@ -1,7 +1,7 @@
 #include <libultraship/libultraship.h>
 #include "2s2h/BenGui/UIWidgets.hpp"
 #include "window/gui/IconsFontAwesome4.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/DeveloperTools/DeveloperTools.h"
 
 extern "C" {
diff --git a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp
index ac73872bd..f411f7aeb 100644
--- a/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp
+++ b/mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp
@@ -1,8 +1,8 @@
 #include "Camera.h"
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"
-#include "Enhancements/FrameInterpolation/FrameInterpolation.h"
+#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
 extern "C" {
 #include <z64.h>
diff --git a/mm/2s2h/Enhancements/Camera/DebugCam.cpp b/mm/2s2h/Enhancements/Camera/DebugCam.cpp
index f5bcc0d7b..4b1c1a6ba 100644
--- a/mm/2s2h/Enhancements/Camera/DebugCam.cpp
+++ b/mm/2s2h/Enhancements/Camera/DebugCam.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"
 
 extern "C" {
diff --git a/mm/2s2h/Enhancements/Camera/FreeLook.cpp b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
index 265edd5ee..3431f4abb 100644
--- a/mm/2s2h/Enhancements/Camera/FreeLook.cpp
+++ b/mm/2s2h/Enhancements/Camera/FreeLook.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"
 
 extern "C" {
diff --git a/mm/2s2h/Enhancements/Cheats/Infinite.cpp b/mm/2s2h/Enhancements/Cheats/Infinite.cpp
index 308a43c80..92a75fda2 100644
--- a/mm/2s2h/Enhancements/Cheats/Infinite.cpp
+++ b/mm/2s2h/Enhancements/Cheats/Infinite.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "variables.h"
 
 void RegisterInfiniteCheats() {
diff --git a/mm/2s2h/Enhancements/Cheats/MoonJump.cpp b/mm/2s2h/Enhancements/Cheats/MoonJump.cpp
index 2c406ef7e..a41edc9b1 100644
--- a/mm/2s2h/Enhancements/Cheats/MoonJump.cpp
+++ b/mm/2s2h/Enhancements/Cheats/MoonJump.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "variables.h"
 
 static HOOK_ID moonJumpOnLGameStateUpdateHookId = 0;
diff --git a/mm/2s2h/Enhancements/Cheats/TimeStop.cpp b/mm/2s2h/Enhancements/Cheats/TimeStop.cpp
index fb12fc0b5..bae6edf37 100644
--- a/mm/2s2h/Enhancements/Cheats/TimeStop.cpp
+++ b/mm/2s2h/Enhancements/Cheats/TimeStop.cpp
@@ -1,7 +1,7 @@
 #include <libultraship/libultraship.h>
 #include "BenPort.h"
-#include "Enhancements/GameInteractor/GameInteractor.h"
-#include "Enhancements/Enhancements.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/Enhancements/Enhancements.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp b/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp
index 8f6b31247..da03acf23 100644
--- a/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp
+++ b/mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterUnbreakableRazorSword() {
     REGISTER_VB_SHOULD(VB_LOWER_RAZOR_SWORD_DURABILITY, {
diff --git a/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp b/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp
index 4eb871901..385102a48 100644
--- a/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp
+++ b/mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterUnrestrictedItems() {
     REGISTER_VB_SHOULD(VB_ITEM_BE_RESTRICTED, {
diff --git a/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp b/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp
index 203b5d6a4..e7ba6cce4 100644
--- a/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterHideTitleCards() {
     REGISTER_VB_SHOULD(VB_SHOW_TITLE_CARD, {
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp
index 5317a27a0..37de2200f 100644
--- a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipDekuSalesman.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp
index 467c2fee1..9b11baa44 100644
--- a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipScarecrowDance.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp
index 062fdf073..f753865f3 100644
--- a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define ELFMSG3_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0x7F00) >> 8)
 
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp
index 94e6e1623..f53d37a2f 100644
--- a/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterSkipEntranceCutscenes() {
     REGISTER_VB_SHOULD(VB_PLAY_ENTRANCE_CS, {
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp
index fb396c05a..031639236 100644
--- a/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp
index 1b1e4e029..3904a6572 100644
--- a/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/SkipToFileSelect.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp
index f6259713a..277235afa 100644
--- a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Cycle/EndOfCycle.cpp b/mm/2s2h/Enhancements/Cycle/EndOfCycle.cpp
index c0c23d8e7..d10a04348 100644
--- a/mm/2s2h/Enhancements/Cycle/EndOfCycle.cpp
+++ b/mm/2s2h/Enhancements/Cycle/EndOfCycle.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/libultraship.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp b/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp
index c9f72647d..879fafc75 100644
--- a/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp
+++ b/mm/2s2h/Enhancements/Dialogue/FastBankSelection.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp b/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp
index eabbb7662..5ed46406c 100644
--- a/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp
+++ b/mm/2s2h/Enhancements/Equipment/InstantRecall.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Boom/z_en_boom.h"
diff --git a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp b/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp
index 52c0f1064..e5e68cfc2 100644
--- a/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp
+++ b/mm/2s2h/Enhancements/Equipment/SkipMagicArrowEquip.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Fixes/FierceDeityZTargetMovement.cpp b/mm/2s2h/Enhancements/Fixes/FierceDeityZTargetMovement.cpp
index a84dcd55f..e359d76a5 100644
--- a/mm/2s2h/Enhancements/Fixes/FierceDeityZTargetMovement.cpp
+++ b/mm/2s2h/Enhancements/Fixes/FierceDeityZTargetMovement.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "variables.h"
diff --git a/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp b/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp
index acf93cda9..e5b4de102 100644
--- a/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp
+++ b/mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp
@@ -1,5 +1,5 @@
 #include "libultraship/libultraship.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Graphics/3DSClock.cpp b/mm/2s2h/Enhancements/Graphics/3DSClock.cpp
index 04fa1efc7..ba5abb48e 100644
--- a/mm/2s2h/Enhancements/Graphics/3DSClock.cpp
+++ b/mm/2s2h/Enhancements/Graphics/3DSClock.cpp
@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 #include "2s2h/BenGui/HudEditor.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/Enhancements/Enhancements.h"
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 #include "misc/title_static/title_static.h"
diff --git a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp b/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp
index c14532842..67eb5cf7a 100644
--- a/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp
+++ b/mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterDisableBlackBars() {
     REGISTER_VB_SHOULD(VB_DISABLE_LETTERBOX, {
diff --git a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp b/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp
index a00159c16..a07a50fa0 100644
--- a/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp
+++ b/mm/2s2h/Enhancements/Graphics/PlayAsKafei.cpp
@@ -1,5 +1,5 @@
 #include "libultraship/libultraship.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Graphics/TextBasedClock.cpp b/mm/2s2h/Enhancements/Graphics/TextBasedClock.cpp
index 4b8058cdc..517d2b7f2 100644
--- a/mm/2s2h/Enhancements/Graphics/TextBasedClock.cpp
+++ b/mm/2s2h/Enhancements/Graphics/TextBasedClock.cpp
@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 #include "2s2h/BenGui/HudEditor.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/Enhancements/Enhancements.h"
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
diff --git a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp b/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp
index ee8a87a83..74c2a0337 100644
--- a/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp
+++ b/mm/2s2h/Enhancements/Masks/BlastMaskKeg.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 static uint32_t bombType;
 
diff --git a/mm/2s2h/Enhancements/Masks/FastTransformation.cpp b/mm/2s2h/Enhancements/Masks/FastTransformation.cpp
index ac9ccc633..0e970a841 100644
--- a/mm/2s2h/Enhancements/Masks/FastTransformation.cpp
+++ b/mm/2s2h/Enhancements/Masks/FastTransformation.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <z64.h>
diff --git a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp b/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
index 7eaff3775..f779e04ff 100644
--- a/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
+++ b/mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterFierceDeityAnywhere() {
     REGISTER_VB_SHOULD(VB_DISABLE_FD_MASK, {
diff --git a/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.cpp b/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.cpp
index 59a138b16..45a967a48 100644
--- a/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.cpp
+++ b/mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterNoBlastMaskCooldown() {
     REGISTER_VB_SHOULD(VB_SET_BLAST_MASK_COOLDOWN_TIMER, {
diff --git a/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp b/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
index 317f37789..5e6704475 100644
--- a/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
+++ b/mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
@@ -1,7 +1,7 @@
 #include <libultraship/bridge.h>
 #include <spdlog/spdlog.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
-#include "Enhancements/FrameInterpolation/FrameInterpolation.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.cpp b/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.cpp
index d20fbcda2..9f7ed23ad 100644
--- a/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.cpp
+++ b/mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.cpp
@@ -1,6 +1,6 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
-#include "Enhancements/Enhancements.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
+#include "2s2h/Enhancements/Enhancements.h"
 
 extern "C" {
 #include <z64save.h>
diff --git a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp b/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp
index 0ed98c051..98ec35ecd 100644
--- a/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp
+++ b/mm/2s2h/Enhancements/Modes/TimeMovesWhenYouMove.cpp
@@ -1,5 +1,5 @@
 #include "libultraship/libultraship.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/mm/2s2h/Enhancements/Player/ClimbSpeed.cpp b/mm/2s2h/Enhancements/Player/ClimbSpeed.cpp
index 66994cfdb..65ee403c8 100644
--- a/mm/2s2h/Enhancements/Player/ClimbSpeed.cpp
+++ b/mm/2s2h/Enhancements/Player/ClimbSpeed.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterClimbSpeed() {
     REGISTER_VB_SHOULD(VB_SET_CLIMB_SPEED, {
diff --git a/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp b/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp
index 07bac7321..9d9e8d042 100644
--- a/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp
+++ b/mm/2s2h/Enhancements/Player/FastFlowerLaunch.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/mm/2s2h/Enhancements/Player/InstantPutaway.cpp b/mm/2s2h/Enhancements/Player/InstantPutaway.cpp
index 8fb05a893..2afd233a9 100644
--- a/mm/2s2h/Enhancements/Player/InstantPutaway.cpp
+++ b/mm/2s2h/Enhancements/Player/InstantPutaway.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterInstantPutaway() {
     REGISTER_VB_SHOULD(VB_RESET_PUTAWAY_TIMER, {
diff --git a/mm/2s2h/Enhancements/Restorations/FlipHopVariable.cpp b/mm/2s2h/Enhancements/Restorations/FlipHopVariable.cpp
index 465002902..08669ccdc 100644
--- a/mm/2s2h/Enhancements/Restorations/FlipHopVariable.cpp
+++ b/mm/2s2h/Enhancements/Restorations/FlipHopVariable.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterVariableFlipHop() {
     REGISTER_VB_SHOULD(VB_FLIP_HOP_VARIABLE, {
diff --git a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp b/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
index 81d951737..60e8ed006 100644
--- a/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
+++ b/mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterPowerCrouchStab() {
     REGISTER_VB_SHOULD(VB_PATCH_POWER_CROUCH_STAB, {
diff --git a/mm/2s2h/Enhancements/Restorations/SideRoll.cpp b/mm/2s2h/Enhancements/Restorations/SideRoll.cpp
index 6de0241d6..1e71f228b 100644
--- a/mm/2s2h/Enhancements/Restorations/SideRoll.cpp
+++ b/mm/2s2h/Enhancements/Restorations/SideRoll.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterSideRoll() {
     REGISTER_VB_SHOULD(VB_PATCH_SIDEROLL, {
diff --git a/mm/2s2h/Enhancements/Restorations/TatlISG.cpp b/mm/2s2h/Enhancements/Restorations/TatlISG.cpp
index 07e091df2..2b19fe0e8 100644
--- a/mm/2s2h/Enhancements/Restorations/TatlISG.cpp
+++ b/mm/2s2h/Enhancements/Restorations/TatlISG.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void RegisterTatlISG() {
     REGISTER_VB_SHOULD(VB_TATL_CONVERSATION_AVAILABLE, {
diff --git a/mm/2s2h/Enhancements/Restorations/WoodfallMountainAppearance.cpp b/mm/2s2h/Enhancements/Restorations/WoodfallMountainAppearance.cpp
index ce1d6f774..b65df0c45 100644
--- a/mm/2s2h/Enhancements/Restorations/WoodfallMountainAppearance.cpp
+++ b/mm/2s2h/Enhancements/Restorations/WoodfallMountainAppearance.cpp
@@ -1,6 +1,6 @@
 
 #include <libultraship/bridge.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "z64save.h"
diff --git a/mm/2s2h/Enhancements/Saving/SavingEnhancements.cpp b/mm/2s2h/Enhancements/Saving/SavingEnhancements.cpp
index 5bc1328a9..22fa326f7 100644
--- a/mm/2s2h/Enhancements/Saving/SavingEnhancements.cpp
+++ b/mm/2s2h/Enhancements/Saving/SavingEnhancements.cpp
@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 #include "BenPort.h"
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/mm/2s2h/Enhancements/Songs/EnableSunsSong.cpp b/mm/2s2h/Enhancements/Songs/EnableSunsSong.cpp
index 6e50bdfd8..8165b1f21 100644
--- a/mm/2s2h/Enhancements/Songs/EnableSunsSong.cpp
+++ b/mm/2s2h/Enhancements/Songs/EnableSunsSong.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include <z64ocarina.h>
diff --git a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp
index f1c7ea2ca..841556565 100644
--- a/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp
+++ b/mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/libultraship.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
diff --git a/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp b/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp
index f15354bfe..92adaaa5d 100644
--- a/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp
+++ b/mm/2s2h/Enhancements/Songs/ZoraEggCount.cpp
@@ -1,5 +1,5 @@
 #include <libultraship/bridge.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Mk/z_en_mk.h"
diff --git a/mm/2s2h/Enhancements/GameInteractor/GameInteractor.cpp b/mm/2s2h/GameInteractor/GameInteractor.cpp
index fbaf19930..fbaf19930 100644
--- a/mm/2s2h/Enhancements/GameInteractor/GameInteractor.cpp
+++ b/mm/2s2h/GameInteractor/GameInteractor.cpp
diff --git a/mm/2s2h/Enhancements/GameInteractor/GameInteractor.h b/mm/2s2h/GameInteractor/GameInteractor.h
index d73e763ae..d73e763ae 100644
--- a/mm/2s2h/Enhancements/GameInteractor/GameInteractor.h
+++ b/mm/2s2h/GameInteractor/GameInteractor.h
diff --git a/mm/2s2h/Enhancements/NameTag/NameTag.cpp b/mm/2s2h/NameTag/NameTag.cpp
index 19432377b..211883bcf 100644
--- a/mm/2s2h/Enhancements/NameTag/NameTag.cpp
+++ b/mm/2s2h/NameTag/NameTag.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include <algorithm>
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/ShipUtils.h"
 
 extern "C" {
diff --git a/mm/2s2h/Enhancements/NameTag/NameTag.h b/mm/2s2h/NameTag/NameTag.h
index da6a22caf..da6a22caf 100644
--- a/mm/2s2h/Enhancements/NameTag/NameTag.h
+++ b/mm/2s2h/NameTag/NameTag.h
diff --git a/mm/2s2h/z_play_2SH.cpp b/mm/2s2h/z_play_2SH.cpp
index 7cafb1ac5..e446f19c7 100644
--- a/mm/2s2h/z_play_2SH.cpp
+++ b/mm/2s2h/z_play_2SH.cpp
@@ -3,7 +3,7 @@
 #include "2s2h/resource/type/Scene.h"
 #include <utils/StringHelper.h>
 #include <Vertex.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 extern "C" {
 #include "global.h"
diff --git a/mm/2s2h/z_scene_2SH.cpp b/mm/2s2h/z_scene_2SH.cpp
index 61ee7ed0d..a47055ae5 100644
--- a/mm/2s2h/z_scene_2SH.cpp
+++ b/mm/2s2h/z_scene_2SH.cpp
@@ -6,7 +6,7 @@
 #include <cassert>
 #include <utils/StringHelper.h>
 #include <DisplayList.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/resource/type/Scene.h"
 #include "2s2h/resource/type/CollisionHeader.h"
 #include "2s2h/resource/type/Cutscene.h"
diff --git a/mm/src/audio/code_8019AF00.c b/mm/src/audio/code_8019AF00.c
index 3600f8c81..dbe3e12e4 100644
--- a/mm/src/audio/code_8019AF00.c
+++ b/mm/src/audio/code_8019AF00.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 typedef struct {
     /* 0x0 */ s8 x;
diff --git a/mm/src/code/game.c b/mm/src/code/game.c
index 7fb04a125..a4dc6d8cc 100644
--- a/mm/src/code/game.c
+++ b/mm/src/code/game.c
@@ -13,7 +13,7 @@
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "debug.h"
 
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 s32 gFramerateDivisor = 1;
 f32 gFramerateDivisorF = 1.0f;
diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c
index ac9add966..b01225633 100644
--- a/mm/src/code/z_actor.c
+++ b/mm/src/code/z_actor.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/BenPort.h"
 
 // bss
diff --git a/mm/src/code/z_camera.c b/mm/src/code/z_camera.c
index 7b02ea02a..ee1ea70c9 100644
--- a/mm/src/code/z_camera.c
+++ b/mm/src/code/z_camera.c
@@ -63,7 +63,7 @@ Vec3f D_801EDDD0;
 Vec3f D_801EDDE0;
 Vec3f D_801EDDF0;
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/Enhancements/Camera/Camera.h"
 
 // Camera will reload its paramData. Usually that means setting the read-only data from what is stored in
diff --git a/mm/src/code/z_demo.c b/mm/src/code/z_demo.c
index e9a24432a..3d34959c0 100644
--- a/mm/src/code/z_demo.c
+++ b/mm/src/code/z_demo.c
@@ -8,7 +8,7 @@
 #include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include <string.h>
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 s16 sCutsceneQuakeIndex;
 struct CutsceneCamera sCutsceneCameraInfo;
diff --git a/mm/src/code/z_lib.c b/mm/src/code/z_lib.c
index 5ca4d4f7a..39407d07f 100644
--- a/mm/src/code/z_lib.c
+++ b/mm/src/code/z_lib.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include <libultraship/bridge.h>
 #include "BenPort.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 f32 Math_CosS(s16 angle) {
     return coss(angle) * SHT_MINV;
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c
index 48d29c4d6..7f0c82be5 100644
--- a/mm/src/code/z_message.c
+++ b/mm/src/code/z_message.c
@@ -6,7 +6,7 @@
 #include "interface/parameter_static/parameter_static.h"
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "BenPort.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "assets/archives/schedule_dma_static/schedule_dma_static_yar.h"
 #include "assets/archives/icon_item_static/icon_item_static_yar.h"
 #include "assets/archives/icon_item_24_static/icon_item_24_static_yar.h"
diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c
index 2e3734a7e..66bb29055 100644
--- a/mm/src/code/z_parameter.c
+++ b/mm/src/code/z_parameter.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include "BenGui/HudEditor.h"
 #include "2s2h_assets.h"
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 // 2S2H [Port] This was originally static but needs to be global so it can be accessed in z_kaleido_collect,
 // z_kaleido_debug, and z_kaleido_draw.
diff --git a/mm/src/code/z_play.c b/mm/src/code/z_play.c
index 56f132219..deab776c1 100644
--- a/mm/src/code/z_play.c
+++ b/mm/src/code/z_play.c
@@ -35,7 +35,7 @@ u8 sMotionBlurStatus;
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "debug.h"
 #include "BenPort.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 #include "2s2h/Enhancements/Graphics/Graphics.h"
 #include "2s2h/DeveloperTools/CollisionViewer.h"
diff --git a/mm/src/code/z_player_lib.c b/mm/src/code/z_player_lib.c
index e90fda727..9f624b93d 100644
--- a/mm/src/code/z_player_lib.c
+++ b/mm/src/code/z_player_lib.c
@@ -45,7 +45,7 @@
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
 #include "2s2h/BenPort.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void PlayerCall_Init(Actor* thisx, PlayState* play);
 void PlayerCall_Destroy(Actor* thisx, PlayState* play);
diff --git a/mm/src/code/z_shrink_window.c b/mm/src/code/z_shrink_window.c
index 2e36948db..c4aa3ac86 100644
--- a/mm/src/code/z_shrink_window.c
+++ b/mm/src/code/z_shrink_window.c
@@ -7,7 +7,7 @@
 #include "global.h"
 #include "z64shrink_window.h"
 #include <string.h>
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #include "BenPort.h"
 
diff --git a/mm/src/code/z_sram_NES.c b/mm/src/code/z_sram_NES.c
index ed6212a8f..47592e63c 100644
--- a/mm/src/code/z_sram_NES.c
+++ b/mm/src/code/z_sram_NES.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include "BenPort.h"
 
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 void Sram_SyncWriteToFlash(SramContext* sramCtx, s32 curPage, s32 numPages);
 void func_80147414(SramContext* sramCtx, s32 fileNum, s32 arg2);
diff --git a/mm/src/code/z_view.c b/mm/src/code/z_view.c
index 1b1e35214..23bba491d 100644
--- a/mm/src/code/z_view.c
+++ b/mm/src/code/z_view.c
@@ -2,7 +2,7 @@
 #include "z64shrink_window.h"
 #include "z64view.h"
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 s32 View_ApplyPerspective(View* view);
 s32 View_ApplyOrtho(View* view);
diff --git a/mm/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/mm/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
index 686e9572b..4e906615a 100644
--- a/mm/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/mm/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@@ -7,7 +7,7 @@
 #include "z_arms_hook.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_link_child/object_link_child.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
 
diff --git a/mm/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/mm/src/overlays/actors/ovl_Boss_02/z_boss_02.c
index 2fe43d749..716c83c4a 100644
--- a/mm/src/overlays/actors/ovl_Boss_02/z_boss_02.c
+++ b/mm/src/overlays/actors/ovl_Boss_02/z_boss_02.c
@@ -12,7 +12,7 @@
 #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20)
 
diff --git a/mm/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/mm/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
index 8a25910eb..adee27afa 100644
--- a/mm/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
+++ b/mm/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
@@ -6,7 +6,7 @@
 
 #include "z_elf_msg3.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/mm/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
index c77db2dbf..8d9aacb2e 100644
--- a/mm/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
+++ b/mm/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
@@ -6,7 +6,7 @@
 
 #include "z_elf_msg6.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/mm/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
index 7ea427bd0..411a4a98b 100644
--- a/mm/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+++ b/mm/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
@@ -6,7 +6,7 @@
 
 #include "z_en_fsn.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/mm/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index a6e7fec72..9d38823ac 100644
--- a/mm/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/mm/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -12,7 +12,7 @@
 #include "overlays/actors/ovl_Obj_Um/z_obj_um.h"
 #include "overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h"
 #include "objects/object_horse_link_child/object_horse_link_child.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/mm/src/overlays/actors/ovl_En_Ja/z_en_ja.c
index e48572bd8..002cea076 100644
--- a/mm/src/overlays/actors/ovl_En_Ja/z_en_ja.c
+++ b/mm/src/overlays/actors/ovl_En_Ja/z_en_ja.c
@@ -5,7 +5,7 @@
  */
 
 #include "z_en_ja.h"
-#include "Enhancements/FrameInterpolation/FrameInterpolation.h"
+#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/mm/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 3e15732da..bcc0529d0 100644
--- a/mm/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/mm/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -6,7 +6,7 @@
 
 #include "z_en_ossan.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/mm/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
index 4a3d1c5d9..17e77c5e6 100644
--- a/mm/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
+++ b/mm/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
@@ -12,7 +12,7 @@
 #include "overlays/actors/ovl_En_Aob_01/z_en_aob_01.h"
 #include "overlays/actors/ovl_En_Dg/z_en_dg.h"
 
-#include "Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_80000000)
 
diff --git a/mm/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/mm/src/overlays/actors/ovl_En_Slime/z_en_slime.c
index 76ac1efd6..1dccb5eb2 100644
--- a/mm/src/overlays/actors/ovl_En_Slime/z_en_slime.c
+++ b/mm/src/overlays/actors/ovl_En_Slime/z_en_slime.c
@@ -7,7 +7,7 @@
 #include "z_en_slime.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_200)
 
diff --git a/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
index 13c1eb329..60fd05a4c 100644
--- a/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+++ b/mm/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
@@ -8,7 +8,7 @@
 #include "objects/object_mastergolon/object_mastergolon.h"
 #include "objects/object_masterzoora/object_masterzoora.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10)
 
diff --git a/mm/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/mm/src/overlays/actors/ovl_En_Test4/z_en_test4.c
index a8c11c517..5ed9acc31 100644
--- a/mm/src/overlays/actors/ovl_En_Test4/z_en_test4.c
+++ b/mm/src/overlays/actors/ovl_En_Test4/z_en_test4.c
@@ -8,7 +8,7 @@
 #include "z64horse.h"
 #include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000)
 
diff --git a/mm/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/mm/src/overlays/actors/ovl_En_Trt/z_en_trt.c
index 40eda53bf..db8401dd6 100644
--- a/mm/src/overlays/actors/ovl_En_Trt/z_en_trt.c
+++ b/mm/src/overlays/actors/ovl_En_Trt/z_en_trt.c
@@ -7,7 +7,7 @@
 #include "z_en_trt.h"
 #include "objects/object_trt/object_trt.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
 
diff --git a/mm/src/overlays/actors/ovl_player_actor/z_player.c b/mm/src/overlays/actors/ovl_player_actor/z_player.c
index 3ce8993dc..397dfdd0c 100644
--- a/mm/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/mm/src/overlays/actors/ovl_player_actor/z_player.c
@@ -45,7 +45,7 @@
 #include "objects/object_link_nuts/object_link_nuts.h"
 #include "objects/object_link_child/object_link_child.h"
 
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #define THIS ((Player*)thisx)
 
diff --git a/mm/src/overlays/gamestates/ovl_title/z_title.c b/mm/src/overlays/gamestates/ovl_title/z_title.c
index dfc1c3160..0a1642812 100644
--- a/mm/src/overlays/gamestates/ovl_title/z_title.c
+++ b/mm/src/overlays/gamestates/ovl_title/z_title.c
@@ -13,7 +13,7 @@
 
 #include "build.h"
 #include "BenPort.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 #include <stdlib.h>
 
 #define dgShipLogoDL "__OTR__misc/nintendo_rogo_static/gShipLogoDL"
diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
index 5e91c8e7e..2441c27bf 100644
--- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
+++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
@@ -8,7 +8,7 @@
 #include "interface/parameter_static/parameter_static.h"
 
 #include "BenGui/HudEditor.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 s16 sEquipState = EQUIP_STATE_MAGIC_ARROW_GROW_ORB;
 
diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c
index 140ba179a..b6ebdcbbd 100644
--- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c
+++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c
@@ -8,7 +8,7 @@
 #include "interface/parameter_static/parameter_static.h"
 
 #include "BenGui/HudEditor.h"
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 s16 sMaskEquipState = EQUIP_STATE_MAGIC_ARROW_GROW_ORB;
 
diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
index 2b7c35156..078491f2a 100644
--- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
+++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
@@ -22,7 +22,7 @@
 
 #include "2s2h_assets.h"
 
-#include "2s2h/Enhancements/GameInteractor/GameInteractor.h"
+#include "2s2h/GameInteractor/GameInteractor.h"
 
 #include "2s2h/Enhancements/Songs/Songs.h"