diff --git a/Makefile b/Makefile
index 7c4c982e..5a1ea240 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ ACTOR_DIR      := actors
 LEVEL_DIRS     := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 
 # Directories containing source files
-SRC_DIRS := src src/engine src/game src/menu src/buffers src/audio $(AUDIO_SRC_DIR) actors levels bin data assets asm lib sound
+SRC_DIRS := src src/game src/init src/menu src/buffers src/audio $(AUDIO_SRC_DIR) actors levels bin data assets asm lib sound
 BIN_DIRS := bin bin/$(VERSION)
 
 GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
@@ -382,7 +382,7 @@ load: $(ROM)
 
 # Extra object file dependencies
 $(BUILD_DIR)/asm/ipl3_font.o:         $(IPL3_RAW_FILES)
-$(BUILD_DIR)/src/game/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
+$(BUILD_DIR)/src/init/crash_screen.o: $(CRASH_TEXTURE_C_FILES)
 $(BUILD_DIR)/lib/rsp.o:               $(BUILD_DIR)/rsp/rspboot.bin $(BUILD_DIR)/rsp/fast3d.bin $(BUILD_DIR)/rsp/audio.bin
 $(SOUND_BIN_DIR)/sound_data.o:        $(SOUND_BIN_DIR)/sound_data.ctl.inc.c $(SOUND_BIN_DIR)/sound_data.tbl.inc.c $(SOUND_BIN_DIR)/sequences.bin.inc.c $(SOUND_BIN_DIR)/bank_sets.inc.c
 $(BUILD_DIR)/levels/scripts.o:        $(BUILD_DIR)/include/level_headers.h
@@ -423,7 +423,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/engine/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
+$(BUILD_DIR)/src/game/ingame_menu.o: $(BUILD_DIR)/include/text_strings.h
 
 
 #==============================================================================#
diff --git a/bin/eu/translation_de.c b/bin/eu/translation_de.c
index 90023ff9..d7c1f597 100644
--- a/bin/eu/translation_de.c
+++ b/bin/eu/translation_de.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/eu/translation_en.c b/bin/eu/translation_en.c
index 0b917a4d..9817bc5a 100644
--- a/bin/eu/translation_en.c
+++ b/bin/eu/translation_en.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/eu/translation_fr.c b/bin/eu/translation_fr.c
index cea3fa49..119839c9 100644
--- a/bin/eu/translation_fr.c
+++ b/bin/eu/translation_fr.c
@@ -2,7 +2,7 @@
 
 #include "macros.h"
 
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/bin/segment2.c b/bin/segment2.c
index fb67932b..d4efe88a 100644
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "macros.h"
 #include "types.h"
-#include "engine/ingame_menu.h"
+#include "game/ingame_menu.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/data/behavior_data.c b/data/behavior_data.c
index 86c25f9b..2d36d034 100644
--- a/data/behavior_data.c
+++ b/data/behavior_data.c
@@ -3,15 +3,15 @@
 #include "sm64.h"
 
 #include "object_constants.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 "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 "menu/file_select.h"
-#include "engine/surface_load.h"
+#include "game/surface_load.h"
 
 #include "actors/common0.h"
 #include "actors/common1.h"
diff --git a/enhancements/debug_box.patch b/enhancements/debug_box.patch
index 12623828..b16de1aa 100644
--- a/enhancements/debug_box.patch
+++ b/enhancements/debug_box.patch
@@ -30,7 +30,7 @@ index 00000000..1ffe0288
 +#include "sm64.h"
 +#include "game/game_init.h"
 +#include "game/geo_misc.h"
-+#include "engine/math_util.h"
++#include "game/math_util.h"
 +
 +#include "debug_box.h"
 +
diff --git a/include/geo_commands.h b/include/geo_commands.h
index 1731a544..c611619b 100644
--- a/include/geo_commands.h
+++ b/include/geo_commands.h
@@ -3,12 +3,12 @@
 
 #include "command_macros_base.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"
+#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"
 
 // sky background params
 #define BACKGROUND_OCEAN_SKY        0
diff --git a/include/moving_texture_macros.h b/include/moving_texture_macros.h
index a503881b..a7067d6d 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 "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // From gMovingTextureIdList
 #define TEXTURE_WATER            0
diff --git a/levels/bbh/geo.c b/levels/bbh/geo.c
index 95aea606..12712e11 100644
--- a/levels/bbh/geo.c
+++ b/levels/bbh/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bbh/header.h b/levels/bbh/header.h
index 63225efe..de769e94 100644
--- a/levels/bbh/header.h
+++ b/levels/bbh/header.h
@@ -2,7 +2,7 @@
 #define BBH_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout geo_bbh_0005B0[];
diff --git a/levels/bbh/script.c b/levels/bbh/script.c
index 8d2ad468..aa8301ed 100644
--- a/levels/bbh/script.c
+++ b/levels/bbh/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bitdw/geo.c b/levels/bitdw/geo.c
index f0425d7d..2b1a1707 100644
--- a/levels/bitdw/geo.c
+++ b/levels/bitdw/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c
index 04b54b23..3a09ec9f 100644
--- a/levels/bitdw/script.c
+++ b/levels/bitdw/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bitfs/geo.c b/levels/bitfs/geo.c
index c6406fee..96851ba0 100644
--- a/levels/bitfs/geo.c
+++ b/levels/bitfs/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c
index adba2a17..585a6e08 100644
--- a/levels/bitfs/script.c
+++ b/levels/bitfs/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bits/geo.c b/levels/bits/geo.c
index b13f6718..fe1078fb 100644
--- a/levels/bits/geo.c
+++ b/levels/bits/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bits/script.c b/levels/bits/script.c
index 5d75a2e7..2b18239d 100644
--- a/levels/bits/script.c
+++ b/levels/bits/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bob/geo.c b/levels/bob/geo.c
index c418543f..59376b73 100644
--- a/levels/bob/geo.c
+++ b/levels/bob/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bob/script.c b/levels/bob/script.c
index c9c7b54a..2575812a 100644
--- a/levels/bob/script.c
+++ b/levels/bob/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_1/geo.c b/levels/bowser_1/geo.c
index 625b7bb6..26906a11 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bowser_1/script.c b/levels/bowser_1/script.c
index abf2f7e7..db4261d4 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_2/geo.c b/levels/bowser_2/geo.c
index 1094dd9e..0bbbe62d 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bowser_2/script.c b/levels/bowser_2/script.c
index a5335184..4f1bda10 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/bowser_3/geo.c b/levels/bowser_3/geo.c
index 2c509cdf..0823b113 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/bowser_3/script.c b/levels/bowser_3/script.c
index b9eefe30..0ce454c3 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_courtyard/geo.c b/levels/castle_courtyard/geo.c
index 50d08c02..46418bf9 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/castle_courtyard/header.h b/levels/castle_courtyard/header.h
index 4745d42e..d5a7e18c 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 "engine/moving_texture.h"
+#include "game/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 d3326b23..bffa0a62 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_grounds/geo.c b/levels/castle_grounds/geo.c
index d4ff0a15..31f74204 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/castle_grounds/header.h b/levels/castle_grounds/header.h
index 130be3b6..5e32ed94 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 "engine/moving_texture.h"
+#include "game/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 ed04b4bf..a1c899c2 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/castle_inside/geo.c b/levels/castle_inside/geo.c
index 7561aa2d..53c8b3a2 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 "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 "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 "make_const_nonconst.h"
 
diff --git a/levels/castle_inside/header.h b/levels/castle_inside/header.h
index 8d68343b..043e3383 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 "engine/paintings.h"
-#include "engine/moving_texture.h"
+#include "game/paintings.h"
+#include "game/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 7fc7fe62..096d2ebd 100644
--- a/levels/castle_inside/painting.inc.c
+++ b/levels/castle_inside/painting.inc.c
@@ -1,4 +1,4 @@
-#include "engine/paintings.h"
+#include "game/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 3ad4b2cb..d6d9eb3a 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 "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ccm/geo.c b/levels/ccm/geo.c
index c9d5b8df..aaa04325 100644
--- a/levels/ccm/geo.c
+++ b/levels/ccm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ccm/header.h b/levels/ccm/header.h
index e5a87947..7c35d003 100644
--- a/levels/ccm/header.h
+++ b/levels/ccm/header.h
@@ -2,7 +2,7 @@
 #define CCM_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout ccm_geo_0003D0[];
diff --git a/levels/ccm/script.c b/levels/ccm/script.c
index f8cf186d..38fda8c7 100644
--- a/levels/ccm/script.c
+++ b/levels/ccm/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/cotmc/geo.c b/levels/cotmc/geo.c
index b4ec97f8..9deb6ef3 100644
--- a/levels/cotmc/geo.c
+++ b/levels/cotmc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/cotmc/script.c b/levels/cotmc/script.c
index 379ee558..9800c0f4 100644
--- a/levels/cotmc/script.c
+++ b/levels/cotmc/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ddd/geo.c b/levels/ddd/geo.c
index 6cc9455d..8dbd4970 100644
--- a/levels/ddd/geo.c
+++ b/levels/ddd/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ddd/header.h b/levels/ddd/header.h
index 119e4709..0d946f1a 100644
--- a/levels/ddd/header.h
+++ b/levels/ddd/header.h
@@ -2,7 +2,7 @@
 #define DDD_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout ddd_geo_000450[];
diff --git a/levels/ddd/script.c b/levels/ddd/script.c
index 137754e7..a2f81f50 100644
--- a/levels/ddd/script.c
+++ b/levels/ddd/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ending/geo.c b/levels/ending/geo.c
index 01b48607..1e973423 100644
--- a/levels/ending/geo.c
+++ b/levels/ending/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ending/script.c b/levels/ending/script.c
index 4687e866..ad3d7386 100644
--- a/levels/ending/script.c
+++ b/levels/ending/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/area.h"
-#include "engine/level_update.h"
+#include "game/area.h"
+#include "game/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 e681bb45..a0c55961 100644
--- a/levels/hmc/areas/1/painting.inc.c
+++ b/levels/hmc/areas/1/painting.inc.c
@@ -1,4 +1,4 @@
-#include "engine/paintings.h"
+#include "game/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 ef13afc9..3bffd83a 100644
--- a/levels/hmc/geo.c
+++ b/levels/hmc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/hmc/header.h b/levels/hmc/header.h
index 4c7ac799..6c2cca11 100644
--- a/levels/hmc/header.h
+++ b/levels/hmc/header.h
@@ -2,7 +2,7 @@
 #define HMC_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout hmc_geo_000530[];
diff --git a/levels/hmc/script.c b/levels/hmc/script.c
index 2b682357..f41e3928 100644
--- a/levels/hmc/script.c
+++ b/levels/hmc/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/intro/geo.c b/levels/intro/geo.c
index a24ab4c6..3048638b 100644
--- a/levels/intro/geo.c
+++ b/levels/intro/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "menu/debug_level_select.h"
 #include "menu/intro_geo.h"
 
diff --git a/levels/intro/script.c b/levels/intro/script.c
index ab861b4f..60fe93f3 100644
--- a/levels/intro/script.c
+++ b/levels/intro/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/area.h"
-#include "engine/level_update.h"
+#include "game/area.h"
+#include "game/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 161d4ea5..d7d0f900 100644
--- a/levels/jrb/geo.c
+++ b/levels/jrb/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/jrb/header.h b/levels/jrb/header.h
index a5e8c347..f142c5c0 100644
--- a/levels/jrb/header.h
+++ b/levels/jrb/header.h
@@ -2,7 +2,7 @@
 #define JRB_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout jrb_geo_000900[];
diff --git a/levels/jrb/script.c b/levels/jrb/script.c
index 8ad16ea2..c7769fe9 100644
--- a/levels/jrb/script.c
+++ b/levels/jrb/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/lll/geo.c b/levels/lll/geo.c
index d6a2cb19..43b6dfe4 100644
--- a/levels/lll/geo.c
+++ b/levels/lll/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/lll/header.h b/levels/lll/header.h
index 681b8f86..b558a9c6 100644
--- a/levels/lll/header.h
+++ b/levels/lll/header.h
@@ -2,7 +2,7 @@
 #define LLL_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout lll_geo_0009E0[];
diff --git a/levels/lll/script.c b/levels/lll/script.c
index 8f8d3aa1..0873972c 100644
--- a/levels/lll/script.c
+++ b/levels/lll/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/menu/geo.c b/levels/menu/geo.c
index e0fe6d5d..d4d8b4b5 100644
--- a/levels/menu/geo.c
+++ b/levels/menu/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "menu/file_select.h"
 #include "menu/star_select.h"
 
diff --git a/levels/menu/script.c b/levels/menu/script.c
index 2664d997..14b18e9f 100644
--- a/levels/menu/script.c
+++ b/levels/menu/script.c
@@ -6,8 +6,8 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/area.h"
-#include "engine/level_update.h"
+#include "game/area.h"
+#include "game/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 834b06ca..58c3aa1c 100644
--- a/levels/pss/geo.c
+++ b/levels/pss/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/pss/script.c b/levels/pss/script.c
index 301a6dca..98cc4732 100644
--- a/levels/pss/script.c
+++ b/levels/pss/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/rr/geo.c b/levels/rr/geo.c
index 80b11114..2fc7289f 100644
--- a/levels/rr/geo.c
+++ b/levels/rr/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/rr/script.c b/levels/rr/script.c
index dc8ed5ad..ac84bce9 100644
--- a/levels/rr/script.c
+++ b/levels/rr/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/sa/geo.c b/levels/sa/geo.c
index 72102a3d..bcf1e782 100644
--- a/levels/sa/geo.c
+++ b/levels/sa/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/sa/script.c b/levels/sa/script.c
index 73489378..75c81dbf 100644
--- a/levels/sa/script.c
+++ b/levels/sa/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/scripts.c b/levels/scripts.c
index e374e471..a4d51bcd 100644
--- a/levels/scripts.c
+++ b/levels/scripts.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
 #include "sm64.h"
-#include "engine/level_update.h"
+#include "game/level_update.h"
 #include "level_commands.h"
-#include "engine/area.h"
+#include "game/area.h"
 
 #include "make_const_nonconst.h"
 
diff --git a/levels/sl/geo.c b/levels/sl/geo.c
index 99d2fc15..8b4219c1 100644
--- a/levels/sl/geo.c
+++ b/levels/sl/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/sl/header.h b/levels/sl/header.h
index 56c66dca..457fb093 100644
--- a/levels/sl/header.h
+++ b/levels/sl/header.h
@@ -2,7 +2,7 @@
 #define SL_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout sl_geo_000360[];
diff --git a/levels/sl/script.c b/levels/sl/script.c
index bb6e456a..350940ec 100644
--- a/levels/sl/script.c
+++ b/levels/sl/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ssl/geo.c b/levels/ssl/geo.c
index 9de721b0..217edac8 100644
--- a/levels/ssl/geo.c
+++ b/levels/ssl/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ssl/header.h b/levels/ssl/header.h
index 6e8b48dc..a38845cd 100644
--- a/levels/ssl/header.h
+++ b/levels/ssl/header.h
@@ -2,7 +2,7 @@
 #define SSL_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout ssl_geo_0005C0[];
diff --git a/levels/ssl/script.c b/levels/ssl/script.c
index 6d60ee79..37f2eac9 100644
--- a/levels/ssl/script.c
+++ b/levels/ssl/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/thi/geo.c b/levels/thi/geo.c
index 9868c1a7..a47ae6f2 100644
--- a/levels/thi/geo.c
+++ b/levels/thi/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/thi/header.h b/levels/thi/header.h
index 656b0653..a3b7ea1a 100644
--- a/levels/thi/header.h
+++ b/levels/thi/header.h
@@ -2,7 +2,7 @@
 #define THI_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout thi_geo_0005B0[];
