diff --git a/constants.asm b/constants.asm
index e3d1ddf95..9c7348e9b 100644
--- a/constants.asm
+++ b/constants.asm
@@ -1,14 +1,13 @@
 _CRYSTAL EQU 1
 
-
-INCLUDE "pokemon_constants.asm"
-INCLUDE "move_constants.asm"
-INCLUDE "battle_constants.asm"
-INCLUDE "map_constants.asm"
-INCLUDE "item_constants.asm"
-INCLUDE "trainer_constants.asm"
-INCLUDE "script_constants.asm"
-INCLUDE "music_constants.asm"
+INCLUDE "constants/pokemon_constants.asm"
+INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/battle_constants.asm"
+INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/trainer_constants.asm"
+INCLUDE "constants/script_constants.asm"
+INCLUDE "constants/music_constants.asm"
 
 
 ; rst vectors
diff --git a/battle_constants.asm b/constants/battle_constants.asm
similarity index 100%
rename from battle_constants.asm
rename to constants/battle_constants.asm
diff --git a/item_constants.asm b/constants/item_constants.asm
similarity index 100%
rename from item_constants.asm
rename to constants/item_constants.asm
diff --git a/map_constants.asm b/constants/map_constants.asm
similarity index 100%
rename from map_constants.asm
rename to constants/map_constants.asm
diff --git a/move_constants.asm b/constants/move_constants.asm
similarity index 100%
rename from move_constants.asm
rename to constants/move_constants.asm
diff --git a/music_constants.asm b/constants/music_constants.asm
similarity index 100%
rename from music_constants.asm
rename to constants/music_constants.asm
diff --git a/pokemon_constants.asm b/constants/pokemon_constants.asm
similarity index 100%
rename from pokemon_constants.asm
rename to constants/pokemon_constants.asm
diff --git a/script_constants.asm b/constants/script_constants.asm
similarity index 100%
rename from script_constants.asm
rename to constants/script_constants.asm
diff --git a/trainer_constants.asm b/constants/trainer_constants.asm
similarity index 100%
rename from trainer_constants.asm
rename to constants/trainer_constants.asm
diff --git a/bittable2.asm b/engine/bittable2.asm
similarity index 100%
rename from bittable2.asm
rename to engine/bittable2.asm
diff --git a/credits.asm b/engine/credits.asm
similarity index 100%
rename from credits.asm
rename to engine/credits.asm
diff --git a/joypad.asm b/engine/joypad.asm
similarity index 100%
rename from joypad.asm
rename to engine/joypad.asm
diff --git a/landmarks.asm b/engine/landmarks.asm
similarity index 100%
rename from landmarks.asm
rename to engine/landmarks.asm
diff --git a/scripting.asm b/engine/scripting.asm
similarity index 100%
rename from scripting.asm
rename to engine/scripting.asm
diff --git a/vblank.asm b/engine/vblank.asm
similarity index 100%
rename from vblank.asm
rename to engine/vblank.asm
diff --git a/main.asm b/main.asm
index 3dd69c930..df7433011 100644
--- a/main.asm
+++ b/main.asm
@@ -60,7 +60,7 @@ INCBIN "baserom.gbc", $150, $283 - $150
 
 
 VBlank: ; 283
-INCLUDE "vblank.asm"
+INCLUDE "engine/vblank.asm"
 
 
 DelayFrame: ; 45a
@@ -437,7 +437,7 @@ SetClock: ; 691
 INCBIN "baserom.gbc", $6c4, $92e - $6c4
 
 
-INCLUDE "joypad.asm"
+INCLUDE "engine/joypad.asm"
 
 
 INCBIN "baserom.gbc", $a1b, $b40 - $a1b
@@ -12984,7 +12984,7 @@ GetFlag2: ; 80430
 
 
 BitTable2: ; 80462
-INCLUDE "bittable2.asm"
+INCLUDE "engine/bittable2.asm"
 ; 80648
 
 
@@ -14938,7 +14938,7 @@ INCLUDE "maps/second_map_headers.asm"
 
 INCBIN "baserom.gbc", $966b0, $96cb1 - $966b0
 
-INCLUDE "scripting.asm"
+INCLUDE "engine/scripting.asm"
 
 INCBIN "baserom.gbc", $97c20, $35e
 
@@ -19353,7 +19353,7 @@ INCBIN "gfx/intro/logo.lz"
 INCBIN "baserom.gbc", $10983f, $1099aa - $10983f
 
 ; Credits
-INCLUDE "credits.asm"
+INCLUDE "engine/credits.asm"
 
 
 SECTION "bank43",DATA,BANK[$43]
@@ -21354,7 +21354,7 @@ MoveNames:
 INCLUDE "battle/move_names.asm"
 
 
-INCLUDE "landmarks.asm"
+INCLUDE "engine/landmarks.asm"
 
 
 RegionCheck: ; 0x1caea1