232 files changed, 513 insertions, 465 deletions

diff --git a/Makefile b/Makefile
index e18b7b2f0..0ba9cdee9 100644
--- a/Makefile
+++ b/Makefile
@@ -40,9 +40,9 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
 $(VERSIONS) $(VERSIONS:%=compare_%)
 
 
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,src,asm,data}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle,/field,/debug,/misc,/scene,/pokemon,/engine,/libs}}))
 
-C_SRCS := $(wildcard src/*.c)
+C_SRCS := $(wildcard src/*/*.c) $(wildcard src/*.c)
 ASM_SRCS := $(wildcard asm/*.s)
 DATA_ASM_SRCS := $(wildcard data/*.s)
 
@@ -90,17 +90,17 @@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(A
 sound/songs/%.s: sound/songs/%.mid
 	cd $(@D) && ../../$(MID) $(<F)
 
-%src/libc.o: CC1 := tools/agbcc/bin/old_agbcc
-%src/libc.o: CFLAGS := -O2
+%src/libs/libc.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/libc.o: CFLAGS := -O2
 
-%src/siirtc.o: CFLAGS := -mthumb-interwork
+%src/libs/siirtc.o: CFLAGS := -mthumb-interwork
 
-%src/agb_flash.o: CFLAGS := -O -mthumb-interwork
-%src/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
-%src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
+%src/libs/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
 
-%src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
-%src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
+%src/libs/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 
 $(SONG_OBJS): %.o: %.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
@@ -113,7 +113,7 @@ $1_ASM_OBJS := $$(ASM_SRCS:%.s=build/$1/%.o)
 $1_DATA_ASM_OBJS := $$(DATA_ASM_SRCS:%.s=build/$1/%.o)
 
 ifeq ($$(NODEP),)
-build/$1/src/%.o: c_dep = $$(shell $$(SCANINC) src/$$(*F).c)
+build/$1/src/%.o: c_dep = $$(shell $$(SCANINC) src/**/$$(*F).c)
 build/$1/asm/%.o: asm_dep = $$(shell $$(SCANINC) asm/$$(*F).s)
 build/$1/data/%.o: asm_dep = $$(shell $$(SCANINC) data/$$(*F).s)
 endif