diff --git a/levels/thi/script.c b/levels/thi/script.c
index c5e1ab3c..b2bda1aa 100644
--- a/levels/thi/script.c
+++ b/levels/thi/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/totwc/geo.c b/levels/totwc/geo.c
index c1d9e855..4391e675 100644
--- a/levels/totwc/geo.c
+++ b/levels/totwc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/totwc/script.c b/levels/totwc/script.c
index 8c6c3467..7664baae 100644
--- a/levels/totwc/script.c
+++ b/levels/totwc/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/ttc/geo.c b/levels/ttc/geo.c
index 204a8ff0..5c37c754 100644
--- a/levels/ttc/geo.c
+++ b/levels/ttc/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ttc/script.c b/levels/ttc/script.c
index ed604685..c871611b 100644
--- a/levels/ttc/script.c
+++ b/levels/ttc/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/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 751278cd..2477f654 100644
--- a/levels/ttm/areas/1/painting.inc.c
+++ b/levels/ttm/areas/1/painting.inc.c
@@ -1,4 +1,4 @@
-#include "engine/paintings.h"
+#include "game/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 08176814..07d62070 100644
--- a/levels/ttm/geo.c
+++ b/levels/ttm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/ttm/header.h b/levels/ttm/header.h
index 4e2a483d..3c060526 100644
--- a/levels/ttm/header.h
+++ b/levels/ttm/header.h
@@ -2,7 +2,7 @@
 #define TTM_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout ttm_geo_000710[];
diff --git a/levels/ttm/script.c b/levels/ttm/script.c
index e8f06e08..a1db6d04 100644
--- a/levels/ttm/script.c
+++ b/levels/ttm/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/vcutm/geo.c b/levels/vcutm/geo.c
index 9bcea41a..e1d27e67 100644
--- a/levels/vcutm/geo.c
+++ b/levels/vcutm/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/vcutm/script.c b/levels/vcutm/script.c
index b2cbcb26..1d609f7d 100644
--- a/levels/vcutm/script.c
+++ b/levels/vcutm/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wdw/geo.c b/levels/wdw/geo.c
index 6fe6d60b..458a1ce9 100644
--- a/levels/wdw/geo.c
+++ b/levels/wdw/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/wdw/header.h b/levels/wdw/header.h
index a7f841f9..63cddc3b 100644
--- a/levels/wdw/header.h
+++ b/levels/wdw/header.h
@@ -2,7 +2,7 @@
 #define WDW_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout wdw_geo_000580[];
diff --git a/levels/wdw/script.c b/levels/wdw/script.c
index e590cda6..6d71cf27 100644
--- a/levels/wdw/script.c
+++ b/levels/wdw/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wf/geo.c b/levels/wf/geo.c
index 3c0b50bb..f31514b6 100644
--- a/levels/wf/geo.c
+++ b/levels/wf/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/wf/header.h b/levels/wf/header.h
index 22e83fb2..44f3cf14 100644
--- a/levels/wf/header.h
+++ b/levels/wf/header.h
@@ -2,7 +2,7 @@
 #define WF_HEADER_H
 
 #include "types.h"
-#include "engine/moving_texture.h"
+#include "game/moving_texture.h"
 
 // geo
 extern const GeoLayout wf_geo_0007E0[];
diff --git a/levels/wf/script.c b/levels/wf/script.c
index 9aeab570..4ab0c206 100644
--- a/levels/wf/script.c
+++ b/levels/wf/script.c
@@ -7,7 +7,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/levels/wmotr/geo.c b/levels/wmotr/geo.c
index 7adf8ae5..edc66962 100644
--- a/levels/wmotr/geo.c
+++ b/levels/wmotr/geo.c
@@ -2,12 +2,12 @@
 #include "sm64.h"
 #include "geo_commands.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 "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 "make_const_nonconst.h"
 
diff --git a/levels/wmotr/script.c b/levels/wmotr/script.c
index af90421e..ad5d6c03 100644
--- a/levels/wmotr/script.c
+++ b/levels/wmotr/script.c
@@ -6,7 +6,7 @@
 #include "segment_symbols.h"
 #include "level_commands.h"
 
-#include "engine/level_update.h"
+#include "game/level_update.h"
 
 #include "levels/scripts.h"
 
diff --git a/sm64.ld b/sm64.ld
index 21c1cf7d..3d9ec088 100755
--- a/sm64.ld
+++ b/sm64.ld
@@ -47,8 +47,8 @@ SECTIONS
     {
         BUILD_DIR/asm/entry.o(.text);
         BUILD_DIR/asm/decompress.o(.text*);
-        BUILD_DIR/src/game/dma_async.o(.text);
-        BUILD_DIR/src/game*.o(.text);
+        BUILD_DIR/src/init/dma_async.o(.text);
+        BUILD_DIR/src/init*.o(.text);
         AUDIO_DIR*.o(.text);
         ULTRA_BUILD_DIR/libgultra_rom.a:*.o(.text);
         BUILD_DIR/src/audio/external.o(.text);
@@ -56,8 +56,8 @@ SECTIONS
 
         BUILD_DIR/asm/entry.o(.data*);
         BUILD_DIR/asm/decompress.o(.data*);
-        BUILD_DIR/src/game/dma_async.o(.data);
-        BUILD_DIR/src/game*.o(.data*);
+        BUILD_DIR/src/init/dma_async.o(.data);
+        BUILD_DIR/src/init*.o(.data*);
         AUDIO_DIR*.o(.data*);
         ULTRA_BUILD_DIR/libgultra_rom.a:*.o(.data*);
         BUILD_DIR/src/audio/external.o(.data*);
@@ -65,16 +65,16 @@ SECTIONS
 
         BUILD_DIR/asm/entry.o(.rodata*);
         BUILD_DIR/asm/decompress.o(.rodata*);
-        BUILD_DIR/src/game/dma_async.o(.rodata);
-        BUILD_DIR/src/game*.o(.rodata*);
+        BUILD_DIR/src/init/dma_async.o(.rodata);
+        BUILD_DIR/src/init*.o(.rodata*);
         AUDIO_DIR*.o(.rodata*);
         ULTRA_BUILD_DIR/libgultra_rom.a:*.o(.rodata*);
         BUILD_DIR/src/audio/external.o(.rodata*);
         BUILD_DIR/lib/rsp.o(.rodata*);
 #ifdef LIBDRAGON_IPL3
-        BUILD_DIR/src/engine*.o(.text);
-        BUILD_DIR/src/engine*.o(.data*);
-        BUILD_DIR/src/engine*.o(.rodata*);
+        BUILD_DIR/src/game*.o(.text);
+        BUILD_DIR/src/game*.o(.data*);
+        BUILD_DIR/src/game*.o(.rodata*);
 #endif
         . = ALIGN(0x10);
     }
@@ -82,7 +82,7 @@ SECTIONS
 
     BEGIN_NOLOAD(main)
     {
-        BUILD_DIR/src/game*.o(.bss*);
+        BUILD_DIR/src/init*.o(.bss*);
 #ifdef VERSION_SH
         AUDIO_DIR/port.o(.bss*);
 #endif
@@ -94,7 +94,7 @@ SECTIONS
         AUDIO_DIR*.o(.bss*);
         BUILD_DIR/src/audio/external.o(.bss*);
         ULTRA_BUILD_DIR/libgultra_rom.a:*.o(.bss*);
-        BUILD_DIR/src/engine*.o(.bss*);
+        BUILD_DIR/src/game*.o(.bss*);
         . = ALIGN(0x10);
     }
     END_NOLOAD(main)
@@ -111,9 +111,9 @@ SECTIONS
 #ifndef LIBDRAGON_IPL3
     BEGIN_SEG(engine, .)
     {
-        BUILD_DIR/src/engine*.o(.text);
-        BUILD_DIR/src/engine*.o(.data*);
-        BUILD_DIR/src/engine*.o(.rodata*);
+        BUILD_DIR/src/game*.o(.text);
+        BUILD_DIR/src/game*.o(.data*);
+        BUILD_DIR/src/game*.o(.rodata*);
         . = ALIGN(0x40);
     }
     END_SEG(engine)
diff --git a/src/audio/external.c b/src/audio/external.c
index e01f183d..769ad02d 100644
--- a/src/audio/external.c
+++ b/src/audio/external.c
@@ -25,9 +25,9 @@
 #include "sh/synthesis.h"
 #endif
 #include "external.h"
-#include "engine/level_update.h"
-#include "engine/object_list_processor.h"
-#include "engine/camera.h"
+#include "game/level_update.h"
+#include "game/object_list_processor.h"
+#include "game/camera.h"
 #include "seq_ids.h"
 #include "dialog_ids.h"
 
diff --git a/src/buffers/buffers.h b/src/buffers/buffers.h
index d8bdf659..83f0dac0 100644
--- a/src/buffers/buffers.h
+++ b/src/buffers/buffers.h
@@ -3,8 +3,8 @@
 
 #include <PR/ultratypes.h>
 
-#include "engine/save_file.h"
-#include "engine/game_init.h"
+#include "game/save_file.h"
+#include "game/game_init.h"
 #include "config.h"
 
 extern u8 gAudioHeap[];
diff --git a/src/engine/area.c b/src/game/area.c
similarity index 99%
rename from src/engine/area.c
rename to src/game/area.c
index aed63358..082bed0f 100644
--- a/src/engine/area.c
+++ b/src/game/area.c
@@ -6,7 +6,7 @@
 #include "behavior_data.h"
 #include "game_init.h"
 #include "object_list_processor.h"
-#include "engine/surface_load.h"
+#include "game/surface_load.h"
 #include "ingame_menu.h"
 #include "screen_transition.h"
 #include "mario.h"
@@ -17,7 +17,7 @@
 #include "area.h"
 #include "rendering_graph_node.h"
 #include "level_update.h"
-#include "engine/geo_layout.h"
+#include "game/geo_layout.h"
 #include "save_file.h"
 #include "level_table.h"
 #include "dialog_ids.h"
diff --git a/src/engine/area.h b/src/game/area.h
similarity index 99%
rename from src/engine/area.h
rename to src/game/area.h
index 55179662..347ffb7b 100644
--- a/src/engine/area.h
+++ b/src/game/area.h
@@ -5,7 +5,7 @@
 
 #include "types.h"
 #include "camera.h"
