diff --git a/Makefile b/Makefile
index 326fb5bd..9f112114 100644
--- a/Makefile
+++ b/Makefile
@@ -33,33 +33,23 @@ $(eval $(call validate-option,VERSION,jp us eu sh cn))
 
 ifeq      ($(VERSION),jp)
   DEFINES   += VERSION_JP=1
-  OPT_FLAGS := -g
-  GRUCODE   ?= f3d_old
-  LIBULTRA ?= D
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/us_jp
 else ifeq ($(VERSION),us)
   DEFINES   += VERSION_US=1
-  OPT_FLAGS := -g
-  GRUCODE   ?= f3d_old
-  LIBULTRA ?= D
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/us_jp
 else ifeq ($(VERSION),eu)
   DEFINES   += VERSION_EU=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= F
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/eu
 else ifeq ($(VERSION),sh)
   DEFINES   += VERSION_SH=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= H
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/sh
 else ifeq ($(VERSION),cn)
   DEFINES   += VERSION_CN=1
-  OPT_FLAGS := -O2
-  GRUCODE   ?= f3d_new
-  LIBULTRA ?= BB
+  GRUCODE   ?= f3dex
   AUDIO_SRC_DIR  ?= src/audio/sh
 endif
 
@@ -121,7 +111,7 @@ ifeq ($(filter $(TARGET_STRING), sm64.jp.f3d_old sm64.us.f3d_old sm64.eu.f3d_new
 endif
 
 # Whether to hide commands or not
-VERBOSE ?= 0
+VERBOSE ?= 1
 ifeq ($(VERBOSE),0)
   V := @
 endif
@@ -305,7 +295,7 @@ endif
 
 # C compiler options
 CFLAGS = -G 0 $(TARGET_CFLAGS) $(DEF_INC_CFLAGS)
-CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-trigraphs
+CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra
 CFLAGS += -Wno-missing-braces
 
 ASFLAGS     := -march=vr4300 -mabi=32 $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(foreach d,$(DEFINES),--defsym $(d))
@@ -336,7 +326,7 @@ else
   RSPASM              := $(TOOLS_DIR)/armips
 endif
 ENDIAN_BITWIDTH       := $(BUILD_DIR)/endian-and-bitwidth
-EMULATOR = mupen64plus
+EMULATOR = ares
 EMU_FLAGS = --noosd
 LOADER = loader64
 LOADER_FLAGS = -vwf
@@ -428,7 +418,7 @@ DUMMY != mkdir -p $(ALL_DIRS)
 $(BUILD_DIR)/include/text_strings.h: $(BUILD_DIR)/include/text_menu_strings.h
 $(BUILD_DIR)/src/menu/file_select.o: $(BUILD_DIR)/include/text_strings.h
 $(BUILD_DIR)/src/menu/star_select.o: $(BUILD_DIR)/include/text_strings.h
-$(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
+$(BUILD_DIR)/src/engine/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 
 
 #==============================================================================#
diff --git a/actors/blue_fish/model.inc.c b/actors/blue_fish/model.inc.c
index 3545358a..66060c07 100644
--- a/actors/blue_fish/model.inc.c
+++ b/actors/blue_fish/model.inc.c
@@ -1,7 +1,7 @@
 // Blue Fish
 
 // 0x0301B5C8
-static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
+ALIGNED8 static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
     0x3f, 0x3f, 0x3f,
     0xff, 0xff, 0xff, 0x28, 0x28, 0x28
 );
diff --git a/bin/eu/translation_de.c b/bin/eu/translation_de.c
index d7c1f597..90023ff9 100644
--- a/bin/eu/translation_de.c
+++ b/bin/eu/translation_de.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/eu/translation_en.c b/bin/eu/translation_en.c
index 9817bc5a..0b917a4d 100644
--- a/bin/eu/translation_en.c
+++ b/bin/eu/translation_en.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/eu/translation_fr.c b/bin/eu/translation_fr.c
index 119839c9..cea3fa49 100644
--- a/bin/eu/translation_fr.c
+++ b/bin/eu/translation_fr.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/segment2.c b/bin/segment2.c
index 7f69dc33..fb67932b 100644
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "macros.h"
 #include "types.h"
-#include "game/ingame_menu.h"
+#include "engine/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
@@ -12016,6 +12016,7 @@ static const Vtx vertex_billboard_num[] = {
 // 0x0200EFF0 - 0x0200F038
 const Gfx dl_billboard_num_begin[] = {
     gsDPPipeSync(),
+    gsDPSetTextureFilter(G_TF_POINT),
     gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
     gsSPClearGeometryMode(G_LIGHTING),
     gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
@@ -12033,6 +12034,7 @@ const Gfx dl_billboard_num_end[] = {
     gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_OFF),
     gsDPPipeSync(),
     gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
+    gsDPSetTextureFilter(G_TF_BILERP),
     gsSPSetGeometryMode(G_LIGHTING),
     gsSPEndDisplayList(),
 };
diff --git a/data/behavior_data.c b/data/behavior_data.c
index 04f95a1c..86c25f9b 100644
--- a/data/behavior_data.c
+++ b/data/behavior_data.c
@@ -3,13 +3,13 @@
 #include "sm64.h"
 
 #include "object_constants.h"
-#include "game/object_list_processor.h"
-#include "game/interaction.h"
-#include "game/behavior_actions.h"
-#include "game/mario_actions_cutscene.h"
-#include "game/mario_misc.h"
-#include "game/object_helpers.h"
-#include "game/debug.h"
+#include "engine/object_list_processor.h"
+#include "engine/interaction.h"
+#include "engine/behavior_actions.h"
+#include "engine/mario_actions_cutscene.h"
+#include "engine/mario_misc.h"
+#include "engine/object_helpers.h"
+#include "engine/debug.h"
 #include "menu/file_select.h"
 #include "engine/surface_load.h"
 
diff --git a/include/geo_commands.h b/include/geo_commands.h
index c611619b..1731a544 100644
--- a/include/geo_commands.h
+++ b/include/geo_commands.h
@@ -3,12 +3,12 @@
 
 #include "command_macros_base.h"
 
-#include "game/shadow.h"
-#include "game/object_helpers.h"
-#include "game/behavior_actions.h"
-#include "game/segment2.h"
-#include "game/mario_misc.h"
-#include "game/mario_actions_cutscene.h"
+#include "engine/shadow.h"
+#include "engine/object_helpers.h"
+#include "engine/behavior_actions.h"
+#include "engine/segment2.h"
+#include "engine/mario_misc.h"
+#include "engine/mario_actions_cutscene.h"
 
 // sky background params
 #define BACKGROUND_OCEAN_SKY        0
diff --git a/include/moving_texture_macros.h b/include/moving_texture_macros.h
index a7067d6d..a503881b 100644
--- a/include/moving_texture_macros.h
+++ b/include/moving_texture_macros.h
@@ -1,7 +1,7 @@
 #ifndef MOVING_TEXTURE_MACROS_H
 #define MOVING_TEXTURE_MACROS_H
 
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // From gMovingTextureIdList
 #define TEXTURE_WATER            0
diff --git a/levels/bbh/geo.c b/levels/bbh/geo.c
index 12712e11..95aea606 100644
--- a/levels/bbh/geo.c
+++ b/levels/bbh/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bbh/header.h b/levels/bbh/header.h
index de769e94..63225efe 100644
--- a/levels/bbh/header.h
+++ b/levels/bbh/header.h
@@ -2,7 +2,7 @@
 #define BBH_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout geo_bbh_0005B0[];
diff --git a/levels/bbh/script.c b/levels/bbh/script.c
index aa8301ed..8d2ad468 100644
--- a/levels/bbh/script.c
+++ b/levels/bbh/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bitdw/geo.c b/levels/bitdw/geo.c
index 2b1a1707..f0425d7d 100644
--- a/levels/bitdw/geo.c
+++ b/levels/bitdw/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c
index 3a09ec9f..04b54b23 100644
--- a/levels/bitdw/script.c
+++ b/levels/bitdw/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bitfs/geo.c b/levels/bitfs/geo.c
index 96851ba0..c6406fee 100644
--- a/levels/bitfs/geo.c
+++ b/levels/bitfs/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c
index 585a6e08..adba2a17 100644
--- a/levels/bitfs/script.c
+++ b/levels/bitfs/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bits/geo.c b/levels/bits/geo.c
index fe1078fb..b13f6718 100644
--- a/levels/bits/geo.c
+++ b/levels/bits/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bits/script.c b/levels/bits/script.c
index 2b18239d..5d75a2e7 100644
--- a/levels/bits/script.c
+++ b/levels/bits/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bob/geo.c b/levels/bob/geo.c
index 59376b73..c418543f 100644
--- a/levels/bob/geo.c
+++ b/levels/bob/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bob/script.c b/levels/bob/script.c
index 2575812a..c9c7b54a 100644
--- a/levels/bob/script.c
+++ b/levels/bob/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_1/geo.c b/levels/bowser_1/geo.c
index 26906a11..625b7bb6 100644
--- a/levels/bowser_1/geo.c
+++ b/levels/bowser_1/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bowser_1/script.c b/levels/bowser_1/script.c
index db4261d4..abf2f7e7 100644
--- a/levels/bowser_1/script.c
+++ b/levels/bowser_1/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_2/geo.c b/levels/bowser_2/geo.c
index 0bbbe62d..1094dd9e 100644
--- a/levels/bowser_2/geo.c
+++ b/levels/bowser_2/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bowser_2/script.c b/levels/bowser_2/script.c
index 4f1bda10..a5335184 100644
--- a/levels/bowser_2/script.c
+++ b/levels/bowser_2/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_3/geo.c b/levels/bowser_3/geo.c
index 0823b113..2c509cdf 100644
--- a/levels/bowser_3/geo.c
+++ b/levels/bowser_3/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/bowser_3/script.c b/levels/bowser_3/script.c
index 0ce454c3..b9eefe30 100644
--- a/levels/bowser_3/script.c
+++ b/levels/bowser_3/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_courtyard/geo.c b/levels/castle_courtyard/geo.c
index 46418bf9..50d08c02 100644
--- a/levels/castle_courtyard/geo.c
+++ b/levels/castle_courtyard/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/castle_courtyard/header.h b/levels/castle_courtyard/header.h
index d5a7e18c..4745d42e 100644
--- a/levels/castle_courtyard/header.h
+++ b/levels/castle_courtyard/header.h
@@ -2,7 +2,7 @@
 #define CASTLE_COURTYARD_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout castle_courtyard_geo_000200[];
diff --git a/levels/castle_courtyard/script.c b/levels/castle_courtyard/script.c
index bffa0a62..d3326b23 100644
--- a/levels/castle_courtyard/script.c
+++ b/levels/castle_courtyard/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_grounds/geo.c b/levels/castle_grounds/geo.c
index 31f74204..d4ff0a15 100644
--- a/levels/castle_grounds/geo.c
+++ b/levels/castle_grounds/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/castle_grounds/header.h b/levels/castle_grounds/header.h
index 5e32ed94..130be3b6 100644
--- a/levels/castle_grounds/header.h
+++ b/levels/castle_grounds/header.h
@@ -2,7 +2,7 @@
 #define CASTLE_GROUNDS_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout castle_grounds_geo_000660[];
diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c
index a1c899c2..ed04b4bf 100644
--- a/levels/castle_grounds/script.c
+++ b/levels/castle_grounds/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_inside/geo.c b/levels/castle_inside/geo.c
index 53c8b3a2..7561aa2d 100644
--- a/levels/castle_inside/geo.c
+++ b/levels/castle_inside/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/castle_inside/header.h b/levels/castle_inside/header.h
index 043e3383..8d68343b 100644
--- a/levels/castle_inside/header.h
+++ b/levels/castle_inside/header.h
@@ -2,8 +2,8 @@
 #define CASTLE_INSIDE_HEADER_H
 
 #include "types.h"
-#include "game/paintings.h"
-#include "game/moving_texture.h"
+#include "engine/paintings.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout castle_geo_000F00[];
diff --git a/levels/castle_inside/painting.inc.c b/levels/castle_inside/painting.inc.c
index 096d2ebd..7fc7fe62 100644
--- a/levels/castle_inside/painting.inc.c
+++ b/levels/castle_inside/painting.inc.c
@@ -1,4 +1,4 @@
-#include "game/paintings.h"
+#include "engine/paintings.h"
 
 // 0x07021800 - 0x07021818
 static const Lights1 inside_castle_seg7_lights_07021800 = gdSPDefLights1(
diff --git a/levels/castle_inside/script.c b/levels/castle_inside/script.c
index d6d9eb3a..3ad4b2cb 100644
--- a/levels/castle_inside/script.c
+++ b/levels/castle_inside/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ccm/geo.c b/levels/ccm/geo.c
index aaa04325..c9d5b8df 100644
--- a/levels/ccm/geo.c
+++ b/levels/ccm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ccm/header.h b/levels/ccm/header.h
index 7c35d003..e5a87947 100644
--- a/levels/ccm/header.h
+++ b/levels/ccm/header.h
@@ -2,7 +2,7 @@
 #define CCM_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout ccm_geo_0003D0[];
diff --git a/levels/ccm/script.c b/levels/ccm/script.c
index 38fda8c7..f8cf186d 100644
--- a/levels/ccm/script.c
+++ b/levels/ccm/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/cotmc/geo.c b/levels/cotmc/geo.c
index 9deb6ef3..b4ec97f8 100644
--- a/levels/cotmc/geo.c
+++ b/levels/cotmc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/cotmc/script.c b/levels/cotmc/script.c
index 9800c0f4..379ee558 100644
--- a/levels/cotmc/script.c
+++ b/levels/cotmc/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ddd/geo.c b/levels/ddd/geo.c
index 8dbd4970..6cc9455d 100644
--- a/levels/ddd/geo.c
+++ b/levels/ddd/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ddd/header.h b/levels/ddd/header.h
index 0d946f1a..119e4709 100644
--- a/levels/ddd/header.h
+++ b/levels/ddd/header.h
@@ -2,7 +2,7 @@
 #define DDD_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout ddd_geo_000450[];
diff --git a/levels/ddd/script.c b/levels/ddd/script.c
index a2f81f50..137754e7 100644
--- a/levels/ddd/script.c
+++ b/levels/ddd/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ending/geo.c b/levels/ending/geo.c
index 1e973423..01b48607 100644
--- a/levels/ending/geo.c
+++ b/levels/ending/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ending/script.c b/levels/ending/script.c
index ad3d7386..4687e866 100644
--- a/levels/ending/script.c
+++ b/levels/ending/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/area.h"
-#include "game/level_update.h"
+#include "engine/area.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/hmc/areas/1/painting.inc.c b/levels/hmc/areas/1/painting.inc.c
index a0c55961..e681bb45 100644
--- a/levels/hmc/areas/1/painting.inc.c
+++ b/levels/hmc/areas/1/painting.inc.c
@@ -1,4 +1,4 @@
-#include "game/paintings.h"
+#include "engine/paintings.h"
 
 // 0x070241B8 - 0x070241D0
 static const Lights1 hmc_seg7_lights_070241B8 = gdSPDefLights1(
diff --git a/levels/hmc/geo.c b/levels/hmc/geo.c
index 3bffd83a..ef13afc9 100644
--- a/levels/hmc/geo.c
+++ b/levels/hmc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/hmc/header.h b/levels/hmc/header.h
index 6c2cca11..4c7ac799 100644
--- a/levels/hmc/header.h
+++ b/levels/hmc/header.h
@@ -2,7 +2,7 @@
 #define HMC_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout hmc_geo_000530[];
diff --git a/levels/hmc/script.c b/levels/hmc/script.c
index f41e3928..2b682357 100644
--- a/levels/hmc/script.c
+++ b/levels/hmc/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/intro/geo.c b/levels/intro/geo.c
index 3048638b..a24ab4c6 100644
--- a/levels/intro/geo.c
+++ b/levels/intro/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 #include "menu/debug_level_select.h"
 #include "menu/intro_geo.h"
 
diff --git a/levels/intro/script.c b/levels/intro/script.c
index 60fe93f3..ab861b4f 100644
--- a/levels/intro/script.c
+++ b/levels/intro/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/area.h"
-#include "game/level_update.h"
+#include "engine/area.h"
+#include "engine/level_update.h"
 #include "menu/title_screen.h"
 
 #include "levels/scripts.h"
diff --git a/levels/jrb/geo.c b/levels/jrb/geo.c
index d7d0f900..161d4ea5 100644
--- a/levels/jrb/geo.c
+++ b/levels/jrb/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/jrb/header.h b/levels/jrb/header.h
index f142c5c0..a5e8c347 100644
--- a/levels/jrb/header.h
+++ b/levels/jrb/header.h
@@ -2,7 +2,7 @@
 #define JRB_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout jrb_geo_000900[];
diff --git a/levels/jrb/script.c b/levels/jrb/script.c
index c7769fe9..8ad16ea2 100644
--- a/levels/jrb/script.c
+++ b/levels/jrb/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/lll/geo.c b/levels/lll/geo.c
index 43b6dfe4..d6a2cb19 100644
--- a/levels/lll/geo.c
+++ b/levels/lll/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/lll/header.h b/levels/lll/header.h
index b558a9c6..681b8f86 100644
--- a/levels/lll/header.h
+++ b/levels/lll/header.h
@@ -2,7 +2,7 @@
 #define LLL_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout lll_geo_0009E0[];
diff --git a/levels/lll/script.c b/levels/lll/script.c
index 0873972c..8f8d3aa1 100644
--- a/levels/lll/script.c
+++ b/levels/lll/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/menu/geo.c b/levels/menu/geo.c
index d4d8b4b5..e0fe6d5d 100644
--- a/levels/menu/geo.c
+++ b/levels/menu/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 #include "menu/file_select.h"
 #include "menu/star_select.h"
 
diff --git a/levels/menu/script.c b/levels/menu/script.c
index 14b18e9f..2664d997 100644
--- a/levels/menu/script.c
+++ b/levels/menu/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/area.h"
-#include "game/level_update.h"
+#include "engine/area.h"
+#include "engine/level_update.h"
 #include "menu/file_select.h"
 #include "menu/star_select.h"
 
diff --git a/levels/pss/geo.c b/levels/pss/geo.c
index 58c3aa1c..834b06ca 100644
--- a/levels/pss/geo.c
+++ b/levels/pss/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/pss/script.c b/levels/pss/script.c
index 98cc4732..301a6dca 100644
--- a/levels/pss/script.c
+++ b/levels/pss/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/rr/geo.c b/levels/rr/geo.c
index 2fc7289f..80b11114 100644
--- a/levels/rr/geo.c
+++ b/levels/rr/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/rr/script.c b/levels/rr/script.c
index ac84bce9..dc8ed5ad 100644
--- a/levels/rr/script.c
+++ b/levels/rr/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/sa/geo.c b/levels/sa/geo.c
index bcf1e782..72102a3d 100644
--- a/levels/sa/geo.c
+++ b/levels/sa/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/sa/script.c b/levels/sa/script.c
index 75c81dbf..73489378 100644
--- a/levels/sa/script.c
+++ b/levels/sa/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/scripts.c b/levels/scripts.c
index a4d51bcd..e374e471 100644
--- a/levels/scripts.c
+++ b/levels/scripts.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
 #include "sm64.h"
-#include "game/level_update.h"
+#include "engine/level_update.h"
 #include "level_commands.h"
-#include "game/area.h"
+#include "engine/area.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/sl/geo.c b/levels/sl/geo.c
index 8b4219c1..99d2fc15 100644
--- a/levels/sl/geo.c
+++ b/levels/sl/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/sl/header.h b/levels/sl/header.h
index 457fb093..56c66dca 100644
--- a/levels/sl/header.h
+++ b/levels/sl/header.h
@@ -2,7 +2,7 @@
 #define SL_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout sl_geo_000360[];
diff --git a/levels/sl/script.c b/levels/sl/script.c
index 350940ec..bb6e456a 100644
--- a/levels/sl/script.c
+++ b/levels/sl/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ssl/geo.c b/levels/ssl/geo.c
index 217edac8..9de721b0 100644
--- a/levels/ssl/geo.c
+++ b/levels/ssl/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ssl/header.h b/levels/ssl/header.h
index a38845cd..6e8b48dc 100644
--- a/levels/ssl/header.h
+++ b/levels/ssl/header.h
@@ -2,7 +2,7 @@
 #define SSL_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout ssl_geo_0005C0[];
diff --git a/levels/ssl/script.c b/levels/ssl/script.c
index 37f2eac9..6d60ee79 100644
--- a/levels/ssl/script.c
+++ b/levels/ssl/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/thi/geo.c b/levels/thi/geo.c
index a47ae6f2..9868c1a7 100644
--- a/levels/thi/geo.c
+++ b/levels/thi/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/thi/header.h b/levels/thi/header.h
index a3b7ea1a..656b0653 100644
--- a/levels/thi/header.h
+++ b/levels/thi/header.h
@@ -2,7 +2,7 @@
 #define THI_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout thi_geo_0005B0[];
diff --git a/levels/thi/script.c b/levels/thi/script.c
index b2bda1aa..c5e1ab3c 100644
--- a/levels/thi/script.c
+++ b/levels/thi/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/totwc/geo.c b/levels/totwc/geo.c
index 4391e675..c1d9e855 100644
--- a/levels/totwc/geo.c
+++ b/levels/totwc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/totwc/script.c b/levels/totwc/script.c
index 7664baae..8c6c3467 100644
--- a/levels/totwc/script.c
+++ b/levels/totwc/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ttc/geo.c b/levels/ttc/geo.c
index 5c37c754..204a8ff0 100644
--- a/levels/ttc/geo.c
+++ b/levels/ttc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ttc/script.c b/levels/ttc/script.c
index c871611b..ed604685 100644
--- a/levels/ttc/script.c
+++ b/levels/ttc/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ttm/areas/1/painting.inc.c b/levels/ttm/areas/1/painting.inc.c
index 2477f654..751278cd 100644
--- a/levels/ttm/areas/1/painting.inc.c
+++ b/levels/ttm/areas/1/painting.inc.c
@@ -1,4 +1,4 @@
-#include "game/paintings.h"
+#include "engine/paintings.h"
 
 // 0x070122F0 - 0x07012308
 static const Lights1 ttm_seg7_lights_070122F0 = gdSPDefLights1(
diff --git a/levels/ttm/geo.c b/levels/ttm/geo.c
index 07d62070..08176814 100644
--- a/levels/ttm/geo.c
+++ b/levels/ttm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/ttm/header.h b/levels/ttm/header.h
index 3c060526..4e2a483d 100644
--- a/levels/ttm/header.h
+++ b/levels/ttm/header.h
@@ -2,7 +2,7 @@
 #define TTM_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout ttm_geo_000710[];
diff --git a/levels/ttm/script.c b/levels/ttm/script.c
index a1db6d04..e8f06e08 100644
--- a/levels/ttm/script.c
+++ b/levels/ttm/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/vcutm/geo.c b/levels/vcutm/geo.c
index e1d27e67..9bcea41a 100644
--- a/levels/vcutm/geo.c
+++ b/levels/vcutm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/vcutm/script.c b/levels/vcutm/script.c
index 1d609f7d..b2cbcb26 100644
--- a/levels/vcutm/script.c
+++ b/levels/vcutm/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wdw/geo.c b/levels/wdw/geo.c
index 458a1ce9..6fe6d60b 100644
--- a/levels/wdw/geo.c
+++ b/levels/wdw/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/wdw/header.h b/levels/wdw/header.h
index 63cddc3b..a7f841f9 100644
--- a/levels/wdw/header.h
+++ b/levels/wdw/header.h
@@ -2,7 +2,7 @@
 #define WDW_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout wdw_geo_000580[];
diff --git a/levels/wdw/script.c b/levels/wdw/script.c
index 6d71cf27..e590cda6 100644
--- a/levels/wdw/script.c
+++ b/levels/wdw/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wf/geo.c b/levels/wf/geo.c
index f31514b6..3c0b50bb 100644
--- a/levels/wf/geo.c
+++ b/levels/wf/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/wf/header.h b/levels/wf/header.h
index 44f3cf14..22e83fb2 100644
--- a/levels/wf/header.h
+++ b/levels/wf/header.h
@@ -2,7 +2,7 @@
 #define WF_HEADER_H
 
 #include "types.h"
-#include "game/moving_texture.h"
+#include "engine/moving_texture.h"
 
 // geo
 extern const GeoLayout wf_geo_0007E0[];
diff --git a/levels/wf/script.c b/levels/wf/script.c
index 4ab0c206..9aeab570 100644
--- a/levels/wf/script.c
+++ b/levels/wf/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wmotr/geo.c b/levels/wmotr/geo.c
index edc66962..7adf8ae5 100644
--- a/levels/wmotr/geo.c
+++ b/levels/wmotr/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.h"
 
-#include "game/level_geo.h"
-#include "game/geo_misc.h"
-#include "game/camera.h"
-#include "game/moving_texture.h"
-#include "game/screen_transition.h"
-#include "game/paintings.h"
+#include "engine/level_geo.h"
+#include "engine/geo_misc.h"
+#include "engine/camera.h"
+#include "engine/moving_texture.h"
+#include "engine/screen_transition.h"
+#include "engine/paintings.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/wmotr/script.c b/levels/wmotr/script.c
index ad5d6c03..af90421e 100644
--- a/levels/wmotr/script.c
+++ b/levels/wmotr/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "game/level_update.h"
+#include "engine/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/sm64.ld b/sm64.ld
index 9f0904e9..680ed7af 100755
--- a/sm64.ld
+++ b/sm64.ld
@@ -33,12 +33,13 @@ SECTIONS
     BEGIN_NOLOAD(buffers)
     {
         BUILD_DIR/src/buffers/buffers.o(.bss*);
+        . = ALIGN(0x10);
         BUILD_DIR/src/buffers/gfx_output_buffer.o(.bss*);
+        . = ALIGN(0x10);
     }
     END_NOLOAD(buffers)
 
    . = _buffersSegmentNoloadEnd;
-   . = ALIGN(0x10);
 
     BEGIN_SEG(main, .)
     {
@@ -58,7 +59,7 @@ SECTIONS
         BUILD_DIR/src/audio/external.o(.data*);
         BUILD_DIR/lib/rsp.o(.data*);
         
-	BUILD_DIR/asm/entry.o(.rodata*);
+        BUILD_DIR/asm/entry.o(.rodata*);
         BUILD_DIR/asm/decompress.o(.rodata*);
         BUILD_DIR/src/game*.o(.rodata*);
         AUDIO_DIR*.o(.rodata*);
@@ -90,6 +91,7 @@ SECTIONS
 
     CREATE_LO_HI_PAIR(_mainSegmentNoloadSize, SIZEOF (.main.noload))
     . = _mainSegmentNoloadEnd;
+    . = ALIGN(0x10);
 
     BEGIN_SEG(engine, .)
     {
diff --git a/src/audio/external.c b/src/audio/external.c
index 769ad02d..e01f183d 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -25,9 +25,9 @@
 #include "sh/synthesis.h"
 #endif
 #include "external.h"
-#include "game/level_update.h"
-#include "game/object_list_processor.h"
-#include "game/camera.h"
+#include "engine/level_update.h"
+#include "engine/object_list_processor.h"
+#include "engine/camera.h"
 #include "seq_ids.h"
 #include "dialog_ids.h"
 
diff --git a/src/buffers/buffers.h b/src/buffers/buffers.h
index 92c97c93..9adcc142 100644
--- a/src/buffers/buffers.h
+++ b/src/buffers/buffers.h
@@ -3,8 +3,8 @@
 
 #include <PR/ultratypes.h>
 
-#include "game/save_file.h"
-#include "game/game_init.h"
+#include "engine/save_file.h"
+#include "engine/game_init.h"
 #include "config.h"
 
 extern u8 gDecompressionHeap[];
diff --git a/src/game/area.c b/src/engine/area.c
similarity index 100%
rename from src/game/area.c
rename to src/engine/area.c
diff --git a/src/game/area.h b/src/engine/area.h
similarity index 100%
rename from src/game/area.h
rename to src/engine/area.h
diff --git a/src/game/behavior_actions.c b/src/engine/behavior_actions.c
similarity index 99%
rename from src/game/behavior_actions.c
rename to src/engine/behavior_actions.c
index 4a29e15e..49da3df7 100644
--- a/src/game/behavior_actions.c
+++ b/src/engine/behavior_actions.c
@@ -26,7 +26,7 @@
 #include "levels/bowser_3/header.h"
 #include "levels/castle_inside/header.h"
 #include "levels/hmc/header.h"
-#include "main.h"
+#include "game/main.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
 #include "mario_step.h"
diff --git a/src/game/behavior_actions.h b/src/engine/behavior_actions.h
similarity index 100%
rename from src/game/behavior_actions.h
rename to src/engine/behavior_actions.h
diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c
index 264ffc26..e533c41b 100644
--- a/src/engine/behavior_script.c
+++ b/src/engine/behavior_script.c
@@ -3,14 +3,14 @@
 #include "sm64.h"
 #include "behavior_data.h"
 #include "behavior_script.h"
-#include "game/area.h"
-#include "game/behavior_actions.h"
-#include "game/game_init.h"
-#include "game/mario.h"
+#include "area.h"
+#include "behavior_actions.h"
+#include "game_init.h"
+#include "mario.h"
 #include "game/memory.h"
-#include "game/obj_behaviors_2.h"
-#include "game/object_helpers.h"
-#include "game/object_list_processor.h"
+#include "obj_behaviors_2.h"
+#include "object_helpers.h"
+#include "object_list_processor.h"
 #include "graph_node.h"
 #include "surface_collision.h"
 
diff --git a/src/game/behaviors/activated_bf_plat.inc.c b/src/engine/behaviors/activated_bf_plat.inc.c
similarity index 100%
rename from src/game/behaviors/activated_bf_plat.inc.c
rename to src/engine/behaviors/activated_bf_plat.inc.c
diff --git a/src/game/behaviors/amp.inc.c b/src/engine/behaviors/amp.inc.c
similarity index 100%
rename from src/game/behaviors/amp.inc.c
rename to src/engine/behaviors/amp.inc.c
diff --git a/src/game/behaviors/animated_floor_switch.inc.c b/src/engine/behaviors/animated_floor_switch.inc.c
similarity index 100%
rename from src/game/behaviors/animated_floor_switch.inc.c
rename to src/engine/behaviors/animated_floor_switch.inc.c
diff --git a/src/game/behaviors/arrow_lift.inc.c b/src/engine/behaviors/arrow_lift.inc.c
similarity index 100%
rename from src/game/behaviors/arrow_lift.inc.c
rename to src/engine/behaviors/arrow_lift.inc.c
diff --git a/src/game/behaviors/bbh_haunted_bookshelf.inc.c b/src/engine/behaviors/bbh_haunted_bookshelf.inc.c
similarity index 100%
rename from src/game/behaviors/bbh_haunted_bookshelf.inc.c
rename to src/engine/behaviors/bbh_haunted_bookshelf.inc.c
diff --git a/src/game/behaviors/bbh_merry_go_round.inc.c b/src/engine/behaviors/bbh_merry_go_round.inc.c
similarity index 100%
rename from src/game/behaviors/bbh_merry_go_round.inc.c
rename to src/engine/behaviors/bbh_merry_go_round.inc.c
diff --git a/src/game/behaviors/bbh_tilting_trap.inc.c b/src/engine/behaviors/bbh_tilting_trap.inc.c
similarity index 100%
rename from src/game/behaviors/bbh_tilting_trap.inc.c
rename to src/engine/behaviors/bbh_tilting_trap.inc.c
diff --git a/src/game/behaviors/beta_boo_key.inc.c b/src/engine/behaviors/beta_boo_key.inc.c
similarity index 100%
rename from src/game/behaviors/beta_boo_key.inc.c
rename to src/engine/behaviors/beta_boo_key.inc.c
diff --git a/src/game/behaviors/beta_bowser_anchor.inc.c b/src/engine/behaviors/beta_bowser_anchor.inc.c
similarity index 100%
rename from src/game/behaviors/beta_bowser_anchor.inc.c
rename to src/engine/behaviors/beta_bowser_anchor.inc.c
diff --git a/src/game/behaviors/beta_chest.inc.c b/src/engine/behaviors/beta_chest.inc.c
similarity index 100%
rename from src/game/behaviors/beta_chest.inc.c
rename to src/engine/behaviors/beta_chest.inc.c
diff --git a/src/game/behaviors/beta_fish_splash_spawner.inc.c b/src/engine/behaviors/beta_fish_splash_spawner.inc.c
similarity index 100%
rename from src/game/behaviors/beta_fish_splash_spawner.inc.c
rename to src/engine/behaviors/beta_fish_splash_spawner.inc.c
diff --git a/src/game/behaviors/beta_holdable_object.inc.c b/src/engine/behaviors/beta_holdable_object.inc.c
similarity index 100%
rename from src/game/behaviors/beta_holdable_object.inc.c
rename to src/engine/behaviors/beta_holdable_object.inc.c
diff --git a/src/game/behaviors/beta_trampoline.inc.c b/src/engine/behaviors/beta_trampoline.inc.c
similarity index 100%
rename from src/game/behaviors/beta_trampoline.inc.c
rename to src/engine/behaviors/beta_trampoline.inc.c
diff --git a/src/game/behaviors/bird.inc.c b/src/engine/behaviors/bird.inc.c
similarity index 100%
rename from src/game/behaviors/bird.inc.c
rename to src/engine/behaviors/bird.inc.c
diff --git a/src/game/behaviors/blue_coin.inc.c b/src/engine/behaviors/blue_coin.inc.c
similarity index 100%
rename from src/game/behaviors/blue_coin.inc.c
rename to src/engine/behaviors/blue_coin.inc.c
diff --git a/src/game/behaviors/blue_fish.inc.c b/src/engine/behaviors/blue_fish.inc.c
similarity index 100%
rename from src/game/behaviors/blue_fish.inc.c
rename to src/engine/behaviors/blue_fish.inc.c
diff --git a/src/game/behaviors/bobomb.inc.c b/src/engine/behaviors/bobomb.inc.c
similarity index 100%
rename from src/game/behaviors/bobomb.inc.c
rename to src/engine/behaviors/bobomb.inc.c
diff --git a/src/game/behaviors/bomp.inc.c b/src/engine/behaviors/bomp.inc.c
similarity index 100%
rename from src/game/behaviors/bomp.inc.c
rename to src/engine/behaviors/bomp.inc.c
diff --git a/src/game/behaviors/boo.inc.c b/src/engine/behaviors/boo.inc.c
similarity index 100%
rename from src/game/behaviors/boo.inc.c
rename to src/engine/behaviors/boo.inc.c
diff --git a/src/game/behaviors/boo_cage.inc.c b/src/engine/behaviors/boo_cage.inc.c
similarity index 100%
rename from src/game/behaviors/boo_cage.inc.c
rename to src/engine/behaviors/boo_cage.inc.c
diff --git a/src/game/behaviors/boulder.inc.c b/src/engine/behaviors/boulder.inc.c
similarity index 100%
rename from src/game/behaviors/boulder.inc.c
rename to src/engine/behaviors/boulder.inc.c
diff --git a/src/game/behaviors/bouncing_fireball.inc.c b/src/engine/behaviors/bouncing_fireball.inc.c
similarity index 100%
rename from src/game/behaviors/bouncing_fireball.inc.c
rename to src/engine/behaviors/bouncing_fireball.inc.c
diff --git a/src/game/behaviors/bowling_ball.inc.c b/src/engine/behaviors/bowling_ball.inc.c
similarity index 100%
rename from src/game/behaviors/bowling_ball.inc.c
rename to src/engine/behaviors/bowling_ball.inc.c
diff --git a/src/game/behaviors/bowser.inc.c b/src/engine/behaviors/bowser.inc.c
similarity index 100%
rename from src/game/behaviors/bowser.inc.c
rename to src/engine/behaviors/bowser.inc.c
diff --git a/src/game/behaviors/bowser_bomb.inc.c b/src/engine/behaviors/bowser_bomb.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_bomb.inc.c
rename to src/engine/behaviors/bowser_bomb.inc.c
diff --git a/src/game/behaviors/bowser_falling_platform.inc.c b/src/engine/behaviors/bowser_falling_platform.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_falling_platform.inc.c
rename to src/engine/behaviors/bowser_falling_platform.inc.c
diff --git a/src/game/behaviors/bowser_flame.inc.c b/src/engine/behaviors/bowser_flame.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_flame.inc.c
rename to src/engine/behaviors/bowser_flame.inc.c
diff --git a/src/game/behaviors/bowser_key.inc.c b/src/engine/behaviors/bowser_key.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_key.inc.c
rename to src/engine/behaviors/bowser_key.inc.c
diff --git a/src/game/behaviors/bowser_key_cutscene.inc.c b/src/engine/behaviors/bowser_key_cutscene.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_key_cutscene.inc.c
rename to src/engine/behaviors/bowser_key_cutscene.inc.c
diff --git a/src/game/behaviors/bowser_puzzle_piece.inc.c b/src/engine/behaviors/bowser_puzzle_piece.inc.c
similarity index 100%
rename from src/game/behaviors/bowser_puzzle_piece.inc.c
rename to src/engine/behaviors/bowser_puzzle_piece.inc.c
diff --git a/src/game/behaviors/break_particles.inc.c b/src/engine/behaviors/break_particles.inc.c
similarity index 100%
rename from src/game/behaviors/break_particles.inc.c
rename to src/engine/behaviors/break_particles.inc.c
diff --git a/src/game/behaviors/breakable_box.inc.c b/src/engine/behaviors/breakable_box.inc.c
similarity index 100%
rename from src/game/behaviors/breakable_box.inc.c
rename to src/engine/behaviors/breakable_box.inc.c
diff --git a/src/game/behaviors/breakable_box_small.inc.c b/src/engine/behaviors/breakable_box_small.inc.c
similarity index 100%
rename from src/game/behaviors/breakable_box_small.inc.c
rename to src/engine/behaviors/breakable_box_small.inc.c
diff --git a/src/game/behaviors/breakable_wall.inc.c b/src/engine/behaviors/breakable_wall.inc.c
similarity index 100%
rename from src/game/behaviors/breakable_wall.inc.c
rename to src/engine/behaviors/breakable_wall.inc.c
diff --git a/src/game/behaviors/bub.inc.c b/src/engine/behaviors/bub.inc.c
similarity index 100%
rename from src/game/behaviors/bub.inc.c
rename to src/engine/behaviors/bub.inc.c
diff --git a/src/game/behaviors/bubba.inc.c b/src/engine/behaviors/bubba.inc.c
similarity index 100%
rename from src/game/behaviors/bubba.inc.c
rename to src/engine/behaviors/bubba.inc.c
diff --git a/src/game/behaviors/bubble.inc.c b/src/engine/behaviors/bubble.inc.c
similarity index 100%
rename from src/game/behaviors/bubble.inc.c
rename to src/engine/behaviors/bubble.inc.c
diff --git a/src/game/behaviors/bullet_bill.inc.c b/src/engine/behaviors/bullet_bill.inc.c
similarity index 100%
rename from src/game/behaviors/bullet_bill.inc.c
rename to src/engine/behaviors/bullet_bill.inc.c
diff --git a/src/game/behaviors/bully.inc.c b/src/engine/behaviors/bully.inc.c
similarity index 100%
rename from src/game/behaviors/bully.inc.c
rename to src/engine/behaviors/bully.inc.c
diff --git a/src/game/behaviors/butterfly.inc.c b/src/engine/behaviors/butterfly.inc.c
similarity index 100%
rename from src/game/behaviors/butterfly.inc.c
rename to src/engine/behaviors/butterfly.inc.c
diff --git a/src/game/behaviors/camera_lakitu.inc.c b/src/engine/behaviors/camera_lakitu.inc.c
similarity index 100%
rename from src/game/behaviors/camera_lakitu.inc.c
rename to src/engine/behaviors/camera_lakitu.inc.c
diff --git a/src/game/behaviors/cannon.inc.c b/src/engine/behaviors/cannon.inc.c
similarity index 100%
rename from src/game/behaviors/cannon.inc.c
rename to src/engine/behaviors/cannon.inc.c
diff --git a/src/game/behaviors/cannon_door.inc.c b/src/engine/behaviors/cannon_door.inc.c
similarity index 100%
rename from src/game/behaviors/cannon_door.inc.c
rename to src/engine/behaviors/cannon_door.inc.c
diff --git a/src/game/behaviors/cap.inc.c b/src/engine/behaviors/cap.inc.c
similarity index 100%
rename from src/game/behaviors/cap.inc.c
rename to src/engine/behaviors/cap.inc.c
diff --git a/src/game/behaviors/capswitch.inc.c b/src/engine/behaviors/capswitch.inc.c
similarity index 100%
rename from src/game/behaviors/capswitch.inc.c
rename to src/engine/behaviors/capswitch.inc.c
diff --git a/src/game/behaviors/castle_cannon_grate.inc.c b/src/engine/behaviors/castle_cannon_grate.inc.c
similarity index 100%
rename from src/game/behaviors/castle_cannon_grate.inc.c
rename to src/engine/behaviors/castle_cannon_grate.inc.c
diff --git a/src/game/behaviors/castle_flag.inc.c b/src/engine/behaviors/castle_flag.inc.c
similarity index 100%
rename from src/game/behaviors/castle_flag.inc.c
rename to src/engine/behaviors/castle_flag.inc.c
diff --git a/src/game/behaviors/castle_floor_trap.inc.c b/src/engine/behaviors/castle_floor_trap.inc.c
similarity index 100%
rename from src/game/behaviors/castle_floor_trap.inc.c
rename to src/engine/behaviors/castle_floor_trap.inc.c
diff --git a/src/game/behaviors/celebration_star.inc.c b/src/engine/behaviors/celebration_star.inc.c
similarity index 100%
rename from src/game/behaviors/celebration_star.inc.c
rename to src/engine/behaviors/celebration_star.inc.c
diff --git a/src/game/behaviors/chain_chomp.inc.c b/src/engine/behaviors/chain_chomp.inc.c
similarity index 100%
rename from src/game/behaviors/chain_chomp.inc.c
rename to src/engine/behaviors/chain_chomp.inc.c
diff --git a/src/game/behaviors/checkerboard_platform.inc.c b/src/engine/behaviors/checkerboard_platform.inc.c
similarity index 100%
rename from src/game/behaviors/checkerboard_platform.inc.c
rename to src/engine/behaviors/checkerboard_platform.inc.c
diff --git a/src/game/behaviors/chuckya.inc.c b/src/engine/behaviors/chuckya.inc.c
similarity index 100%
rename from src/game/behaviors/chuckya.inc.c
rename to src/engine/behaviors/chuckya.inc.c
diff --git a/src/game/behaviors/clam.inc.c b/src/engine/behaviors/clam.inc.c
similarity index 100%
rename from src/game/behaviors/clam.inc.c
rename to src/engine/behaviors/clam.inc.c
diff --git a/src/game/behaviors/clock_arm.inc.c b/src/engine/behaviors/clock_arm.inc.c
similarity index 100%
rename from src/game/behaviors/clock_arm.inc.c
rename to src/engine/behaviors/clock_arm.inc.c
diff --git a/src/game/behaviors/cloud.inc.c b/src/engine/behaviors/cloud.inc.c
similarity index 100%
rename from src/game/behaviors/cloud.inc.c
rename to src/engine/behaviors/cloud.inc.c
diff --git a/src/game/behaviors/coffin.inc.c b/src/engine/behaviors/coffin.inc.c
similarity index 100%
rename from src/game/behaviors/coffin.inc.c
rename to src/engine/behaviors/coffin.inc.c
diff --git a/src/game/behaviors/coin.inc.c b/src/engine/behaviors/coin.inc.c
similarity index 100%
rename from src/game/behaviors/coin.inc.c
rename to src/engine/behaviors/coin.inc.c
diff --git a/src/game/behaviors/collide_particles.inc.c b/src/engine/behaviors/collide_particles.inc.c
similarity index 100%
rename from src/game/behaviors/collide_particles.inc.c
rename to src/engine/behaviors/collide_particles.inc.c
diff --git a/src/game/behaviors/controllable_platform.inc.c b/src/engine/behaviors/controllable_platform.inc.c
similarity index 100%
rename from src/game/behaviors/controllable_platform.inc.c
rename to src/engine/behaviors/controllable_platform.inc.c
diff --git a/src/game/behaviors/corkbox.inc.c b/src/engine/behaviors/corkbox.inc.c
similarity index 100%
rename from src/game/behaviors/corkbox.inc.c
rename to src/engine/behaviors/corkbox.inc.c
diff --git a/src/game/behaviors/cruiser.inc.c b/src/engine/behaviors/cruiser.inc.c
similarity index 100%
rename from src/game/behaviors/cruiser.inc.c
rename to src/engine/behaviors/cruiser.inc.c
diff --git a/src/game/behaviors/ddd_pole.inc.c b/src/engine/behaviors/ddd_pole.inc.c
similarity index 100%
rename from src/game/behaviors/ddd_pole.inc.c
rename to src/engine/behaviors/ddd_pole.inc.c
diff --git a/src/game/behaviors/ddd_sub.inc.c b/src/engine/behaviors/ddd_sub.inc.c
similarity index 100%
rename from src/game/behaviors/ddd_sub.inc.c
rename to src/engine/behaviors/ddd_sub.inc.c
diff --git a/src/game/behaviors/ddd_warp.inc.c b/src/engine/behaviors/ddd_warp.inc.c
similarity index 100%
rename from src/game/behaviors/ddd_warp.inc.c
rename to src/engine/behaviors/ddd_warp.inc.c
diff --git a/src/game/behaviors/decorative_pendulum.inc.c b/src/engine/behaviors/decorative_pendulum.inc.c
similarity index 100%
rename from src/game/behaviors/decorative_pendulum.inc.c
rename to src/engine/behaviors/decorative_pendulum.inc.c
diff --git a/src/game/behaviors/donut_platform.inc.c b/src/engine/behaviors/donut_platform.inc.c
similarity index 100%
rename from src/game/behaviors/donut_platform.inc.c
rename to src/engine/behaviors/donut_platform.inc.c
diff --git a/src/game/behaviors/door.inc.c b/src/engine/behaviors/door.inc.c
similarity index 100%
rename from src/game/behaviors/door.inc.c
rename to src/engine/behaviors/door.inc.c
diff --git a/src/game/behaviors/dorrie.inc.c b/src/engine/behaviors/dorrie.inc.c
similarity index 100%
rename from src/game/behaviors/dorrie.inc.c
rename to src/engine/behaviors/dorrie.inc.c
diff --git a/src/game/behaviors/drawbridge.inc.c b/src/engine/behaviors/drawbridge.inc.c
similarity index 100%
rename from src/game/behaviors/drawbridge.inc.c
rename to src/engine/behaviors/drawbridge.inc.c
diff --git a/src/game/behaviors/elevator.inc.c b/src/engine/behaviors/elevator.inc.c
similarity index 100%
rename from src/game/behaviors/elevator.inc.c
rename to src/engine/behaviors/elevator.inc.c
diff --git a/src/game/behaviors/end_birds_1.inc.c b/src/engine/behaviors/end_birds_1.inc.c
similarity index 100%
rename from src/game/behaviors/end_birds_1.inc.c
rename to src/engine/behaviors/end_birds_1.inc.c
diff --git a/src/game/behaviors/end_birds_2.inc.c b/src/engine/behaviors/end_birds_2.inc.c
similarity index 100%
rename from src/game/behaviors/end_birds_2.inc.c
rename to src/engine/behaviors/end_birds_2.inc.c
diff --git a/src/game/behaviors/enemy_lakitu.inc.c b/src/engine/behaviors/enemy_lakitu.inc.c
similarity index 100%
rename from src/game/behaviors/enemy_lakitu.inc.c
rename to src/engine/behaviors/enemy_lakitu.inc.c
diff --git a/src/game/behaviors/exclamation_box.inc.c b/src/engine/behaviors/exclamation_box.inc.c
similarity index 100%
rename from src/game/behaviors/exclamation_box.inc.c
rename to src/engine/behaviors/exclamation_box.inc.c
diff --git a/src/game/behaviors/explosion.inc.c b/src/engine/behaviors/explosion.inc.c
similarity index 100%
rename from src/game/behaviors/explosion.inc.c
rename to src/engine/behaviors/explosion.inc.c
diff --git a/src/game/behaviors/express_elevator.inc.c b/src/engine/behaviors/express_elevator.inc.c
similarity index 100%
rename from src/game/behaviors/express_elevator.inc.c
rename to src/engine/behaviors/express_elevator.inc.c
diff --git a/src/game/behaviors/eyerok.inc.c b/src/engine/behaviors/eyerok.inc.c
similarity index 100%
rename from src/game/behaviors/eyerok.inc.c
rename to src/engine/behaviors/eyerok.inc.c
diff --git a/src/game/behaviors/falling_pillar.inc.c b/src/engine/behaviors/falling_pillar.inc.c
similarity index 100%
rename from src/game/behaviors/falling_pillar.inc.c
rename to src/engine/behaviors/falling_pillar.inc.c
diff --git a/src/game/behaviors/falling_rising_platform.inc.c b/src/engine/behaviors/falling_rising_platform.inc.c
similarity index 100%
rename from src/game/behaviors/falling_rising_platform.inc.c
rename to src/engine/behaviors/falling_rising_platform.inc.c
diff --git a/src/game/behaviors/ferris_wheel.inc.c b/src/engine/behaviors/ferris_wheel.inc.c
similarity index 100%
rename from src/game/behaviors/ferris_wheel.inc.c
rename to src/engine/behaviors/ferris_wheel.inc.c
diff --git a/src/game/behaviors/fire_piranha_plant.inc.c b/src/engine/behaviors/fire_piranha_plant.inc.c
similarity index 100%
rename from src/game/behaviors/fire_piranha_plant.inc.c
rename to src/engine/behaviors/fire_piranha_plant.inc.c
diff --git a/src/game/behaviors/fire_spitter.inc.c b/src/engine/behaviors/fire_spitter.inc.c
similarity index 100%
rename from src/game/behaviors/fire_spitter.inc.c
rename to src/engine/behaviors/fire_spitter.inc.c
diff --git a/src/game/behaviors/fish.inc.c b/src/engine/behaviors/fish.inc.c
similarity index 100%
rename from src/game/behaviors/fish.inc.c
rename to src/engine/behaviors/fish.inc.c
diff --git a/src/game/behaviors/fishing_boo.inc.c b/src/engine/behaviors/fishing_boo.inc.c
similarity index 100%
rename from src/game/behaviors/fishing_boo.inc.c
rename to src/engine/behaviors/fishing_boo.inc.c
diff --git a/src/game/behaviors/flame.inc.c b/src/engine/behaviors/flame.inc.c
similarity index 100%
rename from src/game/behaviors/flame.inc.c
rename to src/engine/behaviors/flame.inc.c
diff --git a/src/game/behaviors/flame_mario.inc.c b/src/engine/behaviors/flame_mario.inc.c
similarity index 100%
rename from src/game/behaviors/flame_mario.inc.c
rename to src/engine/behaviors/flame_mario.inc.c
diff --git a/src/game/behaviors/flamethrower.inc.c b/src/engine/behaviors/flamethrower.inc.c
similarity index 100%
rename from src/game/behaviors/flamethrower.inc.c
rename to src/engine/behaviors/flamethrower.inc.c
diff --git a/src/game/behaviors/floating_box.inc.c b/src/engine/behaviors/floating_box.inc.c
similarity index 100%
rename from src/game/behaviors/floating_box.inc.c
rename to src/engine/behaviors/floating_box.inc.c
diff --git a/src/game/behaviors/floating_platform.inc.c b/src/engine/behaviors/floating_platform.inc.c
similarity index 100%
rename from src/game/behaviors/floating_platform.inc.c
rename to src/engine/behaviors/floating_platform.inc.c
diff --git a/src/game/behaviors/fly_guy.inc.c b/src/engine/behaviors/fly_guy.inc.c
similarity index 100%
rename from src/game/behaviors/fly_guy.inc.c
rename to src/engine/behaviors/fly_guy.inc.c
diff --git a/src/game/behaviors/flying_bookend_switch.inc.c b/src/engine/behaviors/flying_bookend_switch.inc.c
similarity index 100%
rename from src/game/behaviors/flying_bookend_switch.inc.c
rename to src/engine/behaviors/flying_bookend_switch.inc.c
diff --git a/src/game/behaviors/goomba.inc.c b/src/engine/behaviors/goomba.inc.c
similarity index 100%
rename from src/game/behaviors/goomba.inc.c
rename to src/engine/behaviors/goomba.inc.c
diff --git a/src/game/behaviors/grand_star.inc.c b/src/engine/behaviors/grand_star.inc.c
similarity index 100%
rename from src/game/behaviors/grand_star.inc.c
rename to src/engine/behaviors/grand_star.inc.c
diff --git a/src/game/behaviors/grill_door.inc.c b/src/engine/behaviors/grill_door.inc.c
similarity index 100%
rename from src/game/behaviors/grill_door.inc.c
rename to src/engine/behaviors/grill_door.inc.c
diff --git a/src/game/behaviors/ground_particles.inc.c b/src/engine/behaviors/ground_particles.inc.c
similarity index 100%
rename from src/game/behaviors/ground_particles.inc.c
rename to src/engine/behaviors/ground_particles.inc.c
diff --git a/src/game/behaviors/haunted_chair.inc.c b/src/engine/behaviors/haunted_chair.inc.c
similarity index 100%
rename from src/game/behaviors/haunted_chair.inc.c
rename to src/engine/behaviors/haunted_chair.inc.c
diff --git a/src/game/behaviors/heave_ho.inc.c b/src/engine/behaviors/heave_ho.inc.c
similarity index 100%
rename from src/game/behaviors/heave_ho.inc.c
rename to src/engine/behaviors/heave_ho.inc.c
diff --git a/src/game/behaviors/hidden_star.inc.c b/src/engine/behaviors/hidden_star.inc.c
similarity index 100%
rename from src/game/behaviors/hidden_star.inc.c
rename to src/engine/behaviors/hidden_star.inc.c
diff --git a/src/game/behaviors/hoot.inc.c b/src/engine/behaviors/hoot.inc.c
similarity index 100%
rename from src/game/behaviors/hoot.inc.c
rename to src/engine/behaviors/hoot.inc.c
diff --git a/src/game/behaviors/horizontal_grindel.inc.c b/src/engine/behaviors/horizontal_grindel.inc.c
similarity index 100%
rename from src/game/behaviors/horizontal_grindel.inc.c
rename to src/engine/behaviors/horizontal_grindel.inc.c
diff --git a/src/game/behaviors/intro_lakitu.inc.c b/src/engine/behaviors/intro_lakitu.inc.c
similarity index 100%
rename from src/game/behaviors/intro_lakitu.inc.c
rename to src/engine/behaviors/intro_lakitu.inc.c
diff --git a/src/game/behaviors/intro_peach.inc.c b/src/engine/behaviors/intro_peach.inc.c
similarity index 100%
rename from src/game/behaviors/intro_peach.inc.c
rename to src/engine/behaviors/intro_peach.inc.c
diff --git a/src/game/behaviors/intro_scene.inc.c b/src/engine/behaviors/intro_scene.inc.c
similarity index 100%
rename from src/game/behaviors/intro_scene.inc.c
rename to src/engine/behaviors/intro_scene.inc.c
diff --git a/src/game/behaviors/jrb_ship.inc.c b/src/engine/behaviors/jrb_ship.inc.c
similarity index 100%
rename from src/game/behaviors/jrb_ship.inc.c
rename to src/engine/behaviors/jrb_ship.inc.c
diff --git a/src/game/behaviors/jumping_box.inc.c b/src/engine/behaviors/jumping_box.inc.c
similarity index 100%
rename from src/game/behaviors/jumping_box.inc.c
rename to src/engine/behaviors/jumping_box.inc.c
diff --git a/src/game/behaviors/kickable_board.inc.c b/src/engine/behaviors/kickable_board.inc.c
similarity index 100%
rename from src/game/behaviors/kickable_board.inc.c
rename to src/engine/behaviors/kickable_board.inc.c
diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/engine/behaviors/king_bobomb.inc.c
similarity index 100%
rename from src/game/behaviors/king_bobomb.inc.c
rename to src/engine/behaviors/king_bobomb.inc.c
diff --git a/src/game/behaviors/klepto.inc.c b/src/engine/behaviors/klepto.inc.c
similarity index 100%
rename from src/game/behaviors/klepto.inc.c
rename to src/engine/behaviors/klepto.inc.c
diff --git a/src/game/behaviors/koopa.inc.c b/src/engine/behaviors/koopa.inc.c
similarity index 100%
rename from src/game/behaviors/koopa.inc.c
rename to src/engine/behaviors/koopa.inc.c
diff --git a/src/game/behaviors/koopa_shell.inc.c b/src/engine/behaviors/koopa_shell.inc.c
similarity index 100%
rename from src/game/behaviors/koopa_shell.inc.c
rename to src/engine/behaviors/koopa_shell.inc.c
diff --git a/src/game/behaviors/koopa_shell_underwater.inc.c b/src/engine/behaviors/koopa_shell_underwater.inc.c
similarity index 100%
rename from src/game/behaviors/koopa_shell_underwater.inc.c
rename to src/engine/behaviors/koopa_shell_underwater.inc.c
diff --git a/src/game/behaviors/lll_floating_wood_piece.inc.c b/src/engine/behaviors/lll_floating_wood_piece.inc.c
similarity index 100%
rename from src/game/behaviors/lll_floating_wood_piece.inc.c
rename to src/engine/behaviors/lll_floating_wood_piece.inc.c
diff --git a/src/game/behaviors/lll_hexagonal_ring.inc.c b/src/engine/behaviors/lll_hexagonal_ring.inc.c
similarity index 100%
rename from src/game/behaviors/lll_hexagonal_ring.inc.c
rename to src/engine/behaviors/lll_hexagonal_ring.inc.c
diff --git a/src/game/behaviors/lll_octagonal_rotating_mesh.inc.c b/src/engine/behaviors/lll_octagonal_rotating_mesh.inc.c
similarity index 100%
rename from src/game/behaviors/lll_octagonal_rotating_mesh.inc.c
rename to src/engine/behaviors/lll_octagonal_rotating_mesh.inc.c
diff --git a/src/game/behaviors/lll_rotating_hex_flame.inc.c b/src/engine/behaviors/lll_rotating_hex_flame.inc.c
similarity index 100%
rename from src/game/behaviors/lll_rotating_hex_flame.inc.c
rename to src/engine/behaviors/lll_rotating_hex_flame.inc.c
diff --git a/src/game/behaviors/lll_sinking_rectangle.inc.c b/src/engine/behaviors/lll_sinking_rectangle.inc.c
similarity index 100%
rename from src/game/behaviors/lll_sinking_rectangle.inc.c
rename to src/engine/behaviors/lll_sinking_rectangle.inc.c
diff --git a/src/game/behaviors/lll_sinking_rock_block.inc.c b/src/engine/behaviors/lll_sinking_rock_block.inc.c
similarity index 100%
rename from src/game/behaviors/lll_sinking_rock_block.inc.c
rename to src/engine/behaviors/lll_sinking_rock_block.inc.c
diff --git a/src/game/behaviors/lll_volcano_flames.inc.c b/src/engine/behaviors/lll_volcano_flames.inc.c
similarity index 100%
rename from src/game/behaviors/lll_volcano_flames.inc.c
rename to src/engine/behaviors/lll_volcano_flames.inc.c
diff --git a/src/game/behaviors/mad_piano.inc.c b/src/engine/behaviors/mad_piano.inc.c
similarity index 100%
rename from src/game/behaviors/mad_piano.inc.c
rename to src/engine/behaviors/mad_piano.inc.c
diff --git a/src/game/behaviors/manta_ray.inc.c b/src/engine/behaviors/manta_ray.inc.c
similarity index 100%
rename from src/game/behaviors/manta_ray.inc.c
rename to src/engine/behaviors/manta_ray.inc.c
diff --git a/src/game/behaviors/metal_box.inc.c b/src/engine/behaviors/metal_box.inc.c
similarity index 100%
rename from src/game/behaviors/metal_box.inc.c
rename to src/engine/behaviors/metal_box.inc.c
diff --git a/src/game/behaviors/mips.inc.c b/src/engine/behaviors/mips.inc.c
similarity index 100%
rename from src/game/behaviors/mips.inc.c
rename to src/engine/behaviors/mips.inc.c
diff --git a/src/game/behaviors/moat_drainer.inc.c b/src/engine/behaviors/moat_drainer.inc.c
similarity index 100%
rename from src/game/behaviors/moat_drainer.inc.c
rename to src/engine/behaviors/moat_drainer.inc.c
diff --git a/src/game/behaviors/moat_grill.inc.c b/src/engine/behaviors/moat_grill.inc.c
similarity index 100%
rename from src/game/behaviors/moat_grill.inc.c
rename to src/engine/behaviors/moat_grill.inc.c
diff --git a/src/game/behaviors/moneybag.inc.c b/src/engine/behaviors/moneybag.inc.c
similarity index 100%
rename from src/game/behaviors/moneybag.inc.c
rename to src/engine/behaviors/moneybag.inc.c
diff --git a/src/game/behaviors/monty_mole.inc.c b/src/engine/behaviors/monty_mole.inc.c
similarity index 100%
rename from src/game/behaviors/monty_mole.inc.c
rename to src/engine/behaviors/monty_mole.inc.c
diff --git a/src/game/behaviors/moving_coin.inc.c b/src/engine/behaviors/moving_coin.inc.c
similarity index 100%
rename from src/game/behaviors/moving_coin.inc.c
rename to src/engine/behaviors/moving_coin.inc.c
diff --git a/src/game/behaviors/mr_blizzard.inc.c b/src/engine/behaviors/mr_blizzard.inc.c
similarity index 100%
rename from src/game/behaviors/mr_blizzard.inc.c
rename to src/engine/behaviors/mr_blizzard.inc.c
diff --git a/src/game/behaviors/mr_i.inc.c b/src/engine/behaviors/mr_i.inc.c
similarity index 100%
rename from src/game/behaviors/mr_i.inc.c
rename to src/engine/behaviors/mr_i.inc.c
diff --git a/src/game/behaviors/mushroom_1up.inc.c b/src/engine/behaviors/mushroom_1up.inc.c
similarity index 100%
rename from src/game/behaviors/mushroom_1up.inc.c
rename to src/engine/behaviors/mushroom_1up.inc.c
diff --git a/src/game/behaviors/music_touch.inc.c b/src/engine/behaviors/music_touch.inc.c
similarity index 100%
rename from src/game/behaviors/music_touch.inc.c
rename to src/engine/behaviors/music_touch.inc.c
diff --git a/src/game/behaviors/orange_number.inc.c b/src/engine/behaviors/orange_number.inc.c
similarity index 100%
rename from src/game/behaviors/orange_number.inc.c
rename to src/engine/behaviors/orange_number.inc.c
diff --git a/src/game/behaviors/piranha_bubbles.inc.c b/src/engine/behaviors/piranha_bubbles.inc.c
similarity index 100%
rename from src/game/behaviors/piranha_bubbles.inc.c
rename to src/engine/behaviors/piranha_bubbles.inc.c
diff --git a/src/game/behaviors/piranha_plant.inc.c b/src/engine/behaviors/piranha_plant.inc.c
similarity index 100%
rename from src/game/behaviors/piranha_plant.inc.c
rename to src/engine/behaviors/piranha_plant.inc.c
diff --git a/src/game/behaviors/platform_on_track.inc.c b/src/engine/behaviors/platform_on_track.inc.c
similarity index 100%
rename from src/game/behaviors/platform_on_track.inc.c
rename to src/engine/behaviors/platform_on_track.inc.c
diff --git a/src/game/behaviors/pokey.inc.c b/src/engine/behaviors/pokey.inc.c
similarity index 100%
rename from src/game/behaviors/pokey.inc.c
rename to src/engine/behaviors/pokey.inc.c
diff --git a/src/game/behaviors/pole.inc.c b/src/engine/behaviors/pole.inc.c
similarity index 100%
rename from src/game/behaviors/pole.inc.c
rename to src/engine/behaviors/pole.inc.c
diff --git a/src/game/behaviors/pole_base.inc.c b/src/engine/behaviors/pole_base.inc.c
similarity index 100%
rename from src/game/behaviors/pole_base.inc.c
rename to src/engine/behaviors/pole_base.inc.c
diff --git a/src/game/behaviors/purple_switch.inc.c b/src/engine/behaviors/purple_switch.inc.c
similarity index 100%
rename from src/game/behaviors/purple_switch.inc.c
rename to src/engine/behaviors/purple_switch.inc.c
diff --git a/src/game/behaviors/pyramid_elevator.inc.c b/src/engine/behaviors/pyramid_elevator.inc.c
similarity index 100%
rename from src/game/behaviors/pyramid_elevator.inc.c
rename to src/engine/behaviors/pyramid_elevator.inc.c
diff --git a/src/game/behaviors/pyramid_top.inc.c b/src/engine/behaviors/pyramid_top.inc.c
similarity index 100%
rename from src/game/behaviors/pyramid_top.inc.c
rename to src/engine/behaviors/pyramid_top.inc.c
diff --git a/src/game/behaviors/pyramid_wall.inc.c b/src/engine/behaviors/pyramid_wall.inc.c
similarity index 100%
rename from src/game/behaviors/pyramid_wall.inc.c
rename to src/engine/behaviors/pyramid_wall.inc.c
diff --git a/src/game/behaviors/racing_penguin.inc.c b/src/engine/behaviors/racing_penguin.inc.c
similarity index 100%
rename from src/game/behaviors/racing_penguin.inc.c
rename to src/engine/behaviors/racing_penguin.inc.c
diff --git a/src/game/behaviors/recovery_heart.inc.c b/src/engine/behaviors/recovery_heart.inc.c
similarity index 100%
rename from src/game/behaviors/recovery_heart.inc.c
rename to src/engine/behaviors/recovery_heart.inc.c
diff --git a/src/game/behaviors/red_coin.inc.c b/src/engine/behaviors/red_coin.inc.c
similarity index 100%
rename from src/game/behaviors/red_coin.inc.c
rename to src/engine/behaviors/red_coin.inc.c
diff --git a/src/game/behaviors/reds_star_marker.inc.c b/src/engine/behaviors/reds_star_marker.inc.c
similarity index 100%
rename from src/game/behaviors/reds_star_marker.inc.c
rename to src/engine/behaviors/reds_star_marker.inc.c
diff --git a/src/game/behaviors/rolling_log.inc.c b/src/engine/behaviors/rolling_log.inc.c
similarity index 100%
rename from src/game/behaviors/rolling_log.inc.c
rename to src/engine/behaviors/rolling_log.inc.c
diff --git a/src/game/behaviors/rotating_octagonal_plat.inc.c b/src/engine/behaviors/rotating_octagonal_plat.inc.c
similarity index 100%
rename from src/game/behaviors/rotating_octagonal_plat.inc.c
rename to src/engine/behaviors/rotating_octagonal_plat.inc.c
diff --git a/src/game/behaviors/rotating_platform.inc.c b/src/engine/behaviors/rotating_platform.inc.c
similarity index 100%
rename from src/game/behaviors/rotating_platform.inc.c
rename to src/engine/behaviors/rotating_platform.inc.c
diff --git a/src/game/behaviors/scuttlebug.inc.c b/src/engine/behaviors/scuttlebug.inc.c
similarity index 100%
rename from src/game/behaviors/scuttlebug.inc.c
rename to src/engine/behaviors/scuttlebug.inc.c
diff --git a/src/game/behaviors/seaweed.inc.c b/src/engine/behaviors/seaweed.inc.c
similarity index 100%
rename from src/game/behaviors/seaweed.inc.c
rename to src/engine/behaviors/seaweed.inc.c
diff --git a/src/game/behaviors/seesaw_platform.inc.c b/src/engine/behaviors/seesaw_platform.inc.c
similarity index 100%
rename from src/game/behaviors/seesaw_platform.inc.c
rename to src/engine/behaviors/seesaw_platform.inc.c
diff --git a/src/game/behaviors/shock_wave.inc.c b/src/engine/behaviors/shock_wave.inc.c
similarity index 100%
rename from src/game/behaviors/shock_wave.inc.c
rename to src/engine/behaviors/shock_wave.inc.c
diff --git a/src/game/behaviors/skeeter.inc.c b/src/engine/behaviors/skeeter.inc.c
similarity index 100%
rename from src/game/behaviors/skeeter.inc.c
rename to src/engine/behaviors/skeeter.inc.c
diff --git a/src/game/behaviors/sl_snowman_wind.inc.c b/src/engine/behaviors/sl_snowman_wind.inc.c
similarity index 100%
rename from src/game/behaviors/sl_snowman_wind.inc.c
rename to src/engine/behaviors/sl_snowman_wind.inc.c
diff --git a/src/game/behaviors/sl_walking_penguin.inc.c b/src/engine/behaviors/sl_walking_penguin.inc.c
similarity index 100%
rename from src/game/behaviors/sl_walking_penguin.inc.c
rename to src/engine/behaviors/sl_walking_penguin.inc.c
diff --git a/src/game/behaviors/sliding_platform.inc.c b/src/engine/behaviors/sliding_platform.inc.c
similarity index 100%
rename from src/game/behaviors/sliding_platform.inc.c
rename to src/engine/behaviors/sliding_platform.inc.c
diff --git a/src/game/behaviors/sliding_platform_2.inc.c b/src/engine/behaviors/sliding_platform_2.inc.c
similarity index 100%
rename from src/game/behaviors/sliding_platform_2.inc.c
rename to src/engine/behaviors/sliding_platform_2.inc.c
diff --git a/src/game/behaviors/snow_mound.inc.c b/src/engine/behaviors/snow_mound.inc.c
similarity index 100%
rename from src/game/behaviors/snow_mound.inc.c
rename to src/engine/behaviors/snow_mound.inc.c
diff --git a/src/game/behaviors/snowman.inc.c b/src/engine/behaviors/snowman.inc.c
similarity index 100%
rename from src/game/behaviors/snowman.inc.c
rename to src/engine/behaviors/snowman.inc.c
diff --git a/src/game/behaviors/snufit.inc.c b/src/engine/behaviors/snufit.inc.c
similarity index 100%
rename from src/game/behaviors/snufit.inc.c
rename to src/engine/behaviors/snufit.inc.c
diff --git a/src/game/behaviors/sound_ambient.inc.c b/src/engine/behaviors/sound_ambient.inc.c
similarity index 100%
rename from src/game/behaviors/sound_ambient.inc.c
rename to src/engine/behaviors/sound_ambient.inc.c
diff --git a/src/game/behaviors/sound_birds.inc.c b/src/engine/behaviors/sound_birds.inc.c
similarity index 100%
rename from src/game/behaviors/sound_birds.inc.c
rename to src/engine/behaviors/sound_birds.inc.c
diff --git a/src/game/behaviors/sound_sand.inc.c b/src/engine/behaviors/sound_sand.inc.c
similarity index 100%
rename from src/game/behaviors/sound_sand.inc.c
rename to src/engine/behaviors/sound_sand.inc.c
diff --git a/src/game/behaviors/sound_spawner.inc.c b/src/engine/behaviors/sound_spawner.inc.c
similarity index 100%
rename from src/game/behaviors/sound_spawner.inc.c
rename to src/engine/behaviors/sound_spawner.inc.c
diff --git a/src/game/behaviors/sound_volcano.inc.c b/src/engine/behaviors/sound_volcano.inc.c
similarity index 100%
rename from src/game/behaviors/sound_volcano.inc.c
rename to src/engine/behaviors/sound_volcano.inc.c
diff --git a/src/game/behaviors/sound_waterfall.inc.c b/src/engine/behaviors/sound_waterfall.inc.c
similarity index 100%
rename from src/game/behaviors/sound_waterfall.inc.c
rename to src/engine/behaviors/sound_waterfall.inc.c
diff --git a/src/game/behaviors/sparkle_spawn.inc.c b/src/engine/behaviors/sparkle_spawn.inc.c
similarity index 100%
rename from src/game/behaviors/sparkle_spawn.inc.c
rename to src/engine/behaviors/sparkle_spawn.inc.c
diff --git a/src/game/behaviors/sparkle_spawn_star.inc.c b/src/engine/behaviors/sparkle_spawn_star.inc.c
similarity index 100%
rename from src/game/behaviors/sparkle_spawn_star.inc.c
rename to src/engine/behaviors/sparkle_spawn_star.inc.c
diff --git a/src/game/behaviors/spawn_star.inc.c b/src/engine/behaviors/spawn_star.inc.c
similarity index 100%
rename from src/game/behaviors/spawn_star.inc.c
rename to src/engine/behaviors/spawn_star.inc.c
diff --git a/src/game/behaviors/spawn_star_exit.inc.c b/src/engine/behaviors/spawn_star_exit.inc.c
similarity index 100%
rename from src/game/behaviors/spawn_star_exit.inc.c
rename to src/engine/behaviors/spawn_star_exit.inc.c
diff --git a/src/game/behaviors/spindel.inc.c b/src/engine/behaviors/spindel.inc.c
similarity index 100%
rename from src/game/behaviors/spindel.inc.c
rename to src/engine/behaviors/spindel.inc.c
diff --git a/src/game/behaviors/spindrift.inc.c b/src/engine/behaviors/spindrift.inc.c
similarity index 100%
rename from src/game/behaviors/spindrift.inc.c
rename to src/engine/behaviors/spindrift.inc.c
diff --git a/src/game/behaviors/spiny.inc.c b/src/engine/behaviors/spiny.inc.c
similarity index 100%
rename from src/game/behaviors/spiny.inc.c
rename to src/engine/behaviors/spiny.inc.c
diff --git a/src/game/behaviors/square_platform_cycle.inc.c b/src/engine/behaviors/square_platform_cycle.inc.c
similarity index 100%
rename from src/game/behaviors/square_platform_cycle.inc.c
rename to src/engine/behaviors/square_platform_cycle.inc.c
diff --git a/src/game/behaviors/star_door.inc.c b/src/engine/behaviors/star_door.inc.c
similarity index 100%
rename from src/game/behaviors/star_door.inc.c
rename to src/engine/behaviors/star_door.inc.c
diff --git a/src/game/behaviors/static_checkered_platform.inc.c b/src/engine/behaviors/static_checkered_platform.inc.c
similarity index 100%
rename from src/game/behaviors/static_checkered_platform.inc.c
rename to src/engine/behaviors/static_checkered_platform.inc.c
diff --git a/src/game/behaviors/strong_wind_particle.inc.c b/src/engine/behaviors/strong_wind_particle.inc.c
similarity index 100%
rename from src/game/behaviors/strong_wind_particle.inc.c
rename to src/engine/behaviors/strong_wind_particle.inc.c
diff --git a/src/game/behaviors/sushi.inc.c b/src/engine/behaviors/sushi.inc.c
similarity index 100%
rename from src/game/behaviors/sushi.inc.c
rename to src/engine/behaviors/sushi.inc.c
diff --git a/src/game/behaviors/swing_platform.inc.c b/src/engine/behaviors/swing_platform.inc.c
similarity index 100%
rename from src/game/behaviors/swing_platform.inc.c
rename to src/engine/behaviors/swing_platform.inc.c
diff --git a/src/game/behaviors/switch_hidden_objects.inc.c b/src/engine/behaviors/switch_hidden_objects.inc.c
similarity index 100%
rename from src/game/behaviors/switch_hidden_objects.inc.c
rename to src/engine/behaviors/switch_hidden_objects.inc.c
diff --git a/src/game/behaviors/swoop.inc.c b/src/engine/behaviors/swoop.inc.c
similarity index 100%
rename from src/game/behaviors/swoop.inc.c
rename to src/engine/behaviors/swoop.inc.c
diff --git a/src/game/behaviors/thi_top.inc.c b/src/engine/behaviors/thi_top.inc.c
similarity index 100%
rename from src/game/behaviors/thi_top.inc.c
rename to src/engine/behaviors/thi_top.inc.c
diff --git a/src/game/behaviors/thwomp.inc.c b/src/engine/behaviors/thwomp.inc.c
similarity index 100%
rename from src/game/behaviors/thwomp.inc.c
rename to src/engine/behaviors/thwomp.inc.c
diff --git a/src/game/behaviors/tilting_inverted_pyramid.inc.c b/src/engine/behaviors/tilting_inverted_pyramid.inc.c
similarity index 100%
rename from src/game/behaviors/tilting_inverted_pyramid.inc.c
rename to src/engine/behaviors/tilting_inverted_pyramid.inc.c
diff --git a/src/game/behaviors/tower_door.inc.c b/src/engine/behaviors/tower_door.inc.c
similarity index 100%
rename from src/game/behaviors/tower_door.inc.c
rename to src/engine/behaviors/tower_door.inc.c
diff --git a/src/game/behaviors/tower_platform.inc.c b/src/engine/behaviors/tower_platform.inc.c
similarity index 100%
rename from src/game/behaviors/tower_platform.inc.c
rename to src/engine/behaviors/tower_platform.inc.c
diff --git a/src/game/behaviors/tox_box.inc.c b/src/engine/behaviors/tox_box.inc.c
similarity index 100%
rename from src/game/behaviors/tox_box.inc.c
rename to src/engine/behaviors/tox_box.inc.c
diff --git a/src/game/behaviors/treasure_chest.inc.c b/src/engine/behaviors/treasure_chest.inc.c
similarity index 100%
rename from src/game/behaviors/treasure_chest.inc.c
rename to src/engine/behaviors/treasure_chest.inc.c
diff --git a/src/game/behaviors/tree_particles.inc.c b/src/engine/behaviors/tree_particles.inc.c
similarity index 100%
rename from src/game/behaviors/tree_particles.inc.c
rename to src/engine/behaviors/tree_particles.inc.c
diff --git a/src/game/behaviors/triplet_butterfly.inc.c b/src/engine/behaviors/triplet_butterfly.inc.c
similarity index 100%
rename from src/game/behaviors/triplet_butterfly.inc.c
rename to src/engine/behaviors/triplet_butterfly.inc.c
diff --git a/src/game/behaviors/ttc_2d_rotator.inc.c b/src/engine/behaviors/ttc_2d_rotator.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_2d_rotator.inc.c
rename to src/engine/behaviors/ttc_2d_rotator.inc.c
diff --git a/src/game/behaviors/ttc_cog.inc.c b/src/engine/behaviors/ttc_cog.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_cog.inc.c
rename to src/engine/behaviors/ttc_cog.inc.c
diff --git a/src/game/behaviors/ttc_elevator.inc.c b/src/engine/behaviors/ttc_elevator.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_elevator.inc.c
rename to src/engine/behaviors/ttc_elevator.inc.c
diff --git a/src/game/behaviors/ttc_moving_bar.inc.c b/src/engine/behaviors/ttc_moving_bar.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_moving_bar.inc.c
rename to src/engine/behaviors/ttc_moving_bar.inc.c
diff --git a/src/game/behaviors/ttc_pendulum.inc.c b/src/engine/behaviors/ttc_pendulum.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_pendulum.inc.c
rename to src/engine/behaviors/ttc_pendulum.inc.c
diff --git a/src/game/behaviors/ttc_pit_block.inc.c b/src/engine/behaviors/ttc_pit_block.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_pit_block.inc.c
rename to src/engine/behaviors/ttc_pit_block.inc.c
diff --git a/src/game/behaviors/ttc_rotating_solid.inc.c b/src/engine/behaviors/ttc_rotating_solid.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_rotating_solid.inc.c
rename to src/engine/behaviors/ttc_rotating_solid.inc.c
diff --git a/src/game/behaviors/ttc_spinner.inc.c b/src/engine/behaviors/ttc_spinner.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_spinner.inc.c
rename to src/engine/behaviors/ttc_spinner.inc.c
diff --git a/src/game/behaviors/ttc_treadmill.inc.c b/src/engine/behaviors/ttc_treadmill.inc.c
similarity index 100%
rename from src/game/behaviors/ttc_treadmill.inc.c
rename to src/engine/behaviors/ttc_treadmill.inc.c
diff --git a/src/game/behaviors/tumbling_bridge.inc.c b/src/engine/behaviors/tumbling_bridge.inc.c
similarity index 100%
rename from src/game/behaviors/tumbling_bridge.inc.c
rename to src/engine/behaviors/tumbling_bridge.inc.c
diff --git a/src/game/behaviors/tuxie.inc.c b/src/engine/behaviors/tuxie.inc.c
similarity index 100%
rename from src/game/behaviors/tuxie.inc.c
rename to src/engine/behaviors/tuxie.inc.c
diff --git a/src/game/behaviors/tweester.inc.c b/src/engine/behaviors/tweester.inc.c
similarity index 100%
rename from src/game/behaviors/tweester.inc.c
rename to src/engine/behaviors/tweester.inc.c
diff --git a/src/game/behaviors/ukiki.inc.c b/src/engine/behaviors/ukiki.inc.c
similarity index 100%
rename from src/game/behaviors/ukiki.inc.c
rename to src/engine/behaviors/ukiki.inc.c
diff --git a/src/game/behaviors/ukiki_cage.inc.c b/src/engine/behaviors/ukiki_cage.inc.c
similarity index 100%
rename from src/game/behaviors/ukiki_cage.inc.c
rename to src/engine/behaviors/ukiki_cage.inc.c
diff --git a/src/game/behaviors/unagi.inc.c b/src/engine/behaviors/unagi.inc.c
similarity index 100%
rename from src/game/behaviors/unagi.inc.c
rename to src/engine/behaviors/unagi.inc.c
diff --git a/src/game/behaviors/unused_particle_spawn.inc.c b/src/engine/behaviors/unused_particle_spawn.inc.c
similarity index 100%
rename from src/game/behaviors/unused_particle_spawn.inc.c
rename to src/engine/behaviors/unused_particle_spawn.inc.c
diff --git a/src/game/behaviors/unused_poundable_platform.inc.c b/src/engine/behaviors/unused_poundable_platform.inc.c
similarity index 100%
rename from src/game/behaviors/unused_poundable_platform.inc.c
rename to src/engine/behaviors/unused_poundable_platform.inc.c
diff --git a/src/game/behaviors/warp.inc.c b/src/engine/behaviors/warp.inc.c
similarity index 100%
rename from src/game/behaviors/warp.inc.c
rename to src/engine/behaviors/warp.inc.c
diff --git a/src/game/behaviors/water_bomb.inc.c b/src/engine/behaviors/water_bomb.inc.c
similarity index 100%
rename from src/game/behaviors/water_bomb.inc.c
rename to src/engine/behaviors/water_bomb.inc.c
diff --git a/src/game/behaviors/water_bomb_cannon.inc.c b/src/engine/behaviors/water_bomb_cannon.inc.c
similarity index 100%
rename from src/game/behaviors/water_bomb_cannon.inc.c
rename to src/engine/behaviors/water_bomb_cannon.inc.c
diff --git a/src/game/behaviors/water_mist.inc.c b/src/engine/behaviors/water_mist.inc.c
similarity index 100%
rename from src/game/behaviors/water_mist.inc.c
rename to src/engine/behaviors/water_mist.inc.c
diff --git a/src/game/behaviors/water_mist_particle.inc.c b/src/engine/behaviors/water_mist_particle.inc.c
similarity index 100%
rename from src/game/behaviors/water_mist_particle.inc.c
rename to src/engine/behaviors/water_mist_particle.inc.c
diff --git a/src/game/behaviors/water_objs.inc.c b/src/engine/behaviors/water_objs.inc.c
similarity index 100%
rename from src/game/behaviors/water_objs.inc.c
rename to src/engine/behaviors/water_objs.inc.c
diff --git a/src/game/behaviors/water_pillar.inc.c b/src/engine/behaviors/water_pillar.inc.c
similarity index 100%
rename from src/game/behaviors/water_pillar.inc.c
rename to src/engine/behaviors/water_pillar.inc.c
diff --git a/src/game/behaviors/water_ring.inc.c b/src/engine/behaviors/water_ring.inc.c
similarity index 100%
rename from src/game/behaviors/water_ring.inc.c
rename to src/engine/behaviors/water_ring.inc.c
diff --git a/src/game/behaviors/water_splashes_and_waves.inc.c b/src/engine/behaviors/water_splashes_and_waves.inc.c
similarity index 100%
rename from src/game/behaviors/water_splashes_and_waves.inc.c
rename to src/engine/behaviors/water_splashes_and_waves.inc.c
diff --git a/src/game/behaviors/water_wave.inc.c b/src/engine/behaviors/water_wave.inc.c
similarity index 100%
rename from src/game/behaviors/water_wave.inc.c
rename to src/engine/behaviors/water_wave.inc.c
diff --git a/src/game/behaviors/wdw_water_level.inc.c b/src/engine/behaviors/wdw_water_level.inc.c
similarity index 100%
rename from src/game/behaviors/wdw_water_level.inc.c
rename to src/engine/behaviors/wdw_water_level.inc.c
diff --git a/src/game/behaviors/whirlpool.inc.c b/src/engine/behaviors/whirlpool.inc.c
similarity index 100%
rename from src/game/behaviors/whirlpool.inc.c
rename to src/engine/behaviors/whirlpool.inc.c
diff --git a/src/game/behaviors/white_puff.inc.c b/src/engine/behaviors/white_puff.inc.c
similarity index 100%
rename from src/game/behaviors/white_puff.inc.c
rename to src/engine/behaviors/white_puff.inc.c
diff --git a/src/game/behaviors/white_puff_explode.inc.c b/src/engine/behaviors/white_puff_explode.inc.c
similarity index 100%
rename from src/game/behaviors/white_puff_explode.inc.c
rename to src/engine/behaviors/white_puff_explode.inc.c
diff --git a/src/game/behaviors/whomp.inc.c b/src/engine/behaviors/whomp.inc.c
similarity index 100%
rename from src/game/behaviors/whomp.inc.c
rename to src/engine/behaviors/whomp.inc.c
diff --git a/src/game/behaviors/wiggler.inc.c b/src/engine/behaviors/wiggler.inc.c
similarity index 100%
rename from src/game/behaviors/wiggler.inc.c
rename to src/engine/behaviors/wiggler.inc.c
diff --git a/src/game/behaviors/wind.inc.c b/src/engine/behaviors/wind.inc.c
similarity index 100%
rename from src/game/behaviors/wind.inc.c
rename to src/engine/behaviors/wind.inc.c
diff --git a/src/game/behaviors/yoshi.inc.c b/src/engine/behaviors/yoshi.inc.c
similarity index 100%
rename from src/game/behaviors/yoshi.inc.c
rename to src/engine/behaviors/yoshi.inc.c
diff --git a/src/game/camera.c b/src/engine/camera.c
similarity index 100%
rename from src/game/camera.c
rename to src/engine/camera.c
diff --git a/src/game/camera.h b/src/engine/camera.h
similarity index 100%
rename from src/game/camera.h
rename to src/engine/camera.h
diff --git a/src/game/cn_common_syms_1.c b/src/engine/cn_common_syms_1.c
similarity index 100%
rename from src/game/cn_common_syms_1.c
rename to src/engine/cn_common_syms_1.c
diff --git a/src/game/cn_common_syms_2.c b/src/engine/cn_common_syms_2.c
similarity index 100%
rename from src/game/cn_common_syms_2.c
rename to src/engine/cn_common_syms_2.c
diff --git a/src/game/debug.c b/src/engine/debug.c
similarity index 99%
rename from src/game/debug.c
rename to src/engine/debug.c
index c2b71720..eac0ed4c 100644
--- a/src/game/debug.c
+++ b/src/engine/debug.c
@@ -2,10 +2,10 @@
 
 #include "behavior_data.h"
 #include "debug.h"
-#include "engine/behavior_script.h"
-#include "engine/surface_collision.h"
+#include "behavior_script.h"
+#include "surface_collision.h"
 #include "game_init.h"
-#include "main.h"
+#include "game/main.h"
 #include "object_constants.h"
 #include "object_fields.h"
 #include "object_helpers.h"
diff --git a/src/game/debug.h b/src/engine/debug.h
similarity index 100%
rename from src/game/debug.h
rename to src/engine/debug.h
diff --git a/src/game/debug_course.c b/src/engine/debug_course.c
similarity index 100%
rename from src/game/debug_course.c
rename to src/engine/debug_course.c
diff --git a/src/game/debug_course.h b/src/engine/debug_course.h
similarity index 100%
rename from src/game/debug_course.h
rename to src/engine/debug_course.h
diff --git a/src/game/envfx_bubbles.c b/src/engine/envfx_bubbles.c
similarity index 99%
rename from src/game/envfx_bubbles.c
rename to src/engine/envfx_bubbles.c
index 3c1d672a..2aed7a21 100644
--- a/src/game/envfx_bubbles.c
+++ b/src/engine/envfx_bubbles.c
@@ -2,12 +2,12 @@
 
 #include "sm64.h"
 #include "game_init.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "envfx_snow.h"
 #include "envfx_bubbles.h"
-#include "engine/surface_collision.h"
-#include "engine/math_util.h"
-#include "engine/behavior_script.h"
+#include "surface_collision.h"
+#include "math_util.h"
+#include "behavior_script.h"
 #include "audio/external.h"
 #include "textures.h"
 
diff --git a/src/game/envfx_bubbles.h b/src/engine/envfx_bubbles.h
similarity index 100%
rename from src/game/envfx_bubbles.h
rename to src/engine/envfx_bubbles.h
diff --git a/src/game/envfx_snow.c b/src/engine/envfx_snow.c
similarity index 99%
rename from src/game/envfx_snow.c
rename to src/engine/envfx_snow.c
index b4a4772e..b9b265ac 100644
--- a/src/game/envfx_snow.c
+++ b/src/engine/envfx_snow.c
@@ -4,13 +4,13 @@
 #include "sm64.h"
 #include "dialog_ids.h"
 #include "game_init.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "ingame_menu.h"
 #include "envfx_snow.h"
 #include "envfx_bubbles.h"
-#include "engine/surface_collision.h"
-#include "engine/math_util.h"
-#include "engine/behavior_script.h"
+#include "surface_collision.h"
+#include "math_util.h"
+#include "behavior_script.h"
 #include "audio/external.h"
 #include "obj_behaviors.h"
 
diff --git a/src/game/envfx_snow.h b/src/engine/envfx_snow.h
similarity index 100%
rename from src/game/envfx_snow.h
rename to src/engine/envfx_snow.h
diff --git a/src/game/game_init.c b/src/engine/game_init.c
similarity index 99%
rename from src/game/game_init.c
rename to src/engine/game_init.c
index 6775eeda..98613108 100644
--- a/src/game/game_init.c
+++ b/src/engine/game_init.c
@@ -9,8 +9,8 @@
 #include "buffers/zbuffer.h"
 #include "engine/level_script.h"
 #include "game_init.h"
-#include "main.h"
-#include "memory.h"
+#include "game/main.h"
+#include "game/memory.h"
 #include "profiler.h"
 #include "save_file.h"
 #include "seq_ids.h"
diff --git a/src/game/game_init.h b/src/engine/game_init.h
similarity index 98%
rename from src/game/game_init.h
rename to src/engine/game_init.h
index 94a77b4a..f5b3e2ff 100644
--- a/src/game/game_init.h
+++ b/src/engine/game_init.h
@@ -7,7 +7,7 @@
 #include <PR/os_message.h>
 
 #include "types.h"
-#include "memory.h"
+#include "game/memory.h"
 
 #define GFX_POOL_SIZE 6400 // Size of how large the master display list (gDisplayListHead) can be
 
diff --git a/src/game/geo_misc.c b/src/engine/geo_misc.c
similarity index 99%
rename from src/game/geo_misc.c
rename to src/engine/geo_misc.c
index 7c34157f..cfe796f7 100644
--- a/src/game/geo_misc.c
+++ b/src/engine/geo_misc.c
@@ -4,14 +4,14 @@
 #include "geo_misc.h"
 
 #include "area.h"
-#include "engine/math_util.h"
+#include "math_util.h"
 #include "level_update.h"
 #include "levels/castle_inside/header.h"
 #include "levels/ending/header.h"
 #include "levels/rr/header.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
 #include "save_file.h"
diff --git a/src/game/geo_misc.h b/src/engine/geo_misc.h
similarity index 100%
rename from src/game/geo_misc.h
rename to src/engine/geo_misc.h
diff --git a/src/engine/graph_node.c b/src/engine/graph_node.c
index 66b49b22..2840c0d8 100644
--- a/src/engine/graph_node.c
+++ b/src/engine/graph_node.c
@@ -1,12 +1,12 @@
 #include <ultra64.h>
 #include "sm64.h"
 
-#include "game/level_update.h"
+#include "level_update.h"
 #include "math_util.h"
 #include "game/memory.h"
 #include "graph_node.h"
-#include "game/rendering_graph_node.h"
-#include "game/area.h"
+#include "rendering_graph_node.h"
+#include "area.h"
 #include "geo_layout.h"
 
 // unused Mtx(s)
diff --git a/src/game/hud.c b/src/engine/hud.c
similarity index 100%
rename from src/game/hud.c
rename to src/engine/hud.c
diff --git a/src/game/hud.h b/src/engine/hud.h
similarity index 100%
rename from src/game/hud.h
rename to src/engine/hud.h
diff --git a/src/game/ingame_menu.c b/src/engine/ingame_menu.c
similarity index 99%
rename from src/game/ingame_menu.c
rename to src/engine/ingame_menu.c
index 0ac715ba..96679021 100644
--- a/src/game/ingame_menu.c
+++ b/src/engine/ingame_menu.c
@@ -6,14 +6,14 @@
 #include "camera.h"
 #include "course_table.h"
 #include "dialog_ids.h"
-#include "engine/math_util.h"
+#include "math_util.h"
 #include "eu_translation.h"
 #include "game_init.h"
 #include "gfx_dimensions.h"
 #include "ingame_menu.h"
 #include "level_update.h"
 #include "levels/castle_grounds/header.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "print.h"
 #include "save_file.h"
 #include "segment2.h"
diff --git a/src/game/ingame_menu.h b/src/engine/ingame_menu.h
similarity index 100%
rename from src/game/ingame_menu.h
rename to src/engine/ingame_menu.h
diff --git a/src/game/interaction.c b/src/engine/interaction.c
similarity index 99%
rename from src/game/interaction.c
rename to src/engine/interaction.c
index ea6e4559..2ddaee60 100644
--- a/src/game/interaction.c
+++ b/src/engine/interaction.c
@@ -8,14 +8,14 @@
 #include "camera.h"
 #include "course_table.h"
 #include "dialog_ids.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "math_util.h"
+#include "surface_collision.h"
 #include "game_init.h"
 #include "interaction.h"
 #include "level_update.h"
 #include "mario.h"
 #include "mario_step.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "save_file.h"
diff --git a/src/game/interaction.h b/src/engine/interaction.h
similarity index 100%
rename from src/game/interaction.h
rename to src/engine/interaction.h
diff --git a/src/game/level_geo.c b/src/engine/level_geo.c
similarity index 100%
rename from src/game/level_geo.c
rename to src/engine/level_geo.c
diff --git a/src/game/level_geo.h b/src/engine/level_geo.h
similarity index 100%
rename from src/game/level_geo.h
rename to src/engine/level_geo.h
diff --git a/src/engine/level_script.c b/src/engine/level_script.c
index 0ec43411..1d0e7bbd 100644
--- a/src/engine/level_script.c
+++ b/src/engine/level_script.c
@@ -7,15 +7,15 @@
 #include "audio/external.h"
 #include "buffers/framebuffers.h"
 #include "buffers/zbuffer.h"
-#include "game/area.h"
-#include "game/game_init.h"
-#include "game/mario.h"
+#include "area.h"
+#include "game_init.h"
+#include "mario.h"
 #include "game/memory.h"
-#include "game/object_helpers.h"
-#include "game/object_list_processor.h"
-#include "game/profiler.h"
-#include "game/save_file.h"
-#include "game/sound_init.h"
+#include "object_helpers.h"
+#include "object_list_processor.h"
+#include "profiler.h"
+#include "save_file.h"
+#include "sound_init.h"
 #include "goddard/renderer.h"
 #include "geo_layout.h"
 #include "graph_node.h"
diff --git a/src/game/level_update.c b/src/engine/level_update.c
similarity index 99%
rename from src/game/level_update.c
rename to src/engine/level_update.c
index 4b045ea3..350f2b01 100644
--- a/src/game/level_update.c
+++ b/src/engine/level_update.c
@@ -8,9 +8,9 @@
 #include "level_update.h"
 #include "game_init.h"
 #include "level_update.h"
-#include "main.h"
-#include "engine/math_util.h"
-#include "engine/graph_node.h"
+#include "game/main.h"
+#include "math_util.h"
+#include "graph_node.h"
 #include "area.h"
 #include "save_file.h"
 #include "sound_init.h"
@@ -22,7 +22,7 @@
 #include "save_file.h"
 #include "debug_course.h"
 #ifdef VERSION_EU
-#include "memory.h"
+#include "game/memory.h"
 #include "eu_translation.h"
 #include "segment_symbols.h"
 #endif
diff --git a/src/game/level_update.h b/src/engine/level_update.h
similarity index 100%
rename from src/game/level_update.h
rename to src/engine/level_update.h
diff --git a/src/game/libgcc.c b/src/engine/libgcc.c
similarity index 100%
rename from src/game/libgcc.c
rename to src/engine/libgcc.c
diff --git a/src/game/macro_special_objects.c b/src/engine/macro_special_objects.c
similarity index 100%
rename from src/game/macro_special_objects.c
rename to src/engine/macro_special_objects.c
diff --git a/src/game/macro_special_objects.h b/src/engine/macro_special_objects.h
similarity index 100%
rename from src/game/macro_special_objects.h
rename to src/engine/macro_special_objects.h
diff --git a/src/game/mario.c b/src/engine/mario.c
similarity index 99%
rename from src/game/mario.c
rename to src/engine/mario.c
index dac39b9b..cefb1534 100644
--- a/src/game/mario.c
+++ b/src/engine/mario.c
@@ -6,14 +6,14 @@
 #include "behavior_actions.h"
 #include "behavior_data.h"
 #include "camera.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "graph_node.h"
+#include "math_util.h"
+#include "surface_collision.h"
 #include "game_init.h"
 #include "interaction.h"
 #include "level_table.h"
 #include "level_update.h"
-#include "main.h"
+#include "game/main.h"
 #include "mario.h"
 #include "mario_actions_airborne.h"
 #include "mario_actions_automatic.h"
@@ -24,7 +24,7 @@
 #include "mario_actions_submerged.h"
 #include "mario_misc.h"
 #include "mario_step.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "object_fields.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/game/mario.h b/src/engine/mario.h
similarity index 100%
rename from src/game/mario.h
rename to src/engine/mario.h
diff --git a/src/game/mario_actions_airborne.c b/src/engine/mario_actions_airborne.c
similarity index 100%
rename from src/game/mario_actions_airborne.c
rename to src/engine/mario_actions_airborne.c
diff --git a/src/game/mario_actions_airborne.h b/src/engine/mario_actions_airborne.h
similarity index 100%
rename from src/game/mario_actions_airborne.h
rename to src/engine/mario_actions_airborne.h
diff --git a/src/game/mario_actions_automatic.c b/src/engine/mario_actions_automatic.c
similarity index 99%
rename from src/game/mario_actions_automatic.c
rename to src/engine/mario_actions_automatic.c
index f973c665..926385bc 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/engine/mario_actions_automatic.c
@@ -7,11 +7,11 @@
 #include "area.h"
 #include "mario.h"
 #include "mario_step.h"
-#include "engine/math_util.h"
-#include "memory.h"
-#include "engine/graph_node.h"
+#include "math_util.h"
+#include "game/memory.h"
+#include "graph_node.h"
 #include "save_file.h"
-#include "engine/surface_collision.h"
+#include "surface_collision.h"
 #include "interaction.h"
 #include "camera.h"
 #include "level_table.h"
diff --git a/src/game/mario_actions_automatic.h b/src/engine/mario_actions_automatic.h
similarity index 100%
rename from src/game/mario_actions_automatic.h
rename to src/engine/mario_actions_automatic.h
diff --git a/src/game/mario_actions_cutscene.c b/src/engine/mario_actions_cutscene.c
similarity index 100%
rename from src/game/mario_actions_cutscene.c
rename to src/engine/mario_actions_cutscene.c
diff --git a/src/game/mario_actions_cutscene.h b/src/engine/mario_actions_cutscene.h
similarity index 100%
rename from src/game/mario_actions_cutscene.h
rename to src/engine/mario_actions_cutscene.h
diff --git a/src/game/mario_actions_moving.c b/src/engine/mario_actions_moving.c
similarity index 99%
rename from src/game/mario_actions_moving.c
rename to src/engine/mario_actions_moving.c
index 9da6abb8..73ad1e29 100644
--- a/src/game/mario_actions_moving.c
+++ b/src/engine/mario_actions_moving.c
@@ -3,13 +3,13 @@
 #include "sm64.h"
 #include "mario.h"
 #include "audio/external.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "math_util.h"
+#include "surface_collision.h"
 #include "mario_step.h"
 #include "area.h"
 #include "interaction.h"
 #include "mario_actions_object.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "behavior_data.h"
 #include "rumble_init.h"
 
diff --git a/src/game/mario_actions_moving.h b/src/engine/mario_actions_moving.h
similarity index 100%
rename from src/game/mario_actions_moving.h
rename to src/engine/mario_actions_moving.h
diff --git a/src/game/mario_actions_object.c b/src/engine/mario_actions_object.c
similarity index 100%
rename from src/game/mario_actions_object.c
rename to src/engine/mario_actions_object.c
diff --git a/src/game/mario_actions_object.h b/src/engine/mario_actions_object.h
similarity index 100%
rename from src/game/mario_actions_object.h
rename to src/engine/mario_actions_object.h
diff --git a/src/game/mario_actions_stationary.c b/src/engine/mario_actions_stationary.c
similarity index 99%
rename from src/game/mario_actions_stationary.c
rename to src/engine/mario_actions_stationary.c
index 6475e1f8..703874c0 100644
--- a/src/game/mario_actions_stationary.c
+++ b/src/engine/mario_actions_stationary.c
@@ -5,13 +5,13 @@
 #include "audio/external.h"
 #include "behavior_data.h"
 #include "camera.h"
-#include "engine/math_util.h"
+#include "math_util.h"
 #include "interaction.h"
 #include "level_update.h"
 #include "mario.h"
 #include "mario_actions_stationary.h"
 #include "mario_step.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "save_file.h"
 #include "sound_init.h"
 #include "surface_terrains.h"
diff --git a/src/game/mario_actions_stationary.h b/src/engine/mario_actions_stationary.h
similarity index 100%
rename from src/game/mario_actions_stationary.h
rename to src/engine/mario_actions_stationary.h
diff --git a/src/game/mario_actions_submerged.c b/src/engine/mario_actions_submerged.c
similarity index 99%
rename from src/game/mario_actions_submerged.c
rename to src/engine/mario_actions_submerged.c
index 0c05e9c1..087ad1a0 100644
--- a/src/game/mario_actions_submerged.c
+++ b/src/engine/mario_actions_submerged.c
@@ -3,12 +3,12 @@
 
 #include "sm64.h"
 #include "level_update.h"
-#include "memory.h"
-#include "engine/math_util.h"
+#include "game/memory.h"
+#include "math_util.h"
 #include "area.h"
 #include "save_file.h"
 #include "sound_init.h"
-#include "engine/surface_collision.h"
+#include "surface_collision.h"
 #include "interaction.h"
 #include "mario.h"
 #include "mario_step.h"
diff --git a/src/game/mario_actions_submerged.h b/src/engine/mario_actions_submerged.h
similarity index 100%
rename from src/game/mario_actions_submerged.h
rename to src/engine/mario_actions_submerged.h
diff --git a/src/game/mario_misc.c b/src/engine/mario_misc.c
similarity index 99%
rename from src/game/mario_misc.c
rename to src/engine/mario_misc.c
index 92641df6..617b33f0 100644
--- a/src/game/mario_misc.c
+++ b/src/engine/mario_misc.c
@@ -7,9 +7,9 @@
 #include "behavior_data.h"
 #include "camera.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
+#include "behavior_script.h"
+#include "graph_node.h"
+#include "math_util.h"
 #include "envfx_snow.h"
 #include "game_init.h"
 #include "goddard/renderer.h"
@@ -17,7 +17,7 @@
 #include "level_update.h"
 #include "mario_actions_cutscene.h"
 #include "mario_misc.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
diff --git a/src/game/mario_misc.h b/src/engine/mario_misc.h
similarity index 100%
rename from src/game/mario_misc.h
rename to src/engine/mario_misc.h
diff --git a/src/game/mario_step.c b/src/engine/mario_step.c
similarity index 100%
rename from src/game/mario_step.c
rename to src/engine/mario_step.c
diff --git a/src/game/mario_step.h b/src/engine/mario_step.h
similarity index 100%
rename from src/game/mario_step.h
rename to src/engine/mario_step.h
diff --git a/src/game/moving_texture.c b/src/engine/moving_texture.c
similarity index 99%
rename from src/game/moving_texture.c
rename to src/engine/moving_texture.c
index 86ffa2b7..efb40ac9 100644
--- a/src/game/moving_texture.c
+++ b/src/engine/moving_texture.c
@@ -6,7 +6,7 @@
 #include "camera.h"
 #include "rendering_graph_node.h"
 #include "engine/math_util.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "save_file.h"
 #include "segment2.h"
 #include "engine/surface_collision.h"
diff --git a/src/game/moving_texture.h b/src/engine/moving_texture.h
similarity index 100%
rename from src/game/moving_texture.h
rename to src/engine/moving_texture.h
diff --git a/src/game/obj_behaviors.c b/src/engine/obj_behaviors.c
similarity index 99%
rename from src/game/obj_behaviors.c
rename to src/engine/obj_behaviors.c
index d2a45c97..a31c065e 100644
--- a/src/game/obj_behaviors.c
+++ b/src/engine/obj_behaviors.c
@@ -8,9 +8,9 @@
 #include "camera.h"
 #include "course_table.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "behavior_script.h"
+#include "math_util.h"
+#include "surface_collision.h"
 #include "envfx_bubbles.h"
 #include "game_init.h"
 #include "ingame_menu.h"
@@ -23,7 +23,7 @@
 #include "mario.h"
 #include "mario_actions_cutscene.h"
 #include "mario_misc.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/game/obj_behaviors.h b/src/engine/obj_behaviors.h
similarity index 100%
rename from src/game/obj_behaviors.h
rename to src/engine/obj_behaviors.h
diff --git a/src/game/obj_behaviors_2.c b/src/engine/obj_behaviors_2.c
similarity index 99%
rename from src/game/obj_behaviors_2.c
rename to src/engine/obj_behaviors_2.c
index f6149218..b319ad0c 100644
--- a/src/game/obj_behaviors_2.c
+++ b/src/engine/obj_behaviors_2.c
@@ -9,10 +9,10 @@
 #include "behavior_data.h"
 #include "camera.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
-#include "engine/surface_load.h"
+#include "behavior_script.h"
+#include "math_util.h"
+#include "surface_collision.h"
+#include "surface_load.h"
 #include "game_init.h"
 #include "geo_misc.h"
 #include "ingame_menu.h"
@@ -34,7 +34,7 @@
 #include "levels/vcutm/header.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "obj_behaviors.h"
 #include "obj_behaviors_2.h"
 #include "object_constants.h"
diff --git a/src/game/obj_behaviors_2.h b/src/engine/obj_behaviors_2.h
similarity index 100%
rename from src/game/obj_behaviors_2.h
rename to src/engine/obj_behaviors_2.h
diff --git a/src/game/object_collision.c b/src/engine/object_collision.c
similarity index 100%
rename from src/game/object_collision.c
rename to src/engine/object_collision.c
diff --git a/src/game/object_collision.h b/src/engine/object_collision.h
similarity index 100%
rename from src/game/object_collision.h
rename to src/engine/object_collision.h
diff --git a/src/game/object_helpers.c b/src/engine/object_helpers.c
similarity index 99%
rename from src/game/object_helpers.c
rename to src/engine/object_helpers.c
index 54cf24f4..f0797874 100644
--- a/src/game/object_helpers.c
+++ b/src/engine/object_helpers.c
@@ -7,9 +7,9 @@
 #include "camera.h"
 #include "debug.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/geo_layout.h"
-#include "engine/math_util.h"
+#include "behavior_script.h"
+#include "geo_layout.h"
+#include "math_util.h"
 #include "engine/surface_collision.h"
 #include "game_init.h"
 #include "helper_macros.h"
@@ -19,7 +19,7 @@
 #include "level_update.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/game/object_helpers.h b/src/engine/object_helpers.h
similarity index 100%
rename from src/game/object_helpers.h
rename to src/engine/object_helpers.h
diff --git a/src/game/object_list_processor.c b/src/engine/object_list_processor.c
similarity index 99%
rename from src/game/object_list_processor.c
rename to src/engine/object_list_processor.c
index a2590a22..cc783b7f 100644
--- a/src/game/object_list_processor.c
+++ b/src/engine/object_list_processor.c
@@ -12,7 +12,7 @@
 #include "interaction.h"
 #include "level_update.h"
 #include "mario.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "object_collision.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/game/object_list_processor.h b/src/engine/object_list_processor.h
similarity index 100%
rename from src/game/object_list_processor.h
rename to src/engine/object_list_processor.h
diff --git a/src/game/paintings.c b/src/engine/paintings.c
similarity index 99%
rename from src/game/paintings.c
rename to src/engine/paintings.c
index 08706d9a..5271403a 100644
--- a/src/game/paintings.c
+++ b/src/engine/paintings.c
@@ -10,7 +10,7 @@
 #include "levels/hmc/header.h"
 #include "levels/ttm/header.h"
 #include "mario.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "moving_texture.h"
 #include "object_list_processor.h"
 #include "paintings.h"
diff --git a/src/game/paintings.h b/src/engine/paintings.h
similarity index 100%
rename from src/game/paintings.h
rename to src/engine/paintings.h
diff --git a/src/game/platform_displacement.c b/src/engine/platform_displacement.c
similarity index 100%
rename from src/game/platform_displacement.c
rename to src/engine/platform_displacement.c
diff --git a/src/game/platform_displacement.h b/src/engine/platform_displacement.h
similarity index 100%
rename from src/game/platform_displacement.h
rename to src/engine/platform_displacement.h
diff --git a/src/game/print.c b/src/engine/print.c
similarity index 99%
rename from src/game/print.c
rename to src/engine/print.c
index d02b39a5..fd955f8d 100644
--- a/src/game/print.c
+++ b/src/engine/print.c
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "gfx_dimensions.h"
 #include "game_init.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "print.h"
 #include "segment2.h"
 
diff --git a/src/game/print.h b/src/engine/print.h
similarity index 100%
rename from src/game/print.h
rename to src/engine/print.h
diff --git a/src/game/profiler.c b/src/engine/profiler.c
similarity index 100%
rename from src/game/profiler.c
rename to src/engine/profiler.c
diff --git a/src/game/profiler.h b/src/engine/profiler.h
similarity index 100%
rename from src/game/profiler.h
rename to src/engine/profiler.h
diff --git a/src/game/rendering_graph_node.c b/src/engine/rendering_graph_node.c
similarity index 99%
rename from src/game/rendering_graph_node.c
rename to src/engine/rendering_graph_node.c
index 23430689..f09b03c8 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/engine/rendering_graph_node.c
@@ -1,11 +1,11 @@
 #include <PR/ultratypes.h>
 
 #include "area.h"
-#include "engine/math_util.h"
+#include "math_util.h"
 #include "game_init.h"
 #include "gfx_dimensions.h"
-#include "main.h"
-#include "memory.h"
+#include "game/main.h"
+#include "game/memory.h"
 #include "print.h"
 #include "rendering_graph_node.h"
 #include "shadow.h"
diff --git a/src/game/rendering_graph_node.h b/src/engine/rendering_graph_node.h
similarity index 100%
rename from src/game/rendering_graph_node.h
rename to src/engine/rendering_graph_node.h
diff --git a/src/game/rumble_init.c b/src/engine/rumble_init.c
similarity index 99%
rename from src/game/rumble_init.c
rename to src/engine/rumble_init.c
index d9fb4619..dfcef1ba 100644
--- a/src/game/rumble_init.c
+++ b/src/engine/rumble_init.c
@@ -7,7 +7,7 @@
 #include "macros.h"
 
 #include "buffers/buffers.h"
-#include "main.h"
+#include "game/main.h"
 #include "rumble_init.h"
 
 FORCE_BSS OSThread gRumblePakThread;
diff --git a/src/game/rumble_init.h b/src/engine/rumble_init.h
similarity index 100%
rename from src/game/rumble_init.h
rename to src/engine/rumble_init.h
diff --git a/src/game/save_file.c b/src/engine/save_file.c
similarity index 99%
rename from src/game/save_file.c
rename to src/engine/save_file.c
index 85e5df18..f202dbfc 100644
--- a/src/game/save_file.c
+++ b/src/engine/save_file.c
@@ -2,8 +2,8 @@
 
 #include "sm64.h"
 #include "game_init.h"
-#include "main.h"
-#include "engine/math_util.h"
+#include "game/main.h"
+#include "math_util.h"
 #include "area.h"
 #include "level_update.h"
 #include "save_file.h"
diff --git a/src/game/save_file.h b/src/engine/save_file.h
similarity index 100%
rename from src/game/save_file.h
rename to src/engine/save_file.h
diff --git a/src/game/screen_transition.c b/src/engine/screen_transition.c
similarity index 99%
rename from src/game/screen_transition.c
rename to src/engine/screen_transition.c
index b9fa99b5..30cd7ea7 100644
--- a/src/game/screen_transition.c
+++ b/src/engine/screen_transition.c
@@ -3,12 +3,12 @@
 
 #include "area.h"
 #include "camera.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
-#include "game/game_init.h"
+#include "graph_node.h"
+#include "math_util.h"
+#include "game_init.h"
 #include "geo_misc.h"
 #include "gfx_dimensions.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "screen_transition.h"
 #include "segment2.h"
 #include "sm64.h"
diff --git a/src/game/screen_transition.h b/src/engine/screen_transition.h
similarity index 100%
rename from src/game/screen_transition.h
rename to src/engine/screen_transition.h
diff --git a/src/game/segment2.h b/src/engine/segment2.h
similarity index 100%
rename from src/game/segment2.h
rename to src/engine/segment2.h
diff --git a/src/game/segment7.h b/src/engine/segment7.h
similarity index 100%
rename from src/game/segment7.h
rename to src/engine/segment7.h
diff --git a/src/game/shadow.c b/src/engine/shadow.c
similarity index 99%
rename from src/game/shadow.c
rename to src/engine/shadow.c
index 5856272d..09cda9cd 100644
--- a/src/game/shadow.c
+++ b/src/engine/shadow.c
@@ -2,11 +2,11 @@
 #include <PR/gbi.h>
 #include <math.h>
 
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "math_util.h"
+#include "surface_collision.h"
 #include "geo_misc.h"
 #include "level_table.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
 #include "segment2.h"
diff --git a/src/game/shadow.h b/src/engine/shadow.h
similarity index 100%
rename from src/game/shadow.h
rename to src/engine/shadow.h
diff --git a/src/game/skybox.c b/src/engine/skybox.c
similarity index 99%
rename from src/game/skybox.c
rename to src/engine/skybox.c
index 055d1ce9..e50afaf4 100644
--- a/src/game/skybox.c
+++ b/src/engine/skybox.c
@@ -1,11 +1,11 @@
 #include <PR/ultratypes.h>
 
 #include "area.h"
-#include "engine/math_util.h"
+#include "math_util.h"
 #include "geo_misc.h"
 #include "gfx_dimensions.h"
 #include "level_update.h"
-#include "memory.h"
+#include "game/memory.h"
 #include "save_file.h"
 #include "segment2.h"
 #include "sm64.h"
diff --git a/src/game/skybox.h b/src/engine/skybox.h
similarity index 100%
rename from src/game/skybox.h
rename to src/engine/skybox.h
diff --git a/src/game/sound_init.c b/src/engine/sound_init.c
similarity index 99%
rename from src/game/sound_init.c
rename to src/engine/sound_init.c
index 1ef5331b..03ec834c 100644
--- a/src/game/sound_init.c
+++ b/src/engine/sound_init.c
@@ -2,11 +2,11 @@
 
 #include "area.h"
 #include "audio/external.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
+#include "graph_node.h"
+#include "math_util.h"
 #include "level_table.h"
 #include "level_update.h"
-#include "main.h"
+#include "game/main.h"
 #include "paintings.h"
 #include "print.h"
 #include "profiler.h"
diff --git a/src/game/sound_init.h b/src/engine/sound_init.h
similarity index 100%
rename from src/game/sound_init.h
rename to src/engine/sound_init.h
diff --git a/src/game/spawn_object.c b/src/engine/spawn_object.c
similarity index 100%
rename from src/game/spawn_object.c
rename to src/engine/spawn_object.c
diff --git a/src/game/spawn_object.h b/src/engine/spawn_object.h
similarity index 100%
rename from src/game/spawn_object.h
rename to src/engine/spawn_object.h
diff --git a/src/game/spawn_sound.c b/src/engine/spawn_sound.c
similarity index 100%
rename from src/game/spawn_sound.c
rename to src/engine/spawn_sound.c
diff --git a/src/game/spawn_sound.h b/src/engine/spawn_sound.h
similarity index 100%
rename from src/game/spawn_sound.h
rename to src/engine/spawn_sound.h
diff --git a/src/engine/surface_collision.c b/src/engine/surface_collision.c
index 741307be..0a716e6c 100644
--- a/src/engine/surface_collision.c
+++ b/src/engine/surface_collision.c
@@ -1,10 +1,10 @@
 #include <PR/ultratypes.h>
 
 #include "sm64.h"
-#include "game/debug.h"
-#include "game/level_update.h"
-#include "game/mario.h"
-#include "game/object_list_processor.h"
+#include "debug.h"
+#include "level_update.h"
+#include "mario.h"
+#include "object_list_processor.h"
 #include "surface_collision.h"
 #include "surface_load.h"
 
diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c
index 8437bf00..ca2624dc 100644
--- a/src/engine/surface_load.c
+++ b/src/engine/surface_load.c
@@ -1,16 +1,16 @@
 #include <PR/ultratypes.h>
 
 #include "sm64.h"
-#include "game/ingame_menu.h"
+#include "ingame_menu.h"
 #include "graph_node.h"
 #include "behavior_script.h"
 #include "behavior_data.h"
 #include "game/memory.h"
-#include "game/object_helpers.h"
-#include "game/macro_special_objects.h"
+#include "object_helpers.h"
+#include "macro_special_objects.h"
 #include "surface_collision.h"
-#include "game/mario.h"
-#include "game/object_list_processor.h"
+#include "mario.h"
+#include "object_list_processor.h"
 #include "surface_load.h"
 
 s32 unused8038BE90;
diff --git a/src/game/main.c b/src/game/main.c
index 46bd6978..10bdd412 100644
--- a/src/game/main.c
+++ b/src/game/main.c
@@ -3,15 +3,15 @@
 
 #include "sm64.h"
 #include "audio/external.h"
-#include "game_init.h"
+#include "engine/game_init.h"
 #include "memory.h"
-#include "sound_init.h"
-#include "profiler.h"
+#include "engine/sound_init.h"
+#include "engine/profiler.h"
 #include "buffers/buffers.h"
 #include "segments.h"
 #include "segment_symbols.h"
 #include "main.h"
-#include "rumble_init.h"
+#include "engine/rumble_init.h"
 
 // Message IDs
 #define MESG_SP_COMPLETE 100
diff --git a/src/game/memory.c b/src/game/memory.c
index 5dd5f3de..4b0993a7 100644
--- a/src/game/memory.c
+++ b/src/game/memory.c
@@ -7,7 +7,7 @@
 #include "buffers/zbuffer.h"
 #include "buffers/buffers.h"
 #include "decompress.h"
-#include "game_init.h"
+#include "engine/game_init.h"
 #include "main.h"
 #include "memory.h"
 #include "segments.h"
diff --git a/src/menu/file_select.c b/src/menu/file_select.c
index f06a09cf..dc21e8f9 100644
--- a/src/menu/file_select.c
+++ b/src/menu/file_select.c
@@ -8,17 +8,17 @@
 #include "engine/graph_node.h"
 #include "engine/math_util.h"
 #include "file_select.h"
-#include "game/area.h"
-#include "game/game_init.h"
-#include "game/ingame_menu.h"
-#include "game/object_helpers.h"
-#include "game/object_list_processor.h"
-#include "game/print.h"
-#include "game/save_file.h"
-#include "game/segment2.h"
-#include "game/segment7.h"
-#include "game/spawn_object.h"
-#include "game/rumble_init.h"
+#include "engine/area.h"
+#include "engine/game_init.h"
+#include "engine/ingame_menu.h"
+#include "engine/object_helpers.h"
+#include "engine/object_list_processor.h"
+#include "engine/print.h"
+#include "engine/save_file.h"
+#include "engine/segment2.h"
+#include "engine/segment7.h"
+#include "engine/spawn_object.h"
+#include "engine/rumble_init.h"
 #include "sm64.h"
 #include "text_strings.h"
 
@@ -2887,7 +2887,7 @@ void print_score_file_star_score(s8 fileIndex, s16 courseIndex, s16 x, s16 y) {
 #endif
 
 #ifdef VERSION_EU
-#include "game/segment7.h"
+#include "engine/segment7.h"
 #endif
 
 #define PRINT_COURSE_NAME_CN(courseIndex, shift) \
diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c
index bfa85b8d..f90503e8 100644
--- a/src/menu/intro_geo.c
+++ b/src/menu/intro_geo.c
@@ -1,14 +1,14 @@
 #include <PR/ultratypes.h>
 
 #include "game/memory.h"
-#include "game/segment2.h"
-#include "game/segment7.h"
+#include "engine/segment2.h"
+#include "engine/segment7.h"
 #include "intro_geo.h"
 #include "sm64.h"
 #include "textures.h"
 #include "types.h"
 #include "buffers/framebuffers.h"
-#include "game/game_init.h"
+#include "engine/game_init.h"
 #include "audio/external.h"
 
 // frame counts for the zoom in, hold, and zoom out of title model
diff --git a/src/menu/star_select.c b/src/menu/star_select.c
index 68995d27..191863dc 100644
--- a/src/menu/star_select.c
+++ b/src/menu/star_select.c
@@ -5,17 +5,17 @@
 #include "engine/behavior_script.h"
 #include "engine/graph_node.h"
 #include "eu_translation.h"
-#include "game/area.h"
-#include "game/game_init.h"
-#include "game/ingame_menu.h"
-#include "game/level_update.h"
+#include "engine/area.h"
+#include "engine/game_init.h"
+#include "engine/ingame_menu.h"
+#include "engine/level_update.h"
 #include "game/memory.h"
-#include "game/object_helpers.h"
-#include "game/object_list_processor.h"
-#include "game/save_file.h"
-#include "game/segment2.h"
-#include "game/segment7.h"
-#include "game/rumble_init.h"
+#include "engine/object_helpers.h"
+#include "engine/object_list_processor.h"
+#include "engine/save_file.h"
+#include "engine/segment2.h"
+#include "engine/segment7.h"
+#include "engine/rumble_init.h"
 #include "sm64.h"
 #include "star_select.h"
 #include "text_strings.h"
diff --git a/src/menu/title_screen.c b/src/menu/title_screen.c
index 071714f0..88444489 100644
--- a/src/menu/title_screen.c
+++ b/src/menu/title_screen.c
@@ -2,15 +2,15 @@
 
 #include "audio/external.h"
 #include "engine/math_util.h"
-#include "game/area.h"
-#include "game/game_init.h"
-#include "game/level_update.h"
+#include "engine/area.h"
+#include "engine/game_init.h"
+#include "engine/level_update.h"
 #include "game/main.h"
 #include "game/memory.h"
-#include "game/print.h"
-#include "game/save_file.h"
-#include "game/sound_init.h"
-#include "game/rumble_init.h"
+#include "engine/print.h"
+#include "engine/save_file.h"
+#include "engine/sound_init.h"
+#include "engine/rumble_init.h"
 #include "level_table.h"
 #include "seq_ids.h"
 #include "sm64.h"