diff --git a/ld_script.txt b/ld_script.txt
index d66631d62..619e06350 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -38,15 +38,15 @@ SECTIONS {
     ALIGN(4)
     {
         src/crt0.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/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/engine/decompress.o(.text);
+        src/decompress.o(.text);
         asm/battle_1.o(.text);
         src/rom_800D42C.o(.text);
         asm/battle_1.o(.text_800DC24);
@@ -58,63 +58,63 @@ SECTIONS {
         src/battle/battle_controller_opponent.o(.text);
         asm/battle_9.o(.text);
         src/battle/battle_controller_linkopponent.o(.text);
-        src/pokemon/pokemon_1.o(.text);
+        src/pokemon_1.o(.text);
         src/battle/calculate_base_damage.o(.text);
-        src/pokemon/pokemon_2.o(.text);
-        src/pokemon/pokemon_item_effect.o(.text);
-        src/pokemon/pokemon_3.o(.text);
+        src/pokemon_2.o(.text);
+        src/pokemon_item_effect.o(.text);
+        src/pokemon_3.o(.text);
         src/de_rom_8040FE0.o(.text);
-        src/engine/trig.o(.text);
-        src/engine/random.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/trig.o(.text);
+        src/random.o(.text);
+        src/util.o(.text);
+        src/blend_palette.o(.text);
+        src/daycare.o(.text);
+        src/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);
-        src/engine/trade.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/event_object_movement.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);
-        src/field/party_menu.o(.text);
-        src/field/start_menu.o(.text);
+        src/load_save.o(.text);
+        src/trade.o(.text);
+        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/event_object_movement.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/party_menu.o(.text);
+        src/start_menu.o(.text);
         src/debug/start_menu_debug.o(.text);
-        src/engine/menu.o(.text);
-        src/engine/tileset_anim.o(.text);
-        src/engine/palette.o(.text);
-        src/engine/sound.o(.text);
+        src/menu.o(.text);
+        src/tileset_anim.o(.text);
+        src/palette.o(.text);
+        src/sound.o(.text);
         src/battle/battle_anim.o(.text);
         src/rom_8077ABC.o(.text);
-        src/engine/task.o(.text);
+        src/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);
-        src/field/field_weather_effects.o(.text);
-        src/field/field_fadetransition.o(.text);
-        src/field/field_screen_effect.o(.text);
+        src/title_screen.o(.text);
+        src/field_weather.o(.text);
+        src/field_weather_effects.o(.text);
+        src/field_fadetransition.o(.text);
+        src/field_screen_effect.o(.text);
         src/battle/battle_setup.o(.text);
-        src/engine/cable_club.o(.text);
+        src/cable_club.o(.text);
         src/debug/tomomichi_debug_menu.o(.text);
         asm/tomomichi_debug_menu.o(.text);
         src/debug/nohara_debug_menu.o(.text);
@@ -122,66 +122,66 @@ SECTIONS {
         src/debug/mori_debug_menu.o(.text);
         asm/taya_debug_window.o(.text);
         src/debug/taya_debug_window.o(.text);
-        src/field/trainer_see.o(.text);
-        src/field/wild_encounter.o(.text);
-        src/field/field_effect.o(.text);
+        src/trainer_see.o(.text);
+        src/wild_encounter.o(.text);
+        src/field_effect.o(.text);
         src/scanline_effect.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/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/battle_party_menu.o(.text);
         src/unk_text_8095904.o(.text);
-        src/pokemon/pokemon_storage_system.o(.text);
-        src/pokemon/pokemon_storage_system_2.o(.text);
-        src/pokemon/pokemon_storage_system_3.o(.text);
-        src/pokemon/pokemon_storage_system_4.o(.text);
-        src/pokemon/pokemon_storage_system_5.o(.text);
+        src/pokemon_storage_system.o(.text);
+        src/pokemon_storage_system_2.o(.text);
+        src/pokemon_storage_system_3.o(.text);
+        src/pokemon_storage_system_4.o(.text);
+        src/pokemon_storage_system_5.o(.text);
         asm/pokemon_storage_system.o(.text);
-        src/pokemon/pokemon_icon.o(.text);
-        src/pokemon/pokemon_summary_screen.o(.text);
-        src/field/script_movement.o(.text);
-        src/field/fldeff_cut.o(.text);
+        src/pokemon_icon.o(.text);
+        src/pokemon_summary_screen.o(.text);
+        src/script_movement.o(.text);
+        src/fldeff_cut.o(.text);
         src/debug/kagaya_debug_menu.o(.text);
-        src/pokemon/mail_data.o(.text);
-        src/field/map_name_popup.o(.text);
-        src/field/item_menu.o(.text);
+        src/mail_data.o(.text);
+        src/map_name_popup.o(.text);
+        src/item_menu.o(.text);
         src/battle/battle_anim_80A7E7C.o(.text);
-        src/field/item.o(.text);
+        src/item.o(.text);
         src/debug/matsuda_debug_menu.o(.text);
         src/debug/crash.o(.text);
         src/contest.o(.text);
-        src/field/shop.o(.text);
-        src/field/fldeff_escalator.o(.text);
-        src/field/berry.o(.text);
+        src/shop.o(.text);
+        src/fldeff_escalator.o(.text);
+        src/berry.o(.text);
         src/debug/watanabe_debug_menu.o(.text);
         asm/watanabe_debug_menu.o(.text);
-        src/field/script_menu.o(.text);
-        src/engine/naming_screen.o(.text);
-        src/field/money.o(.text);
+        src/script_menu.o(.text);
+        src/naming_screen.o(.text);
+        src/money.o(.text);
         asm/contest_effect.o(.text);
-        src/engine/record_mixing.o(.text);
+        src/record_mixing.o(.text);
         src/debug/sound_check_menu.o(.text);
-        src/field/secret_base.o(.text);
-        src/field/tv.o(.text);
+        src/secret_base.o(.text);
+        src/tv.o(.text);
         asm/contest_link_80C2020.o(.text);
         src/script_pokemon_util_80C4BF0.o(.text);
-        src/field/field_poison.o(.text);
-        src/pokemon/pokemon_size_record.o(.text);
-        src/field/pc_screen_effect.o(.text);
+        src/field_poison.o(.text);
+        src/pokemon_size_record.o(.text);
+        src/pc_screen_effect.o(.text);
         asm/pc_screen_effect.o(.text);
-        src/field/fldeff_secretpower.o(.text);
-        src/field/fldeff_secret_base_pc.o(.text);
-        src/field/fldeff_decoration.o(.text);
-        src/field/fldeff_poison.o(.text);
-        src/field/fldeff_berrytree.o(.text);
-        src/field/fldeff_recordmixing.o(.text);
-        src/field/field_special_scene.o(.text);
-        src/field/rotating_gate.o(.text);
-        src/field/safari_zone.o(.text);
+        src/fldeff_secretpower.o(.text);
+        src/fldeff_secret_base_pc.o(.text);
+        src/fldeff_decoration.o(.text);
+        src/fldeff_poison.o(.text);
+        src/fldeff_berrytree.o(.text);
+        src/fldeff_recordmixing.o(.text);
+        src/field_special_scene.o(.text);
+        src/rotating_gate.o(.text);
+        src/safari_zone.o(.text);
         src/battle/contest_link_80C857C.o(.text);
-        src/field/item_use.o(.text);
+        src/item_use.o(.text);
         src/battle/anim/powder.o(.text);
         src/battle/anim/orbs.o(.text);
         src/battle/anim/seed.o(.text);
@@ -313,96 +313,96 @@ SECTIONS {
         asm/ground.o(.text);
         asm/normal.o(.text);
         src/battle/anim/battle_intro.o(.text);
-        src/field/bike.o(.text);
+        src/bike.o(.text);
         src/easy_chat_1.o(.text);
         src/easy_chat_2.o(.text);
         src/pokenav_before.o(.text);
         asm/pokenav.o(.text);
         src/pokenav_after.o(.text);
         asm/pokenav.o(.text_80F708C);
-        src/pokemon/mon_markings.o(.text);
-        src/field/mauville_man.o(.text);
-        src/pokemon/mail.o(.text);
-        src/field/menu_helpers.o(.text);
+        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/field/dewford_trend.o(.text);
-        src/field/heal_location.o(.text);
-        src/field/region_map.o(.text);
-        src/scene/cute_sketch.o(.text);
+        src/dewford_trend.o(.text);
+        src/heal_location.o(.text);
+        src/region_map.o(.text);
+        src/cute_sketch.o(.text);
         asm/cute_sketch.o(.text);
-        src/field/decoration.o(.text);
-        src/field/slot_machine.o(.text);
-        src/scene/contest_painting.o(.text);
+        src/decoration.o(.text);
+        src/slot_machine.o(.text);
+        src/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/trader.o(.text);
+        src/starter_choose.o(.text);
+        src/wallclock.o(.text);
         src/rom6.o(.text);
-        src/field/pokeblock.o(.text);
-        src/field/fldeff_flash.o(.text);
+        src/pokeblock.o(.text);
+        src/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/time_events.o(.text);
+        src/birch_pc.o(.text);
+        src/hof_pc.o(.text);
+        src/field_specials.o(.text);
         src/battle/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
-        src/scene/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         src/roulette.o(.text);
         asm/pokedex_cry_screen.o(.text);
-        src/pokemon/pokedex_cry_screen.o(.text);
+        src/pokedex_cry_screen.o(.text);
         asm/pokedex_cry_screen.o(.text_811A4F8);
-        src/field/coins.o(.text);
-        src/field/landmark.o(.text);
-        src/field/fldeff_strength.o(.text);
+        src/coins.o(.text);
+        src/landmark.o(.text);
+        src/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);
-        src/scene/cable_car.o(.text);
+        src/choose_party.o(.text);
+        src/cable_car.o(.text);
         src/roulette_util.o(.text);
-        src/engine/cable_car_util.o(.text);
+        src/cable_car_util.o(.text);
         src/unused_8124F94.o(.text);
-        src/engine/save.o(.text);
-        src/engine/mystery_event_script.o(.text);
+        src/save.o(.text);
+        src/mystery_event_script.o(.text);
         asm/unk_debug_menu_3.o(.text);
-        src/field/field_effect_helpers.o(.text);
+        src/field_effect_helpers.o(.text);
         src/contest_ai.o(.text);
         src/unused_81258BC.o(.text);
         src/battle/anim/sfx.o(.text);
         src/battle/battle_controller_safari.o(.text);
-        src/field/fldeff_sweetscent.o(.text);
+        src/fldeff_sweetscent.o(.text);
         asm/battle_anim_812C144.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);
