diff --git a/.vscode/settings.json b/.vscode/settings.json
index b15d9f73c..bab0b2e16 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,12 +5,12 @@
     "global.h": "c",
     "m4a_internal.h": "c",
     "lib/m4a.h": "c",
-    "engine/task.h": "c",
+    "task.h": "c",
     "flash_internal.h": "c",
     "agb_flash.h": "c",
-    "engine/malloc_ewram.h": "c",
+    "malloc_ewram.h": "c",
     "data.h": "c",
-    "engine/sprite.h": "c",
+    "sprite.h": "c",
     "game/math.h": "c",
     "game/save.h": "c",
     "flags.h": "c",
@@ -28,9 +28,9 @@
     "zones.h": "c",
     "player.h": "c",
     "input.h": "c",
-    "engine/input_recorder.h": "c",
-    "recordings.h": "c",
-    "engine/trig.h": "c",
+    "input_recorder.h": "c",
+    "data/recordings.h": "c",
+    "trig.h": "c",
     "game/options_screen.h": "c",
     "songs.h": "c",
     "text.h": "c",
@@ -39,13 +39,13 @@
     "game/time.h": "c",
     "random": "c",
     "multiplayer.h": "c",
-    "engine/malloc_vram.h": "c",
+    "malloc_vram.h": "c",
     "game/multiplayer/multipak_connection.h": "c",
     "game/multiplayer/team_play.h": "c",
     "multi_boot.h": "c",
     "game/character_select.h": "c",
     "transition.h": "c",
-    "palettes.h": "c",
+    "data/palettes.h": "c",
     "game/multiplayer/mode_select.h": "c",
     "game/time_attack/lobby.h": "c",
     "game/course_select.h": "c",
@@ -163,7 +163,7 @@
     "game/interactables_2/094.h": "c",
     "game/interactables_2/080.h": "c",
     "game/interactables_2/music_plant/pipe_horn.h": "c",
-    "engine/animation_commands.h": "c",
+    "animation_commands.h": "c",
     "game/interactables_2/074.h": "c",
     "game/interactables_2/tec_base/light_bridge.h": "c",
     "game/interactables_2/wind_up_stick.h": "c",
diff --git a/include/engine/animation_commands.h b/include/animation_commands.h
similarity index 98%
rename from include/engine/animation_commands.h
rename to include/animation_commands.h
index f2089fcf9..643113f1e 100644
--- a/include/engine/animation_commands.h
+++ b/include/animation_commands.h
@@ -2,7 +2,7 @@
 #define GUARD_ANIMATION_COMMANDS_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #define AnimCommandSizeInWords(_structType) ((sizeof(_structType)) / sizeof(s32))
 
diff --git a/include/core.h b/include/core.h
index d82d38eb7..1f38e3ec7 100644
--- a/include/core.h
+++ b/include/core.h
@@ -3,9 +3,9 @@
 
 #include "global.h"
 #include "data.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/input_recorder.h"
