diff --git a/Makefile b/Makefile
index d29f69a5d..203bd4aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ audio.o \
 home.o \
 main.o \
 wram.o \
-data/common_text/common_text.o \
+data/text/common_text.o \
 data/maps/maps.o \
 data/pokemon/dex_entries.o \
 data/pokemon/egg_moves.o \
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index fc2c3cace..f3d03b3a0 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -12,7 +12,7 @@
 ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm)
 ; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm)
 ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
-; - Pokered_MonIndices (see data/pokemon/rby_order.asm)
+; - Pokered_MonIndices (see data/pokemon/gen1_order.asm)
 ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
 ; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
 ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm
deleted file mode 100644
index 2f88b4e9d..000000000
--- a/data/common_text/common_text.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDE "constants.asm"
-
-
-SECTION "Text 1", ROMX
-
-INCLUDE "data/common_text/common_text_1.asm"
-
-
-SECTION "Text 2", ROMX
-
-INCLUDE "data/common_text/common_text_2.asm"
-
-
-SECTION "Text 3", ROMX
-
-INCLUDE "data/common_text/common_text_3.asm"
diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm
similarity index 100%
rename from data/pokemon/rby_base_special.asm
rename to data/pokemon/gen1_base_special.asm
diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm
similarity index 100%
rename from data/pokemon/rby_order.asm
rename to data/pokemon/gen1_order.asm
diff --git a/data/battle/battle_text.asm b/data/text/battle_text.asm
similarity index 100%
rename from data/battle/battle_text.asm
rename to data/text/battle_text.asm
diff --git a/data/text/common_text.asm b/data/text/common_text.asm
new file mode 100644
index 000000000..72ef91fea
--- /dev/null
+++ b/data/text/common_text.asm
@@ -0,0 +1,16 @@
+INCLUDE "constants.asm"
+
+
+SECTION "Text 1", ROMX
+
+INCLUDE "data/text/common_text_1.asm"
+
+
+SECTION "Text 2", ROMX
+
+INCLUDE "data/text/common_text_2.asm"
+
+
+SECTION "Text 3", ROMX
+
+INCLUDE "data/text/common_text_3.asm"
diff --git a/data/common_text/common_text_1.asm b/data/text/common_text_1.asm
similarity index 100%
rename from data/common_text/common_text_1.asm
rename to data/text/common_text_1.asm
diff --git a/data/common_text/common_text_2.asm b/data/text/common_text_2.asm
similarity index 100%
rename from data/common_text/common_text_2.asm
rename to data/text/common_text_2.asm
diff --git a/data/common_text/common_text_3.asm b/data/text/common_text_3.asm
similarity index 100%
rename from data/common_text/common_text_3.asm
rename to data/text/common_text_3.asm
diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm
similarity index 100%
rename from data/mail_input_chars.asm
rename to data/text/mail_input_chars.asm
diff --git a/data/name_input_chars.asm b/data/text/name_input_chars.asm
similarity index 100%
rename from data/name_input_chars.asm
rename to data/text/name_input_chars.asm
diff --git a/data/std_text.asm b/data/text/std_text.asm
similarity index 100%
rename from data/std_text.asm
rename to data/text/std_text.asm
diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm
similarity index 100%
rename from data/unused/dakutens.asm
rename to data/text/unused_dakutens.asm
diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm
similarity index 100%
rename from data/unused/gen_1_trainer_names.asm
rename to data/text/unused_gen1_trainer_names.asm
diff --git a/data/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey_text.asm
similarity index 100%
rename from data/unused/sweet_honey_text.asm
rename to data/text/unused_sweet_honey_text.asm
diff --git a/data/unused/unknown_53d84.asm b/data/unused_53d84.asm
similarity index 100%
rename from data/unused/unknown_53d84.asm
rename to data/unused_53d84.asm
diff --git a/engine/naming_screen.asm b/engine/naming_screen.asm
index b53a3b09d..9e5fa3508 100755
--- a/engine/naming_screen.asm
+++ b/engine/naming_screen.asm
@@ -771,7 +771,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 
 ; 11b56
 
