diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm
similarity index 100%
rename from engine/map_object_action.asm
rename to engine/overworld/map_object_action.asm
diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm
similarity index 99%
rename from engine/map_objects.asm
rename to engine/overworld/map_objects.asm
index 20d75238..1c118ed6 100755
--- a/engine/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -163,7 +163,7 @@ asm_4449
 	jr asm_444e
 
 asm_444e
-INCLUDE "engine/map_object_action.asm"
+INCLUDE "engine/overworld/map_object_action.asm"
 
 CopyNextCoordsTileToStandingCoordsTile: ; 45d9 (1:45d9)
 	ld hl, $10
@@ -400,7 +400,7 @@ Function4732:
 
 INCLUDE "engine/movement_pattern.asm"
 INCLUDE "engine/step_types.asm"
-INCLUDE "engine/movement.asm"
+INCLUDE "engine/overworld/movement.asm"
 
 Function5429: ; 5429 (1:5429)
 	call InitStep
diff --git a/engine/movement.asm b/engine/overworld/movement.asm
similarity index 100%
rename from engine/movement.asm
rename to engine/overworld/movement.asm
diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm
similarity index 100%
rename from engine/npc_movement.asm
rename to engine/overworld/npc_movement.asm
diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm
similarity index 100%
rename from engine/player_movement.asm
rename to engine/overworld/player_movement.asm
diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm
similarity index 100%
rename from engine/player_object.asm
rename to engine/overworld/player_object.asm
diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm
similarity index 100%
rename from engine/player_step.asm
rename to engine/overworld/player_step.asm
diff --git a/engine/time.asm b/engine/overworld/time.asm
similarity index 100%
rename from engine/time.asm
rename to engine/overworld/time.asm
diff --git a/main.asm b/main.asm
index 73547c11..4d4f57da 100644
--- a/main.asm
+++ b/main.asm
@@ -49,7 +49,7 @@ PushOAM:
 
 PushOAMEnd
 
-INCLUDE "engine/map_objects.asm"
+INCLUDE "engine/overworld/map_objects.asm"
 INCLUDE "engine/main_menu.asm"
 INCLUDE "engine/title.asm"
 
@@ -204,7 +204,7 @@ CheckNickErrors:: ; 677e (1:677e)
 INCLUDE "engine/math.asm"
 ItemAttributes:
 INCLUDE "items/item_attributes.asm"
-INCLUDE "engine/npc_movement.asm"
+INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "event/happiness_egg.asm"
 INCLUDE "event/special.asm"
 
@@ -321,7 +321,7 @@ Unknown85d7:
 	db PAL_BG_ROOF
 	endr
 
-INCLUDE "engine/player_object.asm"
+INCLUDE "engine/overworld/player_object.asm"
 INCLUDE "engine/sine.asm"
 INCLUDE "engine/predef.asm"
 INCLUDE "engine/color.asm"
@@ -409,7 +409,7 @@ FlagPredef:
 INCLUDE "engine/health.asm"
 INCLUDE "event/overworld.asm"
 INCLUDE "engine/items.asm"
-INCLUDE "engine/player_step.asm"
+INCLUDE "engine/overworld/player_step.asm"
 INCLUDE "engine/anim_hp_bar.asm"
 INCLUDE "engine/move_mon.asm"
 INCLUDE "engine/billspctop.asm"
@@ -634,9 +634,9 @@ Text_KnowsMove:
 
 SECTION "bank4", ROMX, BANK[$4]
 
-INCLUDE "engine/player_movement.asm"
+INCLUDE "engine/overworld/player_movement.asm"
 INCLUDE "engine/pack.asm"
-INCLUDE "engine/time.asm"
+INCLUDE "engine/overworld/time.asm"
 INCLUDE "engine/learn_tm.asm"
 INCLUDE "engine/namingscreen.asm"