-        src/field/battle_tower.o(.text);
-        src/field/use_pokeblock.o(.text);
+        src/learn_move.o(.text);
+        src/fldeff_softboiled.o(.text);
+        src/decoration_inventory.o(.text);
+        src/roamer.o(.text);
+        src/battle_tower.o(.text);
+        src/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);
+        src/player_pc.o(.text);
+        src/intro.o(.text);
+        src/field_region_map.o(.text);
         asm/battle_anim_813F0F4.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/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/debug/nakamura_debug_menu.o(.text);
         asm/nakamura_debug_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/intro_credits_graphics.o(.text);
+        src/evolution_graphics.o(.text);
+        src/bard_music.o(.text);
+        src/fldeff_teleport.o(.text);
         src/debug/unknown_debug_menu.o(.text);
-        src/engine/name_string_util.o(.text);
-        src/engine/menu_cursor.o(.text);
+        src/name_string_util.o(.text);
+        src/menu_cursor.o(.text);
     } =0
 
     script_data :
@@ -486,14 +486,14 @@ SECTIONS {
     .rodata :
     ALIGN(4)
     {
-        src/engine/main.o(.rodata);
-        src/engine/sprite.o(.rodata);
+        src/main.o(.rodata);
+        src/sprite.o(.rodata);
         . += 0x8; /* Why the gap? */
-        src/engine/text.o(.rodata);
-        src/engine/string_util.o(.rodata);
-        src/engine/link.o(.rodata);
-        src/engine/rtc.o(.rodata);
-        src/engine/main_menu.o(.rodata);
+        src/text.o(.rodata);
+        src/string_util.o(.rodata);
+        src/link.o(.rodata);
+        src/rtc.o(.rodata);
+        src/main_menu.o(.rodata);
         data/mon_attrs.o(.rodata);
         data/btl_attrs.o(.rodata);
         src/battle/battle_4.o(.rodata);
@@ -504,45 +504,45 @@ SECTIONS {
         src/battle/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
         src/battle/battle_util.o(.rodata);
-        src/pokemon/pokemon_1.o(.rodata);
-        src/pokemon/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */
+        src/pokemon_1.o(.rodata);
+        src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */
         src/battle/calculate_base_damage.o(.rodata);
-        src/pokemon/pokemon_2.o(.rodata);
-        src/pokemon/pokemon_item_effect.o(.rodata);
-        src/pokemon/pokemon_3.o(.rodata);
+        src/pokemon_2.o(.rodata);
+        src/pokemon_item_effect.o(.rodata);
+        src/pokemon_3.o(.rodata);
         . = ALIGN(4);
-        src/engine/trig.o(.rodata);
-        src/engine/util.o(.rodata);
-        src/field/daycare.o(.rodata);
-        src/scene/egg_hatch.o(.rodata);
+        src/trig.o(.rodata);
+        src/util.o(.rodata);
+        src/daycare.o(.rodata);
+        src/egg_hatch.o(.rodata);
         data/battle_interface.o(.rodata);
         src/battle/pokeball.o(.rodata);
-        src/engine/trade.o(.rodata);
-        src/scene/berry_blender.o(.rodata);
-        src/scene/new_game.o(.rodata);
-        src/field/overworld.o(.rodata);
+        src/trade.o(.rodata);
+        src/berry_blender.o(.rodata);
+        src/new_game.o(.rodata);
+        src/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
-        src/field/fieldmap.o(.rodata);
-        src/field/metatile_behavior.o(.rodata);
-        src/field/field_door.o(.rodata);
-        src/field/field_player_avatar.o(.rodata);
-        src/field/event_object_movement.o(.rodata);
-        src/engine/text_window.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);
-        src/engine/reset_rtc_screen.o(.rodata);
-        src/field/party_menu.o(.rodata);
-        src/field/start_menu.o(.rodata);
+        src/fieldmap.o(.rodata);
+        src/metatile_behavior.o(.rodata);
+        src/field_door.o(.rodata);
+        src/field_player_avatar.o(.rodata);
+        src/event_object_movement.o(.rodata);
+        src/text_window.o(.rodata);
+        src/script.o(.rodata);
+        src/scrcmd.o(.rodata);
+        src/coord_event_weather.o(.rodata);
+        src/field_tasks.o(.rodata);
+        src/reset_rtc_screen.o(.rodata);
+        src/party_menu.o(.rodata);
+        src/start_menu.o(.rodata);
         src/debug/start_menu_debug.o(.data);
         src/debug/start_menu_debug.o(.rodata);
         data/start_menu_debug.o(.rodata);
-        src/engine/menu.o(.rodata);
-        src/engine/tileset_anim.o(.rodata);
-        src/engine/palette.o(.rodata);
-        src/engine/sound.o(.rodata);
+        src/menu.o(.rodata);
+        src/tileset_anim.o(.rodata);
+        src/palette.o(.rodata);
+        src/sound.o(.rodata);
         src/battle/battle_anim.o(.rodata);
         src/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
@@ -552,132 +552,132 @@ SECTIONS {
         data/unused_paw.o(.rodata);
         data/unused_hit.o(.rodata);
         data/unused_orb2.o(.rodata);
-        src/engine/task.o(.rodata);
+        src/task.o(.rodata);
         src/battle/battle_anim_807B69C.o(.rodata);
-        src/scene/title_screen.o(.rodata);
-        src/field/field_weather.o(.rodata);
-        src/field/field_weather_effects.o(.rodata);
-        src/field/field_screen_effect.o(.rodata);
+        src/title_screen.o(.rodata);
+        src/field_weather.o(.rodata);
+        src/field_weather_effects.o(.rodata);
+        src/field_screen_effect.o(.rodata);
         src/battle/battle_setup.o(.rodata);
-        src/engine/cable_club.o(.rodata);
+        src/cable_club.o(.rodata);
         data/debug_menu_tomomichi.o(.rodata);
         data/debug_menu_nohara.o(.rodata);
         src/debug/mori_debug_menu.o(.rodata);
         data/debug_menu_taya.o(.rodata);
-        src/field/trainer_see.o(.rodata);
-        src/field/wild_encounter.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/trainer_see.o(.rodata);
+        src/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/battle_party_menu.o(.rodata);
-        src/pokemon/pokemon_storage_system.o(.rodata);
-        src/pokemon/pokemon_storage_system_2.o(.rodata);
-        src/pokemon/pokemon_storage_system_3.o(.rodata);
-        src/pokemon/pokemon_storage_system_4.o(.rodata);
-        src/pokemon/pokemon_storage_system_5.o(.rodata);
+        src/pokemon_storage_system.o(.rodata);
+        src/pokemon_storage_system_2.o(.rodata);
+        src/pokemon_storage_system_3.o(.rodata);
+        src/pokemon_storage_system_4.o(.rodata);
+        src/pokemon_storage_system_5.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
-        src/pokemon/pokemon_icon.o(.rodata);
-        src/pokemon/pokemon_summary_screen.o(.rodata);
-        src/field/fldeff_cut.o(.rodata);
+        src/pokemon_icon.o(.rodata);
+        src/pokemon_summary_screen.o(.rodata);
+        src/fldeff_cut.o(.rodata);
         src/debug/kagaya_debug_menu.o(.rodata);
-        src/field/item_menu.o(.rodata);
+        src/item_menu.o(.rodata);
         src/battle/battle_anim_80A7E7C.o(.rodata);
-        src/field/item.o(.rodata);
+        src/item.o(.rodata);
         src/debug/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
-        src/field/shop.o(.rodata);
-        src/field/fldeff_escalator.o(.rodata);
-        src/field/berry.o(.rodata);
+        src/shop.o(.rodata);
+        src/fldeff_escalator.o(.rodata);
+        src/berry.o(.rodata);
         data/debug_menu_watanabe.o(.rodata);
-        src/field/script_menu.o(.rodata);
-        src/engine/naming_screen.o(.rodata);
-        src/field/money.o(.rodata);
+        src/script_menu.o(.rodata);
+        src/naming_screen.o(.rodata);
+        src/money.o(.rodata);
         data/contest_effect.o(.rodata);
-        src/engine/record_mixing.o(.data);
-        src/engine/record_mixing.o(.rodata);
+        src/record_mixing.o(.data);
+        src/record_mixing.o(.rodata);
         src/debug/sound_check_menu.o(.rodata);
-        src/field/secret_base.o(.rodata);
-        src/field/tv.o(.rodata);
+        src/secret_base.o(.rodata);
+        src/tv.o(.rodata);
         data/contest_link_80C2020.o(.rodata);
-        src/pokemon/pokemon_size_record.o(.rodata);
-        src/field/pc_screen_effect.o(.rodata);
+        src/pokemon_size_record.o(.rodata);
+        src/pc_screen_effect.o(.rodata);
         data/pc_screen_effect.o(.rodata);
-        src/field/fldeff_secretpower.o(.rodata);
-        src/field/fldeff_decoration.o(.rodata);
-        src/field/fldeff_recordmixing.o(.rodata);
-        src/field/field_special_scene.o(.rodata);
-        src/field/rotating_gate.o(.rodata);
-        src/field/item_use.o(.rodata);
+        src/fldeff_secretpower.o(.rodata);
+        src/fldeff_decoration.o(.rodata);
+        src/fldeff_recordmixing.o(.rodata);
+        src/field_special_scene.o(.rodata);
+        src/rotating_gate.o(.rodata);
+        src/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
         src/battle/anim/battle_intro.o(.rodata);
-        src/field/bike.o(.rodata);
+        src/bike.o(.rodata);
         src/easy_chat_1.o(.rodata);
         src/easy_chat_2.o(.rodata);
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
-        src/pokemon/mon_markings.o(.rodata);
-        src/field/mauville_man.o(.rodata);
-        src/pokemon/mail.o(.rodata);
-        src/field/menu_helpers.o(.rodata);
-        src/field/heal_location.o(.rodata);
-        src/field/region_map.o(.rodata);
+        src/mon_markings.o(.rodata);
+        src/mauville_man.o(.rodata);
+        src/mail.o(.rodata);
+        src/menu_helpers.o(.rodata);
+        src/heal_location.o(.rodata);
+        src/region_map.o(.rodata);
         data/cute_sketch.o(.rodata);
-        src/field/decoration.o(.rodata);
-        src/field/slot_machine.o(.rodata);
-        src/scene/contest_painting.o(.rodata);
+        src/decoration.o(.rodata);
+        src/slot_machine.o(.rodata);
+        src/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);
-        src/field/fldeff_flash.o(.rodata);
-        src/engine/time_events.o(.rodata);
-        src/field/field_specials.o(.rodata);
+        src/trader.o(.rodata);
+        src/starter_choose.o(.rodata);
+        src/wallclock.o(.rodata);
+        src/pokeblock.o(.rodata);
+        src/fldeff_flash.o(.rodata);
+        src/time_events.o(.rodata);
+        src/field_specials.o(.rodata);
         src/battle/battle_records.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
-        src/scene/evolution_scene.o(.rodata);
+        src/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
-        src/field/landmark.o(.rodata);
+        src/landmark.o(.rodata);
         src/battle/battle_transition.o(.rodata);
         src/battle/battle_controller_linkpartner.o(.rodata);
         src/battle/battle_message.o(.rodata);
-        src/field/choose_party.o(.rodata);
-        src/scene/cable_car.o(.rodata);
-        src/engine/save.o(.rodata);
+        src/choose_party.o(.rodata);
+        src/cable_car.o(.rodata);
+        src/save.o(.rodata);
         data/unk_debug_menu_3.o(.rodata);
-        src/field/field_effect_helpers.o(.rodata);
+        src/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle/battle_controller_safari.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
-        src/pokemon/learn_move.o(.rodata);
-        src/field/decoration_inventory.o(.rodata);
-        src/field/roamer.o(.rodata);
-        src/field/battle_tower.o(.rodata);
-        src/field/use_pokeblock.o(.rodata);
+        src/learn_move.o(.rodata);
+        src/decoration_inventory.o(.rodata);
+        src/roamer.o(.rodata);
+        src/battle_tower.o(.rodata);
+        src/use_pokeblock.o(.rodata);
         src/battle/battle_controller_wally.o(.rodata);
-        src/field/player_pc.o(.rodata);
-        src/scene/intro.o(.rodata);
+        src/player_pc.o(.rodata);
+        src/intro.o(.rodata);
         data/battle_anim_813F0F4.o(.rodata);
-        src/scene/hall_of_fame.o(.rodata);
-        src/scene/credits.o(.rodata);
-        src/field/lottery_corner.o(.rodata);
-        src/field/diploma.o(.rodata);
+        src/hall_of_fame.o(.rodata);
+        src/credits.o(.rodata);
+        src/lottery_corner.o(.rodata);
+        src/diploma.o(.rodata);
         src/strings.o(.rodata);
-        src/field/berry_tag_screen.o(.rodata);
-        src/engine/mystery_event_menu.o(.rodata);
-        src/engine/save_failed_screen.o(.rodata);
-        src/pokemon/pokeblock_feed.o(.rodata);
+        src/berry_tag_screen.o(.rodata);
+        src/mystery_event_menu.o(.rodata);
+        src/save_failed_screen.o(.rodata);
+        src/pokeblock_feed.o(.rodata);
         src/debug/nakamura_debug_menu.o(.rodata);
-        src/scene/intro_credits_graphics.o(.rodata);
-        src/scene/evolution_graphics.o(.rodata);
-        src/field/bard_music.o(.rodata);
+        src/intro_credits_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
+        src/bard_music.o(.rodata);
         src/debug/unknown_debug_menu.o(.rodata);
         data/strings2.o(.rodata);
-        src/engine/menu_cursor.o(.rodata);
-        src/engine/mystery_event_msg.o(.rodata);
+        src/menu_cursor.o(.rodata);
+        src/mystery_event_msg.o(.rodata);
         data/debug_menu_3.o(.rodata);
         src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
diff --git a/src/field/bard_music.c b/src/bard_music.c
similarity index 98%
rename from src/field/bard_music.c
rename to src/bard_music.c
index 5c48749cf..4518cf09b 100644
--- a/src/field/bard_music.c
+++ b/src/bard_music.c
@@ -141,9 +141,9 @@ static const u32 sBardSoundLengthDeltas[] = {
 };
 
 #if ENGLISH
-#include "../src/data/bard_music_en.h"
+#include "data/bard_music_en.h"
 #elif GERMAN
-#include "../src/data/bard_music_de.h"
+#include "data/bard_music_de.h"
 #endif // ENGLISH/GERMAN
 
 static const struct BardSound (*const gBardMusicTable[])[6] = {
diff --git a/src/field/battle_tower.c b/src/battle_tower.c
similarity index 99%
rename from src/field/battle_tower.c
rename to src/battle_tower.c
index d4dbba120..8c44b71a3 100644
--- a/src/field/battle_tower.c
+++ b/src/battle_tower.c
@@ -28,9 +28,9 @@
 #include "ewram.h"
 
 #if ENGLISH
-#include "../data/battle_tower/trainers.h"
+#include "data/battle_tower/trainers.h"
 #elif GERMAN
-#include "../data/battle_tower/trainers_de.h"
+#include "data/battle_tower/trainers_de.h"
 #endif
 
 static const u16 sBattleTowerHeldItems[] =
@@ -100,8 +100,8 @@ static const u16 sBattleTowerHeldItems[] =
     ITEM_GANLON_BERRY,
 };
 
-#include "../data/battle_tower/level_50_mons.h"
-#include "../data/battle_tower/level_100_mons.h"
+#include "data/battle_tower/level_50_mons.h"
+#include "data/battle_tower/level_100_mons.h"
 
 static const u8 sMaleTrainerClasses[] =
 {
diff --git a/src/field/berry.c b/src/berry.c
similarity index 100%
rename from src/field/berry.c
rename to src/berry.c
diff --git a/src/scene/berry_blender.c b/src/berry_blender.c
similarity index 100%
rename from src/scene/berry_blender.c
rename to src/berry_blender.c
diff --git a/src/field/berry_tag_screen.c b/src/berry_tag_screen.c
similarity index 100%
rename from src/field/berry_tag_screen.c
rename to src/berry_tag_screen.c
diff --git a/src/field/bike.c b/src/bike.c
similarity index 100%
rename from src/field/bike.c
rename to src/bike.c
diff --git a/src/field/birch_pc.c b/src/birch_pc.c
similarity index 100%
rename from src/field/birch_pc.c
rename to src/birch_pc.c
diff --git a/src/engine/blend_palette.c b/src/blend_palette.c
similarity index 100%
rename from src/engine/blend_palette.c
rename to src/blend_palette.c
diff --git a/src/field/braille_puzzles.c b/src/braille_puzzles.c
similarity index 100%
rename from src/field/braille_puzzles.c
rename to src/braille_puzzles.c
diff --git a/src/scene/cable_car.c b/src/cable_car.c
similarity index 100%
rename from src/scene/cable_car.c
rename to src/cable_car.c
diff --git a/src/engine/cable_car_util.c b/src/cable_car_util.c
similarity index 100%
rename from src/engine/cable_car_util.c
rename to src/cable_car_util.c
diff --git a/src/engine/cable_club.c b/src/cable_club.c
similarity index 100%
rename from src/engine/cable_club.c
rename to src/cable_club.c
diff --git a/src/field/choose_party.c b/src/choose_party.c
similarity index 100%
rename from src/field/choose_party.c
rename to src/choose_party.c
diff --git a/src/engine/clear_save_data_menu.c b/src/clear_save_data_menu.c
similarity index 100%
rename from src/engine/clear_save_data_menu.c
rename to src/clear_save_data_menu.c
diff --git a/src/engine/clock.c b/src/clock.c
similarity index 100%
rename from src/engine/clock.c
rename to src/clock.c
diff --git a/src/field/coins.c b/src/coins.c
similarity index 100%
rename from src/field/coins.c
rename to src/coins.c
diff --git a/src/scene/contest_painting.c b/src/contest_painting.c
similarity index 100%
rename from src/scene/contest_painting.c
rename to src/contest_painting.c
diff --git a/src/field/coord_event_weather.c b/src/coord_event_weather.c
similarity index 100%
rename from src/field/coord_event_weather.c
rename to src/coord_event_weather.c
diff --git a/src/scene/credits.c b/src/credits.c
similarity index 99%
rename from src/scene/credits.c
rename to src/credits.c
index e31e2c797..9a85265e4 100644
--- a/src/scene/credits.c
+++ b/src/credits.c
@@ -246,9 +246,9 @@ const u8 gUnknown_0840B878[] =
 };
 
 #ifdef GERMAN
-#include "../data/credits_de.h"
+#include "data/credits_de.h"
 #else
-#include "../data/credits_en.h"
+#include "data/credits_en.h"
 #endif
 
 const u8 gUnknown_0840CA00[][2] =
diff --git a/src/scene/cute_sketch.c b/src/cute_sketch.c
similarity index 100%
rename from src/scene/cute_sketch.c
rename to src/cute_sketch.c
diff --git a/src/field/daycare.c b/src/daycare.c
similarity index 99%
rename from src/field/daycare.c
rename to src/daycare.c
index da0838d29..e26db531f 100644
--- a/src/field/daycare.c
+++ b/src/daycare.c
@@ -35,7 +35,7 @@ static void ClearDaycareMail(struct DayCareMail *);
 static void SetInitialEggData(struct Pokemon *, u16, struct DayCare *);
 static u8 GetDaycareCompatibilityScore(struct DayCare *);
 
-#include "../data/pokemon/egg_moves.h"
+#include "data/pokemon/egg_moves.h"
 
 static const u8 *const sCompatibilityMessages[] = {
     DaycareText_GetAlongVeryWell,
diff --git a/src/engine/decompress.c b/src/decompress.c
similarity index 100%
rename from src/engine/decompress.c
rename to src/decompress.c
diff --git a/src/field/decoration.c b/src/decoration.c
similarity index 99%
rename from src/field/decoration.c
rename to src/decoration.c
index 0e7fa5f41..477414993 100644
--- a/src/field/decoration.c
+++ b/src/decoration.c
@@ -622,7 +622,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[] = {
@@ -1392,7 +1392,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/field/decoration_inventory.c b/src/decoration_inventory.c
similarity index 100%
rename from src/field/decoration_inventory.c
rename to src/decoration_inventory.c
diff --git a/src/field/dewford_trend.c b/src/dewford_trend.c
similarity index 100%
rename from src/field/dewford_trend.c
rename to src/dewford_trend.c
diff --git a/src/field/diploma.c b/src/diploma.c
similarity index 100%
rename from src/field/diploma.c
rename to src/diploma.c
diff --git a/src/scene/egg_hatch.c b/src/egg_hatch.c
similarity index 100%
rename from src/scene/egg_hatch.c
rename to src/egg_hatch.c
diff --git a/src/field/event_data.c b/src/event_data.c
similarity index 100%
rename from src/field/event_data.c
rename to src/event_data.c
diff --git a/src/field/event_object_movement.c b/src/event_object_movement.c
similarity index 99%
rename from src/field/event_object_movement.c
rename to src/event_object_movement.c
index 7a5f62456..155ce33f5 100644
--- a/src/field/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1578,13 +1578,13 @@ void (*const gUnknown_0836DA88[])(struct Sprite *) =
 const u8 gUnknown_0836DBBC[] = {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 const u8 gUnknown_0836DC09[] = {DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
 
-#include "../data/field_map_obj/map_object_graphics_info_pointers.h"
-#include "../data/field_map_obj/field_effect_object_template_pointers.h"
-#include "../data/field_map_obj/map_object_pic_tables.h"
-#include "../data/field_map_obj/map_object_anims.h"
-#include "../data/field_map_obj/base_oam.h"
-#include "../data/field_map_obj/map_object_subsprites.h"
-#include "../data/field_map_obj/map_object_graphics_info.h"
+#include "data/field_map_obj/map_object_graphics_info_pointers.h"
+#include "data/field_map_obj/field_effect_object_template_pointers.h"
+#include "data/field_map_obj/map_object_pic_tables.h"
+#include "data/field_map_obj/map_object_anims.h"
+#include "data/field_map_obj/base_oam.h"
+#include "data/field_map_obj/map_object_subsprites.h"
+#include "data/field_map_obj/map_object_graphics_info.h"
 
 const struct SpritePalette gUnknown_0837377C[] = {
     {gMapObjectPalette0, 0x1103},
@@ -1790,14 +1790,14 @@ const u16 *const gUnknown_0837399C[] = {
     Unknown_8373988
 };
 
-#include "../data/field_map_obj/berry_tree_graphics_tables.h"
-#include "../data/field_map_obj/field_effect_objects.h"
+#include "data/field_map_obj/berry_tree_graphics_tables.h"
+#include "data/field_map_obj/field_effect_objects.h"
 
 const s16 gUnknown_0837520C[] = {0x20, 0x40, 0x60, 0x80};
 const s16 gUnknown_08375204[] = {0x20, 0x40, 0x80, 0xc0};
 const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50};
 
-#include "../data/field_map_obj/callback_subroutine_pointers.h"
+#include "data/field_map_obj/callback_subroutine_pointers.h"
 
 const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
 const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
@@ -1886,7 +1886,7 @@ const u8 gUnknown_08375767[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "../data/field_map_obj/anim_func_ptrs.h"
+#include "data/field_map_obj/anim_func_ptrs.h"
 
 // text
 
diff --git a/src/scene/evolution_graphics.c b/src/evolution_graphics.c
similarity index 100%
rename from src/scene/evolution_graphics.c
rename to src/evolution_graphics.c
diff --git a/src/scene/evolution_scene.c b/src/evolution_scene.c
similarity index 100%
rename from src/scene/evolution_scene.c
rename to src/evolution_scene.c
diff --git a/src/field/field_camera.c b/src/field_camera.c
similarity index 100%
rename from src/field/field_camera.c
rename to src/field_camera.c
diff --git a/src/field/field_control_avatar.c b/src/field_control_avatar.c
similarity index 100%
rename from src/field/field_control_avatar.c
rename to src/field_control_avatar.c
diff --git a/src/field/field_door.c b/src/field_door.c
similarity index 100%
rename from src/field/field_door.c
rename to src/field_door.c
diff --git a/src/field/field_effect.c b/src/field_effect.c
similarity index 100%
rename from src/field/field_effect.c
rename to src/field_effect.c
diff --git a/src/field/field_effect_helpers.c b/src/field_effect_helpers.c
similarity index 100%
rename from src/field/field_effect_helpers.c
rename to src/field_effect_helpers.c
diff --git a/src/field/field_fadetransition.c b/src/field_fadetransition.c
similarity index 100%
rename from src/field/field_fadetransition.c
rename to src/field_fadetransition.c
diff --git a/src/field/field_message_box.c b/src/field_message_box.c
similarity index 100%
rename from src/field/field_message_box.c
rename to src/field_message_box.c
diff --git a/src/field/field_player_avatar.c b/src/field_player_avatar.c
similarity index 100%
rename from src/field/field_player_avatar.c
rename to src/field_player_avatar.c
diff --git a/src/field/field_poison.c b/src/field_poison.c
similarity index 100%
rename from src/field/field_poison.c
rename to src/field_poison.c
diff --git a/src/field/field_region_map.c b/src/field_region_map.c
similarity index 100%
rename from src/field/field_region_map.c
rename to src/field_region_map.c
diff --git a/src/field/field_screen_effect.c b/src/field_screen_effect.c
similarity index 100%
rename from src/field/field_screen_effect.c
rename to src/field_screen_effect.c
diff --git a/src/field/field_special_scene.c b/src/field_special_scene.c
similarity index 100%
rename from src/field/field_special_scene.c
rename to src/field_special_scene.c
diff --git a/src/field/field_specials.c b/src/field_specials.c
similarity index 100%
rename from src/field/field_specials.c
rename to src/field_specials.c
diff --git a/src/field/field_tasks.c b/src/field_tasks.c
similarity index 100%
rename from src/field/field_tasks.c
rename to src/field_tasks.c
diff --git a/src/field/field_weather.c b/src/field_weather.c
similarity index 100%
rename from src/field/field_weather.c
rename to src/field_weather.c
diff --git a/src/field/field_weather_effects.c b/src/field_weather_effects.c
similarity index 100%
rename from src/field/field_weather_effects.c
rename to src/field_weather_effects.c
diff --git a/src/field/fieldmap.c b/src/fieldmap.c
similarity index 100%
rename from src/field/fieldmap.c
rename to src/fieldmap.c
diff --git a/src/field/fldeff_berrytree.c b/src/fldeff_berrytree.c
similarity index 100%
rename from src/field/fldeff_berrytree.c
rename to src/fldeff_berrytree.c
diff --git a/src/field/fldeff_cut.c b/src/fldeff_cut.c
similarity index 100%
rename from src/field/fldeff_cut.c
rename to src/fldeff_cut.c
diff --git a/src/field/fldeff_decoration.c b/src/fldeff_decoration.c
similarity index 100%
rename from src/field/fldeff_decoration.c
rename to src/fldeff_decoration.c
diff --git a/src/field/fldeff_escalator.c b/src/fldeff_escalator.c
similarity index 100%
rename from src/field/fldeff_escalator.c
rename to src/fldeff_escalator.c
diff --git a/src/field/fldeff_flash.c b/src/fldeff_flash.c
similarity index 100%
rename from src/field/fldeff_flash.c
rename to src/fldeff_flash.c
diff --git a/src/field/fldeff_poison.c b/src/fldeff_poison.c
similarity index 100%
rename from src/field/fldeff_poison.c
rename to src/fldeff_poison.c
diff --git a/src/field/fldeff_recordmixing.c b/src/fldeff_recordmixing.c
similarity index 100%
rename from src/field/fldeff_recordmixing.c
rename to src/fldeff_recordmixing.c
diff --git a/src/field/fldeff_secret_base_pc.c b/src/fldeff_secret_base_pc.c
similarity index 100%
rename from src/field/fldeff_secret_base_pc.c
rename to src/fldeff_secret_base_pc.c
diff --git a/src/field/fldeff_secretpower.c b/src/fldeff_secretpower.c
similarity index 100%
rename from src/field/fldeff_secretpower.c
rename to src/fldeff_secretpower.c
diff --git a/src/field/fldeff_softboiled.c b/src/fldeff_softboiled.c
similarity index 100%
rename from src/field/fldeff_softboiled.c
rename to src/fldeff_softboiled.c
diff --git a/src/field/fldeff_strength.c b/src/fldeff_strength.c
similarity index 100%
rename from src/field/fldeff_strength.c
rename to src/fldeff_strength.c
diff --git a/src/field/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
similarity index 100%
rename from src/field/fldeff_sweetscent.c
rename to src/fldeff_sweetscent.c
diff --git a/src/field/fldeff_teleport.c b/src/fldeff_teleport.c
similarity index 100%
rename from src/field/fldeff_teleport.c
rename to src/fldeff_teleport.c
diff --git a/src/scene/hall_of_fame.c b/src/hall_of_fame.c
similarity index 100%
rename from src/scene/hall_of_fame.c
rename to src/hall_of_fame.c
diff --git a/src/field/heal_location.c b/src/heal_location.c
similarity index 100%
rename from src/field/heal_location.c
rename to src/heal_location.c
diff --git a/src/field/hof_pc.c b/src/hof_pc.c
similarity index 100%
rename from src/field/hof_pc.c
rename to src/hof_pc.c
diff --git a/src/scene/intro.c b/src/intro.c
similarity index 100%
rename from src/scene/intro.c
rename to src/intro.c
diff --git a/src/scene/intro_credits_graphics.c b/src/intro_credits_graphics.c
similarity index 100%
rename from src/scene/intro_credits_graphics.c
rename to src/intro_credits_graphics.c
diff --git a/src/field/item.c b/src/item.c
similarity index 99%
rename from src/field/item.c
rename to src/item.c
index af05c0a21..41cbb7a1e 100644
--- a/src/field/item.c
+++ b/src/item.c
@@ -50,11 +50,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/field/item_menu.c b/src/item_menu.c
similarity index 100%
rename from src/field/item_menu.c
rename to src/item_menu.c
diff --git a/src/field/item_use.c b/src/item_use.c
similarity index 100%
rename from src/field/item_use.c
rename to src/item_use.c
diff --git a/src/field/landmark.c b/src/landmark.c
similarity index 100%
rename from src/field/landmark.c
rename to src/landmark.c
diff --git a/src/pokemon/learn_move.c b/src/learn_move.c
similarity index 100%
rename from src/pokemon/learn_move.c
rename to src/learn_move.c
diff --git a/src/engine/link.c b/src/link.c
similarity index 100%
rename from src/engine/link.c
rename to src/link.c
diff --git a/src/engine/load_save.c b/src/load_save.c
similarity index 100%
rename from src/engine/load_save.c
rename to src/load_save.c
diff --git a/src/field/lottery_corner.c b/src/lottery_corner.c
similarity index 100%
rename from src/field/lottery_corner.c
rename to src/lottery_corner.c
diff --git a/src/pokemon/mail.c b/src/mail.c
similarity index 100%
rename from src/pokemon/mail.c
rename to src/mail.c
diff --git a/src/pokemon/mail_data.c b/src/mail_data.c
similarity index 100%
rename from src/pokemon/mail_data.c
rename to src/mail_data.c
diff --git a/src/engine/main.c b/src/main.c
similarity index 100%
rename from src/engine/main.c
rename to src/main.c
diff --git a/src/engine/main_menu.c b/src/main_menu.c
similarity index 100%
rename from src/engine/main_menu.c
rename to src/main_menu.c
diff --git a/src/field/map_name_popup.c b/src/map_name_popup.c
similarity index 100%
rename from src/field/map_name_popup.c
rename to src/map_name_popup.c
diff --git a/src/field/map_obj_lock.c b/src/map_obj_lock.c
similarity index 100%
rename from src/field/map_obj_lock.c
rename to src/map_obj_lock.c
diff --git a/src/field/mauville_man.c b/src/mauville_man.c
similarity index 100%
rename from src/field/mauville_man.c
rename to src/mauville_man.c
diff --git a/src/engine/menu.c b/src/menu.c
similarity index 100%
rename from src/engine/menu.c
rename to src/menu.c
diff --git a/src/engine/menu_cursor.c b/src/menu_cursor.c
similarity index 99%
rename from src/engine/menu_cursor.c
rename to src/menu_cursor.c
index 35116d40b..f2eb31f16 100644
--- a/src/engine/menu_cursor.c
+++ b/src/menu_cursor.c
@@ -12,9 +12,9 @@ EWRAM_DATA static u8 gUnknown_0203A3D3 = 0;
 EWRAM_DATA static u8 gUnknown_0203A3D4 = 0;
 
 #if ENGLISH
-#include "../src/data/menu_cursor_en.h"
+#include "data/menu_cursor_en.h"
 #elif GERMAN
-#include "../src/data/menu_cursor_de.h"
+#include "data/menu_cursor_de.h"
 #endif // ENGLISH/GERMAN
 
 void sub_814A590(void)
diff --git a/src/field/menu_helpers.c b/src/menu_helpers.c
similarity index 100%
rename from src/field/menu_helpers.c
rename to src/menu_helpers.c
diff --git a/src/field/metatile_behavior.c b/src/metatile_behavior.c
similarity index 100%
rename from src/field/metatile_behavior.c
rename to src/metatile_behavior.c
diff --git a/src/pokemon/mon_markings.c b/src/mon_markings.c
similarity index 100%
rename from src/pokemon/mon_markings.c
rename to src/mon_markings.c
diff --git a/src/field/money.c b/src/money.c
similarity index 100%
rename from src/field/money.c
rename to src/money.c
diff --git a/src/engine/mystery_event_menu.c b/src/mystery_event_menu.c
similarity index 100%
rename from src/engine/mystery_event_menu.c
rename to src/mystery_event_menu.c
diff --git a/src/engine/mystery_event_msg.c b/src/mystery_event_msg.c
similarity index 100%
rename from src/engine/mystery_event_msg.c
rename to src/mystery_event_msg.c
diff --git a/src/engine/mystery_event_script.c b/src/mystery_event_script.c
similarity index 100%
rename from src/engine/mystery_event_script.c
rename to src/mystery_event_script.c
diff --git a/src/engine/name_string_util.c b/src/name_string_util.c
similarity index 100%
rename from src/engine/name_string_util.c
rename to src/name_string_util.c
diff --git a/src/engine/naming_screen.c b/src/naming_screen.c
similarity index 100%
rename from src/engine/naming_screen.c
rename to src/naming_screen.c
diff --git a/src/scene/new_game.c b/src/new_game.c
similarity index 100%
rename from src/scene/new_game.c
rename to src/new_game.c
diff --git a/src/engine/option_menu.c b/src/option_menu.c
similarity index 100%
rename from src/engine/option_menu.c
rename to src/option_menu.c
diff --git a/src/field/overworld.c b/src/overworld.c
similarity index 100%
rename from src/field/overworld.c
rename to src/overworld.c
diff --git a/src/engine/palette.c b/src/palette.c
similarity index 100%
rename from src/engine/palette.c
rename to src/palette.c
diff --git a/src/field/party_menu.c b/src/party_menu.c
similarity index 100%
rename from src/field/party_menu.c
rename to src/party_menu.c
diff --git a/src/field/pc_screen_effect.c b/src/pc_screen_effect.c
similarity index 100%
rename from src/field/pc_screen_effect.c
rename to src/pc_screen_effect.c
diff --git a/src/engine/play_time.c b/src/play_time.c
similarity index 100%
rename from src/engine/play_time.c
rename to src/play_time.c
diff --git a/src/field/player_pc.c b/src/player_pc.c
similarity index 100%
rename from src/field/player_pc.c
rename to src/player_pc.c
diff --git a/src/field/pokeblock.c b/src/pokeblock.c
similarity index 100%
rename from src/field/pokeblock.c
rename to src/pokeblock.c
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokeblock_feed.c
similarity index 100%
rename from src/pokemon/pokeblock_feed.c
rename to src/pokeblock_feed.c
diff --git a/src/pokemon/pokedex.c b/src/pokedex.c
similarity index 99%
rename from src/pokemon/pokedex.c
rename to src/pokedex.c
index 090873f9d..711dc69fa 100644
--- a/src/pokemon/pokedex.c
+++ b/src/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/field/pokedex_area_screen.c b/src/pokedex_area_screen.c
similarity index 100%
rename from src/field/pokedex_area_screen.c
rename to src/pokedex_area_screen.c
diff --git a/src/pokemon/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
similarity index 100%
rename from src/pokemon/pokedex_cry_screen.c
rename to src/pokedex_cry_screen.c
diff --git a/src/pokemon/pokemon_1.c b/src/pokemon_1.c
similarity index 98%
rename from src/pokemon/pokemon_1.c
rename to src/pokemon_1.c
index 80d245b52..a23bb3324 100644
--- a/src/pokemon/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -41,7 +41,7 @@ const struct SpindaSpot gSpindaSpotGraphics[] =
     {34, 33, INCBIN_U16("graphics/spinda_spots/spot_3.bin")}
 };
 
-#include "../data/pokemon/item_effects.h"
+#include "data/pokemon/item_effects.h"
 
 const s8 gNatureStatTable[][5] =
 {
@@ -73,14 +73,14 @@ const s8 gNatureStatTable[][5] =
     {    0,  0,  0,     0,     0} // Quirky
 };
 
-#include "../data/pokemon/tmhm_learnsets.h"
-#include "../data/pokemon/trainer_class_lookups.h"
-#include "../data/pokemon/cry_ids.h"
-#include "../data/pokemon/experience_tables.h"
-#include "../data/pokemon/base_stats.h"
-#include "../data/pokemon/level_up_learnsets.h"
-#include "../data/pokemon/evolution.h"
-#include "../data/pokemon/level_up_learnset_pointers.h"
+#include "data/pokemon/tmhm_learnsets.h"
+#include "data/pokemon/trainer_class_lookups.h"
+#include "data/pokemon/cry_ids.h"
+#include "data/pokemon/experience_tables.h"
+#include "data/pokemon/base_stats.h"
+#include "data/pokemon/level_up_learnsets.h"
+#include "data/pokemon/evolution.h"
+#include "data/pokemon/level_up_learnset_pointers.h"
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon)
 {
diff --git a/src/pokemon/pokemon_2.c b/src/pokemon_2.c
similarity index 100%
rename from src/pokemon/pokemon_2.c
rename to src/pokemon_2.c
diff --git a/src/pokemon/pokemon_3.c b/src/pokemon_3.c
similarity index 100%
rename from src/pokemon/pokemon_3.c
rename to src/pokemon_3.c
diff --git a/src/pokemon/pokemon_icon.c b/src/pokemon_icon.c
similarity index 100%
rename from src/pokemon/pokemon_icon.c
rename to src/pokemon_icon.c
diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon_item_effect.c
similarity index 100%
rename from src/pokemon/pokemon_item_effect.c
rename to src/pokemon_item_effect.c
diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon_menu.c
similarity index 100%
rename from src/pokemon/pokemon_menu.c
rename to src/pokemon_menu.c
diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon_size_record.c
similarity index 100%
rename from src/pokemon/pokemon_size_record.c
rename to src/pokemon_size_record.c
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon_storage_system.c
similarity index 100%
rename from src/pokemon/pokemon_storage_system.c
rename to src/pokemon_storage_system.c
diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
similarity index 100%
rename from src/pokemon/pokemon_storage_system_2.c
rename to src/pokemon_storage_system_2.c
diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c
similarity index 100%
rename from src/pokemon/pokemon_storage_system_3.c
rename to src/pokemon_storage_system_3.c
diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c
similarity index 100%
rename from src/pokemon/pokemon_storage_system_4.c
rename to src/pokemon_storage_system_4.c
diff --git a/src/pokemon/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c
similarity index 100%
rename from src/pokemon/pokemon_storage_system_5.c
rename to src/pokemon_storage_system_5.c
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
similarity index 99%
rename from src/pokemon/pokemon_summary_screen.c
rename to src/pokemon_summary_screen.c
index 0acf465f6..75ddb52d0 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -158,11 +158,11 @@ EWRAM_DATA u8 gUnknown_020384F0 = 0;
 EWRAM_DATA struct Sprite *gUnknown_020384F4 = NULL;
 
 #if ENGLISH
-#include "../data/text/move_descriptions_en.h"
-#include "../data/text/nature_names_en.h"
+#include "data/text/move_descriptions_en.h"
+#include "data/text/nature_names_en.h"
 #elif GERMAN
-#include "../data/text/move_descriptions_de.h"
-#include "../data/text/nature_names_de.h"
+#include "data/text/move_descriptions_de.h"
+#include "data/text/nature_names_de.h"
 #endif
 
 static const u8 * const sPageHeaderTexts[] = {
diff --git a/src/field/pokenav.c b/src/pokenav.c
similarity index 100%
rename from src/field/pokenav.c
rename to src/pokenav.c
diff --git a/src/engine/random.c b/src/random.c
similarity index 100%
rename from src/engine/random.c
rename to src/random.c
diff --git a/src/engine/record_mixing.c b/src/record_mixing.c
similarity index 100%
rename from src/engine/record_mixing.c
rename to src/record_mixing.c
diff --git a/src/field/region_map.c b/src/region_map.c
similarity index 99%
rename from src/field/region_map.c
rename to src/region_map.c
index 6d50701d6..e40fb7752 100644
--- a/src/field/region_map.c
+++ b/src/region_map.c
@@ -141,12 +141,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/engine/reset_rtc_screen.c b/src/reset_rtc_screen.c
similarity index 100%
rename from src/engine/reset_rtc_screen.c
rename to src/reset_rtc_screen.c
diff --git a/src/field/roamer.c b/src/roamer.c
similarity index 100%
rename from src/field/roamer.c
rename to src/roamer.c
diff --git a/src/field/rotating_gate.c b/src/rotating_gate.c
similarity index 100%
rename from src/field/rotating_gate.c
rename to src/rotating_gate.c
diff --git a/src/engine/rtc.c b/src/rtc.c
similarity index 100%
rename from src/engine/rtc.c
rename to src/rtc.c
diff --git a/src/field/safari_zone.c b/src/safari_zone.c
similarity index 100%
rename from src/field/safari_zone.c
rename to src/safari_zone.c
diff --git a/src/engine/save.c b/src/save.c
similarity index 100%
rename from src/engine/save.c
rename to src/save.c
diff --git a/src/engine/save_failed_screen.c b/src/save_failed_screen.c
similarity index 100%
rename from src/engine/save_failed_screen.c
rename to src/save_failed_screen.c
diff --git a/src/engine/save_menu_util.c b/src/save_menu_util.c
similarity index 100%
rename from src/engine/save_menu_util.c
rename to src/save_menu_util.c
diff --git a/src/field/scrcmd.c b/src/scrcmd.c
similarity index 100%
rename from src/field/scrcmd.c
rename to src/scrcmd.c
diff --git a/src/engine/script.c b/src/script.c
similarity index 100%
rename from src/engine/script.c
rename to src/script.c
diff --git a/src/field/script_menu.c b/src/script_menu.c
similarity index 100%
rename from src/field/script_menu.c
rename to src/script_menu.c
diff --git a/src/field/script_movement.c b/src/script_movement.c
similarity index 100%
rename from src/field/script_movement.c
rename to src/script_movement.c
diff --git a/src/field/secret_base.c b/src/secret_base.c
similarity index 100%
rename from src/field/secret_base.c
rename to src/secret_base.c
diff --git a/src/field/shop.c b/src/shop.c
similarity index 100%
rename from src/field/shop.c
rename to src/shop.c
diff --git a/src/field/slot_machine.c b/src/slot_machine.c
similarity index 100%
rename from src/field/slot_machine.c
rename to src/slot_machine.c
diff --git a/src/engine/sound.c b/src/sound.c
similarity index 100%
rename from src/engine/sound.c
rename to src/sound.c
diff --git a/src/engine/sprite.c b/src/sprite.c
similarity index 100%
rename from src/engine/sprite.c
rename to src/sprite.c
diff --git a/src/field/start_menu.c b/src/start_menu.c
similarity index 100%
rename from src/field/start_menu.c
rename to src/start_menu.c
diff --git a/src/field/starter_choose.c b/src/starter_choose.c
similarity index 100%
rename from src/field/starter_choose.c
rename to src/starter_choose.c
diff --git a/src/engine/string_util.c b/src/string_util.c
similarity index 100%
rename from src/engine/string_util.c
rename to src/string_util.c
diff --git a/src/engine/task.c b/src/task.c
similarity index 100%
rename from src/engine/task.c
rename to src/task.c
diff --git a/src/engine/text.c b/src/text.c
similarity index 99%
rename from src/engine/text.c
rename to src/text.c
index fe18a6d79..234e6085d 100644
--- a/src/engine/text.c
+++ b/src/text.c
@@ -234,12 +234,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/engine/text_window.c b/src/text_window.c
similarity index 100%
rename from src/engine/text_window.c
rename to src/text_window.c
diff --git a/src/engine/tileset_anim.c b/src/tileset_anim.c
similarity index 100%
rename from src/engine/tileset_anim.c
rename to src/tileset_anim.c
diff --git a/src/engine/time_events.c b/src/time_events.c
similarity index 100%
rename from src/engine/time_events.c
rename to src/time_events.c
diff --git a/src/scene/title_screen.c b/src/title_screen.c
similarity index 100%
rename from src/scene/title_screen.c
rename to src/title_screen.c
diff --git a/src/engine/trade.c b/src/trade.c
similarity index 100%
rename from src/engine/trade.c
rename to src/trade.c
diff --git a/src/field/trader.c b/src/trader.c
similarity index 100%
rename from src/field/trader.c
rename to src/trader.c
diff --git a/src/engine/trainer_card.c b/src/trainer_card.c
similarity index 100%
rename from src/engine/trainer_card.c
rename to src/trainer_card.c
diff --git a/src/field/trainer_see.c b/src/trainer_see.c
similarity index 100%
rename from src/field/trainer_see.c
rename to src/trainer_see.c
diff --git a/src/engine/trig.c b/src/trig.c
similarity index 100%
rename from src/engine/trig.c
rename to src/trig.c
diff --git a/src/field/tv.c b/src/tv.c
similarity index 100%
rename from src/field/tv.c
rename to src/tv.c
diff --git a/src/field/use_pokeblock.c b/src/use_pokeblock.c
similarity index 100%
rename from src/field/use_pokeblock.c
rename to src/use_pokeblock.c
diff --git a/src/engine/util.c b/src/util.c
similarity index 100%
rename from src/engine/util.c
rename to src/util.c
diff --git a/src/field/wallclock.c b/src/wallclock.c
similarity index 100%
rename from src/field/wallclock.c
rename to src/wallclock.c
diff --git a/src/field/wild_encounter.c b/src/wild_encounter.c
similarity index 100%
rename from src/field/wild_encounter.c
rename to src/wild_encounter.c
diff --git a/sym_bss.txt b/sym_bss.txt
index 6380330bb..01f690085 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,49 +1,49 @@
-. = ALIGN(4); src/engine/main.o(.bss);
-. = ALIGN(4); src/engine/sprite.o(.bss);
-. = ALIGN(4); src/engine/text.o(.bss);
-. = ALIGN(4); src/engine/string_util.o(.bss);
-. = ALIGN(4); src/engine/link.o(.bss);
-. = ALIGN(4); src/engine/rtc.o(.bss);
-. = ALIGN(4); src/field/daycare.o(.bss);
-. = ALIGN(4); src/engine/trade.o(.bss);
-. = ALIGN(4); src/scene/berry_blender.o(.bss);
-. = ALIGN(4); src/engine/play_time.o(.bss);
-. = ALIGN(4); src/field/overworld.o(.bss);
-. = ALIGN(4); src/field/field_camera.o(.bss);
-. = ALIGN(4); src/field/event_object_movement.o(.bss);
-. = ALIGN(4); src/field/field_message_box.o(.bss);
-. = ALIGN(4); src/engine/text_window.o(.bss);
-. = ALIGN(4); src/engine/script.o(.bss);
-. = ALIGN(4); src/field/start_menu.o(.bss);
+. = ALIGN(4); src/main.o(.bss);
+. = ALIGN(4); src/sprite.o(.bss);
+. = ALIGN(4); src/text.o(.bss);
+. = ALIGN(4); src/string_util.o(.bss);
+. = ALIGN(4); src/link.o(.bss);
+. = ALIGN(4); src/rtc.o(.bss);
+. = ALIGN(4); src/daycare.o(.bss);
+. = ALIGN(4); src/trade.o(.bss);
+. = ALIGN(4); src/berry_blender.o(.bss);
+. = ALIGN(4); src/play_time.o(.bss);
+. = ALIGN(4); src/overworld.o(.bss);
+. = ALIGN(4); src/field_camera.o(.bss);
+. = ALIGN(4); src/event_object_movement.o(.bss);
+. = ALIGN(4); src/field_message_box.o(.bss);
+. = ALIGN(4); src/text_window.o(.bss);
+. = ALIGN(4); src/script.o(.bss);
+. = ALIGN(4); src/start_menu.o(.bss);
 . = ALIGN(4); src/debug/start_menu_debug.o(.bss);
-. = ALIGN(4); src/engine/menu.o(.bss);
-. = ALIGN(4); src/engine/tileset_anim.o(.bss);
-. = ALIGN(4); src/engine/sound.o(.bss);
-. = ALIGN(4); src/field/field_weather.o(.bss);
+. = ALIGN(4); src/menu.o(.bss);
+. = ALIGN(4); src/tileset_anim.o(.bss);
+. = ALIGN(4); src/sound.o(.bss);
+. = ALIGN(4); src/field_weather.o(.bss);
 . = ALIGN(4); src/debug/tomomichi_debug_menu.o(.bss);
 . = ALIGN(4); src/debug/nohara_debug_menu.o(.bss);
-. = ALIGN(4); src/field/field_effect.o(.bss);
-. = ALIGN(4); src/engine/trainer_card.o(.bss);
-. = ALIGN(4); src/field/item_menu.o(.bss);
+. = ALIGN(4); src/field_effect.o(.bss);
+. = ALIGN(4); src/trainer_card.o(.bss);
+. = ALIGN(4); src/item_menu.o(.bss);
 #if DEBUG
 unk_debug_bss_3 = .;
     . += 0x4;
 #endif
-. = ALIGN(4); src/field/shop.o(.bss);
-. = ALIGN(4); src/engine/record_mixing.o(.bss);
-. = ALIGN(4); src/field/tv.o(.bss);
+. = ALIGN(4); src/shop.o(.bss);
+. = ALIGN(4); src/record_mixing.o(.bss);
+. = ALIGN(4); src/tv.o(.bss);
 . = ALIGN(4); src/battle/battle_anim_80CA710.o(.bss);
 . = ALIGN(4); src/easy_chat_2.o(.bss);
 . = ALIGN(4); src/pokenav_before.o(.bss);
-. = ALIGN(4); src/field/mauville_man.o(.bss);
-. = ALIGN(4); src/pokemon/mail.o(.bss);
-. = ALIGN(4); src/field/menu_helpers.o(.bss);
-. = ALIGN(4); src/field/slot_machine.o(.bss);
-. = ALIGN(4); src/scene/contest_painting.o(.bss);
-. = ALIGN(4); src/field/pokeblock.o(.bss);
-. = ALIGN(4); src/field/field_specials.o(.bss);
-. = ALIGN(4); src/pokemon/learn_move.o(.bss);
-. = ALIGN(4); src/field/player_pc.o(.bss);
+. = ALIGN(4); src/mauville_man.o(.bss);
+. = ALIGN(4); src/mail.o(.bss);
+. = ALIGN(4); src/menu_helpers.o(.bss);
+. = ALIGN(4); src/slot_machine.o(.bss);
+. = ALIGN(4); src/contest_painting.o(.bss);
+. = ALIGN(4); src/pokeblock.o(.bss);
+. = ALIGN(4); src/field_specials.o(.bss);
+. = ALIGN(4); src/learn_move.o(.bss);
+. = ALIGN(4); src/player_pc.o(.bss);
 . = ALIGN(4); src/debug/nakamura_debug_menu.o(.bss);
 . = ALIGN(4); src/libs/m4a_1.o(.bss);
 . = ALIGN(4); src/libs/agb_flash.o(.bss);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8d0c88f26..52f205779 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,11 +1,11 @@
-. = ALIGN(4); src/engine/main.o(ewram_data);
-. = ALIGN(4); src/engine/sprite.o(ewram_data);
-. = ALIGN(4); src/engine/text.o(ewram_data);
-. = ALIGN(4); src/engine/string_util.o(ewram_data);
+. = ALIGN(4); src/main.o(ewram_data);
+. = ALIGN(4); src/sprite.o(ewram_data);
+. = ALIGN(4); src/text.o(ewram_data);
+. = ALIGN(4); src/string_util.o(ewram_data);
 
 . += 0x2E8;
 
-. = ALIGN(4); src/engine/link.o(ewram_data);
+. = ALIGN(4); src/link.o(ewram_data);
 . = ALIGN(4); src/rom3.o(ewram_data);
 
 /* battle */
@@ -301,92 +301,92 @@ gMoveToLearn = .; /* 2024E82 */
 gBattleMonForms = .; /* 2024E84 */
     . += 0x4;
 
-. = ALIGN(4); src/pokemon/pokemon_1.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_2.o(ewram_data);
-. = ALIGN(4); src/engine/load_save.o(ewram_data);
-. = ALIGN(4); src/engine/trade.o(ewram_data);
-. = ALIGN(4); src/scene/berry_blender.o(ewram_data);
-. = ALIGN(4); src/scene/new_game.o(ewram_data);
-. = ALIGN(4); src/field/overworld.o(ewram_data);
-. = ALIGN(4); src/field/fieldmap.o(ewram_data);
-. = ALIGN(4); src/field/field_camera.o(ewram_data);
-. = ALIGN(4); src/field/field_player_avatar.o(ewram_data);
-. = ALIGN(4); src/field/field_message_box.o(ewram_data);
-. = ALIGN(4); src/engine/script.o(ewram_data);
-. = ALIGN(4); src/field/scrcmd.o(ewram_data);
-. = ALIGN(4); src/field/field_control_avatar.o(ewram_data);
-. = ALIGN(4); src/field/event_data.o(ewram_data);
-. = ALIGN(4); src/field/party_menu.o(ewram_data);
-. = ALIGN(4); src/field/start_menu.o(ewram_data);
-. = ALIGN(4); src/engine/menu.o(ewram_data);
-. = ALIGN(4); src/engine/tileset_anim.o(ewram_data);
-. = ALIGN(4); src/engine/palette.o(ewram_data);
-. = ALIGN(4); src/engine/sound.o(ewram_data);
+. = ALIGN(4); src/pokemon_1.o(ewram_data);
+. = ALIGN(4); src/pokemon_2.o(ewram_data);
+. = ALIGN(4); src/load_save.o(ewram_data);
+. = ALIGN(4); src/trade.o(ewram_data);
+. = ALIGN(4); src/berry_blender.o(ewram_data);
+. = ALIGN(4); src/new_game.o(ewram_data);
+. = ALIGN(4); src/overworld.o(ewram_data);
+. = ALIGN(4); src/fieldmap.o(ewram_data);
+. = ALIGN(4); src/field_camera.o(ewram_data);
+. = ALIGN(4); src/field_player_avatar.o(ewram_data);
+. = ALIGN(4); src/field_message_box.o(ewram_data);
+. = ALIGN(4); src/script.o(ewram_data);
+. = ALIGN(4); src/scrcmd.o(ewram_data);
+. = ALIGN(4); src/field_control_avatar.o(ewram_data);
+. = ALIGN(4); src/event_data.o(ewram_data);
+. = ALIGN(4); src/party_menu.o(ewram_data);
+. = ALIGN(4); src/start_menu.o(ewram_data);
+. = ALIGN(4); src/menu.o(ewram_data);
+. = ALIGN(4); src/tileset_anim.o(ewram_data);
+. = ALIGN(4); src/palette.o(ewram_data);
+. = ALIGN(4); src/sound.o(ewram_data);
 . = ALIGN(4); src/battle/battle_anim.o(ewram_data);
 . = ALIGN(4); src/rom_8077ABC.o(ewram_data);
-. = ALIGN(4); src/scene/title_screen.o(ewram_data);
-. = ALIGN(4); src/field/field_weather.o(ewram_data);
+. = ALIGN(4); src/title_screen.o(ewram_data);
+. = ALIGN(4); src/field_weather.o(ewram_data);
 . = ALIGN(4); src/battle/battle_setup.o(ewram_data);
-. = ALIGN(4); src/engine/cable_club.o(ewram_data);
+. = ALIGN(4); src/cable_club.o(ewram_data);
 . = ALIGN(4); src/debug/taya_debug_window.o(ewram_data);
-. = ALIGN(4); src/field/wild_encounter.o(ewram_data);
-. = ALIGN(4); src/field/field_effect.o(ewram_data);
+. = ALIGN(4); src/wild_encounter.o(ewram_data);
+. = ALIGN(4); src/field_effect.o(ewram_data);
 . = ALIGN(4); src/scanline_effect.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_menu.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokedex.o(ewram_data);
-. = ALIGN(4); src/engine/trainer_card.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_storage_system.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_storage_system_2.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_storage_system_3.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_storage_system_4.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_storage_system_5.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokemon_summary_screen.o(ewram_data);
-. = ALIGN(4); src/field/script_movement.o(ewram_data);
-. = ALIGN(4); src/field/map_name_popup.o(ewram_data);
-. = ALIGN(4); src/field/item_menu.o(ewram_data);
+. = ALIGN(4); src/pokemon_menu.o(ewram_data);
+. = ALIGN(4); src/pokedex.o(ewram_data);
+. = ALIGN(4); src/trainer_card.o(ewram_data);
+. = ALIGN(4); src/pokemon_storage_system.o(ewram_data);
+. = ALIGN(4); src/pokemon_storage_system_2.o(ewram_data);
+. = ALIGN(4); src/pokemon_storage_system_3.o(ewram_data);
+. = ALIGN(4); src/pokemon_storage_system_4.o(ewram_data);
+. = ALIGN(4); src/pokemon_storage_system_5.o(ewram_data);
+. = ALIGN(4); src/pokemon_summary_screen.o(ewram_data);
+. = ALIGN(4); src/script_movement.o(ewram_data);
+. = ALIGN(4); src/map_name_popup.o(ewram_data);
+. = ALIGN(4); src/item_menu.o(ewram_data);
 . = ALIGN(4); src/contest.o(ewram_data);
-. = ALIGN(4); src/field/shop.o(ewram_data);
-. = ALIGN(4); src/field/fldeff_escalator.o(ewram_data);
+. = ALIGN(4); src/shop.o(ewram_data);
+. = ALIGN(4); src/fldeff_escalator.o(ewram_data);
 . = ALIGN(4); src/debug/watanabe_debug_menu.o(ewram_data);
-. = ALIGN(4); src/field/money.o(ewram_data);
-. = ALIGN(4); src/engine/record_mixing.o(ewram_data);
+. = ALIGN(4); src/money.o(ewram_data);
+. = ALIGN(4); src/record_mixing.o(ewram_data);
 . = ALIGN(4); src/debug/sound_check_menu.o(ewram_data);
-. = ALIGN(4); src/field/secret_base.o(ewram_data);
-. = ALIGN(4); src/field/tv.o(ewram_data);
-. = ALIGN(4); src/field/pc_screen_effect.o(ewram_data);
-. = ALIGN(4); src/field/rotating_gate.o(ewram_data);
-. = ALIGN(4); src/field/safari_zone.o(ewram_data);
+. = ALIGN(4); src/secret_base.o(ewram_data);
+. = ALIGN(4); src/tv.o(ewram_data);
+. = ALIGN(4); src/pc_screen_effect.o(ewram_data);
+. = ALIGN(4); src/rotating_gate.o(ewram_data);
+. = ALIGN(4); src/safari_zone.o(ewram_data);
 . = ALIGN(4); src/easy_chat_2.o(ewram_data);
-. = ALIGN(4); src/field/pokenav.o(ewram_data);
-. = ALIGN(4); src/pokemon/mon_markings.o(ewram_data);
-. = ALIGN(4); src/field/mauville_man.o(ewram_data);
-. = ALIGN(4); src/field/menu_helpers.o(ewram_data);
-. = ALIGN(4); src/field/region_map.o(ewram_data);
-. = ALIGN(4); src/field/decoration.o(ewram_data);
+. = ALIGN(4); src/pokenav.o(ewram_data);
+. = ALIGN(4); src/mon_markings.o(ewram_data);
+. = ALIGN(4); src/mauville_man.o(ewram_data);
+. = ALIGN(4); src/menu_helpers.o(ewram_data);
+. = ALIGN(4); src/region_map.o(ewram_data);
+. = ALIGN(4); src/decoration.o(ewram_data);
 . = ALIGN(4); src/battle/battle_ai.o(ewram_data);
 . = ALIGN(4); src/rom6.o(ewram_data);
-. = ALIGN(4); src/field/pokeblock.o(ewram_data);
-. = ALIGN(4); src/field/field_specials.o(ewram_data);
-. = ALIGN(4); src/field/pokedex_area_screen.o(ewram_data);
+. = ALIGN(4); src/pokeblock.o(ewram_data);
+. = ALIGN(4); src/field_specials.o(ewram_data);
+. = ALIGN(4); src/pokedex_area_screen.o(ewram_data);
 . = ALIGN(4); src/roulette.o(ewram_data);
 . = ALIGN(4); src/battle/battle_message.o(ewram_data);
-. = ALIGN(4); src/field/choose_party.o(ewram_data);
-. = ALIGN(4); src/scene/cable_car.o(ewram_data);
-. = ALIGN(4); src/engine/save.o(ewram_data);
-. = ALIGN(4); src/engine/mystery_event_script.o(ewram_data);
-. = ALIGN(4); src/field/roamer.o(ewram_data);
-. = ALIGN(4); src/field/use_pokeblock.o(ewram_data);
-. = ALIGN(4); src/field/player_pc.o(ewram_data);
-. = ALIGN(4); src/scene/intro.o(ewram_data);
-. = ALIGN(4); src/scene/hall_of_fame.o(ewram_data);
-. = ALIGN(4); src/scene/credits.o(ewram_data);
-. = ALIGN(4); src/field/lottery_corner.o(ewram_data);
-. = ALIGN(4); src/field/berry_tag_screen.o(ewram_data);
-. = ALIGN(4); src/engine/mystery_event_menu.o(ewram_data);
-. = ALIGN(4); src/engine/save_failed_screen.o(ewram_data);
-. = ALIGN(4); src/pokemon/pokeblock_feed.o(ewram_data);
+. = ALIGN(4); src/choose_party.o(ewram_data);
+. = ALIGN(4); src/cable_car.o(ewram_data);
+. = ALIGN(4); src/save.o(ewram_data);
+. = ALIGN(4); src/mystery_event_script.o(ewram_data);
+. = ALIGN(4); src/roamer.o(ewram_data);
+. = ALIGN(4); src/use_pokeblock.o(ewram_data);
+. = ALIGN(4); src/player_pc.o(ewram_data);
+. = ALIGN(4); src/intro.o(ewram_data);
+. = ALIGN(4); src/hall_of_fame.o(ewram_data);
+. = ALIGN(4); src/credits.o(ewram_data);
+. = ALIGN(4); src/lottery_corner.o(ewram_data);
+. = ALIGN(4); src/berry_tag_screen.o(ewram_data);
+. = ALIGN(4); src/mystery_event_menu.o(ewram_data);
+. = ALIGN(4); src/save_failed_screen.o(ewram_data);
+. = ALIGN(4); src/pokeblock_feed.o(ewram_data);
 . = ALIGN(4); src/debug/nakamura_debug_menu.o(ewram_data);
-. = ALIGN(4); src/scene/intro_credits_graphics.o(ewram_data);
+. = ALIGN(4); src/intro_credits_graphics.o(ewram_data);
 
 /* ??? */
 
@@ -404,4 +404,4 @@ gUnknown_02039460 = .; /* 2039460 */
 gUnknown_02039760 = .; /* 2039760 */
     . += 0xC00;
 
-. = ALIGN(4); src/engine/menu_cursor.o(ewram_data);
+. = ALIGN(4); src/menu_cursor.o(ewram_data);