-INCLUDE "data/unused/dakutens.asm"
+INCLUDE "data/text/unused_dakutens.asm"
 
 ; 11bbc
 
@@ -945,7 +945,7 @@ NamingScreenGFX_Cursor: ; 11cc7
 INCBIN "gfx/naming_screen/cursor.2bpp"
 ; 11ce7
 
-INCLUDE "data/name_input_chars.asm"
+INCLUDE "data/text/name_input_chars.asm"
 ; 11e5d
 
 NamingScreenGFX_End: ; unused
@@ -1462,6 +1462,6 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac)
 
 ; 121dd
 
-INCLUDE "data/mail_input_chars.asm"
+INCLUDE "data/text/mail_input_chars.asm"
 
 ; 122c1
diff --git a/engine/routines/unreferenced_getgen1trainerclassname.asm b/engine/routines/unreferenced_getgen1trainerclassname.asm
index 64c55ed84..3e23fa711 100644
--- a/engine/routines/unreferenced_getgen1trainerclassname.asm
+++ b/engine/routines/unreferenced_getgen1trainerclassname.asm
@@ -18,4 +18,4 @@ Unreferenced_GetGen1TrainerClassName: ; 50a28
 	jr nz, .copy
 	ret
 
-INCLUDE "data/unused/gen_1_trainer_names.asm"
+INCLUDE "data/text/unused_gen1_trainer_names.asm"
diff --git a/engine/time_capsule.asm b/engine/time_capsule.asm
index 96f61833b..b7e5d28c8 100755
--- a/engine/time_capsule.asm
+++ b/engine/time_capsule.asm
@@ -144,4 +144,4 @@ PlaceTradePartnerNamesAndParty: ; fb60d
 	jr .loop
 ; fb656
 
-INCLUDE "data/pokemon/rby_base_special.asm"
+INCLUDE "data/pokemon/gen1_base_special.asm"
diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm
index 0378ed697..a56e51785 100644
--- a/engine/time_capsule_2.asm
+++ b/engine/time_capsule_2.asm
@@ -36,4 +36,4 @@ ConvertMon_1to2: ; fb908
 ; fb91c
 
 
-INCLUDE "data/pokemon/rby_order.asm"
+INCLUDE "data/pokemon/gen1_order.asm"
diff --git a/main.asm b/main.asm
index 11f4fd39e..8ce0db6ff 100644
--- a/main.asm
+++ b/main.asm
@@ -262,7 +262,7 @@ INCLUDE "engine/load_pics.asm"
 INCLUDE "engine/move_mon_wo_mail.asm"
 INCLUDE "data/pokemon/base_stats.asm"
 INCLUDE "data/pokemon/names.asm"
-INCLUDE "data/unused/unknown_53d84.asm"
+INCLUDE "data/unused_53d84.asm"
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
@@ -279,7 +279,7 @@ SECTION "bank20", ROMX
 INCLUDE "engine/player_movement.asm"
 INCLUDE "engine/engine_flags.asm"
 INCLUDE "engine/variables.asm"
-INCLUDE "data/battle/battle_text.asm"
+INCLUDE "data/text/battle_text.asm"
 INCLUDE "engine/debug.asm"
 
 
@@ -541,7 +541,7 @@ INCLUDE "mobile/mobile_5f.asm"
 
 SECTION "Common Text 1", ROMX
 
-INCLUDE "data/std_text.asm"
+INCLUDE "data/text/std_text.asm"
 INCLUDE "data/phone/text/jack_overworld.asm"
 INCLUDE "data/phone/text/beverly_overworld.asm"
 INCLUDE "data/phone/text/huey_overworld.asm"
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm
index fc3369a21..d90aed911 100644
--- a/maps/GoldenrodNameRater.asm
+++ b/maps/GoldenrodNameRater.asm
@@ -22,7 +22,7 @@ GoldenrodNameRaterBookshelf:
 GoldenrodNameRaterRadio:
 	jumpstd radio2
 
-INCLUDE "data/unused/sweet_honey_text.asm"
+INCLUDE "data/text/unused_sweet_honey_text.asm"
 
 GoldenrodNameRater_MapEvents:
 	; filler