diff --git a/engine/buena_phone_scripts.asm b/engine/phone/buenas_password.asm
similarity index 100%
rename from engine/buena_phone_scripts.asm
rename to engine/phone/buenas_password.asm
diff --git a/engine/phone_scripts_generic.asm b/engine/phone/generic_calls.asm
similarity index 100%
rename from engine/phone_scripts_generic.asm
rename to engine/phone/generic_calls.asm
diff --git a/engine/phone.asm b/engine/phone/phone.asm
similarity index 100%
rename from engine/phone.asm
rename to engine/phone/phone.asm
diff --git a/engine/phone_callers.asm b/engine/phone/phone_callers.asm
similarity index 100%
rename from engine/phone_callers.asm
rename to engine/phone/phone_callers.asm
diff --git a/engine/phone_gossip.asm b/engine/phone/phone_gossip.asm
similarity index 100%
rename from engine/phone_gossip.asm
rename to engine/phone/phone_gossip.asm
diff --git a/engine/phone_scripts.asm b/engine/phone/phone_scripts.asm
similarity index 100%
rename from engine/phone_scripts.asm
rename to engine/phone/phone_scripts.asm
diff --git a/main.asm b/main.asm
index f32809569..cbfe27d2b 100644
--- a/main.asm
+++ b/main.asm
@@ -4638,7 +4638,7 @@ INCLUDE "engine/mon_icons.asm"
 
 SECTION "bank24", ROMX
 
-INCLUDE "engine/phone.asm"
+INCLUDE "engine/phone/phone.asm"
 INCLUDE "engine/timeset.asm"
 INCLUDE "engine/pokegear.asm"
 INCLUDE "engine/fish.asm"
@@ -4647,9 +4647,9 @@ INCLUDE "engine/slot_machine.asm"
 
 SECTION "Phone Engine", ROMX
 
-INCLUDE "engine/phone_callers.asm"
-INCLUDE "engine/phone_gossip.asm"
-INCLUDE "engine/buena_phone_scripts.asm"
+INCLUDE "engine/phone/phone_callers.asm"
+INCLUDE "engine/phone/phone_gossip.asm"
+INCLUDE "engine/phone/buenas_password.asm"
 
 
 SECTION "Phone Text", ROMX
@@ -4683,8 +4683,8 @@ INCLUDE "gfx/mail.asm"
 SECTION "bank2F", ROMX
 
 INCLUDE "engine/std_scripts.asm"
-INCLUDE "engine/phone_scripts.asm"
-INCLUDE "engine/phone_scripts_generic.asm"
+INCLUDE "engine/phone/phone_scripts.asm"
+INCLUDE "engine/phone/generic_calls.asm"
 
 TalkToTrainerScript:: ; 0xbe66a
 	faceplayer