-#include "engine/graph_node.h"
+#include "game/graph_node.h"
 
 struct WarpNode {
     /*00*/ u8 id;
diff --git a/src/engine/behavior_actions.c b/src/game/behavior_actions.c
similarity index 97%
rename from src/engine/behavior_actions.c
rename to src/game/behavior_actions.c
index 49da3df7..90e41ab7 100644
--- a/src/engine/behavior_actions.c
+++ b/src/game/behavior_actions.c
@@ -11,11 +11,11 @@
 #include "camera.h"
 #include "debug.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
-#include "engine/surface_load.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
+#include "game/math_util.h"
+#include "game/surface_collision.h"
+#include "game/surface_load.h"
 #include "game_init.h"
 #include "ingame_menu.h"
 #include "interaction.h"
@@ -26,7 +26,7 @@
 #include "levels/bowser_3/header.h"
 #include "levels/castle_inside/header.h"
 #include "levels/hmc/header.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
 #include "mario_step.h"
diff --git a/src/engine/behavior_actions.h b/src/game/behavior_actions.h
similarity index 100%
rename from src/engine/behavior_actions.h
rename to src/game/behavior_actions.h
diff --git a/src/engine/behavior_script.c b/src/game/behavior_script.c
similarity index 99%
rename from src/engine/behavior_script.c
rename to src/game/behavior_script.c
index e533c41b..b5e550e3 100644
--- a/src/engine/behavior_script.c
+++ b/src/game/behavior_script.c
@@ -7,7 +7,7 @@
 #include "behavior_actions.h"
 #include "game_init.h"
 #include "mario.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "obj_behaviors_2.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/engine/behavior_script.h b/src/game/behavior_script.h
similarity index 100%
rename from src/engine/behavior_script.h
rename to src/game/behavior_script.h
diff --git a/src/engine/behaviors/activated_bf_plat.inc.c b/src/game/behaviors/activated_bf_plat.inc.c
similarity index 100%
rename from src/engine/behaviors/activated_bf_plat.inc.c
rename to src/game/behaviors/activated_bf_plat.inc.c
diff --git a/src/engine/behaviors/amp.inc.c b/src/game/behaviors/amp.inc.c
similarity index 100%
rename from src/engine/behaviors/amp.inc.c
rename to src/game/behaviors/amp.inc.c
diff --git a/src/engine/behaviors/animated_floor_switch.inc.c b/src/game/behaviors/animated_floor_switch.inc.c
similarity index 100%
rename from src/engine/behaviors/animated_floor_switch.inc.c
rename to src/game/behaviors/animated_floor_switch.inc.c
diff --git a/src/engine/behaviors/arrow_lift.inc.c b/src/game/behaviors/arrow_lift.inc.c
similarity index 100%
rename from src/engine/behaviors/arrow_lift.inc.c
rename to src/game/behaviors/arrow_lift.inc.c
diff --git a/src/engine/behaviors/bbh_haunted_bookshelf.inc.c b/src/game/behaviors/bbh_haunted_bookshelf.inc.c
similarity index 100%
rename from src/engine/behaviors/bbh_haunted_bookshelf.inc.c
rename to src/game/behaviors/bbh_haunted_bookshelf.inc.c
diff --git a/src/engine/behaviors/bbh_merry_go_round.inc.c b/src/game/behaviors/bbh_merry_go_round.inc.c
similarity index 100%
rename from src/engine/behaviors/bbh_merry_go_round.inc.c
rename to src/game/behaviors/bbh_merry_go_round.inc.c
diff --git a/src/engine/behaviors/bbh_tilting_trap.inc.c b/src/game/behaviors/bbh_tilting_trap.inc.c
similarity index 100%
rename from src/engine/behaviors/bbh_tilting_trap.inc.c
rename to src/game/behaviors/bbh_tilting_trap.inc.c
diff --git a/src/engine/behaviors/beta_boo_key.inc.c b/src/game/behaviors/beta_boo_key.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_boo_key.inc.c
rename to src/game/behaviors/beta_boo_key.inc.c
diff --git a/src/engine/behaviors/beta_bowser_anchor.inc.c b/src/game/behaviors/beta_bowser_anchor.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_bowser_anchor.inc.c
rename to src/game/behaviors/beta_bowser_anchor.inc.c
diff --git a/src/engine/behaviors/beta_chest.inc.c b/src/game/behaviors/beta_chest.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_chest.inc.c
rename to src/game/behaviors/beta_chest.inc.c
diff --git a/src/engine/behaviors/beta_fish_splash_spawner.inc.c b/src/game/behaviors/beta_fish_splash_spawner.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_fish_splash_spawner.inc.c
rename to src/game/behaviors/beta_fish_splash_spawner.inc.c
diff --git a/src/engine/behaviors/beta_holdable_object.inc.c b/src/game/behaviors/beta_holdable_object.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_holdable_object.inc.c
rename to src/game/behaviors/beta_holdable_object.inc.c
diff --git a/src/engine/behaviors/beta_trampoline.inc.c b/src/game/behaviors/beta_trampoline.inc.c
similarity index 100%
rename from src/engine/behaviors/beta_trampoline.inc.c
rename to src/game/behaviors/beta_trampoline.inc.c
diff --git a/src/engine/behaviors/bird.inc.c b/src/game/behaviors/bird.inc.c
similarity index 100%
rename from src/engine/behaviors/bird.inc.c
rename to src/game/behaviors/bird.inc.c
diff --git a/src/engine/behaviors/blue_coin.inc.c b/src/game/behaviors/blue_coin.inc.c
similarity index 100%
rename from src/engine/behaviors/blue_coin.inc.c
rename to src/game/behaviors/blue_coin.inc.c
diff --git a/src/engine/behaviors/blue_fish.inc.c b/src/game/behaviors/blue_fish.inc.c
similarity index 100%
rename from src/engine/behaviors/blue_fish.inc.c
rename to src/game/behaviors/blue_fish.inc.c
diff --git a/src/engine/behaviors/bobomb.inc.c b/src/game/behaviors/bobomb.inc.c
similarity index 100%
rename from src/engine/behaviors/bobomb.inc.c
rename to src/game/behaviors/bobomb.inc.c
diff --git a/src/engine/behaviors/bomp.inc.c b/src/game/behaviors/bomp.inc.c
similarity index 100%
rename from src/engine/behaviors/bomp.inc.c
rename to src/game/behaviors/bomp.inc.c
diff --git a/src/engine/behaviors/boo.inc.c b/src/game/behaviors/boo.inc.c
similarity index 100%
rename from src/engine/behaviors/boo.inc.c
rename to src/game/behaviors/boo.inc.c
diff --git a/src/engine/behaviors/boo_cage.inc.c b/src/game/behaviors/boo_cage.inc.c
similarity index 100%
rename from src/engine/behaviors/boo_cage.inc.c
rename to src/game/behaviors/boo_cage.inc.c
diff --git a/src/engine/behaviors/boulder.inc.c b/src/game/behaviors/boulder.inc.c
similarity index 100%
rename from src/engine/behaviors/boulder.inc.c
rename to src/game/behaviors/boulder.inc.c
diff --git a/src/engine/behaviors/bouncing_fireball.inc.c b/src/game/behaviors/bouncing_fireball.inc.c
similarity index 100%
rename from src/engine/behaviors/bouncing_fireball.inc.c
rename to src/game/behaviors/bouncing_fireball.inc.c
diff --git a/src/engine/behaviors/bowling_ball.inc.c b/src/game/behaviors/bowling_ball.inc.c
similarity index 100%
rename from src/engine/behaviors/bowling_ball.inc.c
rename to src/game/behaviors/bowling_ball.inc.c
diff --git a/src/engine/behaviors/bowser.inc.c b/src/game/behaviors/bowser.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser.inc.c
rename to src/game/behaviors/bowser.inc.c
diff --git a/src/engine/behaviors/bowser_bomb.inc.c b/src/game/behaviors/bowser_bomb.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_bomb.inc.c
rename to src/game/behaviors/bowser_bomb.inc.c
diff --git a/src/engine/behaviors/bowser_falling_platform.inc.c b/src/game/behaviors/bowser_falling_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_falling_platform.inc.c
rename to src/game/behaviors/bowser_falling_platform.inc.c
diff --git a/src/engine/behaviors/bowser_flame.inc.c b/src/game/behaviors/bowser_flame.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_flame.inc.c
rename to src/game/behaviors/bowser_flame.inc.c
diff --git a/src/engine/behaviors/bowser_key.inc.c b/src/game/behaviors/bowser_key.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_key.inc.c
rename to src/game/behaviors/bowser_key.inc.c
diff --git a/src/engine/behaviors/bowser_key_cutscene.inc.c b/src/game/behaviors/bowser_key_cutscene.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_key_cutscene.inc.c
rename to src/game/behaviors/bowser_key_cutscene.inc.c
diff --git a/src/engine/behaviors/bowser_puzzle_piece.inc.c b/src/game/behaviors/bowser_puzzle_piece.inc.c
similarity index 100%
rename from src/engine/behaviors/bowser_puzzle_piece.inc.c
rename to src/game/behaviors/bowser_puzzle_piece.inc.c
diff --git a/src/engine/behaviors/break_particles.inc.c b/src/game/behaviors/break_particles.inc.c
similarity index 100%
rename from src/engine/behaviors/break_particles.inc.c
rename to src/game/behaviors/break_particles.inc.c
diff --git a/src/engine/behaviors/breakable_box.inc.c b/src/game/behaviors/breakable_box.inc.c
similarity index 100%
rename from src/engine/behaviors/breakable_box.inc.c
rename to src/game/behaviors/breakable_box.inc.c
diff --git a/src/engine/behaviors/breakable_box_small.inc.c b/src/game/behaviors/breakable_box_small.inc.c
similarity index 100%
rename from src/engine/behaviors/breakable_box_small.inc.c
rename to src/game/behaviors/breakable_box_small.inc.c
diff --git a/src/engine/behaviors/breakable_wall.inc.c b/src/game/behaviors/breakable_wall.inc.c
similarity index 100%
rename from src/engine/behaviors/breakable_wall.inc.c
rename to src/game/behaviors/breakable_wall.inc.c
diff --git a/src/engine/behaviors/bub.inc.c b/src/game/behaviors/bub.inc.c
similarity index 100%
rename from src/engine/behaviors/bub.inc.c
rename to src/game/behaviors/bub.inc.c
diff --git a/src/engine/behaviors/bubba.inc.c b/src/game/behaviors/bubba.inc.c
similarity index 100%
rename from src/engine/behaviors/bubba.inc.c
rename to src/game/behaviors/bubba.inc.c
diff --git a/src/engine/behaviors/bubble.inc.c b/src/game/behaviors/bubble.inc.c
similarity index 100%
rename from src/engine/behaviors/bubble.inc.c
rename to src/game/behaviors/bubble.inc.c
diff --git a/src/engine/behaviors/bullet_bill.inc.c b/src/game/behaviors/bullet_bill.inc.c
similarity index 100%
rename from src/engine/behaviors/bullet_bill.inc.c
rename to src/game/behaviors/bullet_bill.inc.c
diff --git a/src/engine/behaviors/bully.inc.c b/src/game/behaviors/bully.inc.c
similarity index 100%
rename from src/engine/behaviors/bully.inc.c
rename to src/game/behaviors/bully.inc.c
diff --git a/src/engine/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c
similarity index 100%
rename from src/engine/behaviors/butterfly.inc.c
rename to src/game/behaviors/butterfly.inc.c
diff --git a/src/engine/behaviors/camera_lakitu.inc.c b/src/game/behaviors/camera_lakitu.inc.c
similarity index 100%
rename from src/engine/behaviors/camera_lakitu.inc.c
rename to src/game/behaviors/camera_lakitu.inc.c
diff --git a/src/engine/behaviors/cannon.inc.c b/src/game/behaviors/cannon.inc.c
similarity index 100%
rename from src/engine/behaviors/cannon.inc.c
rename to src/game/behaviors/cannon.inc.c
diff --git a/src/engine/behaviors/cannon_door.inc.c b/src/game/behaviors/cannon_door.inc.c
similarity index 100%
rename from src/engine/behaviors/cannon_door.inc.c
rename to src/game/behaviors/cannon_door.inc.c
diff --git a/src/engine/behaviors/cap.inc.c b/src/game/behaviors/cap.inc.c
similarity index 100%
rename from src/engine/behaviors/cap.inc.c
rename to src/game/behaviors/cap.inc.c
diff --git a/src/engine/behaviors/capswitch.inc.c b/src/game/behaviors/capswitch.inc.c
similarity index 100%
rename from src/engine/behaviors/capswitch.inc.c
rename to src/game/behaviors/capswitch.inc.c
diff --git a/src/engine/behaviors/castle_cannon_grate.inc.c b/src/game/behaviors/castle_cannon_grate.inc.c
similarity index 100%
rename from src/engine/behaviors/castle_cannon_grate.inc.c
rename to src/game/behaviors/castle_cannon_grate.inc.c
diff --git a/src/engine/behaviors/castle_flag.inc.c b/src/game/behaviors/castle_flag.inc.c
similarity index 100%
rename from src/engine/behaviors/castle_flag.inc.c
rename to src/game/behaviors/castle_flag.inc.c
diff --git a/src/engine/behaviors/castle_floor_trap.inc.c b/src/game/behaviors/castle_floor_trap.inc.c
similarity index 100%
rename from src/engine/behaviors/castle_floor_trap.inc.c
rename to src/game/behaviors/castle_floor_trap.inc.c
diff --git a/src/engine/behaviors/celebration_star.inc.c b/src/game/behaviors/celebration_star.inc.c
similarity index 100%
rename from src/engine/behaviors/celebration_star.inc.c
rename to src/game/behaviors/celebration_star.inc.c
diff --git a/src/engine/behaviors/chain_chomp.inc.c b/src/game/behaviors/chain_chomp.inc.c
similarity index 100%
rename from src/engine/behaviors/chain_chomp.inc.c
rename to src/game/behaviors/chain_chomp.inc.c
diff --git a/src/engine/behaviors/checkerboard_platform.inc.c b/src/game/behaviors/checkerboard_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/checkerboard_platform.inc.c
rename to src/game/behaviors/checkerboard_platform.inc.c
diff --git a/src/engine/behaviors/chuckya.inc.c b/src/game/behaviors/chuckya.inc.c
similarity index 100%
rename from src/engine/behaviors/chuckya.inc.c
rename to src/game/behaviors/chuckya.inc.c
diff --git a/src/engine/behaviors/clam.inc.c b/src/game/behaviors/clam.inc.c
similarity index 100%
rename from src/engine/behaviors/clam.inc.c
rename to src/game/behaviors/clam.inc.c
diff --git a/src/engine/behaviors/clock_arm.inc.c b/src/game/behaviors/clock_arm.inc.c
similarity index 100%
rename from src/engine/behaviors/clock_arm.inc.c
rename to src/game/behaviors/clock_arm.inc.c
diff --git a/src/engine/behaviors/cloud.inc.c b/src/game/behaviors/cloud.inc.c
similarity index 100%
rename from src/engine/behaviors/cloud.inc.c
rename to src/game/behaviors/cloud.inc.c
diff --git a/src/engine/behaviors/coffin.inc.c b/src/game/behaviors/coffin.inc.c
similarity index 100%
rename from src/engine/behaviors/coffin.inc.c
rename to src/game/behaviors/coffin.inc.c
diff --git a/src/engine/behaviors/coin.inc.c b/src/game/behaviors/coin.inc.c
similarity index 100%
rename from src/engine/behaviors/coin.inc.c
rename to src/game/behaviors/coin.inc.c
diff --git a/src/engine/behaviors/collide_particles.inc.c b/src/game/behaviors/collide_particles.inc.c
similarity index 100%
rename from src/engine/behaviors/collide_particles.inc.c
rename to src/game/behaviors/collide_particles.inc.c
diff --git a/src/engine/behaviors/controllable_platform.inc.c b/src/game/behaviors/controllable_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/controllable_platform.inc.c
rename to src/game/behaviors/controllable_platform.inc.c
diff --git a/src/engine/behaviors/corkbox.inc.c b/src/game/behaviors/corkbox.inc.c
similarity index 100%
rename from src/engine/behaviors/corkbox.inc.c
rename to src/game/behaviors/corkbox.inc.c
diff --git a/src/engine/behaviors/cruiser.inc.c b/src/game/behaviors/cruiser.inc.c
similarity index 100%
rename from src/engine/behaviors/cruiser.inc.c
rename to src/game/behaviors/cruiser.inc.c
diff --git a/src/engine/behaviors/ddd_pole.inc.c b/src/game/behaviors/ddd_pole.inc.c
similarity index 100%
rename from src/engine/behaviors/ddd_pole.inc.c
rename to src/game/behaviors/ddd_pole.inc.c
diff --git a/src/engine/behaviors/ddd_sub.inc.c b/src/game/behaviors/ddd_sub.inc.c
similarity index 100%
rename from src/engine/behaviors/ddd_sub.inc.c
rename to src/game/behaviors/ddd_sub.inc.c
diff --git a/src/engine/behaviors/ddd_warp.inc.c b/src/game/behaviors/ddd_warp.inc.c
similarity index 100%
rename from src/engine/behaviors/ddd_warp.inc.c
rename to src/game/behaviors/ddd_warp.inc.c
diff --git a/src/engine/behaviors/decorative_pendulum.inc.c b/src/game/behaviors/decorative_pendulum.inc.c
similarity index 100%
rename from src/engine/behaviors/decorative_pendulum.inc.c
rename to src/game/behaviors/decorative_pendulum.inc.c
diff --git a/src/engine/behaviors/donut_platform.inc.c b/src/game/behaviors/donut_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/donut_platform.inc.c
rename to src/game/behaviors/donut_platform.inc.c
diff --git a/src/engine/behaviors/door.inc.c b/src/game/behaviors/door.inc.c
similarity index 100%
rename from src/engine/behaviors/door.inc.c
rename to src/game/behaviors/door.inc.c
diff --git a/src/engine/behaviors/dorrie.inc.c b/src/game/behaviors/dorrie.inc.c
similarity index 100%
rename from src/engine/behaviors/dorrie.inc.c
rename to src/game/behaviors/dorrie.inc.c
diff --git a/src/engine/behaviors/drawbridge.inc.c b/src/game/behaviors/drawbridge.inc.c
similarity index 100%
rename from src/engine/behaviors/drawbridge.inc.c
rename to src/game/behaviors/drawbridge.inc.c
diff --git a/src/engine/behaviors/elevator.inc.c b/src/game/behaviors/elevator.inc.c
similarity index 100%
rename from src/engine/behaviors/elevator.inc.c
rename to src/game/behaviors/elevator.inc.c
diff --git a/src/engine/behaviors/end_birds_1.inc.c b/src/game/behaviors/end_birds_1.inc.c
similarity index 100%
rename from src/engine/behaviors/end_birds_1.inc.c
rename to src/game/behaviors/end_birds_1.inc.c
diff --git a/src/engine/behaviors/end_birds_2.inc.c b/src/game/behaviors/end_birds_2.inc.c
similarity index 100%
rename from src/engine/behaviors/end_birds_2.inc.c
rename to src/game/behaviors/end_birds_2.inc.c
diff --git a/src/engine/behaviors/enemy_lakitu.inc.c b/src/game/behaviors/enemy_lakitu.inc.c
similarity index 100%
rename from src/engine/behaviors/enemy_lakitu.inc.c
rename to src/game/behaviors/enemy_lakitu.inc.c
diff --git a/src/engine/behaviors/exclamation_box.inc.c b/src/game/behaviors/exclamation_box.inc.c
similarity index 100%
rename from src/engine/behaviors/exclamation_box.inc.c
rename to src/game/behaviors/exclamation_box.inc.c
diff --git a/src/engine/behaviors/explosion.inc.c b/src/game/behaviors/explosion.inc.c
similarity index 100%
rename from src/engine/behaviors/explosion.inc.c
rename to src/game/behaviors/explosion.inc.c
diff --git a/src/engine/behaviors/express_elevator.inc.c b/src/game/behaviors/express_elevator.inc.c
similarity index 100%
rename from src/engine/behaviors/express_elevator.inc.c
rename to src/game/behaviors/express_elevator.inc.c
diff --git a/src/engine/behaviors/eyerok.inc.c b/src/game/behaviors/eyerok.inc.c
similarity index 100%
rename from src/engine/behaviors/eyerok.inc.c
rename to src/game/behaviors/eyerok.inc.c
diff --git a/src/engine/behaviors/falling_pillar.inc.c b/src/game/behaviors/falling_pillar.inc.c
similarity index 100%
rename from src/engine/behaviors/falling_pillar.inc.c
rename to src/game/behaviors/falling_pillar.inc.c
diff --git a/src/engine/behaviors/falling_rising_platform.inc.c b/src/game/behaviors/falling_rising_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/falling_rising_platform.inc.c
rename to src/game/behaviors/falling_rising_platform.inc.c
diff --git a/src/engine/behaviors/ferris_wheel.inc.c b/src/game/behaviors/ferris_wheel.inc.c
similarity index 100%
rename from src/engine/behaviors/ferris_wheel.inc.c
rename to src/game/behaviors/ferris_wheel.inc.c
diff --git a/src/engine/behaviors/fire_piranha_plant.inc.c b/src/game/behaviors/fire_piranha_plant.inc.c
similarity index 100%
rename from src/engine/behaviors/fire_piranha_plant.inc.c
rename to src/game/behaviors/fire_piranha_plant.inc.c
diff --git a/src/engine/behaviors/fire_spitter.inc.c b/src/game/behaviors/fire_spitter.inc.c
similarity index 100%
rename from src/engine/behaviors/fire_spitter.inc.c
rename to src/game/behaviors/fire_spitter.inc.c
diff --git a/src/engine/behaviors/fish.inc.c b/src/game/behaviors/fish.inc.c
similarity index 100%
rename from src/engine/behaviors/fish.inc.c
rename to src/game/behaviors/fish.inc.c
diff --git a/src/engine/behaviors/fishing_boo.inc.c b/src/game/behaviors/fishing_boo.inc.c
similarity index 100%
rename from src/engine/behaviors/fishing_boo.inc.c
rename to src/game/behaviors/fishing_boo.inc.c
diff --git a/src/engine/behaviors/flame.inc.c b/src/game/behaviors/flame.inc.c
similarity index 100%
rename from src/engine/behaviors/flame.inc.c
rename to src/game/behaviors/flame.inc.c
diff --git a/src/engine/behaviors/flame_mario.inc.c b/src/game/behaviors/flame_mario.inc.c
similarity index 100%
rename from src/engine/behaviors/flame_mario.inc.c
rename to src/game/behaviors/flame_mario.inc.c
diff --git a/src/engine/behaviors/flamethrower.inc.c b/src/game/behaviors/flamethrower.inc.c
similarity index 100%
rename from src/engine/behaviors/flamethrower.inc.c
rename to src/game/behaviors/flamethrower.inc.c
diff --git a/src/engine/behaviors/floating_box.inc.c b/src/game/behaviors/floating_box.inc.c
similarity index 100%
rename from src/engine/behaviors/floating_box.inc.c
rename to src/game/behaviors/floating_box.inc.c
diff --git a/src/engine/behaviors/floating_platform.inc.c b/src/game/behaviors/floating_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/floating_platform.inc.c
rename to src/game/behaviors/floating_platform.inc.c
diff --git a/src/engine/behaviors/fly_guy.inc.c b/src/game/behaviors/fly_guy.inc.c
similarity index 100%
rename from src/engine/behaviors/fly_guy.inc.c
rename to src/game/behaviors/fly_guy.inc.c
diff --git a/src/engine/behaviors/flying_bookend_switch.inc.c b/src/game/behaviors/flying_bookend_switch.inc.c
similarity index 100%
rename from src/engine/behaviors/flying_bookend_switch.inc.c
rename to src/game/behaviors/flying_bookend_switch.inc.c
diff --git a/src/engine/behaviors/goomba.inc.c b/src/game/behaviors/goomba.inc.c
similarity index 100%
rename from src/engine/behaviors/goomba.inc.c
rename to src/game/behaviors/goomba.inc.c
diff --git a/src/engine/behaviors/grand_star.inc.c b/src/game/behaviors/grand_star.inc.c
similarity index 100%
rename from src/engine/behaviors/grand_star.inc.c
rename to src/game/behaviors/grand_star.inc.c
diff --git a/src/engine/behaviors/grill_door.inc.c b/src/game/behaviors/grill_door.inc.c
similarity index 100%
rename from src/engine/behaviors/grill_door.inc.c
rename to src/game/behaviors/grill_door.inc.c
diff --git a/src/engine/behaviors/ground_particles.inc.c b/src/game/behaviors/ground_particles.inc.c
similarity index 100%
rename from src/engine/behaviors/ground_particles.inc.c
rename to src/game/behaviors/ground_particles.inc.c
diff --git a/src/engine/behaviors/haunted_chair.inc.c b/src/game/behaviors/haunted_chair.inc.c
similarity index 100%
rename from src/engine/behaviors/haunted_chair.inc.c
rename to src/game/behaviors/haunted_chair.inc.c
diff --git a/src/engine/behaviors/heave_ho.inc.c b/src/game/behaviors/heave_ho.inc.c
similarity index 100%
rename from src/engine/behaviors/heave_ho.inc.c
rename to src/game/behaviors/heave_ho.inc.c
diff --git a/src/engine/behaviors/hidden_star.inc.c b/src/game/behaviors/hidden_star.inc.c
similarity index 100%
rename from src/engine/behaviors/hidden_star.inc.c
rename to src/game/behaviors/hidden_star.inc.c
diff --git a/src/engine/behaviors/hoot.inc.c b/src/game/behaviors/hoot.inc.c
similarity index 100%
rename from src/engine/behaviors/hoot.inc.c
rename to src/game/behaviors/hoot.inc.c
diff --git a/src/engine/behaviors/horizontal_grindel.inc.c b/src/game/behaviors/horizontal_grindel.inc.c
similarity index 100%
rename from src/engine/behaviors/horizontal_grindel.inc.c
rename to src/game/behaviors/horizontal_grindel.inc.c
diff --git a/src/engine/behaviors/intro_lakitu.inc.c b/src/game/behaviors/intro_lakitu.inc.c
similarity index 100%
rename from src/engine/behaviors/intro_lakitu.inc.c
rename to src/game/behaviors/intro_lakitu.inc.c
diff --git a/src/engine/behaviors/intro_peach.inc.c b/src/game/behaviors/intro_peach.inc.c
similarity index 100%
rename from src/engine/behaviors/intro_peach.inc.c
rename to src/game/behaviors/intro_peach.inc.c
diff --git a/src/engine/behaviors/intro_scene.inc.c b/src/game/behaviors/intro_scene.inc.c
similarity index 100%
rename from src/engine/behaviors/intro_scene.inc.c
rename to src/game/behaviors/intro_scene.inc.c
diff --git a/src/engine/behaviors/jrb_ship.inc.c b/src/game/behaviors/jrb_ship.inc.c
similarity index 100%
rename from src/engine/behaviors/jrb_ship.inc.c
rename to src/game/behaviors/jrb_ship.inc.c
diff --git a/src/engine/behaviors/jumping_box.inc.c b/src/game/behaviors/jumping_box.inc.c
similarity index 100%
rename from src/engine/behaviors/jumping_box.inc.c
rename to src/game/behaviors/jumping_box.inc.c
diff --git a/src/engine/behaviors/kickable_board.inc.c b/src/game/behaviors/kickable_board.inc.c
similarity index 100%
rename from src/engine/behaviors/kickable_board.inc.c
rename to src/game/behaviors/kickable_board.inc.c
diff --git a/src/engine/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c
similarity index 100%
rename from src/engine/behaviors/king_bobomb.inc.c
rename to src/game/behaviors/king_bobomb.inc.c
diff --git a/src/engine/behaviors/klepto.inc.c b/src/game/behaviors/klepto.inc.c
similarity index 100%
rename from src/engine/behaviors/klepto.inc.c
rename to src/game/behaviors/klepto.inc.c
diff --git a/src/engine/behaviors/koopa.inc.c b/src/game/behaviors/koopa.inc.c
similarity index 100%
rename from src/engine/behaviors/koopa.inc.c
rename to src/game/behaviors/koopa.inc.c
diff --git a/src/engine/behaviors/koopa_shell.inc.c b/src/game/behaviors/koopa_shell.inc.c
similarity index 100%
rename from src/engine/behaviors/koopa_shell.inc.c
rename to src/game/behaviors/koopa_shell.inc.c
diff --git a/src/engine/behaviors/koopa_shell_underwater.inc.c b/src/game/behaviors/koopa_shell_underwater.inc.c
similarity index 100%
rename from src/engine/behaviors/koopa_shell_underwater.inc.c
rename to src/game/behaviors/koopa_shell_underwater.inc.c
diff --git a/src/engine/behaviors/lll_floating_wood_piece.inc.c b/src/game/behaviors/lll_floating_wood_piece.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_floating_wood_piece.inc.c
rename to src/game/behaviors/lll_floating_wood_piece.inc.c
diff --git a/src/engine/behaviors/lll_hexagonal_ring.inc.c b/src/game/behaviors/lll_hexagonal_ring.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_hexagonal_ring.inc.c
rename to src/game/behaviors/lll_hexagonal_ring.inc.c
diff --git a/src/engine/behaviors/lll_octagonal_rotating_mesh.inc.c b/src/game/behaviors/lll_octagonal_rotating_mesh.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_octagonal_rotating_mesh.inc.c
rename to src/game/behaviors/lll_octagonal_rotating_mesh.inc.c
diff --git a/src/engine/behaviors/lll_rotating_hex_flame.inc.c b/src/game/behaviors/lll_rotating_hex_flame.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_rotating_hex_flame.inc.c
rename to src/game/behaviors/lll_rotating_hex_flame.inc.c
diff --git a/src/engine/behaviors/lll_sinking_rectangle.inc.c b/src/game/behaviors/lll_sinking_rectangle.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_sinking_rectangle.inc.c
rename to src/game/behaviors/lll_sinking_rectangle.inc.c
diff --git a/src/engine/behaviors/lll_sinking_rock_block.inc.c b/src/game/behaviors/lll_sinking_rock_block.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_sinking_rock_block.inc.c
rename to src/game/behaviors/lll_sinking_rock_block.inc.c
diff --git a/src/engine/behaviors/lll_volcano_flames.inc.c b/src/game/behaviors/lll_volcano_flames.inc.c
similarity index 100%
rename from src/engine/behaviors/lll_volcano_flames.inc.c
rename to src/game/behaviors/lll_volcano_flames.inc.c
diff --git a/src/engine/behaviors/mad_piano.inc.c b/src/game/behaviors/mad_piano.inc.c
similarity index 100%
rename from src/engine/behaviors/mad_piano.inc.c
rename to src/game/behaviors/mad_piano.inc.c
diff --git a/src/engine/behaviors/manta_ray.inc.c b/src/game/behaviors/manta_ray.inc.c
similarity index 100%
rename from src/engine/behaviors/manta_ray.inc.c
rename to src/game/behaviors/manta_ray.inc.c
diff --git a/src/engine/behaviors/metal_box.inc.c b/src/game/behaviors/metal_box.inc.c
similarity index 100%
rename from src/engine/behaviors/metal_box.inc.c
rename to src/game/behaviors/metal_box.inc.c
diff --git a/src/engine/behaviors/mips.inc.c b/src/game/behaviors/mips.inc.c
similarity index 100%
rename from src/engine/behaviors/mips.inc.c
rename to src/game/behaviors/mips.inc.c
diff --git a/src/engine/behaviors/moat_drainer.inc.c b/src/game/behaviors/moat_drainer.inc.c
similarity index 100%
rename from src/engine/behaviors/moat_drainer.inc.c
rename to src/game/behaviors/moat_drainer.inc.c
diff --git a/src/engine/behaviors/moat_grill.inc.c b/src/game/behaviors/moat_grill.inc.c
similarity index 100%
rename from src/engine/behaviors/moat_grill.inc.c
rename to src/game/behaviors/moat_grill.inc.c
diff --git a/src/engine/behaviors/moneybag.inc.c b/src/game/behaviors/moneybag.inc.c
similarity index 100%
rename from src/engine/behaviors/moneybag.inc.c
rename to src/game/behaviors/moneybag.inc.c
diff --git a/src/engine/behaviors/monty_mole.inc.c b/src/game/behaviors/monty_mole.inc.c
similarity index 100%
rename from src/engine/behaviors/monty_mole.inc.c
rename to src/game/behaviors/monty_mole.inc.c
diff --git a/src/engine/behaviors/moving_coin.inc.c b/src/game/behaviors/moving_coin.inc.c
similarity index 100%
rename from src/engine/behaviors/moving_coin.inc.c
rename to src/game/behaviors/moving_coin.inc.c
diff --git a/src/engine/behaviors/mr_blizzard.inc.c b/src/game/behaviors/mr_blizzard.inc.c
similarity index 100%
rename from src/engine/behaviors/mr_blizzard.inc.c
rename to src/game/behaviors/mr_blizzard.inc.c
diff --git a/src/engine/behaviors/mr_i.inc.c b/src/game/behaviors/mr_i.inc.c
similarity index 100%
rename from src/engine/behaviors/mr_i.inc.c
rename to src/game/behaviors/mr_i.inc.c
diff --git a/src/engine/behaviors/mushroom_1up.inc.c b/src/game/behaviors/mushroom_1up.inc.c
similarity index 100%
rename from src/engine/behaviors/mushroom_1up.inc.c
rename to src/game/behaviors/mushroom_1up.inc.c
diff --git a/src/engine/behaviors/music_touch.inc.c b/src/game/behaviors/music_touch.inc.c
similarity index 100%
rename from src/engine/behaviors/music_touch.inc.c
rename to src/game/behaviors/music_touch.inc.c
diff --git a/src/engine/behaviors/orange_number.inc.c b/src/game/behaviors/orange_number.inc.c
similarity index 100%
rename from src/engine/behaviors/orange_number.inc.c
rename to src/game/behaviors/orange_number.inc.c
diff --git a/src/engine/behaviors/piranha_bubbles.inc.c b/src/game/behaviors/piranha_bubbles.inc.c
similarity index 100%
rename from src/engine/behaviors/piranha_bubbles.inc.c
rename to src/game/behaviors/piranha_bubbles.inc.c
diff --git a/src/engine/behaviors/piranha_plant.inc.c b/src/game/behaviors/piranha_plant.inc.c
similarity index 100%
rename from src/engine/behaviors/piranha_plant.inc.c
rename to src/game/behaviors/piranha_plant.inc.c
diff --git a/src/engine/behaviors/platform_on_track.inc.c b/src/game/behaviors/platform_on_track.inc.c
similarity index 100%
rename from src/engine/behaviors/platform_on_track.inc.c
rename to src/game/behaviors/platform_on_track.inc.c
diff --git a/src/engine/behaviors/pokey.inc.c b/src/game/behaviors/pokey.inc.c
similarity index 100%
rename from src/engine/behaviors/pokey.inc.c
rename to src/game/behaviors/pokey.inc.c
diff --git a/src/engine/behaviors/pole.inc.c b/src/game/behaviors/pole.inc.c
similarity index 100%
rename from src/engine/behaviors/pole.inc.c
rename to src/game/behaviors/pole.inc.c
diff --git a/src/engine/behaviors/pole_base.inc.c b/src/game/behaviors/pole_base.inc.c
similarity index 100%
rename from src/engine/behaviors/pole_base.inc.c
rename to src/game/behaviors/pole_base.inc.c
diff --git a/src/engine/behaviors/purple_switch.inc.c b/src/game/behaviors/purple_switch.inc.c
similarity index 100%
rename from src/engine/behaviors/purple_switch.inc.c
rename to src/game/behaviors/purple_switch.inc.c
diff --git a/src/engine/behaviors/pyramid_elevator.inc.c b/src/game/behaviors/pyramid_elevator.inc.c
similarity index 100%
rename from src/engine/behaviors/pyramid_elevator.inc.c
rename to src/game/behaviors/pyramid_elevator.inc.c
diff --git a/src/engine/behaviors/pyramid_top.inc.c b/src/game/behaviors/pyramid_top.inc.c
similarity index 100%
rename from src/engine/behaviors/pyramid_top.inc.c
rename to src/game/behaviors/pyramid_top.inc.c
diff --git a/src/engine/behaviors/pyramid_wall.inc.c b/src/game/behaviors/pyramid_wall.inc.c
similarity index 100%
rename from src/engine/behaviors/pyramid_wall.inc.c
rename to src/game/behaviors/pyramid_wall.inc.c
diff --git a/src/engine/behaviors/racing_penguin.inc.c b/src/game/behaviors/racing_penguin.inc.c
similarity index 100%
rename from src/engine/behaviors/racing_penguin.inc.c
rename to src/game/behaviors/racing_penguin.inc.c
diff --git a/src/engine/behaviors/recovery_heart.inc.c b/src/game/behaviors/recovery_heart.inc.c
similarity index 100%
rename from src/engine/behaviors/recovery_heart.inc.c
rename to src/game/behaviors/recovery_heart.inc.c
diff --git a/src/engine/behaviors/red_coin.inc.c b/src/game/behaviors/red_coin.inc.c
similarity index 100%
rename from src/engine/behaviors/red_coin.inc.c
rename to src/game/behaviors/red_coin.inc.c
diff --git a/src/engine/behaviors/reds_star_marker.inc.c b/src/game/behaviors/reds_star_marker.inc.c
similarity index 100%
rename from src/engine/behaviors/reds_star_marker.inc.c
rename to src/game/behaviors/reds_star_marker.inc.c
diff --git a/src/engine/behaviors/rolling_log.inc.c b/src/game/behaviors/rolling_log.inc.c
similarity index 100%
rename from src/engine/behaviors/rolling_log.inc.c
rename to src/game/behaviors/rolling_log.inc.c
diff --git a/src/engine/behaviors/rotating_octagonal_plat.inc.c b/src/game/behaviors/rotating_octagonal_plat.inc.c
similarity index 100%
rename from src/engine/behaviors/rotating_octagonal_plat.inc.c
rename to src/game/behaviors/rotating_octagonal_plat.inc.c
diff --git a/src/engine/behaviors/rotating_platform.inc.c b/src/game/behaviors/rotating_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/rotating_platform.inc.c
rename to src/game/behaviors/rotating_platform.inc.c
diff --git a/src/engine/behaviors/scuttlebug.inc.c b/src/game/behaviors/scuttlebug.inc.c
similarity index 100%
rename from src/engine/behaviors/scuttlebug.inc.c
rename to src/game/behaviors/scuttlebug.inc.c
diff --git a/src/engine/behaviors/seaweed.inc.c b/src/game/behaviors/seaweed.inc.c
similarity index 100%
rename from src/engine/behaviors/seaweed.inc.c
rename to src/game/behaviors/seaweed.inc.c
diff --git a/src/engine/behaviors/seesaw_platform.inc.c b/src/game/behaviors/seesaw_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/seesaw_platform.inc.c
rename to src/game/behaviors/seesaw_platform.inc.c
diff --git a/src/engine/behaviors/shock_wave.inc.c b/src/game/behaviors/shock_wave.inc.c
similarity index 100%
rename from src/engine/behaviors/shock_wave.inc.c
rename to src/game/behaviors/shock_wave.inc.c
diff --git a/src/engine/behaviors/skeeter.inc.c b/src/game/behaviors/skeeter.inc.c
similarity index 100%
rename from src/engine/behaviors/skeeter.inc.c
rename to src/game/behaviors/skeeter.inc.c
diff --git a/src/engine/behaviors/sl_snowman_wind.inc.c b/src/game/behaviors/sl_snowman_wind.inc.c
similarity index 100%
rename from src/engine/behaviors/sl_snowman_wind.inc.c
rename to src/game/behaviors/sl_snowman_wind.inc.c
diff --git a/src/engine/behaviors/sl_walking_penguin.inc.c b/src/game/behaviors/sl_walking_penguin.inc.c
similarity index 100%
rename from src/engine/behaviors/sl_walking_penguin.inc.c
rename to src/game/behaviors/sl_walking_penguin.inc.c
diff --git a/src/engine/behaviors/sliding_platform.inc.c b/src/game/behaviors/sliding_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/sliding_platform.inc.c
rename to src/game/behaviors/sliding_platform.inc.c
diff --git a/src/engine/behaviors/sliding_platform_2.inc.c b/src/game/behaviors/sliding_platform_2.inc.c
similarity index 100%
rename from src/engine/behaviors/sliding_platform_2.inc.c
rename to src/game/behaviors/sliding_platform_2.inc.c
diff --git a/src/engine/behaviors/snow_mound.inc.c b/src/game/behaviors/snow_mound.inc.c
similarity index 100%
rename from src/engine/behaviors/snow_mound.inc.c
rename to src/game/behaviors/snow_mound.inc.c
diff --git a/src/engine/behaviors/snowman.inc.c b/src/game/behaviors/snowman.inc.c
similarity index 100%
rename from src/engine/behaviors/snowman.inc.c
rename to src/game/behaviors/snowman.inc.c
diff --git a/src/engine/behaviors/snufit.inc.c b/src/game/behaviors/snufit.inc.c
similarity index 100%
rename from src/engine/behaviors/snufit.inc.c
rename to src/game/behaviors/snufit.inc.c
diff --git a/src/engine/behaviors/sound_ambient.inc.c b/src/game/behaviors/sound_ambient.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_ambient.inc.c
rename to src/game/behaviors/sound_ambient.inc.c
diff --git a/src/engine/behaviors/sound_birds.inc.c b/src/game/behaviors/sound_birds.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_birds.inc.c
rename to src/game/behaviors/sound_birds.inc.c
diff --git a/src/engine/behaviors/sound_sand.inc.c b/src/game/behaviors/sound_sand.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_sand.inc.c
rename to src/game/behaviors/sound_sand.inc.c
diff --git a/src/engine/behaviors/sound_spawner.inc.c b/src/game/behaviors/sound_spawner.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_spawner.inc.c
rename to src/game/behaviors/sound_spawner.inc.c
diff --git a/src/engine/behaviors/sound_volcano.inc.c b/src/game/behaviors/sound_volcano.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_volcano.inc.c
rename to src/game/behaviors/sound_volcano.inc.c
diff --git a/src/engine/behaviors/sound_waterfall.inc.c b/src/game/behaviors/sound_waterfall.inc.c
similarity index 100%
rename from src/engine/behaviors/sound_waterfall.inc.c
rename to src/game/behaviors/sound_waterfall.inc.c
diff --git a/src/engine/behaviors/sparkle_spawn.inc.c b/src/game/behaviors/sparkle_spawn.inc.c
similarity index 100%
rename from src/engine/behaviors/sparkle_spawn.inc.c
rename to src/game/behaviors/sparkle_spawn.inc.c
diff --git a/src/engine/behaviors/sparkle_spawn_star.inc.c b/src/game/behaviors/sparkle_spawn_star.inc.c
similarity index 100%
rename from src/engine/behaviors/sparkle_spawn_star.inc.c
rename to src/game/behaviors/sparkle_spawn_star.inc.c
diff --git a/src/engine/behaviors/spawn_star.inc.c b/src/game/behaviors/spawn_star.inc.c
similarity index 100%
rename from src/engine/behaviors/spawn_star.inc.c
rename to src/game/behaviors/spawn_star.inc.c
diff --git a/src/engine/behaviors/spawn_star_exit.inc.c b/src/game/behaviors/spawn_star_exit.inc.c
similarity index 100%
rename from src/engine/behaviors/spawn_star_exit.inc.c
rename to src/game/behaviors/spawn_star_exit.inc.c
diff --git a/src/engine/behaviors/spindel.inc.c b/src/game/behaviors/spindel.inc.c
similarity index 100%
rename from src/engine/behaviors/spindel.inc.c
rename to src/game/behaviors/spindel.inc.c
diff --git a/src/engine/behaviors/spindrift.inc.c b/src/game/behaviors/spindrift.inc.c
similarity index 100%
rename from src/engine/behaviors/spindrift.inc.c
rename to src/game/behaviors/spindrift.inc.c
diff --git a/src/engine/behaviors/spiny.inc.c b/src/game/behaviors/spiny.inc.c
similarity index 100%
rename from src/engine/behaviors/spiny.inc.c
rename to src/game/behaviors/spiny.inc.c
diff --git a/src/engine/behaviors/square_platform_cycle.inc.c b/src/game/behaviors/square_platform_cycle.inc.c
similarity index 100%
rename from src/engine/behaviors/square_platform_cycle.inc.c
rename to src/game/behaviors/square_platform_cycle.inc.c
diff --git a/src/engine/behaviors/star_door.inc.c b/src/game/behaviors/star_door.inc.c
similarity index 100%
rename from src/engine/behaviors/star_door.inc.c
rename to src/game/behaviors/star_door.inc.c
diff --git a/src/engine/behaviors/static_checkered_platform.inc.c b/src/game/behaviors/static_checkered_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/static_checkered_platform.inc.c
rename to src/game/behaviors/static_checkered_platform.inc.c
diff --git a/src/engine/behaviors/strong_wind_particle.inc.c b/src/game/behaviors/strong_wind_particle.inc.c
similarity index 100%
rename from src/engine/behaviors/strong_wind_particle.inc.c
rename to src/game/behaviors/strong_wind_particle.inc.c
diff --git a/src/engine/behaviors/sushi.inc.c b/src/game/behaviors/sushi.inc.c
similarity index 100%
rename from src/engine/behaviors/sushi.inc.c
rename to src/game/behaviors/sushi.inc.c
diff --git a/src/engine/behaviors/swing_platform.inc.c b/src/game/behaviors/swing_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/swing_platform.inc.c
rename to src/game/behaviors/swing_platform.inc.c
diff --git a/src/engine/behaviors/switch_hidden_objects.inc.c b/src/game/behaviors/switch_hidden_objects.inc.c
similarity index 100%
rename from src/engine/behaviors/switch_hidden_objects.inc.c
rename to src/game/behaviors/switch_hidden_objects.inc.c
diff --git a/src/engine/behaviors/swoop.inc.c b/src/game/behaviors/swoop.inc.c
similarity index 100%
rename from src/engine/behaviors/swoop.inc.c
rename to src/game/behaviors/swoop.inc.c
diff --git a/src/engine/behaviors/thi_top.inc.c b/src/game/behaviors/thi_top.inc.c
similarity index 100%
rename from src/engine/behaviors/thi_top.inc.c
rename to src/game/behaviors/thi_top.inc.c
diff --git a/src/engine/behaviors/thwomp.inc.c b/src/game/behaviors/thwomp.inc.c
similarity index 100%
rename from src/engine/behaviors/thwomp.inc.c
rename to src/game/behaviors/thwomp.inc.c
diff --git a/src/engine/behaviors/tilting_inverted_pyramid.inc.c b/src/game/behaviors/tilting_inverted_pyramid.inc.c
similarity index 100%
rename from src/engine/behaviors/tilting_inverted_pyramid.inc.c
rename to src/game/behaviors/tilting_inverted_pyramid.inc.c
diff --git a/src/engine/behaviors/tower_door.inc.c b/src/game/behaviors/tower_door.inc.c
similarity index 100%
rename from src/engine/behaviors/tower_door.inc.c
rename to src/game/behaviors/tower_door.inc.c
diff --git a/src/engine/behaviors/tower_platform.inc.c b/src/game/behaviors/tower_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/tower_platform.inc.c
rename to src/game/behaviors/tower_platform.inc.c
diff --git a/src/engine/behaviors/tox_box.inc.c b/src/game/behaviors/tox_box.inc.c
similarity index 100%
rename from src/engine/behaviors/tox_box.inc.c
rename to src/game/behaviors/tox_box.inc.c
diff --git a/src/engine/behaviors/treasure_chest.inc.c b/src/game/behaviors/treasure_chest.inc.c
similarity index 100%
rename from src/engine/behaviors/treasure_chest.inc.c
rename to src/game/behaviors/treasure_chest.inc.c
diff --git a/src/engine/behaviors/tree_particles.inc.c b/src/game/behaviors/tree_particles.inc.c
similarity index 100%
rename from src/engine/behaviors/tree_particles.inc.c
rename to src/game/behaviors/tree_particles.inc.c
diff --git a/src/engine/behaviors/triplet_butterfly.inc.c b/src/game/behaviors/triplet_butterfly.inc.c
similarity index 100%
rename from src/engine/behaviors/triplet_butterfly.inc.c
rename to src/game/behaviors/triplet_butterfly.inc.c
diff --git a/src/engine/behaviors/ttc_2d_rotator.inc.c b/src/game/behaviors/ttc_2d_rotator.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_2d_rotator.inc.c
rename to src/game/behaviors/ttc_2d_rotator.inc.c
diff --git a/src/engine/behaviors/ttc_cog.inc.c b/src/game/behaviors/ttc_cog.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_cog.inc.c
rename to src/game/behaviors/ttc_cog.inc.c
diff --git a/src/engine/behaviors/ttc_elevator.inc.c b/src/game/behaviors/ttc_elevator.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_elevator.inc.c
rename to src/game/behaviors/ttc_elevator.inc.c
diff --git a/src/engine/behaviors/ttc_moving_bar.inc.c b/src/game/behaviors/ttc_moving_bar.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_moving_bar.inc.c
rename to src/game/behaviors/ttc_moving_bar.inc.c
diff --git a/src/engine/behaviors/ttc_pendulum.inc.c b/src/game/behaviors/ttc_pendulum.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_pendulum.inc.c
rename to src/game/behaviors/ttc_pendulum.inc.c
diff --git a/src/engine/behaviors/ttc_pit_block.inc.c b/src/game/behaviors/ttc_pit_block.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_pit_block.inc.c
rename to src/game/behaviors/ttc_pit_block.inc.c
diff --git a/src/engine/behaviors/ttc_rotating_solid.inc.c b/src/game/behaviors/ttc_rotating_solid.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_rotating_solid.inc.c
rename to src/game/behaviors/ttc_rotating_solid.inc.c
diff --git a/src/engine/behaviors/ttc_spinner.inc.c b/src/game/behaviors/ttc_spinner.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_spinner.inc.c
rename to src/game/behaviors/ttc_spinner.inc.c
diff --git a/src/engine/behaviors/ttc_treadmill.inc.c b/src/game/behaviors/ttc_treadmill.inc.c
similarity index 100%
rename from src/engine/behaviors/ttc_treadmill.inc.c
rename to src/game/behaviors/ttc_treadmill.inc.c
diff --git a/src/engine/behaviors/tumbling_bridge.inc.c b/src/game/behaviors/tumbling_bridge.inc.c
similarity index 100%
rename from src/engine/behaviors/tumbling_bridge.inc.c
rename to src/game/behaviors/tumbling_bridge.inc.c
diff --git a/src/engine/behaviors/tuxie.inc.c b/src/game/behaviors/tuxie.inc.c
similarity index 100%
rename from src/engine/behaviors/tuxie.inc.c
rename to src/game/behaviors/tuxie.inc.c
diff --git a/src/engine/behaviors/tweester.inc.c b/src/game/behaviors/tweester.inc.c
similarity index 100%
rename from src/engine/behaviors/tweester.inc.c
rename to src/game/behaviors/tweester.inc.c
diff --git a/src/engine/behaviors/ukiki.inc.c b/src/game/behaviors/ukiki.inc.c
similarity index 100%
rename from src/engine/behaviors/ukiki.inc.c
rename to src/game/behaviors/ukiki.inc.c
diff --git a/src/engine/behaviors/ukiki_cage.inc.c b/src/game/behaviors/ukiki_cage.inc.c
similarity index 100%
rename from src/engine/behaviors/ukiki_cage.inc.c
rename to src/game/behaviors/ukiki_cage.inc.c
diff --git a/src/engine/behaviors/unagi.inc.c b/src/game/behaviors/unagi.inc.c
similarity index 100%
rename from src/engine/behaviors/unagi.inc.c
rename to src/game/behaviors/unagi.inc.c
diff --git a/src/engine/behaviors/unused_particle_spawn.inc.c b/src/game/behaviors/unused_particle_spawn.inc.c
similarity index 100%
rename from src/engine/behaviors/unused_particle_spawn.inc.c
rename to src/game/behaviors/unused_particle_spawn.inc.c
diff --git a/src/engine/behaviors/unused_poundable_platform.inc.c b/src/game/behaviors/unused_poundable_platform.inc.c
similarity index 100%
rename from src/engine/behaviors/unused_poundable_platform.inc.c
rename to src/game/behaviors/unused_poundable_platform.inc.c
diff --git a/src/engine/behaviors/warp.inc.c b/src/game/behaviors/warp.inc.c
similarity index 100%
rename from src/engine/behaviors/warp.inc.c
rename to src/game/behaviors/warp.inc.c
diff --git a/src/engine/behaviors/water_bomb.inc.c b/src/game/behaviors/water_bomb.inc.c
similarity index 100%
rename from src/engine/behaviors/water_bomb.inc.c
rename to src/game/behaviors/water_bomb.inc.c
diff --git a/src/engine/behaviors/water_bomb_cannon.inc.c b/src/game/behaviors/water_bomb_cannon.inc.c
similarity index 100%
rename from src/engine/behaviors/water_bomb_cannon.inc.c
rename to src/game/behaviors/water_bomb_cannon.inc.c
diff --git a/src/engine/behaviors/water_mist.inc.c b/src/game/behaviors/water_mist.inc.c
similarity index 100%
rename from src/engine/behaviors/water_mist.inc.c
rename to src/game/behaviors/water_mist.inc.c
diff --git a/src/engine/behaviors/water_mist_particle.inc.c b/src/game/behaviors/water_mist_particle.inc.c
similarity index 100%
rename from src/engine/behaviors/water_mist_particle.inc.c
rename to src/game/behaviors/water_mist_particle.inc.c
diff --git a/src/engine/behaviors/water_objs.inc.c b/src/game/behaviors/water_objs.inc.c
similarity index 100%
rename from src/engine/behaviors/water_objs.inc.c
rename to src/game/behaviors/water_objs.inc.c
diff --git a/src/engine/behaviors/water_pillar.inc.c b/src/game/behaviors/water_pillar.inc.c
similarity index 100%
rename from src/engine/behaviors/water_pillar.inc.c
rename to src/game/behaviors/water_pillar.inc.c
diff --git a/src/engine/behaviors/water_ring.inc.c b/src/game/behaviors/water_ring.inc.c
similarity index 100%
rename from src/engine/behaviors/water_ring.inc.c
rename to src/game/behaviors/water_ring.inc.c
diff --git a/src/engine/behaviors/water_splashes_and_waves.inc.c b/src/game/behaviors/water_splashes_and_waves.inc.c
similarity index 100%
rename from src/engine/behaviors/water_splashes_and_waves.inc.c
rename to src/game/behaviors/water_splashes_and_waves.inc.c
diff --git a/src/engine/behaviors/water_wave.inc.c b/src/game/behaviors/water_wave.inc.c
similarity index 100%
rename from src/engine/behaviors/water_wave.inc.c
rename to src/game/behaviors/water_wave.inc.c
diff --git a/src/engine/behaviors/wdw_water_level.inc.c b/src/game/behaviors/wdw_water_level.inc.c
similarity index 100%
rename from src/engine/behaviors/wdw_water_level.inc.c
rename to src/game/behaviors/wdw_water_level.inc.c
diff --git a/src/engine/behaviors/whirlpool.inc.c b/src/game/behaviors/whirlpool.inc.c
similarity index 100%
rename from src/engine/behaviors/whirlpool.inc.c
rename to src/game/behaviors/whirlpool.inc.c
diff --git a/src/engine/behaviors/white_puff.inc.c b/src/game/behaviors/white_puff.inc.c
similarity index 100%
rename from src/engine/behaviors/white_puff.inc.c
rename to src/game/behaviors/white_puff.inc.c
diff --git a/src/engine/behaviors/white_puff_explode.inc.c b/src/game/behaviors/white_puff_explode.inc.c
similarity index 100%
rename from src/engine/behaviors/white_puff_explode.inc.c
rename to src/game/behaviors/white_puff_explode.inc.c
diff --git a/src/engine/behaviors/whomp.inc.c b/src/game/behaviors/whomp.inc.c
similarity index 100%
rename from src/engine/behaviors/whomp.inc.c
rename to src/game/behaviors/whomp.inc.c
diff --git a/src/engine/behaviors/wiggler.inc.c b/src/game/behaviors/wiggler.inc.c
similarity index 100%
rename from src/engine/behaviors/wiggler.inc.c
rename to src/game/behaviors/wiggler.inc.c
diff --git a/src/engine/behaviors/wind.inc.c b/src/game/behaviors/wind.inc.c
similarity index 100%
rename from src/engine/behaviors/wind.inc.c
rename to src/game/behaviors/wind.inc.c
diff --git a/src/engine/behaviors/yoshi.inc.c b/src/game/behaviors/yoshi.inc.c
similarity index 100%
rename from src/engine/behaviors/yoshi.inc.c
rename to src/game/behaviors/yoshi.inc.c
diff --git a/src/engine/camera.c b/src/game/camera.c
similarity index 99%
rename from src/engine/camera.c
rename to src/game/camera.c
index 8afc35de..77264817 100644
--- a/src/engine/camera.c
+++ b/src/game/camera.c
@@ -10,10 +10,10 @@
 #include "mario_misc.h"
 #include "game_init.h"
 #include "hud.h"
-#include "engine/math_util.h"
+#include "game/math_util.h"
 #include "area.h"
-#include "engine/surface_collision.h"
-#include "engine/behavior_script.h"
+#include "game/surface_collision.h"
+#include "game/behavior_script.h"
 #include "level_update.h"
 #include "ingame_menu.h"
 #include "mario_actions_cutscene.h"
@@ -25,7 +25,7 @@
 #include "behavior_data.h"
 #include "object_list_processor.h"
 #include "paintings.h"
-#include "engine/graph_node.h"
+#include "game/graph_node.h"
 #include "level_table.h"
 
 #define CBUTTON_MASK (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS)
diff --git a/src/engine/camera.h b/src/game/camera.h
similarity index 99%
rename from src/engine/camera.h
rename to src/game/camera.h
index dc729270..a5c13bf3 100644
--- a/src/engine/camera.h
+++ b/src/game/camera.h
@@ -5,8 +5,8 @@
 
 #include "types.h"
 #include "area.h"
-#include "engine/geo_layout.h"
-#include "engine/graph_node.h"
+#include "game/geo_layout.h"
+#include "game/graph_node.h"
 
 #include "level_table.h"
 
diff --git a/src/engine/cn_common_syms_1.c b/src/game/cn_common_syms_1.c
similarity index 100%
rename from src/engine/cn_common_syms_1.c
rename to src/game/cn_common_syms_1.c
diff --git a/src/engine/cn_common_syms_2.c b/src/game/cn_common_syms_2.c
similarity index 100%
rename from src/engine/cn_common_syms_2.c
rename to src/game/cn_common_syms_2.c
diff --git a/src/engine/debug.c b/src/game/debug.c
similarity index 99%
rename from src/engine/debug.c
rename to src/game/debug.c
index eac0ed4c..8d15158a 100644
--- a/src/engine/debug.c
+++ b/src/game/debug.c
@@ -5,7 +5,7 @@
 #include "behavior_script.h"
 #include "surface_collision.h"
 #include "game_init.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "object_constants.h"
 #include "object_fields.h"
 #include "object_helpers.h"
diff --git a/src/engine/debug.h b/src/game/debug.h
similarity index 100%
rename from src/engine/debug.h
rename to src/game/debug.h
diff --git a/src/engine/debug_course.c b/src/game/debug_course.c
similarity index 100%
rename from src/engine/debug_course.c
rename to src/game/debug_course.c
diff --git a/src/engine/debug_course.h b/src/game/debug_course.h
similarity index 100%
rename from src/engine/debug_course.h
rename to src/game/debug_course.h
diff --git a/src/engine/envfx_bubbles.c b/src/game/envfx_bubbles.c
similarity index 99%
rename from src/engine/envfx_bubbles.c
rename to src/game/envfx_bubbles.c
index 2aed7a21..dc9c8e79 100644
--- a/src/engine/envfx_bubbles.c
+++ b/src/game/envfx_bubbles.c
@@ -2,7 +2,7 @@
 
 #include "sm64.h"
 #include "game_init.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "envfx_snow.h"
 #include "envfx_bubbles.h"
 #include "surface_collision.h"
diff --git a/src/engine/envfx_bubbles.h b/src/game/envfx_bubbles.h
similarity index 100%
rename from src/engine/envfx_bubbles.h
rename to src/game/envfx_bubbles.h
diff --git a/src/engine/envfx_snow.c b/src/game/envfx_snow.c
similarity index 99%
rename from src/engine/envfx_snow.c
rename to src/game/envfx_snow.c
index b9b265ac..e72b4593 100644
--- a/src/engine/envfx_snow.c
+++ b/src/game/envfx_snow.c
@@ -4,7 +4,7 @@
 #include "sm64.h"
 #include "dialog_ids.h"
 #include "game_init.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "ingame_menu.h"
 #include "envfx_snow.h"
 #include "envfx_bubbles.h"
diff --git a/src/engine/envfx_snow.h b/src/game/envfx_snow.h
similarity index 100%
rename from src/engine/envfx_snow.h
rename to src/game/envfx_snow.h
diff --git a/src/engine/game_init.c b/src/game/game_init.c
similarity index 99%
rename from src/engine/game_init.c
rename to src/game/game_init.c
index 98613108..da803633 100644
--- a/src/engine/game_init.c
+++ b/src/game/game_init.c
@@ -7,10 +7,10 @@
 #include "buffers/gfx_output_buffer.h"
 #include "buffers/framebuffers.h"
 #include "buffers/zbuffer.h"
-#include "engine/level_script.h"
+#include "game/level_script.h"
 #include "game_init.h"
-#include "game/main.h"
-#include "game/memory.h"
+#include "init/main.h"
+#include "init/memory.h"
 #include "profiler.h"
 #include "save_file.h"
 #include "seq_ids.h"
@@ -637,6 +637,8 @@ void setup_game_memory(void) {
     load_segment_decompress(2, _segment2_mio0SegmentRomStart, _segment2_mio0SegmentRomEnd);
 }
 
+extern u32 bootTime;
+
 /**
  * Main game loop thread. Runs forever as long as the game continues.
  */
@@ -692,7 +694,9 @@ void thread5_game_loop(UNUSED void *arg) {
         addr = level_script_execute(addr);
 
         display_and_vsync();
-
+        char buff[64];
+        //sprintf(buff, "BOOT TIME: %u", bootTime);
+        //print_text(64, 64, buff);
         // when debug info is enabled, print the "BUF %d" information.
         if (gShowDebugText) {
             // subtract the end of the gfx pool with the display list to obtain the
diff --git a/src/engine/game_init.h b/src/game/game_init.h
similarity index 98%
rename from src/engine/game_init.h
rename to src/game/game_init.h
index f5b3e2ff..ff227f67 100644
--- a/src/engine/game_init.h
+++ b/src/game/game_init.h
@@ -7,7 +7,7 @@
 #include <PR/os_message.h>
 
 #include "types.h"
-#include "game/memory.h"
+#include "init/memory.h"
 
 #define GFX_POOL_SIZE 6400 // Size of how large the master display list (gDisplayListHead) can be
 
diff --git a/src/engine/geo_layout.c b/src/game/geo_layout.c
similarity index 99%
rename from src/engine/geo_layout.c
rename to src/game/geo_layout.c
index 594ac11b..8839397f 100644
--- a/src/engine/geo_layout.c
+++ b/src/game/geo_layout.c
@@ -4,7 +4,7 @@
 
 #include "geo_layout.h"
 #include "math_util.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "graph_node.h"
 
 typedef void (*GeoLayoutCommandProc)(void);
diff --git a/src/engine/geo_layout.h b/src/game/geo_layout.h
similarity index 99%
rename from src/engine/geo_layout.h
rename to src/game/geo_layout.h
index 6211e141..59543124 100644
--- a/src/engine/geo_layout.h
+++ b/src/game/geo_layout.h
@@ -3,7 +3,7 @@
 
 #include <PR/ultratypes.h>
 
-#include "game/memory.h"
+#include "init/memory.h"
 #include "macros.h"
 #include "types.h"
 
diff --git a/src/engine/geo_misc.c b/src/game/geo_misc.c
similarity index 99%
rename from src/engine/geo_misc.c
rename to src/game/geo_misc.c
index cfe796f7..e0f58d22 100644
--- a/src/engine/geo_misc.c
+++ b/src/game/geo_misc.c
@@ -11,7 +11,7 @@
 #include "levels/rr/header.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
 #include "save_file.h"
diff --git a/src/engine/geo_misc.h b/src/game/geo_misc.h
similarity index 100%
rename from src/engine/geo_misc.h
rename to src/game/geo_misc.h
diff --git a/src/engine/graph_node.c b/src/game/graph_node.c
similarity index 99%
rename from src/engine/graph_node.c
rename to src/game/graph_node.c
index 2840c0d8..85f3f948 100644
--- a/src/engine/graph_node.c
+++ b/src/game/graph_node.c
@@ -3,7 +3,7 @@
 
 #include "level_update.h"
 #include "math_util.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "graph_node.h"
 #include "rendering_graph_node.h"
 #include "area.h"
diff --git a/src/engine/graph_node.h b/src/game/graph_node.h
similarity index 99%
rename from src/engine/graph_node.h
rename to src/game/graph_node.h
index 08067e04..ca4feffc 100644
--- a/src/engine/graph_node.h
+++ b/src/game/graph_node.h
@@ -5,7 +5,7 @@
 #include <PR/gbi.h>
 
 #include "types.h"
-#include "game/memory.h"
+#include "init/memory.h"
 
 #define GRAPH_RENDER_ACTIVE         (1 << 0)
 #define GRAPH_RENDER_CHILDREN_FIRST (1 << 1)
diff --git a/src/engine/graph_node_manager.c b/src/game/graph_node_manager.c
similarity index 100%
rename from src/engine/graph_node_manager.c
rename to src/game/graph_node_manager.c
diff --git a/src/engine/hud.c b/src/game/hud.c
similarity index 100%
rename from src/engine/hud.c
rename to src/game/hud.c
diff --git a/src/engine/hud.h b/src/game/hud.h
similarity index 100%
rename from src/engine/hud.h
rename to src/game/hud.h
diff --git a/src/engine/ingame_menu.c b/src/game/ingame_menu.c
similarity index 99%
rename from src/engine/ingame_menu.c
rename to src/game/ingame_menu.c
index 96679021..d1f5741f 100644
--- a/src/engine/ingame_menu.c
+++ b/src/game/ingame_menu.c
@@ -13,7 +13,7 @@
 #include "ingame_menu.h"
 #include "level_update.h"
 #include "levels/castle_grounds/header.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "print.h"
 #include "save_file.h"
 #include "segment2.h"
diff --git a/src/engine/ingame_menu.h b/src/game/ingame_menu.h
similarity index 100%
rename from src/engine/ingame_menu.h
rename to src/game/ingame_menu.h
diff --git a/src/engine/interaction.c b/src/game/interaction.c
similarity index 99%
rename from src/engine/interaction.c
rename to src/game/interaction.c
index 2ddaee60..4eb43d04 100644
--- a/src/engine/interaction.c
+++ b/src/game/interaction.c
@@ -15,7 +15,7 @@
 #include "level_update.h"
 #include "mario.h"
 #include "mario_step.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "save_file.h"
diff --git a/src/engine/interaction.h b/src/game/interaction.h
similarity index 100%
rename from src/engine/interaction.h
rename to src/game/interaction.h
diff --git a/src/engine/level_geo.c b/src/game/level_geo.c
similarity index 99%
rename from src/engine/level_geo.c
rename to src/game/level_geo.c
index 1fc4b88e..b87ea6ef 100644
--- a/src/engine/level_geo.c
+++ b/src/game/level_geo.c
@@ -4,7 +4,7 @@
 #include "rendering_graph_node.h"
 #include "mario_misc.h"
 #include "skybox.h"
-#include "engine/math_util.h"
+#include "game/math_util.h"
 #include "camera.h"
 #include "envfx_snow.h"
 #include "level_geo.h"
diff --git a/src/engine/level_geo.h b/src/game/level_geo.h
similarity index 100%
rename from src/engine/level_geo.h
rename to src/game/level_geo.h
diff --git a/src/engine/level_script.c b/src/game/level_script.c
similarity index 99%
rename from src/engine/level_script.c
rename to src/game/level_script.c
index ad374735..f5a2de0a 100644
--- a/src/engine/level_script.c
+++ b/src/game/level_script.c
@@ -10,7 +10,7 @@
 #include "area.h"
 #include "game_init.h"
 #include "mario.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
 #include "profiler.h"
diff --git a/src/engine/level_script.h b/src/game/level_script.h
similarity index 100%
rename from src/engine/level_script.h
rename to src/game/level_script.h
diff --git a/src/engine/level_update.c b/src/game/level_update.c
similarity index 99%
rename from src/engine/level_update.c
rename to src/game/level_update.c
index 350f2b01..08deb65f 100644
--- a/src/engine/level_update.c
+++ b/src/game/level_update.c
@@ -8,7 +8,7 @@
 #include "level_update.h"
 #include "game_init.h"
 #include "level_update.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "math_util.h"
 #include "graph_node.h"
 #include "area.h"
@@ -22,7 +22,7 @@
 #include "save_file.h"
 #include "debug_course.h"
 #ifdef VERSION_EU
-#include "game/memory.h"
+#include "init/memory.h"
 #include "eu_translation.h"
 #include "segment_symbols.h"
 #endif
diff --git a/src/engine/level_update.h b/src/game/level_update.h
similarity index 100%
rename from src/engine/level_update.h
rename to src/game/level_update.h
diff --git a/src/engine/macro_special_objects.c b/src/game/macro_special_objects.c
similarity index 100%
rename from src/engine/macro_special_objects.c
rename to src/game/macro_special_objects.c
diff --git a/src/engine/macro_special_objects.h b/src/game/macro_special_objects.h
similarity index 100%
rename from src/engine/macro_special_objects.h
rename to src/game/macro_special_objects.h
diff --git a/src/engine/mario.c b/src/game/mario.c
similarity index 99%
rename from src/engine/mario.c
rename to src/game/mario.c
index cefb1534..a5819423 100644
--- a/src/engine/mario.c
+++ b/src/game/mario.c
@@ -13,7 +13,7 @@
 #include "interaction.h"
 #include "level_table.h"
 #include "level_update.h"
-#include "game/main.h"
+#include "init/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 "game/memory.h"
+#include "init/memory.h"
 #include "object_fields.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/engine/mario.h b/src/game/mario.h
similarity index 100%
rename from src/engine/mario.h
rename to src/game/mario.h
diff --git a/src/engine/mario_actions_airborne.c b/src/game/mario_actions_airborne.c
similarity index 99%
rename from src/engine/mario_actions_airborne.c
rename to src/game/mario_actions_airborne.c
index 0d9a5395..d13307f5 100644
--- a/src/engine/mario_actions_airborne.c
+++ b/src/game/mario_actions_airborne.c
@@ -4,8 +4,8 @@
 #include "area.h"
 #include "audio/external.h"
 #include "camera.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
+#include "game/graph_node.h"
+#include "game/math_util.h"
 #include "game_init.h"
 #include "interaction.h"
 #include "level_update.h"
diff --git a/src/engine/mario_actions_airborne.h b/src/game/mario_actions_airborne.h
similarity index 100%
rename from src/engine/mario_actions_airborne.h
rename to src/game/mario_actions_airborne.h
diff --git a/src/engine/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
similarity index 99%
rename from src/engine/mario_actions_automatic.c
rename to src/game/mario_actions_automatic.c
index 926385bc..2524c15d 100644
--- a/src/engine/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -8,7 +8,7 @@
 #include "mario.h"
 #include "mario_step.h"
 #include "math_util.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "graph_node.h"
 #include "save_file.h"
 #include "surface_collision.h"
diff --git a/src/engine/mario_actions_automatic.h b/src/game/mario_actions_automatic.h
similarity index 100%
rename from src/engine/mario_actions_automatic.h
rename to src/game/mario_actions_automatic.h
diff --git a/src/engine/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c
similarity index 99%
rename from src/engine/mario_actions_cutscene.c
rename to src/game/mario_actions_cutscene.c
index 18adfd7c..fd77505e 100644
--- a/src/engine/mario_actions_cutscene.c
+++ b/src/game/mario_actions_cutscene.c
@@ -6,10 +6,10 @@
 #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 "engine/surface_collision.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
+#include "game/math_util.h"
+#include "game/surface_collision.h"
 #include "game_init.h"
 #include "gfx_dimensions.h"
 #include "ingame_menu.h"
diff --git a/src/engine/mario_actions_cutscene.h b/src/game/mario_actions_cutscene.h
similarity index 100%
rename from src/engine/mario_actions_cutscene.h
rename to src/game/mario_actions_cutscene.h
diff --git a/src/engine/mario_actions_moving.c b/src/game/mario_actions_moving.c
similarity index 99%
rename from src/engine/mario_actions_moving.c
rename to src/game/mario_actions_moving.c
index 73ad1e29..9d7d5b3f 100644
--- a/src/engine/mario_actions_moving.c
+++ b/src/game/mario_actions_moving.c
@@ -9,7 +9,7 @@
 #include "area.h"
 #include "interaction.h"
 #include "mario_actions_object.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "behavior_data.h"
 #include "rumble_init.h"
 
diff --git a/src/engine/mario_actions_moving.h b/src/game/mario_actions_moving.h
similarity index 100%
rename from src/engine/mario_actions_moving.h
rename to src/game/mario_actions_moving.h
diff --git a/src/engine/mario_actions_object.c b/src/game/mario_actions_object.c
similarity index 99%
rename from src/engine/mario_actions_object.c
rename to src/game/mario_actions_object.c
index 99f40bc6..7dea5cf9 100644
--- a/src/engine/mario_actions_object.c
+++ b/src/game/mario_actions_object.c
@@ -7,7 +7,7 @@
 #include "mario.h"
 #include "audio/external.h"
 #include "interaction.h"
-#include "engine/math_util.h"
+#include "game/math_util.h"
 #include "rumble_init.h"
 
 /**
diff --git a/src/engine/mario_actions_object.h b/src/game/mario_actions_object.h
similarity index 100%
rename from src/engine/mario_actions_object.h
rename to src/game/mario_actions_object.h
diff --git a/src/engine/mario_actions_stationary.c b/src/game/mario_actions_stationary.c
similarity index 99%
rename from src/engine/mario_actions_stationary.c
rename to src/game/mario_actions_stationary.c
index 703874c0..2263d0f1 100644
--- a/src/engine/mario_actions_stationary.c
+++ b/src/game/mario_actions_stationary.c
@@ -11,7 +11,7 @@
 #include "mario.h"
 #include "mario_actions_stationary.h"
 #include "mario_step.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "save_file.h"
 #include "sound_init.h"
 #include "surface_terrains.h"
diff --git a/src/engine/mario_actions_stationary.h b/src/game/mario_actions_stationary.h
similarity index 100%
rename from src/engine/mario_actions_stationary.h
rename to src/game/mario_actions_stationary.h
diff --git a/src/engine/mario_actions_submerged.c b/src/game/mario_actions_submerged.c
similarity index 99%
rename from src/engine/mario_actions_submerged.c
rename to src/game/mario_actions_submerged.c
index 087ad1a0..d4c0a6b1 100644
--- a/src/engine/mario_actions_submerged.c
+++ b/src/game/mario_actions_submerged.c
@@ -3,7 +3,7 @@
 
 #include "sm64.h"
 #include "level_update.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "math_util.h"
 #include "area.h"
 #include "save_file.h"
diff --git a/src/engine/mario_actions_submerged.h b/src/game/mario_actions_submerged.h
similarity index 100%
rename from src/engine/mario_actions_submerged.h
rename to src/game/mario_actions_submerged.h
diff --git a/src/engine/mario_misc.c b/src/game/mario_misc.c
similarity index 99%
rename from src/engine/mario_misc.c
rename to src/game/mario_misc.c
index 617b33f0..a7e62540 100644
--- a/src/engine/mario_misc.c
+++ b/src/game/mario_misc.c
@@ -17,7 +17,7 @@
 #include "level_update.h"
 #include "mario_actions_cutscene.h"
 #include "mario_misc.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
diff --git a/src/engine/mario_misc.h b/src/game/mario_misc.h
similarity index 100%
rename from src/engine/mario_misc.h
rename to src/game/mario_misc.h
diff --git a/src/engine/mario_step.c b/src/game/mario_step.c
similarity index 99%
rename from src/engine/mario_step.c
rename to src/game/mario_step.c
index 9f442fc4..74b57ff0 100644
--- a/src/engine/mario_step.c
+++ b/src/game/mario_step.c
@@ -1,8 +1,8 @@
 #include <ultra64.h>
 
 #include "sm64.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "game/math_util.h"
+#include "game/surface_collision.h"
 #include "mario.h"
 #include "audio/external.h"
 #include "game_init.h"
diff --git a/src/engine/mario_step.h b/src/game/mario_step.h
similarity index 100%
rename from src/engine/mario_step.h
rename to src/game/mario_step.h
diff --git a/src/engine/math_util.c b/src/game/math_util.c
similarity index 99%
rename from src/engine/math_util.c
rename to src/game/math_util.c
index 72fa6259..103d8c61 100644
--- a/src/engine/math_util.c
+++ b/src/game/math_util.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 
 #include "sm64.h"
-#include "engine/graph_node.h"
+#include "game/graph_node.h"
 #include "math_util.h"
 #include "surface_collision.h"
 
diff --git a/src/engine/math_util.h b/src/game/math_util.h
similarity index 100%
rename from src/engine/math_util.h
rename to src/game/math_util.h
diff --git a/src/engine/moving_texture.c b/src/game/moving_texture.c
similarity index 99%
rename from src/engine/moving_texture.c
rename to src/game/moving_texture.c
index efb40ac9..d6180844 100644
--- a/src/engine/moving_texture.c
+++ b/src/game/moving_texture.c
@@ -5,11 +5,11 @@
 #include "area.h"
 #include "camera.h"
 #include "rendering_graph_node.h"
-#include "engine/math_util.h"
-#include "game/memory.h"
+#include "game/math_util.h"
+#include "init/memory.h"
 #include "save_file.h"
 #include "segment2.h"
-#include "engine/surface_collision.h"
+#include "game/surface_collision.h"
 #include "geo_misc.h"
 #include "rendering_graph_node.h"
 #include "object_list_processor.h"
diff --git a/src/engine/moving_texture.h b/src/game/moving_texture.h
similarity index 100%
rename from src/engine/moving_texture.h
rename to src/game/moving_texture.h
diff --git a/src/engine/obj_behaviors.c b/src/game/obj_behaviors.c
similarity index 99%
rename from src/engine/obj_behaviors.c
rename to src/game/obj_behaviors.c
index a31c065e..f7a8908e 100644
--- a/src/engine/obj_behaviors.c
+++ b/src/game/obj_behaviors.c
@@ -23,7 +23,7 @@
 #include "mario.h"
 #include "mario_actions_cutscene.h"
 #include "mario_misc.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/engine/obj_behaviors.h b/src/game/obj_behaviors.h
similarity index 99%
rename from src/engine/obj_behaviors.h
rename to src/game/obj_behaviors.h
index f4442189..f4a3b6d9 100644
--- a/src/engine/obj_behaviors.h
+++ b/src/game/obj_behaviors.h
@@ -3,7 +3,7 @@
 
 #include <PR/ultratypes.h>
 
-#include "engine/surface_collision.h"
+#include "game/surface_collision.h"
 #include "macros.h"
 #include "types.h"
 
diff --git a/src/engine/obj_behaviors_2.c b/src/game/obj_behaviors_2.c
similarity index 99%
rename from src/engine/obj_behaviors_2.c
rename to src/game/obj_behaviors_2.c
index b319ad0c..8784dec0 100644
--- a/src/engine/obj_behaviors_2.c
+++ b/src/game/obj_behaviors_2.c
@@ -34,7 +34,7 @@
 #include "levels/vcutm/header.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "obj_behaviors.h"
 #include "obj_behaviors_2.h"
 #include "object_constants.h"
diff --git a/src/engine/obj_behaviors_2.h b/src/game/obj_behaviors_2.h
similarity index 100%
rename from src/engine/obj_behaviors_2.h
rename to src/game/obj_behaviors_2.h
diff --git a/src/engine/object_collision.c b/src/game/object_collision.c
similarity index 100%
rename from src/engine/object_collision.c
rename to src/game/object_collision.c
diff --git a/src/engine/object_collision.h b/src/game/object_collision.h
similarity index 100%
rename from src/engine/object_collision.h
rename to src/game/object_collision.h
diff --git a/src/engine/object_helpers.c b/src/game/object_helpers.c
similarity index 99%
rename from src/engine/object_helpers.c
rename to src/game/object_helpers.c
index f0797874..95696753 100644
--- a/src/engine/object_helpers.c
+++ b/src/game/object_helpers.c
@@ -10,7 +10,7 @@
 #include "behavior_script.h"
 #include "geo_layout.h"
 #include "math_util.h"
-#include "engine/surface_collision.h"
+#include "game/surface_collision.h"
 #include "game_init.h"
 #include "helper_macros.h"
 #include "ingame_menu.h"
@@ -19,7 +19,7 @@
 #include "level_update.h"
 #include "mario.h"
 #include "mario_actions_cutscene.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "obj_behaviors.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/engine/object_helpers.h b/src/game/object_helpers.h
similarity index 100%
rename from src/engine/object_helpers.h
rename to src/game/object_helpers.h
diff --git a/src/engine/object_list_processor.c b/src/game/object_list_processor.c
similarity index 99%
rename from src/engine/object_list_processor.c
rename to src/game/object_list_processor.c
index cc783b7f..930c132d 100644
--- a/src/engine/object_list_processor.c
+++ b/src/game/object_list_processor.c
@@ -5,14 +5,14 @@
 #include "behavior_data.h"
 #include "camera.h"
 #include "debug.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
-#include "engine/surface_collision.h"
-#include "engine/surface_load.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
+#include "game/surface_collision.h"
+#include "game/surface_load.h"
 #include "interaction.h"
 #include "level_update.h"
 #include "mario.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_collision.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
diff --git a/src/engine/object_list_processor.h b/src/game/object_list_processor.h
similarity index 100%
rename from src/engine/object_list_processor.h
rename to src/game/object_list_processor.h
diff --git a/src/engine/paintings.c b/src/game/paintings.c
similarity index 99%
rename from src/engine/paintings.c
rename to src/game/paintings.c
index 5271403a..2b820ce7 100644
--- a/src/engine/paintings.c
+++ b/src/game/paintings.c
@@ -2,15 +2,15 @@
 
 #include "sm64.h"
 #include "area.h"
-#include "engine/graph_node.h"
-#include "engine/surface_collision.h"
+#include "game/graph_node.h"
+#include "game/surface_collision.h"
 #include "game_init.h"
 #include "geo_misc.h"
 #include "levels/castle_inside/header.h"
 #include "levels/hmc/header.h"
 #include "levels/ttm/header.h"
 #include "mario.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "moving_texture.h"
 #include "object_list_processor.h"
 #include "paintings.h"
diff --git a/src/engine/paintings.h b/src/game/paintings.h
similarity index 100%
rename from src/engine/paintings.h
rename to src/game/paintings.h
diff --git a/src/engine/platform_displacement.c b/src/game/platform_displacement.c
similarity index 98%
rename from src/engine/platform_displacement.c
rename to src/game/platform_displacement.c
index 40a19940..e8756f85 100644
--- a/src/engine/platform_displacement.c
+++ b/src/game/platform_displacement.c
@@ -1,7 +1,7 @@
 #include <PR/ultratypes.h>
 
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "game/math_util.h"
+#include "game/surface_collision.h"
 #include "level_update.h"
 #include "object_fields.h"
 #include "object_helpers.h"
diff --git a/src/engine/platform_displacement.h b/src/game/platform_displacement.h
similarity index 100%
rename from src/engine/platform_displacement.h
rename to src/game/platform_displacement.h
diff --git a/src/engine/print.c b/src/game/print.c
similarity index 99%
rename from src/engine/print.c
rename to src/game/print.c
index fd955f8d..11d49416 100644
--- a/src/engine/print.c
+++ b/src/game/print.c
@@ -4,7 +4,7 @@
 #include "config.h"
 #include "gfx_dimensions.h"
 #include "game_init.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "print.h"
 #include "segment2.h"
 
diff --git a/src/engine/print.h b/src/game/print.h
similarity index 100%
rename from src/engine/print.h
rename to src/game/print.h
diff --git a/src/engine/profiler.c b/src/game/profiler.c
similarity index 100%
rename from src/engine/profiler.c
rename to src/game/profiler.c
diff --git a/src/engine/profiler.h b/src/game/profiler.h
similarity index 100%
rename from src/engine/profiler.h
rename to src/game/profiler.h
diff --git a/src/engine/rendering_graph_node.c b/src/game/rendering_graph_node.c
similarity index 99%
rename from src/engine/rendering_graph_node.c
rename to src/game/rendering_graph_node.c
index f09b03c8..83bc35d9 100644
--- a/src/engine/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -4,8 +4,8 @@
 #include "math_util.h"
 #include "game_init.h"
 #include "gfx_dimensions.h"
-#include "game/main.h"
-#include "game/memory.h"
+#include "init/main.h"
+#include "init/memory.h"
 #include "print.h"
 #include "rendering_graph_node.h"
 #include "shadow.h"
diff --git a/src/engine/rendering_graph_node.h b/src/game/rendering_graph_node.h
similarity index 97%
rename from src/engine/rendering_graph_node.h
rename to src/game/rendering_graph_node.h
index 097c7876..6bfb0ccb 100644
--- a/src/engine/rendering_graph_node.h
+++ b/src/game/rendering_graph_node.h
@@ -3,7 +3,7 @@
 
 #include <PR/ultratypes.h>
 
-#include "engine/graph_node.h"
+#include "game/graph_node.h"
 
 extern struct GraphNodeRoot *gCurGraphNodeRoot;
 extern struct GraphNodeMasterList *gCurGraphNodeMasterList;
diff --git a/src/engine/rumble_init.c b/src/game/rumble_init.c
similarity index 99%
rename from src/engine/rumble_init.c
rename to src/game/rumble_init.c
index dfcef1ba..9b71e201 100644
--- a/src/engine/rumble_init.c
+++ b/src/game/rumble_init.c
@@ -7,7 +7,7 @@
 #include "macros.h"
 
 #include "buffers/buffers.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "rumble_init.h"
 
 FORCE_BSS OSThread gRumblePakThread;
diff --git a/src/engine/rumble_init.h b/src/game/rumble_init.h
similarity index 100%
rename from src/engine/rumble_init.h
rename to src/game/rumble_init.h
diff --git a/src/engine/save_file.c b/src/game/save_file.c
similarity index 99%
rename from src/engine/save_file.c
rename to src/game/save_file.c
index f202dbfc..0c66b023 100644
--- a/src/engine/save_file.c
+++ b/src/game/save_file.c
@@ -2,7 +2,7 @@
 
 #include "sm64.h"
 #include "game_init.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "math_util.h"
 #include "area.h"
 #include "level_update.h"
diff --git a/src/engine/save_file.h b/src/game/save_file.h
similarity index 100%
rename from src/engine/save_file.h
rename to src/game/save_file.h
diff --git a/src/engine/screen_transition.c b/src/game/screen_transition.c
similarity index 99%
rename from src/engine/screen_transition.c
rename to src/game/screen_transition.c
index 30cd7ea7..9290a6f1 100644
--- a/src/engine/screen_transition.c
+++ b/src/game/screen_transition.c
@@ -8,7 +8,7 @@
 #include "game_init.h"
 #include "geo_misc.h"
 #include "gfx_dimensions.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "screen_transition.h"
 #include "segment2.h"
 #include "sm64.h"
diff --git a/src/engine/screen_transition.h b/src/game/screen_transition.h
similarity index 100%
rename from src/engine/screen_transition.h
rename to src/game/screen_transition.h
diff --git a/src/engine/segment2.h b/src/game/segment2.h
similarity index 100%
rename from src/engine/segment2.h
rename to src/game/segment2.h
diff --git a/src/engine/segment7.h b/src/game/segment7.h
similarity index 100%
rename from src/engine/segment7.h
rename to src/game/segment7.h
diff --git a/src/engine/shadow.c b/src/game/shadow.c
similarity index 99%
rename from src/engine/shadow.c
rename to src/game/shadow.c
index 09cda9cd..29dbce5e 100644
--- a/src/engine/shadow.c
+++ b/src/game/shadow.c
@@ -6,7 +6,7 @@
 #include "surface_collision.h"
 #include "geo_misc.h"
 #include "level_table.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_list_processor.h"
 #include "rendering_graph_node.h"
 #include "segment2.h"
diff --git a/src/engine/shadow.h b/src/game/shadow.h
similarity index 100%
rename from src/engine/shadow.h
rename to src/game/shadow.h
diff --git a/src/engine/skybox.c b/src/game/skybox.c
similarity index 99%
rename from src/engine/skybox.c
rename to src/game/skybox.c
index e50afaf4..7b89b439 100644
--- a/src/engine/skybox.c
+++ b/src/game/skybox.c
@@ -5,7 +5,7 @@
 #include "geo_misc.h"
 #include "gfx_dimensions.h"
 #include "level_update.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "save_file.h"
 #include "segment2.h"
 #include "sm64.h"
diff --git a/src/engine/skybox.h b/src/game/skybox.h
similarity index 100%
rename from src/engine/skybox.h
rename to src/game/skybox.h
diff --git a/src/engine/sound_init.c b/src/game/sound_init.c
similarity index 99%
rename from src/engine/sound_init.c
rename to src/game/sound_init.c
index 03ec834c..d60767aa 100644
--- a/src/engine/sound_init.c
+++ b/src/game/sound_init.c
@@ -6,7 +6,7 @@
 #include "math_util.h"
 #include "level_table.h"
 #include "level_update.h"
-#include "game/main.h"
+#include "init/main.h"
 #include "paintings.h"
 #include "print.h"
 #include "profiler.h"
diff --git a/src/engine/sound_init.h b/src/game/sound_init.h
similarity index 100%
rename from src/engine/sound_init.h
rename to src/game/sound_init.h
diff --git a/src/engine/spawn_object.c b/src/game/spawn_object.c
similarity index 98%
rename from src/engine/spawn_object.c
rename to src/game/spawn_object.c
index 4cc1636b..ba0bc30a 100644
--- a/src/engine/spawn_object.c
+++ b/src/game/spawn_object.c
@@ -1,10 +1,10 @@
 #include <PR/ultratypes.h>
 
 #include "audio/external.h"
-#include "engine/geo_layout.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
-#include "engine/surface_collision.h"
+#include "game/geo_layout.h"
+#include "game/graph_node.h"
+#include "game/math_util.h"
+#include "game/surface_collision.h"
 #include "level_table.h"
 #include "object_constants.h"
 #include "object_fields.h"
diff --git a/src/engine/spawn_object.h b/src/game/spawn_object.h
similarity index 100%
rename from src/engine/spawn_object.h
rename to src/game/spawn_object.h
diff --git a/src/engine/spawn_sound.c b/src/game/spawn_sound.c
similarity index 98%
rename from src/engine/spawn_sound.c
rename to src/game/spawn_sound.c
index abca0d81..69e3be86 100644
--- a/src/engine/spawn_sound.c
+++ b/src/game/spawn_sound.c
@@ -2,8 +2,8 @@
 
 #include "audio/external.h"
 #include "behavior_data.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
 #include "object_helpers.h"
 #include "object_list_processor.h"
 #include "sm64.h"
diff --git a/src/engine/spawn_sound.h b/src/game/spawn_sound.h
similarity index 100%
rename from src/engine/spawn_sound.h
rename to src/game/spawn_sound.h
diff --git a/src/engine/stub.c b/src/game/stub.c
similarity index 100%
rename from src/engine/stub.c
rename to src/game/stub.c
diff --git a/src/engine/surface_collision.c b/src/game/surface_collision.c
similarity index 100%
rename from src/engine/surface_collision.c
rename to src/game/surface_collision.c
diff --git a/src/engine/surface_collision.h b/src/game/surface_collision.h
similarity index 100%
rename from src/engine/surface_collision.h
rename to src/game/surface_collision.h
diff --git a/src/engine/surface_load.c b/src/game/surface_load.c
similarity index 99%
rename from src/engine/surface_load.c
rename to src/game/surface_load.c
index ca2624dc..1fbe2a7c 100644
--- a/src/engine/surface_load.c
+++ b/src/game/surface_load.c
@@ -5,7 +5,7 @@
 #include "graph_node.h"
 #include "behavior_script.h"
 #include "behavior_data.h"
-#include "game/memory.h"
+#include "init/memory.h"
 #include "object_helpers.h"
 #include "macro_special_objects.h"
 #include "surface_collision.h"
diff --git a/src/engine/surface_load.h b/src/game/surface_load.h
similarity index 100%
rename from src/engine/surface_load.h
rename to src/game/surface_load.h
diff --git a/src/game/crash_screen.c b/src/init/crash_screen.c
similarity index 100%
rename from src/game/crash_screen.c
rename to src/init/crash_screen.c
diff --git a/src/game/decompress.h b/src/init/decompress.h
similarity index 100%
rename from src/game/decompress.h
rename to src/init/decompress.h
diff --git a/src/game/dma_async.c b/src/init/dma_async.c
similarity index 98%
rename from src/game/dma_async.c
rename to src/init/dma_async.c
index 00ece2c5..3c9539d0 100644
--- a/src/game/dma_async.c
+++ b/src/init/dma_async.c
@@ -1,5 +1,5 @@
 #include "dma_async.h"
-#include "game/main.h"
+#include "init/main.h"
 
 #define ALIGN16(val) (((val) + 0xF) & ~0xF)
 
diff --git a/src/game/dma_async.h b/src/init/dma_async.h
similarity index 100%
rename from src/game/dma_async.h
rename to src/init/dma_async.h
diff --git a/src/game/libgcc.c b/src/init/libgcc.c
similarity index 100%
rename from src/game/libgcc.c
rename to src/init/libgcc.c
diff --git a/src/game/main.c b/src/init/main.c
similarity index 98%
rename from src/game/main.c
rename to src/init/main.c
index e4a70264..01ea8cf6 100644
--- a/src/game/main.c
+++ b/src/init/main.c
@@ -3,15 +3,15 @@
 
 #include "sm64.h"
 #include "audio/external.h"
-#include "engine/game_init.h"
+#include "game/game_init.h"
 #include "memory.h"
-#include "engine/sound_init.h"
-#include "engine/profiler.h"
+#include "game/sound_init.h"
+#include "game/profiler.h"
 #include "buffers/buffers.h"
 #include "segments.h"
 #include "segment_symbols.h"
 #include "main.h"
-#include "engine/rumble_init.h"
+#include "game/rumble_init.h"
 
 // Message IDs
 #define MESG_SP_COMPLETE 100
@@ -41,6 +41,8 @@ OSMesg gSIEventMesgBuf[1];
 OSMesg gIntrMesgBuf[16];
 OSMesg gUnknownMesgBuf[16];
 
+//u32 bootTime = 0;
+
 struct VblankHandler *gVblankHandler1 = NULL;
 struct VblankHandler *gVblankHandler2 = NULL;
 struct SPTask *gActiveSPTask = NULL;
@@ -337,6 +339,7 @@ void thread3_main(UNUSED void *arg) {
 #ifndef LIBDRAGON_IPL3
     load_engine_code_segment();
 #endif
+    //bootTime = osGetCount();
 
     crash_screen_init();
 
diff --git a/src/game/main.h b/src/init/main.h
similarity index 100%
rename from src/game/main.h
rename to src/init/main.h
diff --git a/src/game/memory.c b/src/init/memory.c
similarity index 99%
rename from src/game/memory.c
rename to src/init/memory.c
index a6b2252b..0d457e37 100644
--- a/src/game/memory.c
+++ b/src/init/memory.c
@@ -8,7 +8,7 @@
 #include "buffers/buffers.h"
 #include "dma_async.h"
 #include "decompress.h"
-#include "engine/game_init.h"
+#include "game/game_init.h"
 #include "main.h"
 #include "memory.h"
 #include "segments.h"
diff --git a/src/game/memory.h b/src/init/memory.h
similarity index 100%
rename from src/game/memory.h
rename to src/init/memory.h
diff --git a/src/menu/file_select.c b/src/menu/file_select.c
index dc21e8f9..13c7f78c 100644
--- a/src/menu/file_select.c
+++ b/src/menu/file_select.c
@@ -4,21 +4,21 @@
 #include "audio/external.h"
 #include "behavior_data.h"
 #include "dialog_ids.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
-#include "engine/math_util.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
+#include "game/math_util.h"
 #include "file_select.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 "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 "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 "engine/segment7.h"
+#include "game/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 f90503e8..66a1e268 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 "engine/segment2.h"
-#include "engine/segment7.h"
+#include "init/memory.h"
+#include "game/segment2.h"
+#include "game/segment7.h"
 #include "intro_geo.h"
 #include "sm64.h"
 #include "textures.h"
 #include "types.h"
 #include "buffers/framebuffers.h"
-#include "engine/game_init.h"
+#include "game/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/intro_geo.h b/src/menu/intro_geo.h
index 9797fd0b..ded0def1 100644
--- a/src/menu/intro_geo.h
+++ b/src/menu/intro_geo.h
@@ -5,7 +5,7 @@
 #include <PR/gbi.h>
 
 #include "types.h"
-#include "engine/graph_node.h"
+#include "game/graph_node.h"
 
 Gfx *geo_intro_super_mario_64_logo(s32 sp50, struct GraphNode *sp54, UNUSED void *context);
 Gfx *geo_intro_tm_copyright(s32 sp40, struct GraphNode *sp44, UNUSED void *context);
diff --git a/src/menu/star_select.c b/src/menu/star_select.c
index 191863dc..c9ee8715 100644
--- a/src/menu/star_select.c
+++ b/src/menu/star_select.c
@@ -2,20 +2,20 @@
 
 #include "audio/external.h"
 #include "behavior_data.h"
-#include "engine/behavior_script.h"
-#include "engine/graph_node.h"
+#include "game/behavior_script.h"
+#include "game/graph_node.h"
 #include "eu_translation.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 "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 "game/area.h"
+#include "game/game_init.h"
+#include "game/ingame_menu.h"
+#include "game/level_update.h"
+#include "init/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 "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 88444489..8400b846 100644
--- a/src/menu/title_screen.c
+++ b/src/menu/title_screen.c
@@ -1,16 +1,16 @@
 #include <PR/ultratypes.h>
 
 #include "audio/external.h"
-#include "engine/math_util.h"
-#include "engine/area.h"
-#include "engine/game_init.h"
-#include "engine/level_update.h"
-#include "game/main.h"
-#include "game/memory.h"
-#include "engine/print.h"
-#include "engine/save_file.h"
-#include "engine/sound_init.h"
-#include "engine/rumble_init.h"
+#include "game/math_util.h"
+#include "game/area.h"
+#include "game/game_init.h"
+#include "game/level_update.h"
+#include "init/main.h"
+#include "init/memory.h"
+#include "game/print.h"
+#include "game/save_file.h"
+#include "game/sound_init.h"
+#include "game/rumble_init.h"
 #include "level_table.h"
 #include "seq_ids.h"
 #include "sm64.h"
diff --git a/tools/demo_data_converter.py b/tools/demo_data_converter.py
index 86ea94c5..230648ef 100755
--- a/tools/demo_data_converter.py
+++ b/tools/demo_data_converter.py
@@ -62,7 +62,7 @@ def main():
         structdef.append("u8 " + item["name"] + "[" + str(len(demobytes)) + "];")
         structobj.append("{" + ",".join(hex(x) for x in demobytes) + "},")
 
-    print("#include \"game/memory.h\"")
+    print("#include \"init/memory.h\"")
     print("#include <stddef.h>")
     print("")
 
diff --git a/tools/mario_anims_converter.py b/tools/mario_anims_converter.py
index fcf92a54..ed01e615 100755
--- a/tools/mario_anims_converter.py
+++ b/tools/mario_anims_converter.py
@@ -136,7 +136,7 @@ try:
             structdef.append("{} {}[{}];".format(type, name, len(arr)))
             structobj.append("{" + ",".join(arr) + "},")
 
-    print("#include \"game/memory.h\"")
+    print("#include \"init/memory.h\"")
     print("#include <stddef.h>")
     print("")