diff --git a/common_syms/battle_anim.txt b/common_syms/battle/battle_anim.txt
index a93ac9b5d..a93ac9b5d 100644
--- a/common_syms/battle_anim.txt
+++ b/common_syms/battle/battle_anim.txt
diff --git a/common_syms/mori_debug_menu.txt b/common_syms/debug/mori_debug_menu.txt
index 77ab5531c..77ab5531c 100644
--- a/common_syms/mori_debug_menu.txt
+++ b/common_syms/debug/mori_debug_menu.txt
diff --git a/common_syms/link.txt b/common_syms/engine/link.txt
index faafda4d0..faafda4d0 100644
--- a/common_syms/link.txt
+++ b/common_syms/engine/link.txt
diff --git a/common_syms/load_save.txt b/common_syms/engine/load_save.txt
index 3b969deca..3b969deca 100644
--- a/common_syms/load_save.txt
+++ b/common_syms/engine/load_save.txt
diff --git a/common_syms/main.txt b/common_syms/engine/main.txt
index a620083d1..a620083d1 100644
--- a/common_syms/main.txt
+++ b/common_syms/engine/main.txt
diff --git a/common_syms/record_mixing.txt b/common_syms/engine/record_mixing.txt
index a6f4f8df3..a6f4f8df3 100644
--- a/common_syms/record_mixing.txt
+++ b/common_syms/engine/record_mixing.txt
diff --git a/common_syms/rng.txt b/common_syms/engine/rng.txt
index 794439ea5..794439ea5 100644
--- a/common_syms/rng.txt
+++ b/common_syms/engine/rng.txt
diff --git a/common_syms/rtc.txt b/common_syms/engine/rtc.txt
index fa00a34d5..fa00a34d5 100644
--- a/common_syms/rtc.txt
+++ b/common_syms/engine/rtc.txt
diff --git a/common_syms/save.txt b/common_syms/engine/save.txt
index d09a52bcf..d09a52bcf 100644
--- a/common_syms/save.txt
+++ b/common_syms/engine/save.txt
diff --git a/common_syms/sound.txt b/common_syms/engine/sound.txt
index 0f6f2fc75..0f6f2fc75 100644
--- a/common_syms/sound.txt
+++ b/common_syms/engine/sound.txt
diff --git a/common_syms/sound_check_menu.txt b/common_syms/engine/sound_check_menu.txt
index ba350ad8e..ba350ad8e 100644
--- a/common_syms/sound_check_menu.txt
+++ b/common_syms/engine/sound_check_menu.txt
diff --git a/common_syms/sprite.txt b/common_syms/engine/sprite.txt
index fe38dc61f..fe38dc61f 100644
--- a/common_syms/sprite.txt
+++ b/common_syms/engine/sprite.txt
diff --git a/common_syms/string_util.txt b/common_syms/engine/string_util.txt
index 1ee62aaad..1ee62aaad 100644
--- a/common_syms/string_util.txt
+++ b/common_syms/engine/string_util.txt
diff --git a/common_syms/task.txt b/common_syms/engine/task.txt
index 6601bd11b..6601bd11b 100644
--- a/common_syms/task.txt
+++ b/common_syms/engine/task.txt
diff --git a/common_syms/field_camera.txt b/common_syms/field/field_camera.txt
index 7aad967f8..7aad967f8 100644
--- a/common_syms/field_camera.txt
+++ b/common_syms/field/field_camera.txt
diff --git a/common_syms/field_control_avatar.txt b/common_syms/field/field_control_avatar.txt
index 040a9e6c1..040a9e6c1 100644
--- a/common_syms/field_control_avatar.txt
+++ b/common_syms/field/field_control_avatar.txt
diff --git a/common_syms/field_map_obj.txt b/common_syms/field/field_map_obj.txt
index 32d8b1915..32d8b1915 100644
--- a/common_syms/field_map_obj.txt
+++ b/common_syms/field/field_map_obj.txt
diff --git a/common_syms/fieldmap.txt b/common_syms/field/fieldmap.txt
index 7819b3b40..7819b3b40 100644
--- a/common_syms/fieldmap.txt
+++ b/common_syms/field/fieldmap.txt
diff --git a/common_syms/overworld.txt b/common_syms/field/overworld.txt
index ecdb190b2..ecdb190b2 100644
--- a/common_syms/overworld.txt
+++ b/common_syms/field/overworld.txt
diff --git a/common_syms/start_menu.txt b/common_syms/field/start_menu.txt
index bc0c247d1..bc0c247d1 100644
--- a/common_syms/start_menu.txt
+++ b/common_syms/field/start_menu.txt
diff --git a/common_syms/tv.txt b/common_syms/field/tv.txt
index 829139f8f..829139f8f 100644
--- a/common_syms/tv.txt
+++ b/common_syms/field/tv.txt
diff --git a/common_syms/agb_flash.txt b/common_syms/libs/agb_flash.txt
index cb421ec80..cb421ec80 100644
--- a/common_syms/agb_flash.txt
+++ b/common_syms/libs/agb_flash.txt
diff --git a/common_syms/m4a_2.txt b/common_syms/libs/m4a_2.txt
index a80d8a79d..a80d8a79d 100644
--- a/common_syms/m4a_2.txt
+++ b/common_syms/libs/m4a_2.txt
diff --git a/common_syms/rom3.txt b/common_syms/misc/rom3.txt
index 06a965ff6..06a965ff6 100644
--- a/common_syms/rom3.txt
+++ b/common_syms/misc/rom3.txt
diff --git a/common_syms/pokeblock_feed.txt b/common_syms/pokemon/pokeblock_feed.txt
index 827e6526e..827e6526e 100644
--- a/common_syms/pokeblock_feed.txt
+++ b/common_syms/pokemon/pokeblock_feed.txt
diff --git a/common_syms/pokedex.txt b/common_syms/pokemon/pokedex.txt
index 18b14f3ed..18b14f3ed 100644
--- a/common_syms/pokedex.txt
+++ b/common_syms/pokemon/pokedex.txt
diff --git a/common_syms/pokemon_1.txt b/common_syms/pokemon/pokemon_1.txt
index c588d53a7..c588d53a7 100644
--- a/common_syms/pokemon_1.txt
+++ b/common_syms/pokemon/pokemon_1.txt
diff --git a/common_syms/pokemon_menu.txt b/common_syms/pokemon/pokemon_menu.txt
index 98a1bf53b..98a1bf53b 100644
--- a/common_syms/pokemon_menu.txt
+++ b/common_syms/pokemon/pokemon_menu.txt
diff --git a/common_syms/berry_blender.txt b/common_syms/scene/berry_blender.txt
index 524a31411..524a31411 100644
--- a/common_syms/berry_blender.txt
+++ b/common_syms/scene/berry_blender.txt
diff --git a/common_syms/contest_painting.txt b/common_syms/scene/contest_painting.txt
index 2e8490348..2e8490348 100644
--- a/common_syms/contest_painting.txt
+++ b/common_syms/scene/contest_painting.txt
diff --git a/common_syms/cute_sketch.txt b/common_syms/scene/cute_sketch.txt
index e69de29bb..e69de29bb 100644
--- a/common_syms/cute_sketch.txt
+++ b/common_syms/scene/cute_sketch.txt
diff --git a/common_syms/egg_hatch.txt b/common_syms/scene/egg_hatch.txt
index 891ccc104..891ccc104 100644
--- a/common_syms/egg_hatch.txt
+++ b/common_syms/scene/egg_hatch.txt
diff --git a/common_syms/evolution_scene.txt b/common_syms/scene/evolution_scene.txt
index 137cd3e05..137cd3e05 100644
--- a/common_syms/evolution_scene.txt
+++ b/common_syms/scene/evolution_scene.txt
diff --git a/common_syms/intro.txt b/common_syms/scene/intro.txt
index d069b1014..d069b1014 100644
--- a/common_syms/intro.txt
+++ b/common_syms/scene/intro.txt
diff --git a/ld_script.txt b/ld_script.txt
index aacee605e..118ced0ea 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -25,7 +25,7 @@ SECTIONS {
 <BSS>
 
         /* .bss.code starts at 0x3000F60 */
-        src/m4a_2.o(.bss.code);
+        src/libs/m4a_2.o(.bss.code);
 
         /* COMMON starts at 0x3001760 */
 <COMMON>
@@ -39,229 +39,229 @@ SECTIONS {
     ALIGN(4)
     {
         asm/crt0.o(.text);
-        src/main.o(.text);
-        src/sprite.o(.text);
-        src/text.o(.text);
-        src/string_util.o(.text);
-        src/link.o(.text);
-        src/rtc.o(.text);
-        src/main_menu.o(.text);
-        src/rom3.o(.text);
-        src/decompress.o(.text);
+        src/engine/main.o(.text);
+        src/engine/sprite.o(.text);
+        src/engine/text.o(.text);
+        src/engine/string_util.o(.text);
+        src/engine/link.o(.text);
+        src/engine/rtc.o(.text);
+        src/engine/main_menu.o(.text);
+        src/misc/rom3.o(.text);
+        src/engine/decompress.o(.text);
         asm/battle_1.o(.text);
-        src/rom_800D42C.o(.text);
+        src/misc/rom_800D42C.o(.text);
         asm/battle_1.o(.text_800DC24);
-        src/battle_2.o(.text);
+        src/battle/battle_2.o(.text);
         asm/battle_2.o(.text);
-        src/battle_3.o(.text);
-        src/battle_4.o(.text);
-        src/battle_controller_player.o(.text);
-        src/battle_7.o(.text);
-        src/battle_controller_opponent.o(.text);
+        src/battle/battle_3.o(.text);
+        src/battle/battle_4.o(.text);
+        src/battle/battle_controller_player.o(.text);
+        src/battle/battle_7.o(.text);
+        src/battle/battle_controller_opponent.o(.text);
         asm/battle_9.o(.text);
-        src/battle_controller_linkopponent.o(.text);
-        src/pokemon_1.o(.text);
-        src/calculate_base_damage.o(.text);
-        src/pokemon_2.o(.text);
+        src/battle/battle_controller_linkopponent.o(.text);
+        src/pokemon/pokemon_1.o(.text);
+        src/battle/calculate_base_damage.o(.text);
+        src/pokemon/pokemon_2.o(.text);
         asm/pokemon_item_effect.o(.text);
-        src/pokemon_3.o(.text);
-        src/de_rom_8040FE0.o(.text);
-        src/trig.o(.text);
-        src/rng.o(.text);
-        src/util.o(.text);
-        src/blend_palette.o(.text);
-        src/daycare.o(.text);
-        src/egg_hatch.o(.text);
-        src/battle_interface.o(.text);
-        src/smokescreen.o(.text);
-        src/pokeball.o(.text);
-        src/load_save.o(.text);
+        src/pokemon/pokemon_3.o(.text);
+        src/misc/de_rom_8040FE0.o(.text);
+        src/engine/trig.o(.text);
+        src/engine/rng.o(.text);
+        src/engine/util.o(.text);
+        src/engine/blend_palette.o(.text);
+        src/field/daycare.o(.text);
+        src/scene/egg_hatch.o(.text);
+        src/battle/battle_interface.o(.text);
+        src/battle/smokescreen.o(.text);
+        src/battle/pokeball.o(.text);
+        src/engine/load_save.o(.text);
         asm/trade.o(.text);
-        src/trade.o(.text);
+        src/engine/trade.o(.text);
         asm/trade.o(.text.sub_804A9F4);
-        src/trade.o(.text.sub_804DAD4);
+        src/engine/trade.o(.text.sub_804DAD4);
         asm/trade.o(.text.sub_804DB2C);
-        src/berry_blender.o(.text);
-        src/play_time.o(.text);
-        src/new_game.o(.text);
-        src/overworld.o(.text);
-        src/fieldmap.o(.text);
-        src/metatile_behavior.o(.text);
-        src/field_camera.o(.text);
-        src/field_door.o(.text);
-        src/field_player_avatar.o(.text);
-        src/field_map_obj.o(.text);
-        src/field_ground_effect.o(.text);
-        src/field_map_obj_helpers.o(.text);
-        src/field_message_box.o(.text);
-        src/map_obj_lock.o(.text);
-        src/text_window.o(.text);
-        src/script.o(.text);
-        src/scrcmd.o(.text);
-        src/field_control_avatar.o(.text);
-        src/event_data.o(.text);
-        src/coord_event_weather.o(.text);
-        src/field_tasks.o(.text);
-        src/clock.o(.text);
-        src/reset_rtc_screen.o(.text);
+        src/scene/berry_blender.o(.text);
+        src/engine/play_time.o(.text);
+        src/scene/new_game.o(.text);
+        src/field/overworld.o(.text);
+        src/field/fieldmap.o(.text);
+        src/field/metatile_behavior.o(.text);
+        src/field/field_camera.o(.text);
+        src/field/field_door.o(.text);
+        src/field/field_player_avatar.o(.text);
+        src/field/field_map_obj.o(.text);
+        src/field/field_ground_effect.o(.text);
+        src/field/field_map_obj_helpers.o(.text);
+        src/field/field_message_box.o(.text);
+        src/field/map_obj_lock.o(.text);
+        src/engine/text_window.o(.text);
+        src/engine/script.o(.text);
+        src/field/scrcmd.o(.text);
+        src/field/field_control_avatar.o(.text);
+        src/field/event_data.o(.text);
+        src/field/coord_event_weather.o(.text);
+        src/field/field_tasks.o(.text);
+        src/engine/clock.o(.text);
+        src/engine/reset_rtc_screen.o(.text);
         asm/party_menu.o(.text);
-        src/party_menu.o(.text);
+        src/field/party_menu.o(.text);
         asm/party_menu.o(.text_8070968);
-        src/start_menu.o(.text);
-        src/menu.o(.text);
-        src/tileset_anim.o(.text);
-        src/palette.o(.text);
-        src/sound.o(.text);
-        src/battle_anim.o(.text);
-        src/rom_8077ABC.o(.text);
-        src/task.o(.text);
-        src/reshow_battle_screen.o(.text);
-        src/battle_anim_807B69C.o(.text);
-        src/title_screen.o(.text);
-        src/field_weather.o(.text);
+        src/field/start_menu.o(.text);
+        src/engine/menu.o(.text);
+        src/engine/tileset_anim.o(.text);
+        src/engine/palette.o(.text);
+        src/engine/sound.o(.text);
+        src/battle/battle_anim.o(.text);
+        src/misc/rom_8077ABC.o(.text);
+        src/engine/task.o(.text);
+        src/battle/reshow_battle_screen.o(.text);
+        src/battle/battle_anim_807B69C.o(.text);
+        src/scene/title_screen.o(.text);
+        src/field/field_weather.o(.text);
         asm/field_weather.o(.text);
-        src/field_fadetransition.o(.text);
-        src/field_screen_effect.o(.text);
-        src/battle_setup.o(.text);
-        src/cable_club.o(.text);
-        src/mori_debug_menu.o(.text);
-        src/trainer_see.o(.text);
-        src/wild_encounter.o(.text);
-        src/field_effect.o(.text);
-        src/unknown_task.o(.text);
-        src/pokemon_menu.o(.text);
-        src/option_menu.o(.text);
-        src/pokedex.o(.text);
-        src/trainer_card.o(.text);
-        src/save_menu_util.o(.text);
-        src/battle_party_menu.o(.text);
+        src/field/field_fadetransition.o(.text);
+        src/field/field_screen_effect.o(.text);
+        src/battle/battle_setup.o(.text);
+        src/engine/cable_club.o(.text);
+        src/debug/mori_debug_menu.o(.text);
+        src/field/trainer_see.o(.text);
+        src/field/wild_encounter.o(.text);
+        src/field/field_effect.o(.text);
+        src/misc/unknown_task.o(.text);
+        src/pokemon/pokemon_menu.o(.text);
+        src/engine/option_menu.o(.text);
+        src/pokemon/pokedex.o(.text);
+        src/engine/trainer_card.o(.text);
+        src/engine/save_menu_util.o(.text);
+        src/battle/battle_party_menu.o(.text);
         asm/pokemon_storage_system.o(.text);
-        src/pokemon_storage_system.o(.text);
+        src/pokemon/pokemon_storage_system.o(.text);
         asm/pokemon_storage_system.o(.text_8098A38);
-        src/pokemon_icon.o(.text);
+        src/pokemon/pokemon_icon.o(.text);
         asm/pokemon_summary_screen.o(.text);
-        src/pokemon_summary_screen.o(.text);
+        src/pokemon/pokemon_summary_screen.o(.text);
         asm/pokemon_summary_screen.o(.text_80A0958);
-        src/script_movement.o(.text);
-        src/fldeff_cut.o(.text);
-        src/mail_data.o(.text);
-        src/map_name_popup.o(.text);
-        src/item_menu.o(.text);
-        src/battle_anim_80A7E7C.o(.text);
-        src/item.o(.text);
-        src/matsuda_debug_menu.o(.text);
+        src/field/script_movement.o(.text);
+        src/field/fldeff_cut.o(.text);
+        src/pokemon/mail_data.o(.text);
+        src/field/map_name_popup.o(.text);
+        src/field/item_menu.o(.text);
+        src/battle/battle_anim_80A7E7C.o(.text);
+        src/field/item.o(.text);
+        src/debug/matsuda_debug_menu.o(.text);
         asm/contest.o(.text);
-        src/shop.o(.text);
-        src/berry.o(.text);
-        src/script_menu.o(.text);
-        src/naming_screen.o(.text);
-        src/money.o(.text);
+        src/field/shop.o(.text);
+        src/field/berry.o(.text);
+        src/field/script_menu.o(.text);
+        src/engine/naming_screen.o(.text);
+        src/field/money.o(.text);
         asm/contest_effect.o(.text);
-        src/record_mixing.o(.text);
-        src/sound_check_menu.o(.text);
-        src/secret_base.o(.text);
+        src/engine/record_mixing.o(.text);
+        src/engine/sound_check_menu.o(.text);
+        src/field/secret_base.o(.text);
         asm/secret_base.o(.text_80BC1D0);
-        src/tv.o(.text);
+        src/field/tv.o(.text);
         asm/contest_link_80C2020.o(.text);
-        src/script_pokemon_util_80C4BF0.o(.text);
-        src/field_poison.o(.text);
-        src/pokemon_size_record.o(.text);
+        src/misc/script_pokemon_util_80C4BF0.o(.text);
+        src/field/field_poison.o(.text);
+        src/pokemon/pokemon_size_record.o(.text);
         asm/fldeff_80C5CD4.o(.text);
-        src/field_special_scene.o(.text);
-        src/rotating_gate.o(.text);
-        src/safari_zone.o(.text);
+        src/field/field_special_scene.o(.text);
+        src/field/rotating_gate.o(.text);
+        src/field/safari_zone.o(.text);
         asm/contest_link_80C857C.o(.text);
-        src/contest_link_80C857C.o(.text);
-        src/item_use.o(.text);
+        src/battle/contest_link_80C857C.o(.text);
+        src/field/item_use.o(.text);
         asm/battle_anim_80CA710.o(.text);
-        src/bike.o(.text);
+        src/field/bike.o(.text);
         asm/easy_chat.o(.text);
-        src/easy_chat.o(.text);
+        src/field/easy_chat.o(.text);
         asm/pokenav.o(.text);
-        src/pokenav.o(.text);
+        src/field/pokenav.o(.text);
         asm/pokenav.o(.text_80F708C);
-        src/mon_markings.o(.text);
-        src/mauville_man.o(.text);
-        src/mail.o(.text);
-        src/menu_helpers.o(.text);
-        src/script_pokemon_util_80F99CC.o(.text);
-        src/dewford_trend.o(.text);
-        src/heal_location.o(.text);
-        src/region_map.o(.text);
-        src/cute_sketch.o(.text);
+        src/pokemon/mon_markings.o(.text);
+        src/field/mauville_man.o(.text);
+        src/pokemon/mail.o(.text);
+        src/field/menu_helpers.o(.text);
+        src/misc/script_pokemon_util_80F99CC.o(.text);
+        src/field/dewford_trend.o(.text);
+        src/field/heal_location.o(.text);
+        src/field/region_map.o(.text);
+        src/scene/cute_sketch.o(.text);
         asm/cute_sketch.o(.text);
-        src/decoration.o(.text);
+        src/field/decoration.o(.text);
         asm/slot_machine.o(.text);
-        src/slot_machine.o(.text);
+        src/field/slot_machine.o(.text);
         asm/slot_machine.o(.text_8104D30)
-        src/slot_machine.o(.text_b);
-        src/contest_painting.o(.text);
-        src/battle_ai.o(.text);
-        src/trader.o(.text);
-        src/starter_choose.o(.text);
-        src/wallclock.o(.text);
-        src/rom6.o(.text);
-        src/pokeblock.o(.text);
-        src/fldeff_flash.o(.text);
-        src/post_battle_event_funcs.o(.text);
-        src/time_events.o(.text);
-        src/birch_pc.o(.text);
-        src/hof_pc.o(.text);
-        src/field_specials.o(.text);
-        src/battle_records.o(.text);
+        src/field/slot_machine.o(.text_b);
+        src/scene/contest_painting.o(.text);
+        src/battle/battle_ai.o(.text);
+        src/field/trader.o(.text);
+        src/field/starter_choose.o(.text);
+        src/field/wallclock.o(.text);
+        src/misc/rom6.o(.text);
+        src/field/pokeblock.o(.text);
+        src/field/fldeff_flash.o(.text);
+        src/battle/post_battle_event_funcs.o(.text);
+        src/engine/time_events.o(.text);
+        src/field/birch_pc.o(.text);
+        src/field/hof_pc.o(.text);
+        src/field/field_specials.o(.text);
+        src/battle/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
-        src/evolution_scene.o(.text);
+        src/scene/evolution_scene.o(.text);
         asm/roulette.o(.text);
         asm/pokedex_cry_screen.o(.text);
-        src/pokedex_cry_screen.o(.text);
+        src/pokemon/pokedex_cry_screen.o(.text);
         asm/pokedex_cry_screen.o(.text_811A4F8);
-        src/coins.o(.text);
-        src/landmark.o(.text);
-        src/fldeff_strength.o(.text);
-        src/battle_transition.o(.text);
-        src/battle_controller_linkpartner.o(.text);
-        src/battle_message.o(.text);
-        src/choose_party.o(.text);
+        src/field/coins.o(.text);
+        src/field/landmark.o(.text);
+        src/field/fldeff_strength.o(.text);
+        src/battle/battle_transition.o(.text);
+        src/battle/battle_controller_linkpartner.o(.text);
+        src/battle/battle_message.o(.text);
+        src/field/choose_party.o(.text);
         asm/cable_car.o(.text);
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
-        src/unused_8124F94.o(.text);
-        src/save.o(.text);
-        src/mystery_event_script.o(.text);
-        src/field_effect_helpers.o(.text);
+        src/misc/unused_8124F94.o(.text);
+        src/engine/save.o(.text);
+        src/engine/mystery_event_script.o(.text);
+        src/field/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_81258BC.o(.text);
-        src/battle_controller_safari.o(.text);
-        src/fldeff_sweetscent.o(.text);
+        src/battle/battle_controller_safari.o(.text);
+        src/field/fldeff_sweetscent.o(.text);
         asm/battle_anim_812C144.o(.text);
-        src/learn_move.o(.text);
-        src/fldeff_softboiled.o(.text);
-        src/decoration_inventory.o(.text);
-        src/roamer.o(.text);
+        src/pokemon/learn_move.o(.text);
+        src/field/fldeff_softboiled.o(.text);
+        src/field/decoration_inventory.o(.text);
+        src/field/roamer.o(.text);
         asm/battle_tower.o(.text);
-        src/use_pokeblock.o(.text);
-        src/battle_controller_wally.o(.text);
-        src/player_pc.o(.text);
-        src/intro.o(.text);
-        src/field_region_map.o(.text);
+        src/field/use_pokeblock.o(.text);
+        src/battle/battle_controller_wally.o(.text);
+        src/field/player_pc.o(.text);
+        src/scene/intro.o(.text);
+        src/field/field_region_map.o(.text);
         asm/battle_anim_813F0F4.o(.text);
-        src/hall_of_fame.o(.text);
-        src/credits.o(.text);
-        src/lottery_corner.o(.text);
-        src/diploma.o(.text);
-        src/berry_tag_screen.o(.text);
-        src/mystery_event_menu.o(.text);
-        src/save_failed_screen.o(.text);
-        src/braille_puzzles.o(.text);
-        src/pokeblock_feed.o(.text);
-        src/clear_save_data_menu.o(.text);
-        src/intro_credits_graphics.o(.text);
-        src/evolution_graphics.o(.text);
-        src/bard_music.o(.text);
-        src/fldeff_teleport.o(.text);
-        src/unknown_debug_menu.o(.text);
-        src/name_string_util.o(.text);
-        src/menu_cursor.o(.text);
+        src/scene/hall_of_fame.o(.text);
+        src/scene/credits.o(.text);
+        src/field/lottery_corner.o(.text);
+        src/field/diploma.o(.text);
+        src/field/berry_tag_screen.o(.text);
+        src/engine/mystery_event_menu.o(.text);
+        src/engine/save_failed_screen.o(.text);
+        src/field/braille_puzzles.o(.text);
+        src/pokemon/pokeblock_feed.o(.text);
+        src/engine/clear_save_data_menu.o(.text);
+        src/scene/intro_credits_graphics.o(.text);
+        src/scene/evolution_graphics.o(.text);
+        src/field/bard_music.o(.text);
+        src/field/fldeff_teleport.o(.text);
+        src/debug/unknown_debug_menu.o(.text);
+        src/engine/name_string_util.o(.text);
+        src/engine/menu_cursor.o(.text);
     } =0
 
     script_data :
@@ -283,13 +283,13 @@ SECTIONS {
     {
         asm/libgcnmultiboot.o(.text);
         asm/m4a_1.o(.text);
-        src/m4a_2.o(.text);
+        src/libs/m4a_2.o(.text);
         asm/m4a_3.o(.text);
-        src/m4a_4.o(.text);
-        src/agb_flash.o(.text);
-        src/agb_flash_1m.o(.text);
-        src/agb_flash_mx.o(.text);
-        src/siirtc.o(.text);
+        src/libs/m4a_4.o(.text);
+        src/libs/agb_flash.o(.text);
+        src/libs/agb_flash_1m.o(.text);
+        src/libs/agb_flash_mx.o(.text);
+        src/libs/siirtc.o(.text);
         asm/libagbsyscall.o(.text);
         tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text);
         tools/agbcc/lib/libgcc.a:_divsi3.o(.text);
@@ -305,175 +305,175 @@ SECTIONS {
         tools/agbcc/lib/libgcc.a:fp-bit.o(.text);
         tools/agbcc/lib/libgcc.a:_lshrdi3.o(.text);
         tools/agbcc/lib/libgcc.a:_negdi2.o(.text);
-        src/libc.o(.text);
+        src/libs/libc.o(.text);
     } =0
 
     .rodata :
     ALIGN(4)
     {
-        src/main.o(.rodata);
-        src/sprite.o(.rodata);
+        src/engine/main.o(.rodata);
+        src/engine/sprite.o(.rodata);
         . += 0x8; /* Why the gap? */
-        src/text.o(.rodata);
-        src/string_util.o(.rodata);
-        src/link.o(.rodata);
-        src/rtc.o(.rodata);
+        src/engine/text.o(.rodata);
+        src/engine/string_util.o(.rodata);
+        src/engine/link.o(.rodata);
+        src/engine/rtc.o(.rodata);
         data/main_menu.o(.rodata);
         data/data2a.o(.rodata);
-        src/battle_4.o(.rodata);
-        src/battle_controller_player.o(.rodata);
+        src/battle/battle_4.o(.rodata);
+        src/battle/battle_controller_player.o(.rodata);
         data/data2b.o(.rodata);
-        src/battle_controller_opponent.o(.rodata);
-        src/battle_controller_linkopponent.o(.rodata);
+        src/battle/battle_controller_opponent.o(.rodata);
+        src/battle/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
-        src/battle_3.o(.rodata);
-        src/pokemon_data.o(.rodata);
+        src/battle/battle_3.o(.rodata);
+        src/pokemon/pokemon_data.o(.rodata);
         . = ALIGN(4);
-        src/trig.o(.rodata);
-        src/util.o(.rodata);
-        src/daycare.o(.rodata);
-        src/egg_hatch.o(.rodata);
+        src/engine/trig.o(.rodata);
+        src/engine/util.o(.rodata);
+        src/field/daycare.o(.rodata);
+        src/scene/egg_hatch.o(.rodata);
         data/battle_interface.o(.rodata);
-        src/pokeball.o(.rodata);
+        src/battle/pokeball.o(.rodata);
         data/trade.o(.rodata);
-        src/berry_blender.o(.rodata);
-        src/new_game.o(.rodata);
-        src/overworld.o(.rodata);
+        src/scene/berry_blender.o(.rodata);
+        src/scene/new_game.o(.rodata);
+        src/field/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
-        src/fieldmap.o(.rodata);
-        src/metatile_behavior.o(.rodata);
+        src/field/fieldmap.o(.rodata);
+        src/field/metatile_behavior.o(.rodata);
         data/field_door.o(.rodata);
-        src/field_player_avatar.o(.rodata);
-        src/field_map_obj.o(.rodata);
-        src/field_ground_effect.o(.rodata);
+        src/field/field_player_avatar.o(.rodata);
+        src/field/field_map_obj.o(.rodata);
+        src/field/field_ground_effect.o(.rodata);
         data/field_map_obj_helpers.o(.rodata);
         data/text_window.o(.rodata);
-        src/script.o(.rodata);
-        src/scrcmd.o(.rodata);
-        src/coord_event_weather.o(.rodata);
-        src/field_tasks.o(.rodata);
+        src/engine/script.o(.rodata);
+        src/field/scrcmd.o(.rodata);
+        src/field/coord_event_weather.o(.rodata);
+        src/field/field_tasks.o(.rodata);
         data/reset_rtc_screen.o(.rodata);
         data/party_menu.o(.rodata);
-        src/start_menu.o(.rodata);
-        src/menu.o(.rodata);
+        src/field/start_menu.o(.rodata);
+        src/engine/menu.o(.rodata);
         data/tileset_anim.o(.rodata);
-        src/palette.o(.rodata);
-        src/sound.o(.rodata);
+        src/engine/palette.o(.rodata);
+        src/engine/sound.o(.rodata);
         data/battle_anim.o(.rodata);
-        src/battle_anim.o(.rodata);
-        src/rom_8077ABC.o(.rodata);
+        src/battle/battle_anim.o(.rodata);
+        src/misc/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
         data/data_8393054.o(.rodata);
-        src/task.o(.rodata);
-        src/battle_anim_807B69C.o(.rodata);
-        src/title_screen.o(.rodata);
+        src/engine/task.o(.rodata);
+        src/battle/battle_anim_807B69C.o(.rodata);
+        src/scene/title_screen.o(.rodata);
         data/field_weather.o(.rodata);
-        src/field_screen_effect.o(.rodata);
-        src/battle_setup.o(.rodata);
+        src/field/field_screen_effect.o(.rodata);
+        src/battle/battle_setup.o(.rodata);
         data/cable_club.o(.rodata);
         data/mori_debug_menu.o(.rodata);
-        src/trainer_see.o(.rodata);
+        src/field/trainer_see.o(.rodata);
         data/trainer_see.o(.rodata);
-        src/wild_encounter.o(.rodata);
+        src/field/wild_encounter.o(.rodata);
         data/wild_encounter.o(.rodata);
-        src/field_effect.o(.rodata);
-        src/pokemon_menu.o(.rodata);
-        src/option_menu.o(.rodata);
-        src/pokedex.o(.rodata);
-        src/trainer_card.o(.rodata);
-        src/battle_party_menu.o(.rodata);
+        src/field/field_effect.o(.rodata);
+        src/pokemon/pokemon_menu.o(.rodata);
+        src/engine/option_menu.o(.rodata);
+        src/pokemon/pokedex.o(.rodata);
+        src/engine/trainer_card.o(.rodata);
+        src/battle/battle_party_menu.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
-        src/pokemon_icon.o(.rodata);
+        src/pokemon/pokemon_icon.o(.rodata);
         data/pokemon_summary_screen.o(.rodata);
         data/fldeff_cut.o(.rodata);
-        src/item_menu.o(.rodata);
+        src/field/item_menu.o(.rodata);
         data/battle_anim_80A7E7C.o(.rodata);
-        src/item.o(.rodata);
+        src/field/item.o(.rodata);
         data/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
-        src/shop.o(.rodata);
-        src/berry.o(.rodata);
-        src/script_menu.o(.rodata);
-        src/naming_screen.o(.rodata);
+        src/field/shop.o(.rodata);
+        src/field/berry.o(.rodata);
+        src/field/script_menu.o(.rodata);
+        src/engine/naming_screen.o(.rodata);
         data/naming_screen.o(.rodata);
         data/money.o(.rodata);
         data/contest_effect.o(.rodata);
-        src/record_mixing.o(.data);
-        src/record_mixing.o(.rodata);
-        src/sound_check_menu.o(.rodata);
+        src/engine/record_mixing.o(.data);
+        src/engine/record_mixing.o(.rodata);
+        src/engine/sound_check_menu.o(.rodata);
         data/secret_base.o(.rodata);
         data/tv.o(.rodata);
         data/contest_link_80C2020.o(.rodata);
-        src/pokemon_size_record.o(.rodata);
+        src/pokemon/pokemon_size_record.o(.rodata);
         data/fldeff_80C5CD4.o(.rodata);
-        src/field_special_scene.o(.rodata);
+        src/field/field_special_scene.o(.rodata);
         data/field_special_scene.o(.rodata);
-        src/rotating_gate.o(.rodata);
-        src/item_use.o(.rodata);
+        src/field/rotating_gate.o(.rodata);
+        src/field/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
-        src/bike.o(.rodata);
+        src/field/bike.o(.rodata);
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
         data/mon_markings.o(.rodata);
-        src/mauville_man.o(.rodata);
+        src/field/mauville_man.o(.rodata);
         data/mail.o(.rodata);
-        src/menu_helpers.o(.rodata);
-        src/heal_location.o(.rodata);
-        src/region_map.o(.rodata);
+        src/field/menu_helpers.o(.rodata);
+        src/field/heal_location.o(.rodata);
+        src/field/region_map.o(.rodata);
         data/cute_sketch.o(.rodata);
-        src/decoration.o(.rodata);
+        src/field/decoration.o(.rodata);
         data/slot_machine.o(.rodata);
-        src/contest_painting.o(.rodata);
-        src/battle_ai.o(.rodata);
-        src/trader.o(.rodata);
-        src/starter_choose.o(.rodata);
-        src/wallclock.o(.rodata);
-        src/pokeblock.o(.rodata);
+        src/scene/contest_painting.o(.rodata);
+        src/battle/battle_ai.o(.rodata);
+        src/field/trader.o(.rodata);
+        src/field/starter_choose.o(.rodata);
+        src/field/wallclock.o(.rodata);
+        src/field/pokeblock.o(.rodata);
         data/fldeff_flash.o(.rodata);
-        src/time_events.o(.rodata);
-        src/field_specials.o(.rodata);
+        src/engine/time_events.o(.rodata);
+        src/field/field_specials.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
-        src/evolution_scene.o(.rodata);
+        src/scene/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
         data/landmark.o(.rodata);
-        src/battle_transition.o(.rodata);
-        src/battle_controller_linkpartner.o(.rodata);
+        src/battle/battle_transition.o(.rodata);
+        src/battle/battle_controller_linkpartner.o(.rodata);
         data/battle_message.o(.rodata);
-        src/choose_party.o(.rodata);
+        src/field/choose_party.o(.rodata);
         data/cable_car.o(.rodata);
-        src/save.o(.rodata);
-        src/field_effect_helpers.o(.rodata);
+        src/engine/save.o(.rodata);
+        src/field/field_effect_helpers.o(.rodata);
         data/contest_ai.o(.rodata);
-        src/battle_controller_safari.o(.rodata);
+        src/battle/battle_controller_safari.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
-        src/learn_move.o(.rodata);
-        src/decoration_inventory.o(.rodata);
-        src/roamer.o(.rodata);
+        src/pokemon/learn_move.o(.rodata);
+        src/field/decoration_inventory.o(.rodata);
+        src/field/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
-        src/use_pokeblock.o(.rodata);
-        src/battle_controller_wally.o(.rodata);
-        src/player_pc.o(.rodata);
-        src/intro.o(.rodata);
+        src/field/use_pokeblock.o(.rodata);
+        src/battle/battle_controller_wally.o(.rodata);
+        src/field/player_pc.o(.rodata);
+        src/scene/intro.o(.rodata);
         data/battle_anim_813F0F4.o(.rodata);
-        src/hall_of_fame.o(.rodata);
-        src/credits.o(.rodata);
+        src/scene/hall_of_fame.o(.rodata);
+        src/scene/credits.o(.rodata);
         data/credits.o(.rodata);
-        src/lottery_corner.o(.rodata);
-        src/diploma.o(.rodata);
+        src/field/lottery_corner.o(.rodata);
+        src/field/diploma.o(.rodata);
         src/strings.o(.rodata);
-        src/berry_tag_screen.o(.rodata);
-        src/save_failed_screen.o(.rodata);
-        src/pokeblock_feed.o(.rodata);
+        src/field/berry_tag_screen.o(.rodata);
+        src/engine/save_failed_screen.o(.rodata);
+        src/pokemon/pokeblock_feed.o(.rodata);
         data/intro_credits_graphics.o(.rodata);
-        src/evolution_graphics.o(.rodata);
+        src/scene/evolution_graphics.o(.rodata);
         data/bard_music.o(.rodata);
         data/unknown_debug_menu.o(.rodata);
         data/strings2.o(.rodata);
         data/menu_cursor.o(.rodata);
         data/mystery_event_msg.o(.rodata);
-        src/m4a_tables.o(.rodata);
+        src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
     } =0
 
@@ -902,11 +902,11 @@ SECTIONS {
     lib_rodata :
     ALIGN(4)
     {
-        src/agb_flash.o(.rodata);
-        src/agb_flash_1m.o(.rodata);
-        src/agb_flash_mx.o(.rodata);
-        src/agb_flash_le.o(.rodata);
-        src/siirtc.o(.rodata);
+        src/libs/agb_flash.o(.rodata);
+        src/libs/agb_flash_1m.o(.rodata);
+        src/libs/agb_flash_mx.o(.rodata);
+        src/libs/agb_flash_le.o(.rodata);
+        src/libs/siirtc.o(.rodata);
         tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata);
     } =0
 
diff --git a/src/battle_2.c b/src/battle/battle_2.c
index 770aa1209..770aa1209 100644
--- a/src/battle_2.c
+++ b/src/battle/battle_2.c
diff --git a/src/battle_3.c b/src/battle/battle_3.c
index b59757f00..b59757f00 100644
--- a/src/battle_3.c
+++ b/src/battle/battle_3.c
diff --git a/src/battle_4.c b/src/battle/battle_4.c
index e4a4895b5..e4a4895b5 100644
--- a/src/battle_4.c
+++ b/src/battle/battle_4.c
diff --git a/src/battle_7.c b/src/battle/battle_7.c
index ad96510cf..ad96510cf 100644
--- a/src/battle_7.c
+++ b/src/battle/battle_7.c
diff --git a/src/battle_ai.c b/src/battle/battle_ai.c
index 1869bbe36..1869bbe36 100644
--- a/src/battle_ai.c
+++ b/src/battle/battle_ai.c
diff --git a/src/battle_anim.c b/src/battle/battle_anim.c
index 111d72813..111d72813 100644
--- a/src/battle_anim.c
+++ b/src/battle/battle_anim.c
diff --git a/src/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c
index bf3eb7ef1..bf3eb7ef1 100644
--- a/src/battle_anim_807B69C.c
+++ b/src/battle/battle_anim_807B69C.c
diff --git a/src/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c
index e0c79dc8e..e0c79dc8e 100644
--- a/src/battle_anim_80A7E7C.c
+++ b/src/battle/battle_anim_80A7E7C.c
diff --git a/src/battle_anim_80CA710.c b/src/battle/battle_anim_80CA710.c
index 65ccd7c21..65ccd7c21 100644
--- a/src/battle_anim_80CA710.c
+++ b/src/battle/battle_anim_80CA710.c
diff --git a/src/battle/battle_anim_81258BC.c b/src/battle/battle_anim_81258BC.c
new file mode 100644
index 000000000..5bdbb4946
--- /dev/null
+++ b/src/battle/battle_anim_81258BC.c
@@ -0,0 +1,50 @@
+#include "global.h"
+#include "battle_anim_81258BC.h"
+#include "battle.h"
+#include "battle_message.h"
+#include "menu_cursor.h"
+#include "text.h"
+
+extern struct Window gUnknown_03004210;
+extern u8 gDisplayedStringBattle[];
+extern u8 gActionSelectionCursor[];
+
+extern const u8 gUnknown_08400CBB[];
+extern u8 gActiveBank;
+extern const u8 gUnknown_08400D15[];
+
+extern void *gBattleBankFunc[];
+extern u16 gUnknown_030042A0;
+extern u16 gUnknown_030042A4;
+
+#if ENGLISH
+#define SUB_812BB10_TILE_DATA_OFFSET 440
+#elif GERMAN
+#define SUB_812BB10_TILE_DATA_OFFSET 444
+#endif
+
+void sub_812BB10(void) {
+    int i;
+
+    gUnknown_030042A4 = 0;
+    gUnknown_030042A0 = 160;
+    gUnknown_03004210.paletteNum = 0;
+    FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18);
+    FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36);
+    gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2;
+
+    InitWindow(&gUnknown_03004210, gUnknown_08400D15, 400, 18, 35);
+    sub_8002F44(&gUnknown_03004210);
+    sub_814A5C0(0, 0xFFFF, 12, 11679, 0);
+
+    for (i = 0; i < 4; i++)
+    {
+        nullsub_8(i);
+    }
+
+    sub_802E3E4(gActionSelectionCursor[gActiveBank], 0);
+    StrCpyDecodeToDisplayedStringBattle((u8 *) gUnknown_08400CBB);
+
+    InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35);
+    sub_8002F44(&gUnknown_03004210);
+}
\ No newline at end of file
diff --git a/src/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 0b6c3b6a1..0b6c3b6a1 100644
--- a/src/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
diff --git a/src/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 3e34b2e25..3e34b2e25 100644
--- a/src/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
diff --git a/src/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 72b56b962..72b56b962 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
diff --git a/src/battle_controller_player.c b/src/battle/battle_controller_player.c
index 53b596c5e..53b596c5e 100644
--- a/src/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
diff --git a/src/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index e05578c31..e05578c31 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
diff --git a/src/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index bf6ef0892..bf6ef0892 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
diff --git a/src/battle_interface.c b/src/battle/battle_interface.c
index 0741ad33a..0741ad33a 100644
--- a/src/battle_interface.c
+++ b/src/battle/battle_interface.c
diff --git a/src/battle_message.c b/src/battle/battle_message.c
index a3cc320ad..a3cc320ad 100644
--- a/src/battle_message.c
+++ b/src/battle/battle_message.c
diff --git a/src/battle_party_menu.c b/src/battle/battle_party_menu.c
index 49e0b8432..49e0b8432 100644
--- a/src/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
diff --git a/src/battle_records.c b/src/battle/battle_records.c
index d848a10b8..d848a10b8 100644
--- a/src/battle_records.c
+++ b/src/battle/battle_records.c
diff --git a/src/battle_setup.c b/src/battle/battle_setup.c
index 59e17e9eb..59e17e9eb 100644
--- a/src/battle_setup.c
+++ b/src/battle/battle_setup.c
diff --git a/src/battle_transition.c b/src/battle/battle_transition.c
index 53d32d03a..53d32d03a 100644
--- a/src/battle_transition.c
+++ b/src/battle/battle_transition.c
diff --git a/src/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index f5c679876..f5c679876 100644
--- a/src/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
diff --git a/src/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 0ae98af09..0ae98af09 100644
--- a/src/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
diff --git a/src/pokeball.c b/src/battle/pokeball.c
index ee3b95678..ee3b95678 100644
--- a/src/pokeball.c
+++ b/src/battle/pokeball.c
diff --git a/src/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c
index 27d7022fe..27d7022fe 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/battle/post_battle_event_funcs.c
diff --git a/src/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c
index 343c8f183..343c8f183 100644
--- a/src/reshow_battle_screen.c
+++ b/src/battle/reshow_battle_screen.c
diff --git a/src/smokescreen.c b/src/battle/smokescreen.c
index 8345cb6ad..8345cb6ad 100644
--- a/src/smokescreen.c
+++ b/src/battle/smokescreen.c
diff --git a/src/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index c7d81f502..c7d81f502 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
diff --git a/src/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 1595ecd2e..1595ecd2e 100644
--- a/src/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
diff --git a/src/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index a81625f2a..a81625f2a 100644
--- a/src/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
diff --git a/src/blend_palette.c b/src/engine/blend_palette.c
index 843c50ac1..843c50ac1 100644
--- a/src/blend_palette.c
+++ b/src/engine/blend_palette.c
diff --git a/src/cable_club.c b/src/engine/cable_club.c
index 7a85f2b6c..7a85f2b6c 100644
--- a/src/cable_club.c
+++ b/src/engine/cable_club.c
diff --git a/src/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c
index 498562fe0..498562fe0 100644
--- a/src/clear_save_data_menu.c
+++ b/src/engine/clear_save_data_menu.c
diff --git a/src/clock.c b/src/engine/clock.c
index 9635514d2..9635514d2 100644
--- a/src/clock.c
+++ b/src/engine/clock.c
diff --git a/src/decompress.c b/src/engine/decompress.c
index 3e5993118..3e5993118 100644
--- a/src/decompress.c
+++ b/src/engine/decompress.c
diff --git a/src/link.c b/src/engine/link.c
index 850201ccb..850201ccb 100644
--- a/src/link.c
+++ b/src/engine/link.c
diff --git a/src/load_save.c b/src/engine/load_save.c
index 8424b1121..8424b1121 100644
--- a/src/load_save.c
+++ b/src/engine/load_save.c
diff --git a/src/main.c b/src/engine/main.c
index d7c11b6c8..d7c11b6c8 100644
--- a/src/main.c
+++ b/src/engine/main.c
diff --git a/src/main_menu.c b/src/engine/main_menu.c
index e0af86f3d..e0af86f3d 100644
--- a/src/main_menu.c
+++ b/src/engine/main_menu.c
diff --git a/src/menu.c b/src/engine/menu.c
index a9c4aaa43..a9c4aaa43 100644
--- a/src/menu.c
+++ b/src/engine/menu.c
diff --git a/src/menu_cursor.c b/src/engine/menu_cursor.c
index d43be2a2f..d43be2a2f 100644
--- a/src/menu_cursor.c
+++ b/src/engine/menu_cursor.c
diff --git a/src/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 0e48dc177..0e48dc177 100644
--- a/src/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
diff --git a/src/mystery_event_script.c b/src/engine/mystery_event_script.c
index a6568f5de..a6568f5de 100644
--- a/src/mystery_event_script.c
+++ b/src/engine/mystery_event_script.c
diff --git a/src/name_string_util.c b/src/engine/name_string_util.c
index f1a935453..f1a935453 100644
--- a/src/name_string_util.c
+++ b/src/engine/name_string_util.c
diff --git a/src/naming_screen.c b/src/engine/naming_screen.c
index 3f8417e6d..3f8417e6d 100644
--- a/src/naming_screen.c
+++ b/src/engine/naming_screen.c
diff --git a/src/option_menu.c b/src/engine/option_menu.c
index dfc49b035..dfc49b035 100644
--- a/src/option_menu.c
+++ b/src/engine/option_menu.c
diff --git a/src/palette.c b/src/engine/palette.c
index 17e9ca178..17e9ca178 100644
--- a/src/palette.c
+++ b/src/engine/palette.c
diff --git a/src/play_time.c b/src/engine/play_time.c
index 9882c9c4b..9882c9c4b 100644
--- a/src/play_time.c
+++ b/src/engine/play_time.c
diff --git a/src/record_mixing.c b/src/engine/record_mixing.c
index 8dff432c1..8dff432c1 100644
--- a/src/record_mixing.c
+++ b/src/engine/record_mixing.c
diff --git a/src/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index d052992ad..d052992ad 100644
--- a/src/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
diff --git a/src/rng.c b/src/engine/rng.c
index 7d4b5600e..7d4b5600e 100644
--- a/src/rng.c
+++ b/src/engine/rng.c
diff --git a/src/rtc.c b/src/engine/rtc.c
index d73f943d2..d73f943d2 100644
--- a/src/rtc.c
+++ b/src/engine/rtc.c
diff --git a/src/save.c b/src/engine/save.c
index eae3f4470..eae3f4470 100644
--- a/src/save.c
+++ b/src/engine/save.c
diff --git a/src/save_failed_screen.c b/src/engine/save_failed_screen.c
index b91e8b5bf..b91e8b5bf 100644
--- a/src/save_failed_screen.c
+++ b/src/engine/save_failed_screen.c
diff --git a/src/save_menu_util.c b/src/engine/save_menu_util.c
index a2d17bd36..a2d17bd36 100644
--- a/src/save_menu_util.c
+++ b/src/engine/save_menu_util.c
diff --git a/src/script.c b/src/engine/script.c
index f049b96fc..f049b96fc 100644
--- a/src/script.c
+++ b/src/engine/script.c
diff --git a/src/sound.c b/src/engine/sound.c
index 91f5e06a3..91f5e06a3 100644
--- a/src/sound.c
+++ b/src/engine/sound.c
diff --git a/src/sound_check_menu.c b/src/engine/sound_check_menu.c
index d97ae6d86..d97ae6d86 100644
--- a/src/sound_check_menu.c
+++ b/src/engine/sound_check_menu.c
diff --git a/src/sprite.c b/src/engine/sprite.c
index fb8c2b648..fb8c2b648 100644
--- a/src/sprite.c
+++ b/src/engine/sprite.c
diff --git a/src/string_util.c b/src/engine/string_util.c
index 9686256a1..9686256a1 100644
--- a/src/string_util.c
+++ b/src/engine/string_util.c
diff --git a/src/task.c b/src/engine/task.c
index 7bd2b5937..7bd2b5937 100644
--- a/src/task.c
+++ b/src/engine/task.c
diff --git a/src/text.c b/src/engine/text.c
index b27084b86..abde4484a 100644
--- a/src/text.c
+++ b/src/engine/text.c
@@ -219,12 +219,12 @@ static const u8 sBrailleGlyphs[] = INCBIN_U8("graphics/fonts/font6_braille.1bpp"
 static const u32 sDownArrowTiles[] = INCBIN_U32("graphics/fonts/down_arrow.4bpp");
 
 // clang-format off
-#include "data/text/type1_map.h"
-#include "data/text/type3_map.h"
-#include "data/text/font1_widths.h"
-#include "data/text/font4_widths.h"
-#include "data/text/font0_widths.h"
-#include "data/text/font3_widths.h"
+#include "../data/text/type1_map.h"
+#include "../data/text/type3_map.h"
+#include "../data/text/font1_widths.h"
+#include "../data/text/font4_widths.h"
+#include "../data/text/font0_widths.h"
+#include "../data/text/font3_widths.h"
 // clang-format on
 
 const u16 gUnknownPalette_81E6692[] = INCBIN_U16("graphics/fonts/unknown_81E6692.gbapal");
diff --git a/src/text_window.c b/src/engine/text_window.c
index 9a88789d1..9a88789d1 100644
--- a/src/text_window.c
+++ b/src/engine/text_window.c
diff --git a/src/tileset_anim.c b/src/engine/tileset_anim.c
index 34685381d..34685381d 100644
--- a/src/tileset_anim.c
+++ b/src/engine/tileset_anim.c
diff --git a/src/time_events.c b/src/engine/time_events.c
index accb03db8..accb03db8 100644
--- a/src/time_events.c
+++ b/src/engine/time_events.c
diff --git a/src/trade.c b/src/engine/trade.c
index 0816fe555..0816fe555 100644
--- a/src/trade.c
+++ b/src/engine/trade.c
diff --git a/src/trainer_card.c b/src/engine/trainer_card.c
index bcb62ede6..bcb62ede6 100644
--- a/src/trainer_card.c
+++ b/src/engine/trainer_card.c
diff --git a/src/trig.c b/src/engine/trig.c
index e16a69e63..e16a69e63 100644
--- a/src/trig.c
+++ b/src/engine/trig.c
diff --git a/src/util.c b/src/engine/util.c
index 582b9f806..582b9f806 100644
--- a/src/util.c
+++ b/src/engine/util.c
diff --git a/src/bard_music.c b/src/field/bard_music.c
index daf003233..daf003233 100644
--- a/src/bard_music.c
+++ b/src/field/bard_music.c
diff --git a/src/berry.c b/src/field/berry.c
index d82eab2a6..d82eab2a6 100644
--- a/src/berry.c
+++ b/src/field/berry.c
diff --git a/src/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 1413a02ca..1413a02ca 100644
--- a/src/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
diff --git a/src/bike.c b/src/field/bike.c
index dae86bd88..dae86bd88 100644
--- a/src/bike.c
+++ b/src/field/bike.c
diff --git a/src/birch_pc.c b/src/field/birch_pc.c
index 9872dd54d..9872dd54d 100644
--- a/src/birch_pc.c
+++ b/src/field/birch_pc.c
diff --git a/src/braille_puzzles.c b/src/field/braille_puzzles.c
index b11b1ff3a..b11b1ff3a 100644
--- a/src/braille_puzzles.c
+++ b/src/field/braille_puzzles.c
diff --git a/src/choose_party.c b/src/field/choose_party.c
index 9cdf63fc8..9cdf63fc8 100644
--- a/src/choose_party.c
+++ b/src/field/choose_party.c
diff --git a/src/coins.c b/src/field/coins.c
index 3c6356612..3c6356612 100644
--- a/src/coins.c
+++ b/src/field/coins.c
diff --git a/src/coord_event_weather.c b/src/field/coord_event_weather.c
index 9c5a1ca4d..9c5a1ca4d 100644
--- a/src/coord_event_weather.c
+++ b/src/field/coord_event_weather.c
diff --git a/src/daycare.c b/src/field/daycare.c
index 591b5b188..591b5b188 100644
--- a/src/daycare.c
+++ b/src/field/daycare.c
diff --git a/src/decoration.c b/src/field/decoration.c
index 1d48692c1..065afbfb6 100644
--- a/src/decoration.c
+++ b/src/field/decoration.c
@@ -619,7 +619,7 @@ const u8 DecorDesc_REGISTEEL_DOLL[] = _(
     "Place it on a mat\n"
     "or a desk.");
 #elif GERMAN
-#include "data/decoration/descriptions_de.h"
+#include "../data/decoration/descriptions_de.h"
 #endif
 
 const u16 DecorGfx_SMALL_DESK[] = {
@@ -1389,7 +1389,7 @@ const struct Decoration gDecorations[] = {
     {DECOR_REGISTEEL_DOLL,  _("REGISTEEL DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL}
 };
 #elif GERMAN
-#include "data/decoration/decorations.h"
+#include "../data/decoration/decorations.h"
 #endif
 
 const u8 *const gUnknown_083EC5E4[] = {
diff --git a/src/decoration_inventory.c b/src/field/decoration_inventory.c
index 083cb260c..083cb260c 100644
--- a/src/decoration_inventory.c
+++ b/src/field/decoration_inventory.c
diff --git a/src/dewford_trend.c b/src/field/dewford_trend.c
index aaf4dd66a..aaf4dd66a 100644
--- a/src/dewford_trend.c
+++ b/src/field/dewford_trend.c
diff --git a/src/diploma.c b/src/field/diploma.c
index 27601404c..27601404c 100644
--- a/src/diploma.c
+++ b/src/field/diploma.c
diff --git a/src/easy_chat.c b/src/field/easy_chat.c
index 6014b3d14..6014b3d14 100644
--- a/src/easy_chat.c
+++ b/src/field/easy_chat.c
diff --git a/src/event_data.c b/src/field/event_data.c
index ee475343f..ee475343f 100644
--- a/src/event_data.c
+++ b/src/field/event_data.c
diff --git a/src/field_camera.c b/src/field/field_camera.c
index db51cf054..db51cf054 100644
--- a/src/field_camera.c
+++ b/src/field/field_camera.c
diff --git a/src/field_control_avatar.c b/src/field/field_control_avatar.c
index ff8e8504c..ff8e8504c 100644
--- a/src/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
diff --git a/src/field_door.c b/src/field/field_door.c
index ab46f0696..ab46f0696 100644
--- a/src/field_door.c
+++ b/src/field/field_door.c
diff --git a/src/field_effect.c b/src/field/field_effect.c
index 1bdf82991..1bdf82991 100644
--- a/src/field_effect.c
+++ b/src/field/field_effect.c
diff --git a/src/field_effect_helpers.c b/src/field/field_effect_helpers.c
index 2ad8bdce3..2ad8bdce3 100644
--- a/src/field_effect_helpers.c
+++ b/src/field/field_effect_helpers.c
diff --git a/src/field_fadetransition.c b/src/field/field_fadetransition.c
index d95177821..d95177821 100644
--- a/src/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
diff --git a/src/field_ground_effect.c b/src/field/field_ground_effect.c
index 5af8ea3e3..5af8ea3e3 100644
--- a/src/field_ground_effect.c
+++ b/src/field/field_ground_effect.c
diff --git a/src/field_map_obj.c b/src/field/field_map_obj.c
index 59319a16e..59319a16e 100644
--- a/src/field_map_obj.c
+++ b/src/field/field_map_obj.c
diff --git a/src/field_map_obj_helpers.c b/src/field/field_map_obj_helpers.c
index b453d3794..b453d3794 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field/field_map_obj_helpers.c
diff --git a/src/field_message_box.c b/src/field/field_message_box.c
index 35aac7ac9..35aac7ac9 100644
--- a/src/field_message_box.c
+++ b/src/field/field_message_box.c
diff --git a/src/field_player_avatar.c b/src/field/field_player_avatar.c
index e7947b704..e7947b704 100644
--- a/src/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
diff --git a/src/field_poison.c b/src/field/field_poison.c
index 1244b9c62..1244b9c62 100644
--- a/src/field_poison.c
+++ b/src/field/field_poison.c
diff --git a/src/field_region_map.c b/src/field/field_region_map.c
index 7cb22e5df..7cb22e5df 100644
--- a/src/field_region_map.c
+++ b/src/field/field_region_map.c
diff --git a/src/field_screen_effect.c b/src/field/field_screen_effect.c
index 1464a99b1..1464a99b1 100644
--- a/src/field_screen_effect.c
+++ b/src/field/field_screen_effect.c
diff --git a/src/field_special_scene.c b/src/field/field_special_scene.c
index 38c076c51..38c076c51 100644
--- a/src/field_special_scene.c
+++ b/src/field/field_special_scene.c
diff --git a/src/field_specials.c b/src/field/field_specials.c
index c23ea2ddc..c23ea2ddc 100644
--- a/src/field_specials.c
+++ b/src/field/field_specials.c
diff --git a/src/field_tasks.c b/src/field/field_tasks.c
index da6f162c2..da6f162c2 100644
--- a/src/field_tasks.c
+++ b/src/field/field_tasks.c
diff --git a/src/field_weather.c b/src/field/field_weather.c
index 443a38357..443a38357 100644
--- a/src/field_weather.c
+++ b/src/field/field_weather.c
diff --git a/src/fieldmap.c b/src/field/fieldmap.c
index 7a31ae720..7a31ae720 100644
--- a/src/fieldmap.c
+++ b/src/field/fieldmap.c
diff --git a/src/fldeff_cut.c b/src/field/fldeff_cut.c
index 00643a979..00643a979 100644
--- a/src/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
diff --git a/src/fldeff_flash.c b/src/field/fldeff_flash.c
index 1ee8a8f05..1ee8a8f05 100644
--- a/src/fldeff_flash.c
+++ b/src/field/fldeff_flash.c
diff --git a/src/fldeff_softboiled.c b/src/field/fldeff_softboiled.c
index cb26d9966..cb26d9966 100644
--- a/src/fldeff_softboiled.c
+++ b/src/field/fldeff_softboiled.c
diff --git a/src/fldeff_strength.c b/src/field/fldeff_strength.c
index d9603d094..d9603d094 100644
--- a/src/fldeff_strength.c
+++ b/src/field/fldeff_strength.c
diff --git a/src/fldeff_sweetscent.c b/src/field/fldeff_sweetscent.c
index b9dbf619d..b9dbf619d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/field/fldeff_sweetscent.c
diff --git a/src/fldeff_teleport.c b/src/field/fldeff_teleport.c
index af48fb414..af48fb414 100644
--- a/src/fldeff_teleport.c
+++ b/src/field/fldeff_teleport.c
diff --git a/src/heal_location.c b/src/field/heal_location.c
index 42bc18567..42bc18567 100644
--- a/src/heal_location.c
+++ b/src/field/heal_location.c
diff --git a/src/hof_pc.c b/src/field/hof_pc.c
index aeeb7fe17..aeeb7fe17 100644
--- a/src/hof_pc.c
+++ b/src/field/hof_pc.c
diff --git a/src/item.c b/src/field/item.c
index 36871285a..fd49f5c39 100644
--- a/src/item.c
+++ b/src/field/item.c
@@ -30,11 +30,11 @@ enum
 };
 
 #if ENGLISH
-#include "data/item_descriptions_en.h"
-#include "data/items_en.h"
+#include "../data/item_descriptions_en.h"
+#include "../data/items_en.h"
 #elif GERMAN
-#include "data/item_descriptions_de.h"
-#include "data/items_de.h"
+#include "../data/item_descriptions_de.h"
+#include "../data/items_de.h"
 #endif
 
 static void CompactPCItems(void);
diff --git a/src/item_menu.c b/src/field/item_menu.c
index 7ff0e6174..7ff0e6174 100644
--- a/src/item_menu.c
+++ b/src/field/item_menu.c
diff --git a/src/item_use.c b/src/field/item_use.c
index 8bc83bdc6..8bc83bdc6 100644
--- a/src/item_use.c
+++ b/src/field/item_use.c
diff --git a/src/landmark.c b/src/field/landmark.c
index 6a53716bb..6a53716bb 100644
--- a/src/landmark.c
+++ b/src/field/landmark.c
diff --git a/src/lottery_corner.c b/src/field/lottery_corner.c
index c2c25b9ac..c2c25b9ac 100644
--- a/src/lottery_corner.c
+++ b/src/field/lottery_corner.c
diff --git a/src/map_name_popup.c b/src/field/map_name_popup.c
index 01105d0db..01105d0db 100644
--- a/src/map_name_popup.c
+++ b/src/field/map_name_popup.c
diff --git a/src/map_obj_lock.c b/src/field/map_obj_lock.c
index 2856320b8..2856320b8 100644
--- a/src/map_obj_lock.c
+++ b/src/field/map_obj_lock.c
diff --git a/src/mauville_man.c b/src/field/mauville_man.c
index 33bc39648..33bc39648 100644
--- a/src/mauville_man.c
+++ b/src/field/mauville_man.c
diff --git a/src/menu_helpers.c b/src/field/menu_helpers.c
index 14e823355..14e823355 100644
--- a/src/menu_helpers.c
+++ b/src/field/menu_helpers.c
diff --git a/src/metatile_behavior.c b/src/field/metatile_behavior.c
index d05ba0b89..d05ba0b89 100644
--- a/src/metatile_behavior.c
+++ b/src/field/metatile_behavior.c
diff --git a/src/money.c b/src/field/money.c
index 5d0f0ae8d..5d0f0ae8d 100644
--- a/src/money.c
+++ b/src/field/money.c
diff --git a/src/overworld.c b/src/field/overworld.c
index 9b41a262d..9b41a262d 100644
--- a/src/overworld.c
+++ b/src/field/overworld.c
diff --git a/src/party_menu.c b/src/field/party_menu.c
index 39477e293..39477e293 100644
--- a/src/party_menu.c
+++ b/src/field/party_menu.c
diff --git a/src/player_pc.c b/src/field/player_pc.c
index 83e6dd221..83e6dd221 100644
--- a/src/player_pc.c
+++ b/src/field/player_pc.c
diff --git a/src/pokeblock.c b/src/field/pokeblock.c
index 34f4ffa35..34f4ffa35 100644
--- a/src/pokeblock.c
+++ b/src/field/pokeblock.c
diff --git a/src/pokenav.c b/src/field/pokenav.c
index 21d7bb4e3..21d7bb4e3 100644
--- a/src/pokenav.c
+++ b/src/field/pokenav.c
diff --git a/src/region_map.c b/src/field/region_map.c
index 900c9ad71..bfd2729c2 100644
--- a/src/region_map.c
+++ b/src/field/region_map.c
@@ -140,12 +140,12 @@ static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map
 static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz");
 static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz");
 
-#include "data/region_map_layout.h"
+#include "../data/region_map_layout.h"
 
 #if ENGLISH
-#include "data/region_map_names_en.h"
+#include "../data/region_map_names_en.h"
 #elif GERMAN
-#include "data/region_map_names_de.h"
+#include "../data/region_map_names_de.h"
 #endif
 
 struct RegionMapLocation
diff --git a/src/roamer.c b/src/field/roamer.c
index 948828d5e..948828d5e 100644
--- a/src/roamer.c
+++ b/src/field/roamer.c
diff --git a/src/rotating_gate.c b/src/field/rotating_gate.c
index e8ab7e1bf..e8ab7e1bf 100644
--- a/src/rotating_gate.c
+++ b/src/field/rotating_gate.c
diff --git a/src/safari_zone.c b/src/field/safari_zone.c
index 14fd1ddc4..14fd1ddc4 100644
--- a/src/safari_zone.c
+++ b/src/field/safari_zone.c
diff --git a/src/scrcmd.c b/src/field/scrcmd.c
index 31a90158a..31a90158a 100644
--- a/src/scrcmd.c
+++ b/src/field/scrcmd.c
diff --git a/src/script_menu.c b/src/field/script_menu.c
index e25e74d8c..e25e74d8c 100644
--- a/src/script_menu.c
+++ b/src/field/script_menu.c
diff --git a/src/script_movement.c b/src/field/script_movement.c
index 30e10b451..30e10b451 100644
--- a/src/script_movement.c
+++ b/src/field/script_movement.c
diff --git a/src/secret_base.c b/src/field/secret_base.c
index b2cd1f094..b2cd1f094 100644
--- a/src/secret_base.c
+++ b/src/field/secret_base.c
diff --git a/src/shop.c b/src/field/shop.c
index 375205935..375205935 100644
--- a/src/shop.c
+++ b/src/field/shop.c
diff --git a/src/slot_machine.c b/src/field/slot_machine.c
index e8e4f271b..e8e4f271b 100644
--- a/src/slot_machine.c
+++ b/src/field/slot_machine.c
diff --git a/src/start_menu.c b/src/field/start_menu.c
index 6e44090df..6e44090df 100644
--- a/src/start_menu.c
+++ b/src/field/start_menu.c
diff --git a/src/starter_choose.c b/src/field/starter_choose.c
index 2b28df4f0..2b28df4f0 100644
--- a/src/starter_choose.c
+++ b/src/field/starter_choose.c
diff --git a/src/trader.c b/src/field/trader.c
index 61f48fad8..61f48fad8 100644
--- a/src/trader.c
+++ b/src/field/trader.c
diff --git a/src/trainer_see.c b/src/field/trainer_see.c
index 5a8ebbafc..5a8ebbafc 100644
--- a/src/trainer_see.c
+++ b/src/field/trainer_see.c
diff --git a/src/tv.c b/src/field/tv.c
index e9b5e850d..e9b5e850d 100644
--- a/src/tv.c
+++ b/src/field/tv.c
diff --git a/src/use_pokeblock.c b/src/field/use_pokeblock.c
index e946a9cfc..e946a9cfc 100644
--- a/src/use_pokeblock.c
+++ b/src/field/use_pokeblock.c
diff --git a/src/wallclock.c b/src/field/wallclock.c
index 8db13dc2d..8db13dc2d 100644
--- a/src/wallclock.c
+++ b/src/field/wallclock.c
diff --git a/src/wild_encounter.c b/src/field/wild_encounter.c
index 390898917..390898917 100644
--- a/src/wild_encounter.c
+++ b/src/field/wild_encounter.c
diff --git a/src/agb_flash.c b/src/libs/agb_flash.c
index 340d469a7..340d469a7 100644
--- a/src/agb_flash.c
+++ b/src/libs/agb_flash.c
diff --git a/src/agb_flash_1m.c b/src/libs/agb_flash_1m.c
index e249fab9a..e249fab9a 100644
--- a/src/agb_flash_1m.c
+++ b/src/libs/agb_flash_1m.c
diff --git a/src/agb_flash_le.c b/src/libs/agb_flash_le.c
index 39d956e27..39d956e27 100644
--- a/src/agb_flash_le.c
+++ b/src/libs/agb_flash_le.c
diff --git a/src/agb_flash_mx.c b/src/libs/agb_flash_mx.c
index 67348901f..67348901f 100644
--- a/src/agb_flash_mx.c
+++ b/src/libs/agb_flash_mx.c
diff --git a/src/libc.c b/src/libs/libc.c
index 920673e3e..920673e3e 100644
--- a/src/libc.c
+++ b/src/libs/libc.c
diff --git a/src/m4a_2.c b/src/libs/m4a_2.c
index 2d3c65848..2d3c65848 100644
--- a/src/m4a_2.c
+++ b/src/libs/m4a_2.c
diff --git a/src/m4a_4.c b/src/libs/m4a_4.c
index 2e1d140b4..2e1d140b4 100644
--- a/src/m4a_4.c
+++ b/src/libs/m4a_4.c
diff --git a/src/m4a_tables.c b/src/libs/m4a_tables.c
index 91f00a31d..91f00a31d 100644
--- a/src/m4a_tables.c
+++ b/src/libs/m4a_tables.c
diff --git a/src/siirtc.c b/src/libs/siirtc.c
index 965a068f1..965a068f1 100644
--- a/src/siirtc.c
+++ b/src/libs/siirtc.c
diff --git a/src/de_rom_8040FE0.c b/src/misc/de_rom_8040FE0.c
index eebcc1437..eebcc1437 100644
--- a/src/de_rom_8040FE0.c
+++ b/src/misc/de_rom_8040FE0.c
diff --git a/src/rom3.c b/src/misc/rom3.c
index 3f4860ecc..3f4860ecc 100644
--- a/src/rom3.c
+++ b/src/misc/rom3.c
diff --git a/src/rom6.c b/src/misc/rom6.c
index 3a5071034..3a5071034 100644
--- a/src/rom6.c
+++ b/src/misc/rom6.c
diff --git a/src/rom_800D42C.c b/src/misc/rom_800D42C.c
index f51779e65..f51779e65 100644
--- a/src/rom_800D42C.c
+++ b/src/misc/rom_800D42C.c
diff --git a/src/rom_8077ABC.c b/src/misc/rom_8077ABC.c
index 172233e6d..172233e6d 100644
--- a/src/rom_8077ABC.c
+++ b/src/misc/rom_8077ABC.c
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/misc/script_pokemon_util_80C4BF0.c
index f98293a90..f98293a90 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/misc/script_pokemon_util_80C4BF0.c
diff --git a/src/script_pokemon_util_80F99CC.c b/src/misc/script_pokemon_util_80F99CC.c
index f930df8e2..f930df8e2 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/misc/script_pokemon_util_80F99CC.c
diff --git a/src/unknown_task.c b/src/misc/unknown_task.c
index 5ec7fa6bc..5ec7fa6bc 100644
--- a/src/unknown_task.c
+++ b/src/misc/unknown_task.c
diff --git a/src/unused_8124F94.c b/src/misc/unused_8124F94.c
index 5f76fa92e..5f76fa92e 100644
--- a/src/unused_8124F94.c
+++ b/src/misc/unused_8124F94.c
diff --git a/src/learn_move.c b/src/pokemon/learn_move.c
index 33252c66b..33252c66b 100644
--- a/src/learn_move.c
+++ b/src/pokemon/learn_move.c
diff --git a/src/mail.c b/src/pokemon/mail.c
index c5dd119e3..c5dd119e3 100644
--- a/src/mail.c
+++ b/src/pokemon/mail.c
diff --git a/src/mail_data.c b/src/pokemon/mail_data.c
index ae3f4b3e8..ae3f4b3e8 100644
--- a/src/mail_data.c
+++ b/src/pokemon/mail_data.c
diff --git a/src/mon_markings.c b/src/pokemon/mon_markings.c
index 0cad8db59..0cad8db59 100644
--- a/src/mon_markings.c
+++ b/src/pokemon/mon_markings.c
diff --git a/src/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index 5d6b215cd..5d6b215cd 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
diff --git a/src/pokedex.c b/src/pokemon/pokedex.c
index 894fb1a0a..e27ec1e05 100644
--- a/src/pokedex.c
+++ b/src/pokemon/pokedex.c
@@ -185,7 +185,7 @@ static const u8 gUnknown_0839FA7C[] = INCBIN_U8("graphics/pokedex/noball.4bpp.lz
 extern const u8 gUnknown_0839FA7C[];
 #endif
 
-#include "data/pokedex_orders.h"
+#include "../data/pokedex_orders.h"
 static const struct OamData gOamData_83A0404 =
 {
     .y = 160,
@@ -514,9 +514,9 @@ static const u8 gUnknown_083A05F1[] = {16, 8, 4, 2, 1};
 const u8 gEmptySpacce_83A05F6[] = {0, 0};  // Padding, maybe?
 static const u8 gUnknown_083A05F8[] = _("");
 #if ENGLISH
-#include "data/pokedex_entries_en.h"
+#include "../data/pokedex_entries_en.h"
 #elif GERMAN
-#include "data/pokedex_entries_de.h"
+#include "../data/pokedex_entries_de.h"
 #endif
 static const u16 gUnknown_083B4EC4[16] = {0};
 static const u8 *const sMonFootprintTable[] =
diff --git a/src/pokedex_cry_screen.c b/src/pokemon/pokedex_cry_screen.c
index 92fd832fc..92fd832fc 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokemon/pokedex_cry_screen.c
diff --git a/src/pokemon_1.c b/src/pokemon/pokemon_1.c
index 1d597cb17..1d597cb17 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon/pokemon_1.c
diff --git a/src/pokemon_2.c b/src/pokemon/pokemon_2.c
index f02ce6170..f02ce6170 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon/pokemon_2.c
diff --git a/src/pokemon_3.c b/src/pokemon/pokemon_3.c
index 1eff9b83c..1eff9b83c 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon/pokemon_3.c
diff --git a/src/pokemon_data.c b/src/pokemon/pokemon_data.c
index 6414134fb..6414134fb 100644
--- a/src/pokemon_data.c
+++ b/src/pokemon/pokemon_data.c
diff --git a/src/pokemon_icon.c b/src/pokemon/pokemon_icon.c
index 9bb3386e1..9bb3386e1 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon/pokemon_icon.c
diff --git a/src/pokemon_menu.c b/src/pokemon/pokemon_menu.c
index bc5150a16..bc5150a16 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon/pokemon_menu.c
diff --git a/src/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c
index f2222bd3b..f2222bd3b 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon/pokemon_size_record.c
diff --git a/src/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index 5e97523e2..5e97523e2 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
diff --git a/src/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index 00a0bea29..00a0bea29 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
diff --git a/src/berry_blender.c b/src/scene/berry_blender.c
index 7ffcc5185..7ffcc5185 100644
--- a/src/berry_blender.c
+++ b/src/scene/berry_blender.c
diff --git a/src/contest_painting.c b/src/scene/contest_painting.c
index 3662efdec..3662efdec 100644
--- a/src/contest_painting.c
+++ b/src/scene/contest_painting.c
diff --git a/src/credits.c b/src/scene/credits.c
index cf10137c1..cf10137c1 100644
--- a/src/credits.c
+++ b/src/scene/credits.c
diff --git a/src/cute_sketch.c b/src/scene/cute_sketch.c
index 5317bc334..5317bc334 100644
--- a/src/cute_sketch.c
+++ b/src/scene/cute_sketch.c
diff --git a/src/egg_hatch.c b/src/scene/egg_hatch.c
index f77c477ae..f77c477ae 100644
--- a/src/egg_hatch.c
+++ b/src/scene/egg_hatch.c
diff --git a/src/evolution_graphics.c b/src/scene/evolution_graphics.c
index 1fd5bf8fa..1fd5bf8fa 100644
--- a/src/evolution_graphics.c
+++ b/src/scene/evolution_graphics.c
diff --git a/src/evolution_scene.c b/src/scene/evolution_scene.c
index 88f3e23a8..88f3e23a8 100644
--- a/src/evolution_scene.c
+++ b/src/scene/evolution_scene.c
diff --git a/src/hall_of_fame.c b/src/scene/hall_of_fame.c
index 6f7df576b..6f7df576b 100644
--- a/src/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
diff --git a/src/intro.c b/src/scene/intro.c
index dd7cc858c..dd7cc858c 100644
--- a/src/intro.c
+++ b/src/scene/intro.c
diff --git a/src/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index cd0589af8..cd0589af8 100755
--- a/src/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
diff --git a/src/new_game.c b/src/scene/new_game.c
index 3f9e9f5a1..3f9e9f5a1 100644
--- a/src/new_game.c
+++ b/src/scene/new_game.c
diff --git a/src/title_screen.c b/src/scene/title_screen.c
index 2503b0654..2503b0654 100644
--- a/src/title_screen.c
+++ b/src/scene/title_screen.c
diff --git a/sym_bss.txt b/sym_bss.txt
index aa16612ed..c1348d8b2 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,41 +1,41 @@
-	.include "src/main.o"
-	.include "src/sprite.o"
-	.include "src/text.o"
-	.include "src/string_util.o"
-	.include "src/link.o"
-	.include "src/rtc.o"
-	.include "src/daycare.o"
-    .include "src/trade.o"
-	.include "src/berry_blender.o"
-	.include "src/play_time.o"
-	.include "src/overworld.o"
-	.include "src/field_camera.o"
-	.include "src/field_map_obj.o"
-	.include "src/field_message_box.o"
-	.include "src/text_window.o"
-	.include "src/script.o"
-	.include "src/start_menu.o"
-	.include "src/menu.o"
-	.include "src/tileset_anim.o"
-	.include "src/sound.o"
-	.include "src/field_weather.o"
-	.include "src/field_effect.o"
-	.include "src/item_menu.o"
-	.include "src/shop.o"
-	.include "src/record_mixing.o"
-	.include "src/tv.o"
-    .include "src/battle_anim_80CA710.o"
-    .include "src/easy_chat.o"
-    .include "src/pokenav.o"
-	.include "src/mauville_man.o"
-	.include "src/menu_helpers.o"
-	.include "src/contest_painting.o"
-	.include "src/pokeblock.o"
-	.include "src/field_specials.o"
-    .include "src/learn_move.o"
-	.include "src/player_pc.o"
+	.include "src/engine/main.o"
+	.include "src/engine/sprite.o"
+	.include "src/engine/text.o"
+	.include "src/engine/string_util.o"
+	.include "src/engine/link.o"
+	.include "src/engine/rtc.o"
+	.include "src/field/daycare.o"
+    .include "src/engine/trade.o"
+	.include "src/scene/berry_blender.o"
+	.include "src/engine/play_time.o"
+	.include "src/field/overworld.o"
+	.include "src/field/field_camera.o"
+	.include "src/field/field_map_obj.o"
+	.include "src/field/field_message_box.o"
+	.include "src/engine/text_window.o"
+	.include "src/engine/script.o"
+	.include "src/field/start_menu.o"
+	.include "src/engine/menu.o"
+	.include "src/engine/tileset_anim.o"
+	.include "src/engine/sound.o"
+	.include "src/field/field_weather.o"
+	.include "src/field/field_effect.o"
+	.include "src/field/item_menu.o"
+	.include "src/field/shop.o"
+	.include "src/engine/record_mixing.o"
+	.include "src/field/tv.o"
+    .include "src/battle/battle_anim_80CA710.o"
+    .include "src/field/easy_chat.o"
+    .include "src/field/pokenav.o"
+	.include "src/field/mauville_man.o"
+	.include "src/field/menu_helpers.o"
+	.include "src/scene/contest_painting.o"
+	.include "src/field/pokeblock.o"
+	.include "src/field/field_specials.o"
+    .include "src/pokemon/learn_move.o"
+	.include "src/field/player_pc.o"
 	.include "asm/m4a_1.o"
-	.include "src/agb_flash.o"
-	.include "src/siirtc.o"
+	.include "src/libs/agb_flash.o"
+	.include "src/libs/siirtc.o"
 	.include "tools/agbcc/lib/libgcc.a:dp-bit.o"
 	.include "tools/agbcc/lib/libgcc.a:fp-bit.o"
diff --git a/sym_common.txt b/sym_common.txt
index d9da3ec3b..414d03e0f 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,9 +1,9 @@
-	.include "main.o"
-	.include "sprite.o"
-	.include "string_util.o"
-	.include "link.o"
-	.include "rtc.o"
-	.include "rom3.o"
+	.include "engine/main.o"
+	.include "engine/sprite.o"
+	.include "engine/string_util.o"
+	.include "engine/link.o"
+	.include "engine/rtc.o"
+	.include "misc/rom3.o"
 
 @ battle
 
@@ -104,10 +104,10 @@ gUnknown_03004348: @ 3004348
 gUnknown_0300434C: @ 300434C
 	.space 0x4
 
-	.include "pokemon_1.o"
-	.include "rng.o"
-	.include "egg_hatch.o"
-	.include "load_save.o"
+	.include "pokemon/pokemon_1.o"
+	.include "engine/rng.o"
+	.include "scene/egg_hatch.o"
+	.include "engine/load_save.o"
 
 @ trade
 
@@ -117,12 +117,12 @@ gUnknown_03004824: @ 3004824
 gUnknown_03004828: @ 3004828
 	.space 0x8
 
-	.include "berry_blender.o"
-	.include "overworld.o"
-	.include "fieldmap.o"
-	.include "field_camera.o"
-	.include "field_map_obj.o"
-	.include "field_control_avatar.o"
+	.include "scene/berry_blender.o"
+	.include "field/overworld.o"
+	.include "field/fieldmap.o"
+	.include "field/field_camera.o"
+	.include "field/field_map_obj.o"
+	.include "field/field_control_avatar.o"
 
 @ party_menu?
 
@@ -130,11 +130,11 @@ gUnknown_03004828: @ 3004828
 gUnknown_03004AE4: @ 3004AE4
 	.space 0x4
 
-	.include "start_menu.o"
-	.include "sound.o"
-	.include "battle_anim.o"
-	.include "task.o"
-	.include "mori_debug_menu.o"
+	.include "field/start_menu.o"
+	.include "engine/sound.o"
+	.include "battle/battle_anim.o"
+	.include "engine/task.o"
+	.include "debug/mori_debug_menu.o"
 
 @ unknown_task
 
@@ -160,8 +160,8 @@ gUnknown_03005560: @ 3005560
 gUnknown_030056A0: @ 30056A0
 	.space 0x640
 
-    .include "pokemon_menu.o"
-	.include "pokedex.o"
+    .include "pokemon/pokemon_menu.o"
+	.include "pokemon/pokedex.o"
 
 @ pokemon_summary_screen
 
@@ -187,14 +187,14 @@ gCurrentBagPocketItemSlots: @ 3005D24
 gUnknown_03005D28: @ 3005D28
 	.space 0x4
 
-	.include "record_mixing.o"
-	.include "sound_check_menu.o"
+	.include "engine/record_mixing.o"
+	.include "engine/sound_check_menu.o"
 
 	.align 2
 gUnknown_03005D34: @ 3005D34
 	.space 0x4
 
-	.include "tv.o"
+	.include "field/tv.o"
 
 	.space 0x64 @ unused variable?
 
@@ -236,19 +236,19 @@ gUnknown_03005E08: @ 3005E08
 gUnknown_03005E0C: @ 3005E0C
 	.space 0x4
 
-	.include "contest_painting.o"
-    .include "evolution_scene.o"
+	.include "scene/contest_painting.o"
+    .include "scene/evolution_scene.o"
 
 @ pokedex_cry_screen
 
 gUnknown_03005E98: @ 3005E98
 	.space 0x4
 
-	.include "save.o"
+	.include "engine/save.o"
 
 	.space 0x10 @ unused variable?
 
-	.include "intro.o"
+	.include "scene/intro.o"
 
 @ battle_anim_813F0F4
 
@@ -262,7 +262,6 @@ gUnknown_03005F10: @ 3005F10
 gUnknown_03005F14: @ 3005F14
 	.space 0xC
 
-
-	.include "pokeblock_feed.o"
-	.include "m4a_2.o"
-	.include "agb_flash.o"
+	.include "pokemon/pokeblock_feed.o"
+	.include "libs/m4a_2.o"
+	.include "libs/agb_flash.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 040173cfd..f7352cd1d 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,12 +1,12 @@
-	.include "src/main.o"
-	.include "src/sprite.o"
-	.include "src/text.o"
-	.include "src/string_util.o"
+	.include "src/engine/main.o"
+	.include "src/engine/sprite.o"
+	.include "src/engine/text.o"
+	.include "src/engine/string_util.o"
 
 	.space 0x2E8
 
-	.include "src/link.o"
-	.include "src/rom3.o"
+	.include "src/engine/link.o"
+	.include "src/misc/rom3.o"
 
 @ battle
 
@@ -293,9 +293,9 @@ gMoveToLearn: @ 2024E82
 gBattleMonForms: @ 2024E84
 	.space 0x4
 
-	.include "src/pokemon_1.o"
-	.include "src/pokemon_2.o"
-	.include "src/load_save.o"
+	.include "src/pokemon/pokemon_1.o"
+	.include "src/pokemon/pokemon_2.o"
+	.include "src/engine/load_save.o"
 
 @ trade
 
@@ -308,17 +308,17 @@ gUnknown_02029700: @ 2029700
 gUnknown_020297D8: @ 20297D8
 	.space 0x4
 
-	.include "src/berry_blender.o"
-	.include "src/new_game.o"
-	.include "src/overworld.o"
-	.include "src/fieldmap.o"
-	.include "src/field_camera.o"
-	.include "src/field_player_avatar.o"
-	.include "src/field_message_box.o"
-	.include "src/script.o"
-	.include "src/scrcmd.o"
-	.include "src/field_control_avatar.o"
-	.include "src/event_data.o"
+	.include "src/scene/berry_blender.o"
+	.include "src/scene/new_game.o"
+	.include "src/field/overworld.o"
+	.include "src/field/fieldmap.o"
+	.include "src/field/field_camera.o"
+	.include "src/field/field_player_avatar.o"
+	.include "src/field/field_message_box.o"
+	.include "src/engine/script.o"
+	.include "src/field/scrcmd.o"
+	.include "src/field/field_control_avatar.o"
+	.include "src/field/event_data.o"
 
 @ party_menu
 
@@ -338,14 +338,14 @@ gUnknown_0202E8F8: @ 202E8F8
 gUnknown_0202E8FA: @ 202E8FA
 	.space 0x2
 
-	.include "src/start_menu.o"
-	.include "src/menu.o"
-	.include "src/tileset_anim.o"
-	.include "src/palette.o"
-	.include "src/sound.o"
-	.include "src/battle_anim.o"
-	.include "src/rom_8077ABC.o"
-	.include "src/title_screen.o"
+	.include "src/field/start_menu.o"
+	.include "src/engine/menu.o"
+	.include "src/engine/tileset_anim.o"
+	.include "src/engine/palette.o"
+	.include "src/engine/sound.o"
+	.include "src/battle/battle_anim.o"
+	.include "src/misc/rom_8077ABC.o"
+	.include "src/scene/title_screen.o"
 
 @ field_weather
 
@@ -365,20 +365,19 @@ gUnknown_0202FF38: @ 202FF38
 gUnknown_0202FF58: @ 202FF58
 	.space 0x4
 
-	.include "src/battle_setup.o"
-	.include "src/wild_encounter.o"
-	.include "src/field_effect.o"
+	.include "src/battle/battle_setup.o"
+	.include "src/field/wild_encounter.o"
+	.include "src/field/field_effect.o"
 
 @ unknown_task
 
 gUnknown_0202FFA4: @ 202FFA4
 	.space 0x4
 
-
-	.include "src/pokemon_menu.o"
-	.include "src/pokedex.o"
-	.include "src/trainer_card.o"
-	.include "src/pokemon_storage_system.o"
+	.include "src/pokemon/pokemon_menu.o"
+	.include "src/pokemon/pokedex.o"
+	.include "src/engine/trainer_card.o"
+	.include "src/pokemon/pokemon_storage_system.o"
 
 @ still pokemon_storage_system
 
@@ -442,9 +441,9 @@ gUnknown_020384F0: @ 20384F0
 gUnknown_020384F4: @ 20384F4
 	.space 0x4
 
-	.include "src/script_movement.o"
-	.include "src/map_name_popup.o"
-	.include "src/item_menu.o"
+	.include "src/field/script_movement.o"
+	.include "src/field/map_name_popup.o"
+	.include "src/field/item_menu.o"
 
 @ contest
 
@@ -501,8 +500,8 @@ gScriptContestCategory: @ 203869C
 gScriptContestRank: @ 203869E
 	.space 0x2
 
-	.include "src/shop.o"
-	.include "src/money.o"
+	.include "src/field/shop.o"
+	.include "src/field/money.o"
 
 @ record_mixing
 
@@ -510,7 +509,7 @@ gScriptContestRank: @ 203869E
 gUnknown_02038738: @ 2038738
 	.space 0x78
 
-	.include "src/sound_check_menu.o"
+	.include "src/engine/sound_check_menu.o"
 
 @ secret_base
 
@@ -520,7 +519,7 @@ gUnknown_020387DC: @ 20387DC
 
 @ tv
 
-	.include "src/tv.o"
+	.include "src/field/tv.o"
 
 @ fldeff_80C5CD4
 
@@ -528,8 +527,8 @@ gUnknown_020387DC: @ 20387DC
 gUnknown_020387EC: @ 20387EC
 	.space 0x4
 
-	.include "src/rotating_gate.o"
-	.include "src/safari_zone.o"
+	.include "src/field/rotating_gate.o"
+	.include "src/field/safari_zone.o"
 
 @ easy_chat
 
@@ -544,15 +543,15 @@ gUnknown_020388B0: @ 20388B0
 gUnknown_020388B4: @ 20388B4
 	.space 0x4
 
-	.include "src/mon_markings.o"
-	.include "src/mauville_man.o"
-	.include "src/menu_helpers.o"
-	.include "src/region_map.o"
-	.include "src/decoration.o"
-	.include "src/battle_ai.o"
-	.include "src/rom6.o"
-	.include "src/pokeblock.o"
-	.include "src/field_specials.o"
+	.include "src/pokemon/mon_markings.o"
+	.include "src/field/mauville_man.o"
+	.include "src/field/menu_helpers.o"
+	.include "src/field/region_map.o"
+	.include "src/field/decoration.o"
+	.include "src/battle/battle_ai.o"
+	.include "src/misc/rom6.o"
+	.include "src/field/pokeblock.o"
+	.include "src/field/field_specials.o"
 
 @ pokedex_area_screen
 
@@ -580,7 +579,7 @@ gUnknown_0203926A: @ 203926A
 gAbilitiesPerBank: @ 203926C
 	.space 0x4
 
-	.include "src/choose_party.o"
+	.include "src/field/choose_party.o"
 
 @ cable_car
 
@@ -606,19 +605,19 @@ gUnknown_0203927C: @ 203927C
 gUnknown_0203927D: @ 203927D
 	.space 0x7
 
-	.include "src/save.o"
-	.include "src/mystery_event_script.o"
-	.include "src/roamer.o"
-	.include "src/use_pokeblock.o"
-	.include "src/player_pc.o"
-	.include "src/intro.o"
-	.include "src/hall_of_fame.o"
-	.include "src/credits.o"
-	.include "src/lottery_corner.o"
-	.include "src/berry_tag_screen.o"
-	.include "src/mystery_event_menu.o"
-	.include "src/save_failed_screen.o"
-	.include "src/pokeblock_feed.o"
+	.include "src/engine/save.o"
+	.include "src/engine/mystery_event_script.o"
+	.include "src/field/roamer.o"
+	.include "src/field/use_pokeblock.o"
+	.include "src/field/player_pc.o"
+	.include "src/scene/intro.o"
+	.include "src/scene/hall_of_fame.o"
+	.include "src/scene/credits.o"
+	.include "src/field/lottery_corner.o"
+	.include "src/field/berry_tag_screen.o"
+	.include "src/engine/mystery_event_menu.o"
+	.include "src/engine/save_failed_screen.o"
+	.include "src/pokemon/pokeblock_feed.o"
 
 @ intro_credits_graphics
 
@@ -645,4 +644,4 @@ gUnknown_02039760: @ 2039760
 gUnknown_0203A360: @ 203A360
 	.space 0x20
 
-	.include "src/menu_cursor.o"
+	.include "src/engine/menu_cursor.o"