+#include "task.h"
+#include "sprite.h"
+#include "input_recorder.h"
 
 struct MultiSioData_0_0 {
     // id
diff --git a/include/data.h b/include/data.h
index 54fc03a86..ea7ff6a86 100644
--- a/include/data.h
+++ b/include/data.h
@@ -6,7 +6,7 @@
 #define GUARD_DATA_H
 
 #include "global.h"
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 // TODO: extract this data
 extern union Unk_03002E60 gMapHeaders[];
diff --git a/include/palettes.h b/include/data/palettes.h
similarity index 100%
rename from include/palettes.h
rename to include/data/palettes.h
diff --git a/include/recordings.h b/include/data/recordings.h
similarity index 100%
rename from include/recordings.h
rename to include/data/recordings.h
diff --git a/include/game/backgrounds.h b/include/game/backgrounds.h
index 3a3e9b93b..0403cfd89 100644
--- a/include/game/backgrounds.h
+++ b/include/game/backgrounds.h
@@ -2,7 +2,7 @@
 #define GUARD_BACKGROUNDS_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 struct UNK_3005B80_UNK4 {
     u8 unk0;
diff --git a/include/game/game.h b/include/game/game.h
index 91260c7a3..283884b68 100644
--- a/include/game/game.h
+++ b/include/game/game.h
@@ -14,10 +14,10 @@
 #define GAME_MODE_MULTI_PLAYER_COLLECT_RINGS 5
 
 #include "global.h"
-#include "engine/sprite.h"
-#include "lib/multi_sio.h"
+#include "sprite.h"
+#include "multi_sio.h"
 #include "game/save.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 
diff --git a/include/game/interactable.h b/include/game/interactable.h
index 3295d6df8..1c09138d0 100644
--- a/include/game/interactable.h
+++ b/include/game/interactable.h
@@ -3,7 +3,7 @@
 
 #include "gba/defines.h"
 #include "gba/types.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
 
 #define INTERACTABLE_DATA_SIZE_SA1 4
diff --git a/include/game/interactables_2/dash_ring.h b/include/game/interactables_2/dash_ring.h
index a3d17013e..c84297731 100644
--- a/include/game/interactables_2/dash_ring.h
+++ b/include/game/interactables_2/dash_ring.h
@@ -2,7 +2,7 @@
 #define GUARD_IA_DASH_RING_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/interactable.h"
 
 #define DASH_RING__NUM_ORIENTATIONS 8
diff --git a/include/game/multiplayer/multipak_connection.h b/include/game/multiplayer/multipak_connection.h
index 872dc4237..2758549c4 100644
--- a/include/game/multiplayer/multipak_connection.h
+++ b/include/game/multiplayer/multipak_connection.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "game/game.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 
 extern u8 gMultiplayerUnlockedCharacters;
 extern u8 gMultiplayerConnections;
diff --git a/include/game/options_screen.h b/include/game/options_screen.h
index 0fd57dec9..d9bfc1788 100644
--- a/include/game/options_screen.h
+++ b/include/game/options_screen.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 #include "game/save.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "constants/text.h"
 
diff --git a/include/game/special_stage/collectables.h b/include/game/special_stage/collectables.h
index 9a53f5b17..527fd132a 100644
--- a/include/game/special_stage/collectables.h
+++ b/include/game/special_stage/collectables.h
@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_COLLECTABLES_H
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/special_stage/main.h"
 
 #define MAX_RING_PARTICLES 8
diff --git a/include/game/special_stage/data.h b/include/game/special_stage/data.h
index a5e66c86b..ee684bea6 100644
--- a/include/game/special_stage/data.h
+++ b/include/game/special_stage/data.h
@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_DATA_H
 
 #include "global.h"
-#include "engine/sprite.h" // for the 'AnimId' type
+#include "sprite.h" // for the 'AnimId' type
 #include "zones.h"
 
 #define SPRITE_ARRAY_END                                                                \
diff --git a/include/game/special_stage/guard_robo.h b/include/game/special_stage/guard_robo.h
index 210553fa5..24404e5af 100644
--- a/include/game/special_stage/guard_robo.h
+++ b/include/game/special_stage/guard_robo.h
@@ -3,7 +3,7 @@
 #define GUARD_SPECIAL_GUARD_ROBO_H
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/special_stage/main.h"
 #include "game/special_stage/data.h"
 
diff --git a/include/game/special_stage/main.h b/include/game/special_stage/main.h
index 1a8d8f1be..d2f44f69d 100644
--- a/include/game/special_stage/main.h
+++ b/include/game/special_stage/main.h
@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 
 #define SPECIAL_STAGE_ZONE_SIZE 8
diff --git a/include/game/special_stage/ui.h b/include/game/special_stage/ui.h
index fa119d2eb..2f663b5b2 100644
--- a/include/game/special_stage/ui.h
+++ b/include/game/special_stage/ui.h
@@ -2,7 +2,7 @@
 #define GUARD_SPECIAL_STAGE_UI_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/special_stage/main.h"
 
 struct SpecialStageUI {
diff --git a/include/game/special_stage/utils.h b/include/game/special_stage/utils.h
index 2ebbdb7b8..26215f3e2 100644
--- a/include/game/special_stage/utils.h
+++ b/include/game/special_stage/utils.h
@@ -4,7 +4,7 @@
 #include "global.h"
 #include "game/special_stage/main.h"
 #include "game/special_stage/data.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 extern void *gUnknown_03005B58;
 extern void *gUnknown_03005B5C;
diff --git a/include/game/title_screen.h b/include/game/title_screen.h
index 3a7aa6667..28ba89d7c 100644
--- a/include/game/title_screen.h
+++ b/include/game/title_screen.h
@@ -2,7 +2,7 @@
 #define GUARD_INTRO_H
 
 #include "global.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 // TODO: not sure why these were shared from here, may
 // not be
diff --git a/include/engine/input_recorder.h b/include/input_recorder.h
similarity index 100%
rename from include/engine/input_recorder.h
rename to include/input_recorder.h
diff --git a/include/main.h b/include/main.h
index 18b2ff9f3..7ba179ed3 100644
--- a/include/main.h
+++ b/include/main.h
@@ -3,9 +3,9 @@
 
 #include "global.h"
 #include "data.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/input_recorder.h"
+#include "task.h"
+#include "sprite.h"
+#include "input_recorder.h"
 
 struct MultiSioData_0_0 {
     // id
diff --git a/include/engine/malloc_ewram.h b/include/malloc_ewram.h
similarity index 100%
rename from include/engine/malloc_ewram.h
rename to include/malloc_ewram.h
diff --git a/include/engine/malloc_vram.h b/include/malloc_vram.h
similarity index 100%
rename from include/engine/malloc_vram.h
rename to include/malloc_vram.h
diff --git a/include/lib/multi_boot.h b/include/multi_boot.h
similarity index 100%
rename from include/lib/multi_boot.h
rename to include/multi_boot.h
diff --git a/include/lib/multi_sio.h b/include/multi_sio.h
similarity index 100%
rename from include/lib/multi_sio.h
rename to include/multi_sio.h
diff --git a/include/lib/sio32_multi_load.h b/include/sio32_multi_load.h
similarity index 99%
rename from include/lib/sio32_multi_load.h
rename to include/sio32_multi_load.h
index f254d99f3..f043a7fb3 100644
--- a/include/lib/sio32_multi_load.h
+++ b/include/sio32_multi_load.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_SIO32_MULTI_LOAD_H
 #define GUARD_SIO32_MULTI_LOAD_H
 
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 
 // Optimize the following settings based on the software
 // specifications
diff --git a/include/engine/sprite.h b/include/sprite.h
similarity index 100%
rename from include/engine/sprite.h
rename to include/sprite.h
diff --git a/include/engine/task.h b/include/task.h
similarity index 100%
rename from include/engine/task.h
rename to include/task.h
diff --git a/include/engine/trig.h b/include/trig.h
similarity index 100%
rename from include/engine/trig.h
rename to include/trig.h
diff --git a/ldscript.txt b/ldscript.txt
index 3106e21d6..f44e7ade6 100644
--- a/ldscript.txt
+++ b/ldscript.txt
@@ -25,26 +25,31 @@ SECTIONS
     ROM :
 	ALIGN(4)
 	{
+        /* bootstrap */
         build/sa2/asm/rom_header.o(.text);
         build/sa2/asm/crt0.o(.text);
+
+        /* engine */
         build/sa2/asm/multi_sio_asm.o(.text);
-        build/sa2/src/lib/multi_sio.o(.text);
-        build/sa2/src/lib/multi_boot.o(.text);
-        build/sa2/src/lib/sio32_multi_load.o(.text);
+        build/sa2/src/multi_sio.o(.text);
+        build/sa2/src/multi_boot.o(.text);
+        build/sa2/src/sio32_multi_load.o(.text);
         build/sa2/src/core.o(.text);
         build/sa2/src/main.o(.text);
-        build/sa2/src/engine/task.o(.text);
-        build/sa2/src/engine/sprite_1.o(.text);
-        build/sa2/src/engine/bg_update.o(.text);
-        build/sa2/src/engine/animation_commands_extra.o(.text);
+        build/sa2/src/task.o(.text);
+        build/sa2/src/sprite_1.o(.text);
+        build/sa2/src/bg_update.o(.text);
+        build/sa2/src/animation_commands_extra.o(.text);
         build/sa2/asm/sprite_2.o(.text);
-        build/sa2/src/engine/sprite_3.o(.text);
+        build/sa2/src/sprite_3.o(.text);
         build/sa2/asm/sprite_3.o(.text);
-        build/sa2/src/engine/animation_commands.o(.text);
+        build/sa2/src/animation_commands.o(.text);
         build/sa2/asm/sprite_4.o(.text);
-        build/sa2/src/engine/malloc_ewram.o(.text);
-        build/sa2/src/engine/malloc_vram.o(.text);
-        build/sa2/src/engine/input_recorder.o(.text);
+        build/sa2/src/malloc_ewram.o(.text);
+        build/sa2/src/malloc_vram.o(.text);
+        build/sa2/src/input_recorder.o(.text);
+
+        /* game */
         build/sa2/asm/entities_0.o(.text);
         build/sa2/src/game/interactables_0/spring.o(.text);
         build/sa2/asm/interactable_platform.o(.text);
@@ -164,6 +169,8 @@ SECTIONS
         build/sa2/src/game/cutscenes/final_ending_fall.o(.text);
         build/sa2/src/game/cutscenes/final_ending_land.o(.text);
         build/sa2/src/game/cutscenes/missing_emeralds.o(.text);
+
+        /* libs */
         build/sa2/asm/m4a0.o(.text);
         build/sa2/src/lib/m4a.o(.text);
         build/sa2/src/lib/agb_flash.o(.text);
@@ -185,15 +192,18 @@ SECTIONS
         *libc.a:memset.o(.text);
 
         /* Data */
-        build/sa2/src/lib/multi_sio.o(.rodata);
-        build/sa2/src/lib/sio32_multi_load.o(.rodata);
+        /* engine Data */
+        build/sa2/src/multi_sio.o(.rodata);
+        build/sa2/src/sio32_multi_load.o(.rodata);
         build/sa2/src/core.o(.rodata);
-        build/sa2/src/engine/sprite_1.o(.rodata);
-        build/sa2/src/engine/trig.o(.rodata);
+        build/sa2/src/sprite_1.o(.rodata);
+        build/sa2/src/trig.o(.rodata);
         build/sa2/asm/sprite_3.o(.rodata);
-        build/sa2/src/engine/animation_commands_extra.o(.rodata);
-        build/sa2/src/engine/animation_commands.o(.rodata);
+        build/sa2/src/animation_commands_extra.o(.rodata);
+        build/sa2/src/animation_commands.o(.rodata);
         build/sa2/asm/sprite_4.o(.rodata);
+    
+        /* game Data */
         build/sa2/data/multiboot_chao_garden.o(.rodata);
         build/sa2/asm/entities_0.o(.rodata);
         build/sa2/src/game/interactables_0/spring.o(.rodata);
@@ -546,8 +556,8 @@ SECTIONS
         build/sa2/data/data3.o(.rodata);
         build/sa2/data/special_stage_levels.o(.rodata);
         build/sa2/data/handlers_ia_pipe_horn_sequences.o(.rodata);
-        build/sa2/src/palettes.o(.rodata);
-        build/sa2/src/recordings.o(.rodata);
+        build/sa2/src/data/palettes.o(.rodata);
+        build/sa2/src/data/recordings.o(.rodata);
         build/sa2/data/data4.o(.rodata);
         build/sa2/data/multiboot_subgame_loader.o(.rodata);
 
diff --git a/src/engine/animation_commands.c b/src/animation_commands.c
similarity index 98%
rename from src/engine/animation_commands.c
rename to src/animation_commands.c
index 0a64ca3a1..841a5b921 100644
--- a/src/engine/animation_commands.c
+++ b/src/animation_commands.c
@@ -3,9 +3,9 @@
 
 #include "data.h"
 #include "flags.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 extern s32 animCmd_GetTiles(void *cursor, Sprite *sprite);
 static s32 animCmd_GetPalette(void *cursor, Sprite *sprite);
diff --git a/src/engine/animation_commands_extra.c b/src/animation_commands_extra.c
similarity index 99%
rename from src/engine/animation_commands_extra.c
rename to src/animation_commands_extra.c
index 440221185..19db66987 100644
--- a/src/engine/animation_commands_extra.c
+++ b/src/animation_commands_extra.c
@@ -2,13 +2,13 @@
 #include "gba/syscall.h"
 #include "core.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "data.h"
 #include "flags.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
-#include "engine/animation_commands.h"
+#include "animation_commands.h"
 
 extern const struct SpriteTables *gUnknown_03002794;
 extern u8 gVramGraphicsCopyQueueIndex;
diff --git a/src/engine/bg_update.c b/src/bg_update.c
similarity index 100%
rename from src/engine/bg_update.c
rename to src/bg_update.c
diff --git a/src/core.c b/src/core.c
index 4584c90ee..f2e59e59e 100644
--- a/src/core.c
+++ b/src/core.c
@@ -2,14 +2,14 @@
 #include "global.h"
 #include "data.h"
 #include "lib/m4a.h"
-#include "engine/malloc_ewram.h"
-#include "lib/multi_sio.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "malloc_ewram.h"
+#include "multi_sio.h"
+#include "sprite.h"
+#include "task.h"
 #include "lib/agb_flash.h"
 #include "flags.h"
-#include "engine/input_recorder.h"
-#include "engine/malloc_vram.h"
+#include "input_recorder.h"
+#include "malloc_vram.h"
 
 // TODO: the order of these vars has
 // been shuffled due to compilation losses.
diff --git a/src/palettes.c b/src/data/palettes.c
similarity index 82%
rename from src/palettes.c
rename to src/data/palettes.c
index fe818c1bf..54e15889c 100644
--- a/src/palettes.c
+++ b/src/data/palettes.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "palettes.h"
+#include "data/palettes.h"
 
 // TODO: move to data and include as asm
 const u8 gUnknown_08C8796C[] = INCBIN_U8("graphics/8C8796C.gbapal");
diff --git a/src/recordings.c b/src/data/recordings.c
similarity index 100%
rename from src/recordings.c
rename to src/data/recordings.c
diff --git a/src/game/boost_effect.c b/src/game/boost_effect.c
index 9af0fb247..b97b9c69d 100644
--- a/src/game/boost_effect.c
+++ b/src/game/boost_effect.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "sprite.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "game/math.h"
 #include "game/boost_effect.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/character_select.c b/src/game/character_select.c
index 36d8a3c4a..86788eddc 100644
--- a/src/game/character_select.c
+++ b/src/game/character_select.c
@@ -2,14 +2,14 @@
 #include "core.h"
 #include "transition.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/character_select.h"
 #include "game/save.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "flags.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/results.h"
 #include "player.h"
diff --git a/src/game/countdown.c b/src/game/countdown.c
index 1b9e3d0c3..1fccc7810 100644
--- a/src/game/countdown.c
+++ b/src/game/countdown.c
@@ -1,9 +1,9 @@
 #include "game/countdown.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "constants/animations.h"
diff --git a/src/game/course_select.c b/src/game/course_select.c
index 448df1af0..65d672ff4 100644
--- a/src/game/course_select.c
+++ b/src/game/course_select.c
@@ -1,17 +1,17 @@
 #include "game/course_select.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "game/save.h"
 #include "lib/m4a.h"
 #include "game/character_select.h"
 #include "constants/songs.h"
 #include "constants/text.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 struct CourseSelectionScreen {
     struct UNK_802D4CC_UNK270 screenFade;
diff --git a/src/game/cutscenes/credits.c b/src/game/cutscenes/credits.c
index 533102dd4..cdaf77f08 100644
--- a/src/game/cutscenes/credits.c
+++ b/src/game/cutscenes/credits.c
@@ -4,9 +4,9 @@
 #include "game/cutscenes/credits_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 
diff --git a/src/game/cutscenes/credits_end.c b/src/game/cutscenes/credits_end.c
index 1e0c20a4f..2e9c10557 100644
--- a/src/game/cutscenes/credits_end.c
+++ b/src/game/cutscenes/credits_end.c
@@ -4,9 +4,9 @@
 #include "game/cutscenes/missing_emeralds.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/title_screen.h"
diff --git a/src/game/cutscenes/credits_slides.c b/src/game/cutscenes/credits_slides.c
index 9b3be6fb6..51750a2de 100644
--- a/src/game/cutscenes/credits_slides.c
+++ b/src/game/cutscenes/credits_slides.c
@@ -3,9 +3,9 @@
 #include "game/cutscenes/credits_end.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 
diff --git a/src/game/cutscenes/endings.c b/src/game/cutscenes/endings.c
index 2fe72f125..f21ec3c73 100644
--- a/src/game/cutscenes/endings.c
+++ b/src/game/cutscenes/endings.c
@@ -2,14 +2,14 @@
 #include "game/cutscenes/endings.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/cutscenes/extra_ending_fall.h"
 #include "game/cutscenes/final_ending_fall.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 
 #include "constants/songs.h"
diff --git a/src/game/cutscenes/extra_ending_fall.c b/src/game/cutscenes/extra_ending_fall.c
index 0eabe2850..a311cca3e 100644
--- a/src/game/cutscenes/extra_ending_fall.c
+++ b/src/game/cutscenes/extra_ending_fall.c
@@ -3,11 +3,11 @@
 #include "game/cutscenes/extra_ending_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 #include "game/math.h"
 
diff --git a/src/game/cutscenes/extra_ending_slides.c b/src/game/cutscenes/extra_ending_slides.c
index 212845052..511b20c1c 100644
--- a/src/game/cutscenes/extra_ending_slides.c
+++ b/src/game/cutscenes/extra_ending_slides.c
@@ -2,9 +2,9 @@
 #include "game/cutscenes/credits.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 
diff --git a/src/game/cutscenes/final_ending_fall.c b/src/game/cutscenes/final_ending_fall.c
index 478d5f443..9e22a1ca8 100644
--- a/src/game/cutscenes/final_ending_fall.c
+++ b/src/game/cutscenes/final_ending_fall.c
@@ -3,9 +3,9 @@
 #include "game/cutscenes/extra_ending_slides.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/math.h"
diff --git a/src/game/cutscenes/final_ending_land.c b/src/game/cutscenes/final_ending_land.c
index 628f761e3..7f5d89a3c 100644
--- a/src/game/cutscenes/final_ending_land.c
+++ b/src/game/cutscenes/final_ending_land.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/cutscenes/credits.h"
 #include "game/cutscenes/missing_emeralds.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "game/math.h"
diff --git a/src/game/cutscenes/level_endings.c b/src/game/cutscenes/level_endings.c
index 31d3fad94..291ae8c83 100644
--- a/src/game/cutscenes/level_endings.c
+++ b/src/game/cutscenes/level_endings.c
@@ -2,12 +2,12 @@
 #include "game/cutscenes/level_endings.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/course_select.h"
 #include "game/save.h"
 
diff --git a/src/game/cutscenes/missing_emeralds.c b/src/game/cutscenes/missing_emeralds.c
index 3dd73aa4e..bbf5c31d8 100644
--- a/src/game/cutscenes/missing_emeralds.c
+++ b/src/game/cutscenes/missing_emeralds.c
@@ -2,9 +2,9 @@
 #include "game/cutscenes/missing_emeralds.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
 #include "game/title_screen.h"
diff --git a/src/game/game.c b/src/game/game.c
index 05cf957c6..b18437cb4 100644
--- a/src/game/game.c
+++ b/src/game/game.c
@@ -2,13 +2,13 @@
 #include "game/game.h"
 #include "game/save.h"
 #include "game/race_progress.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "game/multiboot/collect_rings/time_display.h"
 #include "lib/m4a.h"
 #include "game/time_attack/lobby.h"
 #include "game/game_over.h"
 #include "constants/songs.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "constants/move_states.h"
 
diff --git a/src/game/game_over.c b/src/game/game_over.c
index edb414f5d..356d25feb 100644
--- a/src/game/game_over.c
+++ b/src/game/game_over.c
@@ -3,10 +3,10 @@
 #include "game/game.h"
 #include "game/time_attack/lobby.h"
 #include "game/title_screen.h"
-#include "engine/task.h"
+#include "task.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "constants/songs.h"
 
 typedef struct {
diff --git a/src/game/init.c b/src/game/init.c
index d61b2c14d..75cc7d2b8 100644
--- a/src/game/init.c
+++ b/src/game/init.c
@@ -2,7 +2,7 @@
 #include "core.h"
 #include "data.h"
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/init.h"
 #include "flags.h"
 #include "game/save.h"
diff --git a/src/game/interactables_0/044.c b/src/game/interactables_0/044.c
index 8ac221dcb..da9539fa2 100644
--- a/src/game/interactables_0/044.c
+++ b/src/game/interactables_0/044.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/interactables.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_0/clear_pipe.c b/src/game/interactables_0/clear_pipe.c
index f9d57c682..dde0bae3c 100644
--- a/src/game/interactables_0/clear_pipe.c
+++ b/src/game/interactables_0/clear_pipe.c
@@ -4,8 +4,8 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 
diff --git a/src/game/interactables_0/platform.c b/src/game/interactables_0/platform.c
index 9b5de9475..dd344e929 100644
--- a/src/game/interactables_0/platform.c
+++ b/src/game/interactables_0/platform.c
@@ -1,4 +1,4 @@
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "zones.h"
 #include "constants/animations.h"
diff --git a/src/game/interactables_0/ramp.c b/src/game/interactables_0/ramp.c
index b096050a4..150e526ce 100644
--- a/src/game/interactables_0/ramp.c
+++ b/src/game/interactables_0/ramp.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/interactable.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "zones.h"
 
 #include "constants/animations.h"
diff --git a/src/game/interactables_0/slidy_ice.c b/src/game/interactables_0/slidy_ice.c
index 1234e2c86..2567ecfdf 100644
--- a/src/game/interactables_0/slidy_ice.c
+++ b/src/game/interactables_0/slidy_ice.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
diff --git a/src/game/interactables_0/spring.c b/src/game/interactables_0/spring.c
index 618ffd6d6..ecf8a3f25 100644
--- a/src/game/interactables_0/spring.c
+++ b/src/game/interactables_0/spring.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 #include "zones.h"
 
 #include "constants/animations.h"
diff --git a/src/game/interactables_1/019.c b/src/game/interactables_1/019.c
index 4e6d673c7..a6e48fe7f 100644
--- a/src/game/interactables_1/019.c
+++ b/src/game/interactables_1/019.c
@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "data.h"
 
 #include "constants/animations.h"
diff --git a/src/game/interactables_1/booster.c b/src/game/interactables_1/booster.c
index 9ed6df0ac..0554b5945 100644
--- a/src/game/interactables_1/booster.c
+++ b/src/game/interactables_1/booster.c
@@ -1,12 +1,12 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/game.h"
 
 #include "constants/animations.h"
diff --git a/src/game/interactables_1/bouncy_bar.c b/src/game/interactables_1/bouncy_bar.c
index 3bc3dc9bd..69e65fdca 100644
--- a/src/game/interactables_1/bouncy_bar.c
+++ b/src/game/interactables_1/bouncy_bar.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/interactable.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"
diff --git a/src/game/interactables_1/checkpoint.c b/src/game/interactables_1/checkpoint.c
index c15d146de..6aac13eab 100644
--- a/src/game/interactables_1/checkpoint.c
+++ b/src/game/interactables_1/checkpoint.c
@@ -1,15 +1,15 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "core.h"
 
 #include "data.h"
 #include "flags.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/anim_commands.h"
diff --git a/src/game/interactables_1/decoration.c b/src/game/interactables_1/decoration.c
index 62b7f107b..fd6168d61 100644
--- a/src/game/interactables_1/decoration.c
+++ b/src/game/interactables_1/decoration.c
@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
-#include "engine/task.h"
+#include "malloc_vram.h"
+#include "task.h"
 #include "game/game.h"
 
 #include "constants/animations.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 typedef struct {
     /* 0x00 */ SpriteBase base;
diff --git a/src/game/interactables_1/gapped_loop.c b/src/game/interactables_1/gapped_loop.c
index df50c0fc1..3669edb86 100644
--- a/src/game/interactables_1/gapped_loop.c
+++ b/src/game/interactables_1/gapped_loop.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_1/gapped_loop.h"
 #include "constants/move_states.h"
-#include "engine/sprite.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "trig.h"
 
 typedef struct {
     SpriteBase base;
diff --git a/src/game/interactables_1/incline_ramp.c b/src/game/interactables_1/incline_ramp.c
index 5407a5690..da33fdf62 100644
--- a/src/game/interactables_1/incline_ramp.c
+++ b/src/game/interactables_1/incline_ramp.c
@@ -4,8 +4,8 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/move_states.h"
 #include "constants/songs.h"
diff --git a/src/game/interactables_1/spikes.c b/src/game/interactables_1/spikes.c
index 71581f9ec..4d62dc767 100644
--- a/src/game/interactables_1/spikes.c
+++ b/src/game/interactables_1/spikes.c
@@ -1,9 +1,9 @@
 #include <string.h> // for memcpy
 
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/interactable.h"
 
diff --git a/src/game/interactables_1/spring_bouncy.c b/src/game/interactables_1/spring_bouncy.c
index 0bf4176fa..cac250a9d 100644
--- a/src/game/interactables_1/spring_bouncy.c
+++ b/src/game/interactables_1/spring_bouncy.c
@@ -2,12 +2,12 @@
 #include "lib/m4a.h"
 #include "gba/syscall.h"
 
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_1/toggle_player_layer.c b/src/game/interactables_1/toggle_player_layer.c
index 18b85bcf5..dc232eeec 100644
--- a/src/game/interactables_1/toggle_player_layer.c
+++ b/src/game/interactables_1/toggle_player_layer.c
@@ -1,10 +1,10 @@
 #include "global.h"
 
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/interactables.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_1/windmill.c b/src/game/interactables_1/windmill.c
index 85a07a532..0edceaeaa 100644
--- a/src/game/interactables_1/windmill.c
+++ b/src/game/interactables_1/windmill.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "game/interactables_1/windmill.h"
-#include "engine/malloc_vram.h"
-#include "engine/sprite.h"
+#include "malloc_vram.h"
+#include "sprite.h"
 #include "game/game.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "constants/animations.h"
 
 typedef struct {
diff --git a/src/game/interactables_2/080.c b/src/game/interactables_2/080.c
index f9701840c..729ead769 100644
--- a/src/game/interactables_2/080.c
+++ b/src/game/interactables_2/080.c
@@ -2,11 +2,11 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/interactables_2/080.h"
-#include "engine/malloc_vram.h"
-#include "engine/trig.h"
+#include "malloc_vram.h"
+#include "trig.h"
 #include "constants/animations.h"
 #include "constants/songs.h"
 
diff --git a/src/game/interactables_2/085.c b/src/game/interactables_2/085.c
index 83b84ea5c..a7be59cc4 100644
--- a/src/game/interactables_2/085.c
+++ b/src/game/interactables_2/085.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "game/interactables_2/085.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "lib/m4a.h"
 
 #include "constants/songs.h"
diff --git a/src/game/interactables_2/095.c b/src/game/interactables_2/095.c
index 1d20d4b38..cc4d3229d 100644
--- a/src/game/interactables_2/095.c
+++ b/src/game/interactables_2/095.c
@@ -1,9 +1,9 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/interactables_2/095.h"
-#include "engine/malloc_vram.h"
-#include "engine/trig.h"
+#include "malloc_vram.h"
+#include "trig.h"
 
 #include "constants/move_states.h"
 
diff --git a/src/game/interactables_2/105.c b/src/game/interactables_2/105.c
index 40fb03ac1..2718cffd0 100644
--- a/src/game/interactables_2/105.c
+++ b/src/game/interactables_2/105.c
@@ -3,9 +3,9 @@
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 #include "game/game.h"
 
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/dash_ring.c b/src/game/interactables_2/dash_ring.c
index 7d300f115..7035178ad 100644
--- a/src/game/interactables_2/dash_ring.c
+++ b/src/game/interactables_2/dash_ring.c
@@ -1,14 +1,14 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/dash_ring.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/hot_crater/crane.c b/src/game/interactables_2/hot_crater/crane.c
index d95d56691..daf938c63 100644
--- a/src/game/interactables_2/hot_crater/crane.c
+++ b/src/game/interactables_2/hot_crater/crane.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/hot_crater/turn_around_bar.c b/src/game/interactables_2/hot_crater/turn_around_bar.c
index 6d19cf0b9..e3b29ac6c 100644
--- a/src/game/interactables_2/hot_crater/turn_around_bar.c
+++ b/src/game/interactables_2/hot_crater/turn_around_bar.c
@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/turn_around_bar.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/hot_crater/wind_up_stick.c b/src/game/interactables_2/hot_crater/wind_up_stick.c
index a2bb52e99..29bdc69a2 100644
--- a/src/game/interactables_2/hot_crater/wind_up_stick.c
+++ b/src/game/interactables_2/hot_crater/wind_up_stick.c
@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/wind_up_stick.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/ice_paradise/half_pipe.c b/src/game/interactables_2/ice_paradise/half_pipe.c
index a11b99973..1e19a9316 100644
--- a/src/game/interactables_2/ice_paradise/half_pipe.c
+++ b/src/game/interactables_2/ice_paradise/half_pipe.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/interactable.h"
 #include "game/interactables_2/ice_paradise/half_pipe.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 typedef struct {
     s32 x;
diff --git a/src/game/interactables_2/ice_paradise/slowing_snow.c b/src/game/interactables_2/ice_paradise/slowing_snow.c
index f05479643..b3c06dc34 100644
--- a/src/game/interactables_2/ice_paradise/slowing_snow.c
+++ b/src/game/interactables_2/ice_paradise/slowing_snow.c
@@ -1,10 +1,10 @@
 #include "global.h"
 
-#include "engine/task.h"
+#include "task.h"
 #include "game/game.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/move_states.h"
 
diff --git a/src/game/interactables_2/music_plant/german_flute.c b/src/game/interactables_2/music_plant/german_flute.c
index 8e1d03626..462d9eb5a 100644
--- a/src/game/interactables_2/music_plant/german_flute.c
+++ b/src/game/interactables_2/music_plant/german_flute.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"
diff --git a/src/game/interactables_2/music_plant/guitar_string.c b/src/game/interactables_2/music_plant/guitar_string.c
index 29f2d2d6b..1a7f695dd 100644
--- a/src/game/interactables_2/music_plant/guitar_string.c
+++ b/src/game/interactables_2/music_plant/guitar_string.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "core.h"
 #include "lib/m4a.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "game/interactable.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "game/game.h"
 
diff --git a/src/game/interactables_2/music_plant/handlers_ia_pipe_horn.c b/src/game/interactables_2/music_plant/handlers_ia_pipe_horn.c
index bb0835fc9..769ff615f 100644
--- a/src/game/interactables_2/music_plant/handlers_ia_pipe_horn.c
+++ b/src/game/interactables_2/music_plant/handlers_ia_pipe_horn.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/interactables_2/music_plant/pipe_horn.h"
 
diff --git a/src/game/interactables_2/music_plant/keyboard.c b/src/game/interactables_2/music_plant/keyboard.c
index a688d5ecc..d77c03b4c 100644
--- a/src/game/interactables_2/music_plant/keyboard.c
+++ b/src/game/interactables_2/music_plant/keyboard.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"
diff --git a/src/game/interactables_2/music_plant/note_block.c b/src/game/interactables_2/music_plant/note_block.c
index c674ec2ea..9abb15241 100644
--- a/src/game/interactables_2/music_plant/note_block.c
+++ b/src/game/interactables_2/music_plant/note_block.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"
diff --git a/src/game/interactables_2/music_plant/note_sphere.c b/src/game/interactables_2/music_plant/note_sphere.c
index 2325e9293..bb4ebba94 100644
--- a/src/game/interactables_2/music_plant/note_sphere.c
+++ b/src/game/interactables_2/music_plant/note_sphere.c
@@ -3,9 +3,9 @@
 
 #include "lib/m4a.h"
 #include "game/math.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactable.h"
 #include "game/interactables_2/note_particle.h"
diff --git a/src/game/interactables_2/music_plant/pipe_horn.c b/src/game/interactables_2/music_plant/pipe_horn.c
index 3f82145ff..8651b86ec 100644
--- a/src/game/interactables_2/music_plant/pipe_horn.c
+++ b/src/game/interactables_2/music_plant/pipe_horn.c
@@ -1,10 +1,10 @@
 #include "global.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "game/interactables_2/music_plant/pipe_horn.h"
 
diff --git a/src/game/interactables_2/note_particle.c b/src/game/interactables_2/note_particle.c
index ba8ac260a..9fba2be01 100644
--- a/src/game/interactables_2/note_particle.c
+++ b/src/game/interactables_2/note_particle.c
@@ -1,12 +1,12 @@
 #include "global.h"
 #include "gba/types.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "game/game.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "task.h"
+#include "trig.h"
 
 #include "game/interactables_2/note_particle.h"
 
diff --git a/src/game/interactables_2/notification_ring_bonus.c b/src/game/interactables_2/notification_ring_bonus.c
index d66cd4a5b..24df61837 100644
--- a/src/game/interactables_2/notification_ring_bonus.c
+++ b/src/game/interactables_2/notification_ring_bonus.c
@@ -1,11 +1,11 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 #include "game/game.h"
 
 #include "game/interactable.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/sky_canyon_init.c b/src/game/interactables_2/sky_canyon_init.c
index bf14572db..a948c40d2 100644
--- a/src/game/interactables_2/sky_canyon_init.c
+++ b/src/game/interactables_2/sky_canyon_init.c
@@ -1,7 +1,7 @@
 #include "global.h"
 
-#include "engine/sprite.h"
-#include "engine/task.h"
+#include "sprite.h"
+#include "task.h"
 
 #include "constants/animations.h"
 
diff --git a/src/game/interactables_2/special_ring.c b/src/game/interactables_2/special_ring.c
index 7f327d8b4..6c37f2673 100644
--- a/src/game/interactables_2/special_ring.c
+++ b/src/game/interactables_2/special_ring.c
@@ -1,15 +1,15 @@
 #include "global.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "game/game.h"
-#include "engine/task.h"
+#include "task.h"
 #include "core.h"
 
 #include "data.h"
 #include "flags.h"
 #include "game/interactable.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/interactables_2/tec_base/light_bridge.c b/src/game/interactables_2/tec_base/light_bridge.c
index 3aae82d12..9863115c0 100644
--- a/src/game/interactables_2/tec_base/light_bridge.c
+++ b/src/game/interactables_2/tec_base/light_bridge.c
@@ -2,9 +2,9 @@
 #include "game/game.h"
 #include "game/interactable.h"
 #include "game/interactables_2/tec_base/light_bridge.h"
-#include "engine/sprite.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "sprite.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 
 #include "constants/interactables.h"
diff --git a/src/game/interactables_2/tec_base/note_block.c b/src/game/interactables_2/tec_base/note_block.c
index d4a1e6eb3..e680b6775 100644
--- a/src/game/interactables_2/tec_base/note_block.c
+++ b/src/game/interactables_2/tec_base/note_block.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "game/interactables_2/tec_base/note_block.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 
diff --git a/src/game/multiboot/collect_rings/results.c b/src/game/multiboot/collect_rings/results.c
index 8db03df12..a88a26865 100644
--- a/src/game/multiboot/collect_rings/results.c
+++ b/src/game/multiboot/collect_rings/results.c
@@ -4,14 +4,14 @@
 #include "game/multiboot/connection.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiboot/collect_rings/results.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "lib/multi_boot.h"
-#include "lib/sio32_multi_load.h"
+#include "multi_boot.h"
+#include "sio32_multi_load.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"
diff --git a/src/game/multiboot/collect_rings/time_display.c b/src/game/multiboot/collect_rings/time_display.c
index 3c689a785..5c52e2e7e 100644
--- a/src/game/multiboot/collect_rings/time_display.c
+++ b/src/game/multiboot/collect_rings/time_display.c
@@ -1,8 +1,8 @@
 #include "core.h"
 #include "game/game.h"
 #include "game/multiboot/collect_rings/time_display.h"
-#include "engine/malloc_vram.h"
-#include "engine/animation_commands.h"
+#include "malloc_vram.h"
+#include "animation_commands.h"
 
 typedef struct {
     Sprite unk0;
diff --git a/src/game/multiboot/connection.c b/src/game/multiboot/connection.c
index 00535b899..ae7a59c4e 100644
--- a/src/game/multiboot/connection.c
+++ b/src/game/multiboot/connection.c
@@ -5,14 +5,14 @@
 #include "game/multiboot/collect_rings/results.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/mode_select.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "lib/multi_boot.h"
-#include "lib/sio32_multi_load.h"
+#include "multi_boot.h"
+#include "sio32_multi_load.h"
 #include "mb_programs.h"
 
 #include "constants/animations.h"
diff --git a/src/game/multiplayer/communication_outcome.c b/src/game/multiplayer/communication_outcome.c
index cf197b686..509639962 100644
--- a/src/game/multiplayer/communication_outcome.c
+++ b/src/game/multiplayer/communication_outcome.c
@@ -3,11 +3,11 @@
 #include "data.h"
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/multipak_connection.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "lib/m4a.h"
 #include "game/game.h"
 #include "flags.h"
diff --git a/src/game/multiplayer/mode_select.c b/src/game/multiplayer/mode_select.c
index 61ad81335..0194fe007 100644
--- a/src/game/multiplayer/mode_select.c
+++ b/src/game/multiplayer/mode_select.c
@@ -4,10 +4,10 @@
 #include "game/multiboot/connection.h"
 #include "game/save.h"
 #include "core.h"
-#include "lib/multi_sio.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "engine/malloc_vram.h"
+#include "multi_sio.h"
+#include "task.h"
+#include "sprite.h"
+#include "malloc_vram.h"
 #include "transition.h"
 #include "lib/m4a.h"
 #include "flags.h"
diff --git a/src/game/multiplayer/multipak_connection.c b/src/game/multiplayer/multipak_connection.c
index ef401e1c6..8c015e8ee 100644
--- a/src/game/multiplayer/multipak_connection.c
+++ b/src/game/multiplayer/multipak_connection.c
@@ -4,11 +4,11 @@
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer/communication_outcome.h"
 #include "game/multiplayer/mode_select.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "game/title_screen.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "transition.h"
 #include "lib/m4a.h"
 #include "constants/text.h"
diff --git a/src/game/multiplayer/results.c b/src/game/multiplayer/results.c
index b71eaf9d8..3f5a07c71 100644
--- a/src/game/multiplayer/results.c
+++ b/src/game/multiplayer/results.c
@@ -3,10 +3,10 @@
 #include "game/multiplayer/results.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/multiplayer_lobby.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
-#include "lib/multi_sio.h"
+#include "multi_sio.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"
 #include "constants/text.h"
diff --git a/src/game/multiplayer/team_play.c b/src/game/multiplayer/team_play.c
index 0d47066fa..30a48ceb8 100644
--- a/src/game/multiplayer/team_play.c
+++ b/src/game/multiplayer/team_play.c
@@ -2,15 +2,15 @@
 #include "game/multiplayer/team_play.h"
 #include "game/save.h"
 #include "core.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
-#include "lib/multi_sio.h"
+#include "task.h"
+#include "sprite.h"
+#include "multi_sio.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 #include "flags.h"
 #include "game/course_select.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"
diff --git a/src/game/multiplayer_lobby.c b/src/game/multiplayer_lobby.c
index 33159375b..528d61762 100644
--- a/src/game/multiplayer_lobby.c
+++ b/src/game/multiplayer_lobby.c
@@ -1,13 +1,13 @@
 #include "global.h"
 #include "core.h"
 #include "game/multiplayer_lobby.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "transition.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"
 #include "game/save.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "game/multiplayer/multipak_connection.h"
 #include "game/title_screen.h"
 #include "game/character_select.h"
diff --git a/src/game/options_screen.c b/src/game/options_screen.c
index f03c3fd7f..bc378a8cc 100644
--- a/src/game/options_screen.c
+++ b/src/game/options_screen.c
@@ -2,11 +2,11 @@
 #include "core.h"
 #include "game/options_screen.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/save.h"
-#include "engine/malloc_ewram.h"
+#include "malloc_ewram.h"
 #include "game/math.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "constants/songs.h"
 #include "constants/text.h"
diff --git a/src/game/race_progress.c b/src/game/race_progress.c
index aeffe7fe3..0281e9674 100644
--- a/src/game/race_progress.c
+++ b/src/game/race_progress.c
@@ -1,10 +1,10 @@
 #include "game/race_progress.h"
 #include "core.h"
 #include "game/game.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "transition.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 #include "constants/animations.h"
 #include "constants/move_states.h"
diff --git a/src/game/save.c b/src/game/save.c
index fae39b404..d4eb627b8 100644
--- a/src/game/save.c
+++ b/src/game/save.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "lib/agb_flash.h"
-#include "engine/malloc_ewram.h"
+#include "malloc_ewram.h"
 #include "flags.h"
 #include "game/save.h"
 #include "lib/m4a.h"
diff --git a/src/game/sound_test.c b/src/game/sound_test.c
index 7b88cc723..3b6ed3bbb 100644
--- a/src/game/sound_test.c
+++ b/src/game/sound_test.c
@@ -2,13 +2,13 @@
 #include "game/sound_test.h"
 #include "core.h"
 #include "game/options_screen.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "flags.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/backgrounds.h"
 #include "transition.h"
-#include "palettes.h"
+#include "data/palettes.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"
diff --git a/src/game/special_stage/collectables.c b/src/game/special_stage/collectables.c
index b62cfe62c..2360f450e 100644
--- a/src/game/special_stage/collectables.c
+++ b/src/game/special_stage/collectables.c
@@ -4,9 +4,9 @@
 #include "game/special_stage/utils.h"
 #include "game/special_stage/collectables.h"
 #include "game/special_stage/data.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/math.h"
 #include "constants/songs.h"
 #include "zones.h"
diff --git a/src/game/special_stage/guard_robo.c b/src/game/special_stage/guard_robo.c
index d32a9e307..2a2edd2bc 100644
--- a/src/game/special_stage/guard_robo.c
+++ b/src/game/special_stage/guard_robo.c
@@ -1,5 +1,5 @@
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/special_stage/main.h"
 #include "game/special_stage/player.h"
 #include "game/special_stage/utils.h"
@@ -8,7 +8,7 @@
 #include "game/special_stage/collectables.h"
 #include "game/special_stage/tables.h"
 #include "game/special_stage/data.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "lib/m4a.h"
 #include "constants/songs.h"
 
diff --git a/src/game/special_stage/main.c b/src/game/special_stage/main.c
index 8a45996e6..c8aba3869 100644
--- a/src/game/special_stage/main.c
+++ b/src/game/special_stage/main.c
@@ -9,10 +9,10 @@
 #include "game/special_stage/physics.h"
 #include "game/special_stage/tables.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
+#include "task.h"
 #include "game/title_screen.h"
 #include "zones.h"
 #include "constants/songs.h"
diff --git a/src/game/special_stage/physics.c b/src/game/special_stage/physics.c
index fb2f316f5..5f343b096 100644
--- a/src/game/special_stage/physics.c
+++ b/src/game/special_stage/physics.c
@@ -4,8 +4,8 @@
 #include "game/special_stage/physics.h"
 #include "game/special_stage/guard_robo.h"
 #include "game/special_stage/data.h"
-#include "engine/task.h"
-#include "engine/trig.h"
+#include "task.h"
+#include "trig.h"
 #include "game/game.h"
 #include "lib/m4a.h"
 
diff --git a/src/game/special_stage/utils.c b/src/game/special_stage/utils.c
index 752c8b503..d95fcaf53 100644
--- a/src/game/special_stage/utils.c
+++ b/src/game/special_stage/utils.c
@@ -3,8 +3,8 @@
 #include "game/special_stage/world.h"
 #include "game/special_stage/utils.h"
 #include "game/special_stage/data.h"
-#include "engine/sprite.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "trig.h"
 
 void *gUnknown_03005B58 = NULL;
 void *gUnknown_03005B5C = NULL;
diff --git a/src/game/special_stage/world.c b/src/game/special_stage/world.c
index b16681661..cb1c9737b 100644
--- a/src/game/special_stage/world.c
+++ b/src/game/special_stage/world.c
@@ -5,12 +5,12 @@
 #include "game/special_stage/world.h"
 #include "game/special_stage/guard_robo.h"
 #include "game/special_stage/data.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
 #include "game/save.h"
-#include "engine/trig.h"
+#include "trig.h"
 #include "game/game.h"
-#include "engine/malloc_ewram.h"
+#include "malloc_ewram.h"
 #include "zones.h"
 #include "constants/songs.h"
 
diff --git a/src/game/stage.c b/src/game/stage.c
index 72309862b..010b8c9e9 100644
--- a/src/game/stage.c
+++ b/src/game/stage.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-#include "engine/sprite.h"
+#include "sprite.h"
 
 #include "constants/animations.h"
 
diff --git a/src/game/time_attack/lobby.c b/src/game/time_attack/lobby.c
index 9c8d2c61b..5cefa7fef 100644
--- a/src/game/time_attack/lobby.c
+++ b/src/game/time_attack/lobby.c
@@ -1,17 +1,17 @@
 #include "game/time_attack/lobby.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "transition.h"
 #include "game/game.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 #include "game/character_select.h"
 #include "game/course_select.h"
 #include "game/options_screen.h"
 #include "game/title_screen.h"
 #include "zones.h"
-#include "engine/task.h"
+#include "task.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"
diff --git a/src/game/time_attack/mode_select.c b/src/game/time_attack/mode_select.c
index eb8158df9..acd7fcd9f 100644
--- a/src/game/time_attack/mode_select.c
+++ b/src/game/time_attack/mode_select.c
@@ -1,10 +1,10 @@
 #include "game/time_attack/mode_select.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "game/save.h"
-#include "engine/task.h"
-#include "engine/malloc_vram.h"
+#include "task.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
 #include "game/title_screen.h"
 #include "game/game.h"
diff --git a/src/game/time_attack/results.c b/src/game/time_attack/results.c
index 4cecec314..5c8f75645 100644
--- a/src/game/time_attack/results.c
+++ b/src/game/time_attack/results.c
@@ -1,14 +1,14 @@
 #include "game/time_attack/results.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "transition.h"
 #include "game/save.h"
 #include "game/game.h"
 #include "game/time.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "lib/m4a.h"
-#include "engine/trig.h"
-#include "engine/task.h"
+#include "trig.h"
+#include "task.h"
 #include "game/time_attack/lobby.h"
 
 #include "constants/animations.h"
diff --git a/src/game/title_screen.c b/src/game/title_screen.c
index 8077c1f50..d40d00608 100644
--- a/src/game/title_screen.c
+++ b/src/game/title_screen.c
@@ -4,11 +4,11 @@
 #include "global.h"
 #include "core.h"
 #include "lib/m4a.h"
-#include "engine/task.h"
-#include "engine/sprite.h"
+#include "task.h"
+#include "sprite.h"
 #include "game/save.h"
 #include "transition.h"
-#include "engine/input_recorder.h"
+#include "input_recorder.h"
 #include "game/math.h"
 #include "game/math.h"
 #include "mb_programs.h"
@@ -17,12 +17,12 @@
 #include "game/time_attack/lobby.h"
 #include "player.h"
 #include "zones.h"
-#include "recordings.h"
-#include "engine/trig.h"
+#include "data/recordings.h"
+#include "trig.h"
 #include "game/backgrounds.h"
 #include "game/multiplayer/mode_select.h"
 #include "game/character_select.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "game/time_attack/mode_select.h"
 
 #include "constants/animations.h"
diff --git a/src/game/true_area_53/intro.c b/src/game/true_area_53/intro.c
index eb5c810e5..79fc8b3d8 100644
--- a/src/game/true_area_53/intro.c
+++ b/src/game/true_area_53/intro.c
@@ -1,10 +1,10 @@
 #include "core.h"
 #include "game/game.h"
 #include "game/true_area_53/intro.h"
-#include "engine/task.h"
+#include "task.h"
 #include "lib/m4a.h"
-#include "engine/sprite.h"
-#include "engine/trig.h"
+#include "sprite.h"
+#include "trig.h"
 #include "game/math.h"
 #include "constants/songs.h"
 #include "constants/animations.h"
diff --git a/src/game/unknown_object_6998.c b/src/game/unknown_object_6998.c
index 561786086..abf7d465d 100644
--- a/src/game/unknown_object_6998.c
+++ b/src/game/unknown_object_6998.c
@@ -1,8 +1,8 @@
 #include "core.h"
 #include "game/unknown_object_6998.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 #include "game/game.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 
 typedef struct {
     Sprite unk0[4];
diff --git a/src/engine/input_recorder.c b/src/input_recorder.c
similarity index 93%
rename from src/engine/input_recorder.c
rename to src/input_recorder.c
index 29e489e96..c23c6fc09 100644
--- a/src/engine/input_recorder.c
+++ b/src/input_recorder.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "core.h"
-#include "engine/task.h"
-#include "engine/malloc_ewram.h"
-#include "engine/input_recorder.h"
+#include "task.h"
+#include "malloc_ewram.h"
+#include "input_recorder.h"
 
 #define TAPE_LENGTH 0x800
 
diff --git a/src/engine/malloc_ewram.c b/src/malloc_ewram.c
similarity index 98%
rename from src/engine/malloc_ewram.c
rename to src/malloc_ewram.c
index 1e9d423c8..d2d06d6c2 100644
--- a/src/engine/malloc_ewram.c
+++ b/src/malloc_ewram.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "engine/malloc_ewram.h"
+#include "malloc_ewram.h"
 
 /* At the very beginning, there's only one node. */
 void EwramInitHeap(void)
diff --git a/src/engine/malloc_vram.c b/src/malloc_vram.c
similarity index 97%
rename from src/engine/malloc_vram.c
rename to src/malloc_vram.c
index 9c6c6e537..18d11c1a1 100644
--- a/src/engine/malloc_vram.c
+++ b/src/malloc_vram.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "engine/malloc_vram.h"
+#include "malloc_vram.h"
 
 void *VramMalloc(u32 numTiles)
 {
diff --git a/src/lib/multi_boot.c b/src/multi_boot.c
similarity index 99%
rename from src/lib/multi_boot.c
rename to src/multi_boot.c
index b4fe7e8da..bf45c0dcc 100644
--- a/src/lib/multi_boot.c
+++ b/src/multi_boot.c
@@ -1,4 +1,4 @@
-#include "lib/multi_boot.h"
+#include "multi_boot.h"
 
 #include "global.h"
 
diff --git a/src/lib/multi_sio.c b/src/multi_sio.c
similarity index 99%
rename from src/lib/multi_sio.c
rename to src/multi_sio.c
index 08c96ea0c..68ae4891a 100644
--- a/src/lib/multi_sio.c
+++ b/src/multi_sio.c
@@ -1,6 +1,6 @@
 #include "global.h"
-#include "lib/multi_sio.h"
-#include "lib/sio32_multi_load.h"
+#include "multi_sio.h"
+#include "sio32_multi_load.h"
 
 static const char sMultiSioLibVer[] = "MultiSio4Sio32Load010528";
 
diff --git a/src/lib/sio32_multi_load.c b/src/sio32_multi_load.c
similarity index 99%
rename from src/lib/sio32_multi_load.c
rename to src/sio32_multi_load.c
index 06b779768..775560a5e 100644
--- a/src/lib/sio32_multi_load.c
+++ b/src/sio32_multi_load.c
@@ -1,4 +1,4 @@
-#include "lib/sio32_multi_load.h"
+#include "sio32_multi_load.h"
 
 #include "global.h"
 
diff --git a/src/engine/sprite_1.c b/src/sprite_1.c
similarity index 98%
rename from src/engine/sprite_1.c
rename to src/sprite_1.c
index a7d42a365..8785b1790 100644
--- a/src/engine/sprite_1.c
+++ b/src/sprite_1.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "flags.h"
 
 extern s32 animCmd_GetTiles_COPY(void *, Sprite *);
diff --git a/src/engine/sprite_2.c b/src/sprite_2.c
similarity index 72%
rename from src/engine/sprite_2.c
rename to src/sprite_2.c
index 5f7b0c106..39f846fe2 100644
--- a/src/engine/sprite_2.c
+++ b/src/sprite_2.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "flags.h"
 
 // TODO: Fill
\ No newline at end of file
diff --git a/src/engine/sprite_3.c b/src/sprite_3.c
similarity index 99%
rename from src/engine/sprite_3.c
rename to src/sprite_3.c
index 0c2a6e2c8..56da1e1e8 100644
--- a/src/engine/sprite_3.c
+++ b/src/sprite_3.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "engine/sprite.h"
+#include "sprite.h"
 #include "flags.h"
 
 extern const u8 gUnknown_080984DC[][2];
diff --git a/src/engine/task.c b/src/task.c
similarity index 99%
rename from src/engine/task.c
rename to src/task.c
index 965d6dc67..941af12cb 100644
--- a/src/engine/task.c
+++ b/src/task.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/task.h"
+#include "task.h"
 #include "core.h"
 #include "flags.h"
 #include "lib/m4a.h"
diff --git a/src/engine/trig.c b/src/trig.c
similarity index 99%
rename from src/engine/trig.c
rename to src/trig.c
index 9e3027e9f..8afab8e50 100644
--- a/src/engine/trig.c
+++ b/src/trig.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "engine/trig.h"
+#include "trig.h"
 
 const s16 gSineTable[0x500] = {
     Q_2_14(0), /* sin(0*π/512) */
diff --git a/sym_iwram.txt b/sym_iwram.txt
index cecf5f1c3..a29657203 100644
--- a/sym_iwram.txt
+++ b/sym_iwram.txt
@@ -1,14 +1,14 @@
 /**** bss ****/
 build/sa2/src/lib/m4a.o(.bss.code);
-build/sa2/src/lib/multi_boot.o(.bss);
+build/sa2/src/multi_boot.o(.bss);
 /* space 0x20 */
 . = 0x0000042C; 
 build/sa2/src/lib/agb_flash.o(.bss);
 
 /**** common ****/
 . = ALIGN(16); 
-build/sa2/src/lib/multi_sio.o(.data);
-build/sa2/src/lib/sio32_multi_load.o(COMMON);
+build/sa2/src/multi_sio.o(.data);
+build/sa2/src/sio32_multi_load.o(COMMON);
 build/sa2/src/core.o(.data);
 
 . = ALIGN(32);