diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
index 88fe9ca6e..86fdf9384 100644
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -1,10 +1,10 @@
-; collision permissions (see tilesets/collision_permissions.asm)
+; collision permissions (see data/collision_permissions.asm)
 LANDTILE             EQU $00
 WATERTILE            EQU $01
 WALLTILE             EQU $0f
 TALK                 EQU $10
 
-; collision data types (see tilesets/*_collision.asm)
+; collision data types (see data/tilesets/*_collision.asm)
 ; TileCollisionTable indexes (see data/collision_permissions.asm)
 COLL_FLOOR             EQU $00
 COLL_01                EQU $01 ; garbage
@@ -28,19 +28,19 @@ COLL_CUT_28            EQU $28 ; garbage
 COLL_WATER             EQU $29
 COLL_ICE_2B            EQU $2b ; unused
 COLL_WHIRLPOOL_2C      EQU $2c ; unused
-COLL_WATERFALL_RIGHT   EQU $30 ; unused !!!
-COLL_WATERFALL_LEFT    EQU $31 ; unused !!!
-COLL_WATERFALL_UP      EQU $32 ; unused !!!
+COLL_WATERFALL_RIGHT   EQU $30 ; unused
+COLL_WATERFALL_LEFT    EQU $31 ; unused
+COLL_WATERFALL_UP      EQU $32 ; unused
 COLL_WATERFALL         EQU $33
-COLL_CURRENT_RIGHT     EQU $38 ; unused !!!
-COLL_CURRENT_LEFT      EQU $39 ; unused !!!
-COLL_CURRENT_UP        EQU $3a ; unused !!!
-COLL_CURRENT_DOWN      EQU $3b ; unused !!!
-COLL_BRAKE             EQU $40 ; unused !!!
-COLL_WALK_RIGHT        EQU $41 ; unused !!!
-COLL_WALK_LEFT         EQU $42 ; unused !!!
-COLL_WALK_UP           EQU $43 ; unused !!!
-COLL_WALK_DOWN         EQU $44 ; unused !!!
+COLL_CURRENT_RIGHT     EQU $38 ; unused
+COLL_CURRENT_LEFT      EQU $39 ; unused
+COLL_CURRENT_UP        EQU $3a ; unused
+COLL_CURRENT_DOWN      EQU $3b ; unused
+COLL_BRAKE             EQU $40 ; unused
+COLL_WALK_RIGHT        EQU $41 ; unused
+COLL_WALK_LEFT         EQU $42 ; unused
+COLL_WALK_UP           EQU $43 ; unused
+COLL_WALK_DOWN         EQU $44 ; unused
 COLL_BRAKE_45          EQU $45 ; garbage
 COLL_BRAKE_46          EQU $46 ; unused
 COLL_BRAKE_47          EQU $47 ; unused
@@ -92,16 +92,16 @@ COLL_WINDOW            EQU $9d
 COLL_INCENSE_BURNER    EQU $9f
 COLL_HOP_RIGHT         EQU $a0
 COLL_HOP_LEFT          EQU $a1
-COLL_HOP_UP            EQU $a2 ; unused !!!
+COLL_HOP_UP            EQU $a2 ; unused
 COLL_HOP_DOWN          EQU $a3
 COLL_HOP_DOWN_RIGHT    EQU $a4
 COLL_HOP_DOWN_LEFT     EQU $a5
-COLL_HOP_UP_RIGHT      EQU $a6 ; unused !!!
-COLL_HOP_UP_LEFT       EQU $a7 ; unused !!!
+COLL_HOP_UP_RIGHT      EQU $a6 ; unused
+COLL_HOP_UP_LEFT       EQU $a7 ; unused
 COLL_RIGHT_WALL        EQU $b0
 COLL_LEFT_WALL         EQU $b1
 COLL_UP_WALL           EQU $b2
-COLL_DOWN_WALL         EQU $b3 ; unused !!!
+COLL_DOWN_WALL         EQU $b3 ; unused
 COLL_FF                EQU $ff ; garbage
 
 ; collision data type nybbles
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 90dd0f8d2..d32797ecc 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,4 +1,4 @@
-; Tilesets indexes (see tilesets/tilesets.asm)
+; Tilesets indexes (see data/tilesets.asm)
 const_value set 1
 	const TILESET_JOHTO_1              ; 01
 	const TILESET_JOHTO_2              ; 02
@@ -37,7 +37,7 @@ const_value set 1
 	const TILESET_OMANYTE_WORD_ROOM    ; 23
 	const TILESET_AERODACTYL_WORD_ROOM ; 24
 
-; bg palette values (see tilesets/*_palette_map.asm)
+; bg palette values (see gfx/tilesets/*_palette_map.asm)
 	const_def
 	const PAL_BG_GRAY   ; 0
 	const PAL_BG_RED    ; 1
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index 8064a63e9..c7e30114a 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -2,6 +2,7 @@
 ; Maps with environment ROUTE or TOWN can only use these sprites.
 
 OutdoorSprites: ; 144b8
+; entries correspond to map groups
 	dw OlivineGroupSprites
 	dw MahoganyGroupSprites
 	dw DungeonsGroupSprites
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index 8c79e6f82..2a1b8d3eb 100644
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -1,5 +1,6 @@
 MapGroupRoofs: ; 1c021i
-; entries correspond to Roofs (see below)
+; entries correspond to map groups
+; values are indexes for Roofs (see below)
 	db -1 ; group 0 (unused)
 	db  3 ; group 1 (Olivine)
 	db  2 ; group 2 (Mahogany)
diff --git a/tilesets/data.asm b/data/tileset_data.asm
similarity index 65%
rename from tilesets/data.asm
rename to data/tileset_data.asm
index 2df9c0949..0f4dcbb34 100644
--- a/tilesets/data.asm
+++ b/data/tileset_data.asm
@@ -1,5 +1,5 @@
 tilecoll: MACRO
-; used in tilesets/*_collision.asm
+; used in data/tilesets/*_collision.asm
 	db COLL_\1, COLL_\2, COLL_\3, COLL_\4
 ENDM
 
@@ -11,11 +11,11 @@ INCBIN "gfx/tilesets/kanto.2bpp.lz"
 ; 0x18606
 
 TilesetKantoMeta: ; 0x18606
-INCBIN "tilesets/kanto_metatiles.bin"
+INCBIN "data/tilesets/kanto_metatiles.bin"
 ; 0x18e06
 
 TilesetKantoColl: ; 0x18e06
-INCLUDE "tilesets/kanto_collision.asm"
+INCLUDE "data/tilesets/kanto_collision.asm"
 ; 0x19006
 
 Tileset0GFX: ; 0x19006
@@ -25,12 +25,12 @@ INCBIN "gfx/tilesets/johto_1.2bpp.lz"
 
 Tileset0Meta: ; 0x19c0e
 TilesetJohto1Meta: ; 0x19c0e
-INCBIN "tilesets/johto_1_metatiles.bin"
+INCBIN "data/tilesets/johto_1_metatiles.bin"
 ; 0x1a40e
 
 Tileset0Coll: ; 0x1a40e
 TilesetJohto1Coll: ; 0x1a40e
-INCLUDE "tilesets/johto_1_collision.asm"
+INCLUDE "data/tilesets/johto_1_collision.asm"
 ; 0x1a60e
 
 TilesetIcePathGFX: ; 0x1a60e
@@ -38,11 +38,11 @@ INCBIN "gfx/tilesets/ice_path.2bpp.lz"
 ; 0x1af3e
 
 TilesetIcePathMeta: ; 0x1af3e
-INCBIN "tilesets/ice_path_metatiles.bin"
+INCBIN "data/tilesets/ice_path_metatiles.bin"
 ; 0x1b33e
 
 TilesetIcePathColl: ; 0x1b33e
-INCLUDE "tilesets/ice_path_collision.asm"
+INCLUDE "data/tilesets/ice_path_collision.asm"
 ; 0x1b43e
 
 TilesetPlayersHouse2FGFX: ; 0x1b43e
@@ -50,11 +50,11 @@ INCBIN "gfx/tilesets/players_house_2f.2bpp.lz"
 ; 0x1b8fe
 
 TilesetPlayersHouse2FMeta: ; 0x1b8fe
-INCBIN "tilesets/players_house_2f_metatiles.bin"
+INCBIN "data/tilesets/players_house_2f_metatiles.bin"
 ; 0x1bcfe
 
 TilesetPlayersHouse2FColl: ; 0x1bcfe
-INCLUDE "tilesets/players_house_2f_collision.asm"
+INCLUDE "data/tilesets/players_house_2f_collision.asm"
 ; 0x1bdfe
 
 
@@ -65,11 +65,11 @@ INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
 ; 0x1c73c
 
 TilesetPokecenterMeta: ; 0x1c73c
-INCBIN "tilesets/pokecenter_metatiles.bin"
+INCBIN "data/tilesets/pokecenter_metatiles.bin"
 ; 0x1cb3c
 
 TilesetPokecenterColl: ; 0x1cb3c
-INCLUDE "tilesets/pokecenter_collision.asm"
+INCLUDE "data/tilesets/pokecenter_collision.asm"
 ; 0x1cc3c
 
 TilesetPortGFX: ; 0x1cc3c
@@ -77,11 +77,11 @@ INCBIN "gfx/tilesets/port.2bpp.lz"
 ; 0x1d04c
 
 TilesetPortMeta: ; 0x1d04c
-INCBIN "tilesets/port_metatiles.bin"
+INCBIN "data/tilesets/port_metatiles.bin"
 ; 0x1d44c
 
 TilesetPortColl: ; 0x1d44c
-INCLUDE "tilesets/port_collision.asm"
+INCLUDE "data/tilesets/port_collision.asm"
 ; 0x1d54c
 
 TilesetPlayersHouseGFX: ; 0x1d54c
@@ -89,11 +89,11 @@ INCBIN "gfx/tilesets/players_house.2bpp.lz"
 ; 0x1d92c
 
 TilesetPlayersHouseMeta: ; 0x1d92c
-INCBIN "tilesets/players_house_metatiles.bin"
+INCBIN "data/tilesets/players_house_metatiles.bin"
 ; 0x1dd2c
 
 TilesetPlayersHouseColl: ; 0x1dd2c
-INCLUDE "tilesets/players_house_collision.asm"
+INCLUDE "data/tilesets/players_house_collision.asm"
 ; 0x1de2c
 
 TilesetCeladonMansionGFX: ; 0x1de2c
@@ -101,11 +101,11 @@ INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz"
 ; 0x1e58c
 
 TilesetCeladonMansionMeta: ; 0x1e58c
-INCBIN "tilesets/celadon_mansion_metatiles.bin"
+INCBIN "data/tilesets/celadon_mansion_metatiles.bin"
 ; 0x1e98c
 
 TilesetCeladonMansionColl: ; 0x1e98c
-INCLUDE "tilesets/celadon_mansion_collision.asm"
+INCLUDE "data/tilesets/celadon_mansion_collision.asm"
 ; 0x1ea8c
 
 TilesetCaveGFX: ; 0x1ea8c
@@ -114,12 +114,12 @@ INCBIN "gfx/tilesets/cave.2bpp.lz"
 
 TilesetCaveMeta: ; 0x1ee1c
 TilesetWhirlIslandsMeta: ; 0x1ee1c
-INCBIN "tilesets/cave_metatiles.bin"
+INCBIN "data/tilesets/cave_metatiles.bin"
 ; 0x1f21c
 
 TilesetCaveColl: ; 0x1f21c
 TilesetWhirlIslandsColl: ; 0x1f21c
-INCLUDE "tilesets/cave_collision.asm"
+INCLUDE "data/tilesets/cave_collision.asm"
 ; 0x1f31c
 
 
@@ -130,11 +130,11 @@ INCBIN "gfx/tilesets/sprout_tower.2bpp.lz"
 ; 0x206e1
 
 TilesetSproutTowerMeta: ; 0x206e1
-INCBIN "tilesets/sprout_tower_metatiles.bin"
+INCBIN "data/tilesets/sprout_tower_metatiles.bin"
 ; 0x20ae1
 
 TilesetSproutTowerColl: ; 0x20ae1
-INCLUDE "tilesets/sprout_tower_collision.asm"
+INCLUDE "data/tilesets/sprout_tower_collision.asm"
 ; 0x20be1
 
 TilesetLabGFX: ; 0x20be1
@@ -142,11 +142,11 @@ INCBIN "gfx/tilesets/lab.2bpp.lz"
 ; 0x213e1
 
 TilesetLabMeta: ; 0x213e1
-INCBIN "tilesets/lab_metatiles.bin"
+INCBIN "data/tilesets/lab_metatiles.bin"
 ; 0x217e1
 
 TilesetLabColl: ; 0x217e1
-INCLUDE "tilesets/lab_collision.asm"
+INCLUDE "data/tilesets/lab_collision.asm"
 ; 0x218e1
 
 TilesetMartGFX: ; 0x218e1
@@ -154,11 +154,11 @@ INCBIN "gfx/tilesets/mart.2bpp.lz"
 ; 0x22031
 
 TilesetMartMeta: ; 0x22031
-INCBIN "tilesets/mart_metatiles.bin"
+INCBIN "data/tilesets/mart_metatiles.bin"
 ; 0x22431
 
 TilesetMartColl: ; 0x22431
-INCLUDE "tilesets/mart_collision.asm"
+INCLUDE "data/tilesets/mart_collision.asm"
 ; 0x22531
 
 TilesetGameCornerGFX: ; 0x22531
@@ -166,11 +166,11 @@ INCBIN "gfx/tilesets/game_corner.2bpp.lz"
 ; 0x22af1
 
 TilesetGameCornerMeta: ; 0x22af1
-INCBIN "tilesets/game_corner_metatiles.bin"
+INCBIN "data/tilesets/game_corner_metatiles.bin"
 ; 0x22ef1
 
 TilesetGameCornerColl: ; 0x22ef1
-INCLUDE "tilesets/game_corner_collision.asm"
+INCLUDE "data/tilesets/game_corner_collision.asm"
 ; 0x22ff1
 
 TilesetTrainStationGFX: ; 0x22ff1
@@ -178,15 +178,15 @@ INCBIN "gfx/tilesets/train_station.2bpp.lz"
 ; 0x23391
 
 TilesetTrainStationMeta: ; 0x23391
-INCBIN "tilesets/train_station_metatiles.bin"
+INCBIN "data/tilesets/train_station_metatiles.bin"
 ; 0x23791
 
 TilesetTrainStationColl: ; 0x23791
-INCLUDE "tilesets/train_station_collision.asm"
+INCLUDE "data/tilesets/train_station_collision.asm"
 ; 0x23891
 
 TilesetIlexForestMeta: ; 0x23891
-INCBIN "tilesets/ilex_forest_metatiles.bin"
+INCBIN "data/tilesets/ilex_forest_metatiles.bin"
 ; 0x23b11
 
 
@@ -197,11 +197,11 @@ INCBIN "gfx/tilesets/gym_1.2bpp.lz"
 ; 0x304e0
 
 TilesetGym1Meta: ; 0x304e0
-INCBIN "tilesets/gym_1_metatiles.bin"
+INCBIN "data/tilesets/gym_1_metatiles.bin"
 ; 0x308e0
 
 TilesetGym1Coll: ; 0x308e0
-INCLUDE "tilesets/gym_1_collision.asm"
+INCLUDE "data/tilesets/gym_1_collision.asm"
 ; 0x309e0
 
 TilesetParkGFX: ; 0x309e0
@@ -209,11 +209,11 @@ INCBIN "gfx/tilesets/park.2bpp.lz"
 ; 0x30e80
 
 TilesetParkMeta: ; 0x30e80
-INCBIN "tilesets/park_metatiles.bin"
+INCBIN "data/tilesets/park_metatiles.bin"
 ; 0x31280
 
 TilesetParkColl: ; 0x31280
-INCLUDE "tilesets/park_collision.asm"
+INCLUDE "data/tilesets/park_collision.asm"
 ; 0x31380
 
 TilesetRadioTowerGFX: ; 0x31380
@@ -221,11 +221,11 @@ INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
 ; 0x318e0
 
 TilesetRadioTowerMeta: ; 0x318e0
-INCBIN "tilesets/radio_tower_metatiles.bin"
+INCBIN "data/tilesets/radio_tower_metatiles.bin"
 ; 0x31ce0
 
 TilesetRadioTowerColl: ; 0x31ce0
-INCLUDE "tilesets/radio_tower_collision.asm"
+INCLUDE "data/tilesets/radio_tower_collision.asm"
 ; 0x31de0
 
 TilesetUndergroundGFX: ; 0x31de0
@@ -233,11 +233,11 @@ INCBIN "gfx/tilesets/underground.2bpp.lz"
 ; 0x321b0
 
 TilesetUndergroundMeta: ; 0x321b0
-INCBIN "tilesets/underground_metatiles.bin"
+INCBIN "data/tilesets/underground_metatiles.bin"
 ; 0x325b0
 
 TilesetUndergroundColl: ; 0x325b0
-INCLUDE "tilesets/underground_collision.asm"
+INCLUDE "data/tilesets/underground_collision.asm"
 ; 0x326b0
 
 TilesetWhirlIslandsGFX: ; 0x326b0
@@ -245,11 +245,11 @@ INCBIN "gfx/tilesets/whirl_islands.2bpp.lz"
 ; 0x329f0
 
 UnusedTilesetWhirlIslandsMeta: ; 0x329f0
-INCBIN "tilesets/unused_whirl_islands_metatiles.bin"
+INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin"
 ; 0x331f0
 
 UnusedTilesetWhirlIslandsColl: ; 0x331f0
-INCLUDE "tilesets/unused_whirl_islands_collision.asm"
+INCLUDE "data/tilesets/unused_whirl_islands_collision.asm"
 ; 0x333f0
 
 
@@ -260,11 +260,11 @@ INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
 ; 0xb48a0
 
 TilesetPokeComCenterMeta: ; 0xb48a0
-INCBIN "tilesets/pokecom_center_metatiles.bin"
+INCBIN "data/tilesets/pokecom_center_metatiles.bin"
 ; 0xb4ca0
 
 TilesetPokeComCenterColl: ; 0xb4ca0
-INCLUDE "tilesets/pokecom_center_collision.asm"
+INCLUDE "data/tilesets/pokecom_center_collision.asm"
 ; 0xb4da0
 
 TilesetBattleTowerGFX: ; 0xb4da0
@@ -272,11 +272,11 @@ INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
 ; 0xb50e0
 
 TilesetBattleTowerMeta: ; 0xb50e0
-INCBIN "tilesets/battle_tower_metatiles.bin"
+INCBIN "data/tilesets/battle_tower_metatiles.bin"
 ; 0xb54e0
 
 TilesetBattleTowerColl: ; 0xb54e0
-INCLUDE "tilesets/battle_tower_collision.asm"
+INCLUDE "data/tilesets/battle_tower_collision.asm"
 ; 0xb55e0
 
 TilesetGateGFX: ; 0xb55e0
@@ -284,11 +284,11 @@ INCBIN "gfx/tilesets/gate.2bpp.lz"
 ; 0xb59e0
 
 TilesetGateMeta: ; 0xb59e0
-INCBIN "tilesets/gate_metatiles.bin"
+INCBIN "data/tilesets/gate_metatiles.bin"
 ; 0xb5de0
 
 TilesetGateColl: ; 0xb5de0
-INCLUDE "tilesets/gate_collision.asm"
+INCLUDE "data/tilesets/gate_collision.asm"
 ; 0xb5ee0
 
 TilesetJohto2GFX: ; 0xb5ee0
@@ -297,11 +297,11 @@ INCBIN "gfx/tilesets/johto_2.2bpp.lz"
 ; 0xb6ae8
 
 TilesetJohto2Meta: ; 0xb6ae8
-INCBIN "tilesets/johto_2_metatiles.bin"
+INCBIN "data/tilesets/johto_2_metatiles.bin"
 ; 0xb72e8
 
 TilesetJohto2Coll: ; 0xb72e8
-INCLUDE "tilesets/johto_2_collision.asm"
+INCLUDE "data/tilesets/johto_2_collision.asm"
 ; 0xb74e8
 
 TilesetKurtsHouseGFX: ; 0xb74e8
@@ -309,11 +309,11 @@ INCBIN "gfx/tilesets/kurts_house.2bpp.lz"
 ; 0xb79a8
 
 TilesetKurtsHouseMeta: ; 0xb79a8
-INCBIN "tilesets/kurts_house_metatiles.bin"
+INCBIN "data/tilesets/kurts_house_metatiles.bin"
 ; 0xb7da8
 
 TilesetKurtsHouseColl: ; 0xb7da8
-INCLUDE "tilesets/kurts_house_collision.asm"
+INCLUDE "data/tilesets/kurts_house_collision.asm"
 ; 0xb7ea8
 
 
@@ -328,11 +328,11 @@ INCBIN "gfx/tilesets/olivine_gym.2bpp.lz"
 ; 0xdcc50
 
 TilesetOlivineGymMeta: ; 0xdcc50
-INCBIN "tilesets/olivine_gym_metatiles.bin"
+INCBIN "data/tilesets/olivine_gym_metatiles.bin"
 ; 0xdd050
 
 TilesetOlivineGymColl: ; 0xdd050
-INCLUDE "tilesets/olivine_gym_collision.asm"
+INCLUDE "data/tilesets/olivine_gym_collision.asm"
 ; 0xdd150
 
 TilesetHouse1GFX: ; 0xdd150
@@ -340,11 +340,11 @@ INCBIN "gfx/tilesets/house_1.2bpp.lz"
 ; 0xdd600
 
 TilesetHouse1Meta: ; 0xdd600
-INCBIN "tilesets/house_1_metatiles.bin"
+INCBIN "data/tilesets/house_1_metatiles.bin"
 ; 0xdda00
 
 TilesetHouse1Coll: ; 0xdda00
-INCLUDE "tilesets/house_1_collision.asm"
+INCLUDE "data/tilesets/house_1_collision.asm"
 ; 0xddb00
 
 TilesetLighthouseGFX: ; 0xddb00
@@ -352,15 +352,15 @@ INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
 ; 0xddf70
 
 TilesetLighthouseMeta: ; 0xddf70
-INCBIN "tilesets/lighthouse_metatiles.bin"
+INCBIN "data/tilesets/lighthouse_metatiles.bin"
 ; 0xde370
 
 TilesetLighthouseColl: ; 0xde370
-INCLUDE "tilesets/lighthouse_collision.asm"
+INCLUDE "data/tilesets/lighthouse_collision.asm"
 ; 0xde470
 
 TilesetIlexForestColl: ; 0xde470
-INCLUDE "tilesets/ilex_forest_collision.asm"
+INCLUDE "data/tilesets/ilex_forest_collision.asm"
 ; 0xde570
 
 TilesetPowerPlantGFX: ; 0xde570
@@ -368,23 +368,23 @@ INCBIN "gfx/tilesets/power_plant.2bpp.lz"
 ; 0xde990
 
 TilesetPowerPlantMeta: ; 0xde990
-INCBIN "tilesets/power_plant_metatiles.bin"
+INCBIN "data/tilesets/power_plant_metatiles.bin"
 ; 0xded90
 
 TilesetPowerPlantColl: ; 0xded90
-INCLUDE "tilesets/power_plant_collision.asm"
+INCLUDE "data/tilesets/power_plant_collision.asm"
 ; 0xdee90
 
 TilesetBattleTowerOutsideMeta: ; 0xdee90
-INCBIN "tilesets/battle_tower_outside_metatiles.bin"
+INCBIN "data/tilesets/battle_tower_outside_metatiles.bin"
 ; 0xdf690
 
 TilesetBattleTowerOutsideColl: ; 0xdf690
-INCLUDE "tilesets/battle_tower_outside_collision.asm"
+INCLUDE "data/tilesets/battle_tower_outside_collision.asm"
 ; 0xdf890
 
 TilesetBetaWordRoomMeta: ; 0xdf890
-INCBIN "tilesets/beta_word_room_metatiles.bin"
+INCBIN "data/tilesets/beta_word_room_metatiles.bin"
 ; 0xdfc90
 
 TilesetBetaWordRoomColl: ; 0xdfc90
@@ -392,7 +392,7 @@ TilesetHoOhWordRoomColl: ; 0xdfc90
 TilesetKabutoWordRoomColl: ; 0xdfc90
 TilesetOmanyteWordRoomColl: ; 0xdfc90
 TilesetAerodactylWordRoomColl: ; 0xdfc90
-INCLUDE "tilesets/beta_word_room_collision.asm"
+INCLUDE "data/tilesets/beta_word_room_collision.asm"
 ; 0xdfd90
 
 
@@ -408,28 +408,28 @@ INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
 ; 0x1dd1a9
 
 TilesetRuinsOfAlphMeta: ; 0x1dd1a9
-INCBIN "tilesets/ruins_of_alph_metatiles.bin"
+INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
 ; 0x1dd5a9
 
 TilesetRuinsOfAlphColl: ; 0x1dd5a9
-INCLUDE "tilesets/ruins_of_alph_collision.asm"
+INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
 ; 0x1dd6a9
 
 
 SECTION "Tileset Data 8", ROMX
 
 TilesetHoOhWordRoomMeta: ; 0x1e0000
-INCBIN "tilesets/ho_oh_word_room_metatiles.bin"
+INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin"
 ; 0x1e0400
 
 TilesetKabutoWordRoomMeta: ; 0x1e0400
-INCBIN "tilesets/kabuto_word_room_metatiles.bin"
+INCBIN "data/tilesets/kabuto_word_room_metatiles.bin"
 ; 0x1e0800
 
 TilesetOmanyteWordRoomMeta: ; 0x1e0800
-INCBIN "tilesets/omanyte_word_room_metatiles.bin"
+INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
 ; 0x1e0c00
 
 TilesetAerodactylWordRoomMeta: ; 0x1e0c00
-INCBIN "tilesets/aerodactyl_word_room_metatiles.bin"
+INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
 ; 0x1e1000
diff --git a/tilesets/tilesets.asm b/data/tilesets.asm
similarity index 84%
rename from tilesets/tilesets.asm
rename to data/tilesets.asm
index 06cbdb05d..196dcd6ae 100644
--- a/tilesets/tilesets.asm
+++ b/data/tilesets.asm
@@ -5,6 +5,11 @@ tileset: MACRO
 	dw \1PalMap
 ENDM
 
+; Associated data:
+; - The *GFX, *Meta, and *Coll are defined in data/tileset_data.asm
+; - The *Anim are defined in engine/tileset_anims.asm
+; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
+
 Tilesets:: ; 4d596
 ; entries correspond to TILESET_* constants
 	tileset Tileset0
diff --git a/tilesets/aerodactyl_word_room_collision.asm b/data/tilesets/aerodactyl_word_room_collision.asm
similarity index 100%
rename from tilesets/aerodactyl_word_room_collision.asm
rename to data/tilesets/aerodactyl_word_room_collision.asm
diff --git a/tilesets/aerodactyl_word_room_metatiles.bin b/data/tilesets/aerodactyl_word_room_metatiles.bin
similarity index 100%
rename from tilesets/aerodactyl_word_room_metatiles.bin
rename to data/tilesets/aerodactyl_word_room_metatiles.bin
diff --git a/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm
similarity index 100%
rename from tilesets/battle_tower_collision.asm
rename to data/tilesets/battle_tower_collision.asm
diff --git a/tilesets/battle_tower_metatiles.bin b/data/tilesets/battle_tower_metatiles.bin
similarity index 100%
rename from tilesets/battle_tower_metatiles.bin
rename to data/tilesets/battle_tower_metatiles.bin
diff --git a/tilesets/battle_tower_outside_collision.asm b/data/tilesets/battle_tower_outside_collision.asm
similarity index 100%
rename from tilesets/battle_tower_outside_collision.asm
rename to data/tilesets/battle_tower_outside_collision.asm
diff --git a/tilesets/battle_tower_outside_metatiles.bin b/data/tilesets/battle_tower_outside_metatiles.bin
similarity index 100%
rename from tilesets/battle_tower_outside_metatiles.bin
rename to data/tilesets/battle_tower_outside_metatiles.bin
diff --git a/tilesets/beta_word_room_collision.asm b/data/tilesets/beta_word_room_collision.asm
similarity index 100%
rename from tilesets/beta_word_room_collision.asm
rename to data/tilesets/beta_word_room_collision.asm
diff --git a/tilesets/beta_word_room_metatiles.bin b/data/tilesets/beta_word_room_metatiles.bin
similarity index 100%
rename from tilesets/beta_word_room_metatiles.bin
rename to data/tilesets/beta_word_room_metatiles.bin
diff --git a/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm
similarity index 100%
rename from tilesets/cave_collision.asm
rename to data/tilesets/cave_collision.asm
diff --git a/tilesets/cave_metatiles.bin b/data/tilesets/cave_metatiles.bin
similarity index 100%
rename from tilesets/cave_metatiles.bin
rename to data/tilesets/cave_metatiles.bin
diff --git a/tilesets/celadon_mansion_collision.asm b/data/tilesets/celadon_mansion_collision.asm
similarity index 100%
rename from tilesets/celadon_mansion_collision.asm
rename to data/tilesets/celadon_mansion_collision.asm
diff --git a/tilesets/celadon_mansion_metatiles.bin b/data/tilesets/celadon_mansion_metatiles.bin
similarity index 100%
rename from tilesets/celadon_mansion_metatiles.bin
rename to data/tilesets/celadon_mansion_metatiles.bin
diff --git a/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm
similarity index 100%
rename from tilesets/game_corner_collision.asm
rename to data/tilesets/game_corner_collision.asm
diff --git a/tilesets/game_corner_metatiles.bin b/data/tilesets/game_corner_metatiles.bin
similarity index 100%
rename from tilesets/game_corner_metatiles.bin
rename to data/tilesets/game_corner_metatiles.bin
diff --git a/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm
similarity index 100%
rename from tilesets/gate_collision.asm
rename to data/tilesets/gate_collision.asm
diff --git a/tilesets/gate_metatiles.bin b/data/tilesets/gate_metatiles.bin
similarity index 100%
rename from tilesets/gate_metatiles.bin
rename to data/tilesets/gate_metatiles.bin
diff --git a/tilesets/gym_1_collision.asm b/data/tilesets/gym_1_collision.asm
similarity index 100%
rename from tilesets/gym_1_collision.asm
rename to data/tilesets/gym_1_collision.asm
diff --git a/tilesets/gym_1_metatiles.bin b/data/tilesets/gym_1_metatiles.bin
similarity index 100%
rename from tilesets/gym_1_metatiles.bin
rename to data/tilesets/gym_1_metatiles.bin
diff --git a/tilesets/ho_oh_word_room_collision.asm b/data/tilesets/ho_oh_word_room_collision.asm
similarity index 100%
rename from tilesets/ho_oh_word_room_collision.asm
rename to data/tilesets/ho_oh_word_room_collision.asm
diff --git a/tilesets/ho_oh_word_room_metatiles.bin b/data/tilesets/ho_oh_word_room_metatiles.bin
similarity index 100%
rename from tilesets/ho_oh_word_room_metatiles.bin
rename to data/tilesets/ho_oh_word_room_metatiles.bin
diff --git a/tilesets/house_1_collision.asm b/data/tilesets/house_1_collision.asm
similarity index 100%
rename from tilesets/house_1_collision.asm
rename to data/tilesets/house_1_collision.asm
diff --git a/tilesets/house_1_metatiles.bin b/data/tilesets/house_1_metatiles.bin
similarity index 100%
rename from tilesets/house_1_metatiles.bin
rename to data/tilesets/house_1_metatiles.bin
diff --git a/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm
similarity index 100%
rename from tilesets/ice_path_collision.asm
rename to data/tilesets/ice_path_collision.asm
diff --git a/tilesets/ice_path_metatiles.bin b/data/tilesets/ice_path_metatiles.bin
similarity index 100%
rename from tilesets/ice_path_metatiles.bin
rename to data/tilesets/ice_path_metatiles.bin
diff --git a/tilesets/ilex_forest_collision.asm b/data/tilesets/ilex_forest_collision.asm
similarity index 100%
rename from tilesets/ilex_forest_collision.asm
rename to data/tilesets/ilex_forest_collision.asm
diff --git a/tilesets/ilex_forest_metatiles.bin b/data/tilesets/ilex_forest_metatiles.bin
similarity index 100%
rename from tilesets/ilex_forest_metatiles.bin
rename to data/tilesets/ilex_forest_metatiles.bin
diff --git a/tilesets/johto_1_collision.asm b/data/tilesets/johto_1_collision.asm
similarity index 100%
rename from tilesets/johto_1_collision.asm
rename to data/tilesets/johto_1_collision.asm
diff --git a/tilesets/johto_1_metatiles.bin b/data/tilesets/johto_1_metatiles.bin
similarity index 100%
rename from tilesets/johto_1_metatiles.bin
rename to data/tilesets/johto_1_metatiles.bin
diff --git a/tilesets/johto_2_collision.asm b/data/tilesets/johto_2_collision.asm
similarity index 100%
rename from tilesets/johto_2_collision.asm
rename to data/tilesets/johto_2_collision.asm
diff --git a/tilesets/johto_2_metatiles.bin b/data/tilesets/johto_2_metatiles.bin
similarity index 100%
rename from tilesets/johto_2_metatiles.bin
rename to data/tilesets/johto_2_metatiles.bin
diff --git a/tilesets/kabuto_word_room_collision.asm b/data/tilesets/kabuto_word_room_collision.asm
similarity index 100%
rename from tilesets/kabuto_word_room_collision.asm
rename to data/tilesets/kabuto_word_room_collision.asm
diff --git a/tilesets/kabuto_word_room_metatiles.bin b/data/tilesets/kabuto_word_room_metatiles.bin
similarity index 100%
rename from tilesets/kabuto_word_room_metatiles.bin
rename to data/tilesets/kabuto_word_room_metatiles.bin
diff --git a/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm
similarity index 100%
rename from tilesets/kanto_collision.asm
rename to data/tilesets/kanto_collision.asm
diff --git a/tilesets/kanto_metatiles.bin b/data/tilesets/kanto_metatiles.bin
similarity index 100%
rename from tilesets/kanto_metatiles.bin
rename to data/tilesets/kanto_metatiles.bin
diff --git a/tilesets/kurts_house_collision.asm b/data/tilesets/kurts_house_collision.asm
similarity index 100%
rename from tilesets/kurts_house_collision.asm
rename to data/tilesets/kurts_house_collision.asm
diff --git a/tilesets/kurts_house_metatiles.bin b/data/tilesets/kurts_house_metatiles.bin
similarity index 100%
rename from tilesets/kurts_house_metatiles.bin
rename to data/tilesets/kurts_house_metatiles.bin
diff --git a/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm
similarity index 100%
rename from tilesets/lab_collision.asm
rename to data/tilesets/lab_collision.asm
diff --git a/tilesets/lab_metatiles.bin b/data/tilesets/lab_metatiles.bin
similarity index 100%
rename from tilesets/lab_metatiles.bin
rename to data/tilesets/lab_metatiles.bin
diff --git a/tilesets/lighthouse_collision.asm b/data/tilesets/lighthouse_collision.asm
similarity index 100%
rename from tilesets/lighthouse_collision.asm
rename to data/tilesets/lighthouse_collision.asm
diff --git a/tilesets/lighthouse_metatiles.bin b/data/tilesets/lighthouse_metatiles.bin
similarity index 100%
rename from tilesets/lighthouse_metatiles.bin
rename to data/tilesets/lighthouse_metatiles.bin
diff --git a/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm
similarity index 100%
rename from tilesets/mart_collision.asm
rename to data/tilesets/mart_collision.asm
diff --git a/tilesets/mart_metatiles.bin b/data/tilesets/mart_metatiles.bin
similarity index 100%
rename from tilesets/mart_metatiles.bin
rename to data/tilesets/mart_metatiles.bin
diff --git a/tilesets/olivine_gym_collision.asm b/data/tilesets/olivine_gym_collision.asm
similarity index 100%
rename from tilesets/olivine_gym_collision.asm
rename to data/tilesets/olivine_gym_collision.asm
diff --git a/tilesets/olivine_gym_metatiles.bin b/data/tilesets/olivine_gym_metatiles.bin
similarity index 100%
rename from tilesets/olivine_gym_metatiles.bin
rename to data/tilesets/olivine_gym_metatiles.bin
diff --git a/tilesets/omanyte_word_room_collision.asm b/data/tilesets/omanyte_word_room_collision.asm
similarity index 100%
rename from tilesets/omanyte_word_room_collision.asm
rename to data/tilesets/omanyte_word_room_collision.asm
diff --git a/tilesets/omanyte_word_room_metatiles.bin b/data/tilesets/omanyte_word_room_metatiles.bin
similarity index 100%
rename from tilesets/omanyte_word_room_metatiles.bin
rename to data/tilesets/omanyte_word_room_metatiles.bin
diff --git a/tilesets/park_collision.asm b/data/tilesets/park_collision.asm
similarity index 100%
rename from tilesets/park_collision.asm
rename to data/tilesets/park_collision.asm
diff --git a/tilesets/park_metatiles.bin b/data/tilesets/park_metatiles.bin
similarity index 100%
rename from tilesets/park_metatiles.bin
rename to data/tilesets/park_metatiles.bin
diff --git a/tilesets/players_house_2f_collision.asm b/data/tilesets/players_house_2f_collision.asm
similarity index 100%
rename from tilesets/players_house_2f_collision.asm
rename to data/tilesets/players_house_2f_collision.asm
diff --git a/tilesets/players_house_2f_metatiles.bin b/data/tilesets/players_house_2f_metatiles.bin
similarity index 100%
rename from tilesets/players_house_2f_metatiles.bin
rename to data/tilesets/players_house_2f_metatiles.bin
diff --git a/tilesets/players_house_collision.asm b/data/tilesets/players_house_collision.asm
similarity index 100%
rename from tilesets/players_house_collision.asm
rename to data/tilesets/players_house_collision.asm
diff --git a/tilesets/players_house_metatiles.bin b/data/tilesets/players_house_metatiles.bin
similarity index 100%
rename from tilesets/players_house_metatiles.bin
rename to data/tilesets/players_house_metatiles.bin
diff --git a/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm
similarity index 100%
rename from tilesets/pokecenter_collision.asm
rename to data/tilesets/pokecenter_collision.asm
diff --git a/tilesets/pokecenter_metatiles.bin b/data/tilesets/pokecenter_metatiles.bin
similarity index 100%
rename from tilesets/pokecenter_metatiles.bin
rename to data/tilesets/pokecenter_metatiles.bin
diff --git a/tilesets/pokecom_center_collision.asm b/data/tilesets/pokecom_center_collision.asm
similarity index 100%
rename from tilesets/pokecom_center_collision.asm
rename to data/tilesets/pokecom_center_collision.asm
diff --git a/tilesets/pokecom_center_metatiles.bin b/data/tilesets/pokecom_center_metatiles.bin
similarity index 100%
rename from tilesets/pokecom_center_metatiles.bin
rename to data/tilesets/pokecom_center_metatiles.bin
diff --git a/tilesets/port_collision.asm b/data/tilesets/port_collision.asm
similarity index 100%
rename from tilesets/port_collision.asm
rename to data/tilesets/port_collision.asm
diff --git a/tilesets/port_metatiles.bin b/data/tilesets/port_metatiles.bin
similarity index 100%
rename from tilesets/port_metatiles.bin
rename to data/tilesets/port_metatiles.bin
diff --git a/tilesets/power_plant_collision.asm b/data/tilesets/power_plant_collision.asm
similarity index 100%
rename from tilesets/power_plant_collision.asm
rename to data/tilesets/power_plant_collision.asm
diff --git a/tilesets/power_plant_metatiles.bin b/data/tilesets/power_plant_metatiles.bin
similarity index 100%
rename from tilesets/power_plant_metatiles.bin
rename to data/tilesets/power_plant_metatiles.bin
diff --git a/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm
similarity index 100%
rename from tilesets/radio_tower_collision.asm
rename to data/tilesets/radio_tower_collision.asm
diff --git a/tilesets/radio_tower_metatiles.bin b/data/tilesets/radio_tower_metatiles.bin
similarity index 100%
rename from tilesets/radio_tower_metatiles.bin
rename to data/tilesets/radio_tower_metatiles.bin
diff --git a/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm
similarity index 100%
rename from tilesets/ruins_of_alph_collision.asm
rename to data/tilesets/ruins_of_alph_collision.asm
diff --git a/tilesets/ruins_of_alph_metatiles.bin b/data/tilesets/ruins_of_alph_metatiles.bin
similarity index 100%
rename from tilesets/ruins_of_alph_metatiles.bin
rename to data/tilesets/ruins_of_alph_metatiles.bin
diff --git a/tilesets/sprout_tower_collision.asm b/data/tilesets/sprout_tower_collision.asm
similarity index 100%
rename from tilesets/sprout_tower_collision.asm
rename to data/tilesets/sprout_tower_collision.asm
diff --git a/tilesets/sprout_tower_metatiles.bin b/data/tilesets/sprout_tower_metatiles.bin
similarity index 100%
rename from tilesets/sprout_tower_metatiles.bin
rename to data/tilesets/sprout_tower_metatiles.bin
diff --git a/tilesets/train_station_collision.asm b/data/tilesets/train_station_collision.asm
similarity index 100%
rename from tilesets/train_station_collision.asm
rename to data/tilesets/train_station_collision.asm
diff --git a/tilesets/train_station_metatiles.bin b/data/tilesets/train_station_metatiles.bin
similarity index 100%
rename from tilesets/train_station_metatiles.bin
rename to data/tilesets/train_station_metatiles.bin
diff --git a/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm
similarity index 100%
rename from tilesets/underground_collision.asm
rename to data/tilesets/underground_collision.asm
diff --git a/tilesets/underground_metatiles.bin b/data/tilesets/underground_metatiles.bin
similarity index 100%
rename from tilesets/underground_metatiles.bin
rename to data/tilesets/underground_metatiles.bin
diff --git a/tilesets/unused_whirl_islands_collision.asm b/data/tilesets/unused_whirl_islands_collision.asm
similarity index 100%
rename from tilesets/unused_whirl_islands_collision.asm
rename to data/tilesets/unused_whirl_islands_collision.asm
diff --git a/tilesets/unused_whirl_islands_metatiles.bin b/data/tilesets/unused_whirl_islands_metatiles.bin
similarity index 100%
rename from tilesets/unused_whirl_islands_metatiles.bin
rename to data/tilesets/unused_whirl_islands_metatiles.bin
diff --git a/tilesets/whirl_islands_collision.asm b/data/tilesets/whirl_islands_collision.asm
similarity index 100%
rename from tilesets/whirl_islands_collision.asm
rename to data/tilesets/whirl_islands_collision.asm
diff --git a/tilesets/whirl_islands_metatiles.bin b/data/tilesets/whirl_islands_metatiles.bin
similarity index 100%
rename from tilesets/whirl_islands_metatiles.bin
rename to data/tilesets/whirl_islands_metatiles.bin
diff --git a/docs/design_flaws.md b/docs/design_flaws.md
index 21a222743..7dbe79cfb 100644
--- a/docs/design_flaws.md
+++ b/docs/design_flaws.md
@@ -471,7 +471,7 @@ GetNumberedTMHM: ; d417
 
 ## `GetForestTreeFrame` works, but it's still bad
 
-In [tilesets/animations.asm](/tilesets/animations.asm):
+In [engine/tileset_anims.asm](/engine/tileset_anims.asm):
 
 ```asm
 GetForestTreeFrame: ; fc54c
diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm
index e4783619c..f877c8e0a 100755
--- a/engine/crystal_colors.asm
+++ b/engine/crystal_colors.asm
@@ -204,7 +204,7 @@ Function49496: ; 49496
 	ret
 ; 494ac
 
-INCLUDE "tilesets/special_palettes.asm"
+INCLUDE "engine/tileset_palettes.asm"
 
 MG_Mobile_Layout02: ; 49706
 	ld hl, .Palette_49732
diff --git a/tilesets/roofs.asm b/engine/mapgroup_roofs.asm
similarity index 100%
rename from tilesets/roofs.asm
rename to engine/mapgroup_roofs.asm
diff --git a/tilesets/animations.asm b/engine/tileset_anims.asm
similarity index 100%
rename from tilesets/animations.asm
rename to engine/tileset_anims.asm
diff --git a/tilesets/special_palettes.asm b/engine/tileset_palettes.asm
similarity index 100%
rename from tilesets/special_palettes.asm
rename to engine/tileset_palettes.asm
diff --git a/tilesets/aerodactyl_word_room_palette_map.asm b/gfx/tilesets/aerodactyl_word_room_palette_map.asm
similarity index 100%
rename from tilesets/aerodactyl_word_room_palette_map.asm
rename to gfx/tilesets/aerodactyl_word_room_palette_map.asm
diff --git a/tilesets/battle_tower_outside_palette_map.asm b/gfx/tilesets/battle_tower_outside_palette_map.asm
similarity index 100%
rename from tilesets/battle_tower_outside_palette_map.asm
rename to gfx/tilesets/battle_tower_outside_palette_map.asm
diff --git a/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_palette_map.asm
similarity index 100%
rename from tilesets/battle_tower_palette_map.asm
rename to gfx/tilesets/battle_tower_palette_map.asm
diff --git a/tilesets/beta_word_room_palette_map.asm b/gfx/tilesets/beta_word_room_palette_map.asm
similarity index 100%
rename from tilesets/beta_word_room_palette_map.asm
rename to gfx/tilesets/beta_word_room_palette_map.asm
diff --git a/tilesets/cave_palette_map.asm b/gfx/tilesets/cave_palette_map.asm
similarity index 100%
rename from tilesets/cave_palette_map.asm
rename to gfx/tilesets/cave_palette_map.asm
diff --git a/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/celadon_mansion_palette_map.asm
similarity index 100%
rename from tilesets/celadon_mansion_palette_map.asm
rename to gfx/tilesets/celadon_mansion_palette_map.asm
diff --git a/tilesets/game_corner_palette_map.asm b/gfx/tilesets/game_corner_palette_map.asm
similarity index 100%
rename from tilesets/game_corner_palette_map.asm
rename to gfx/tilesets/game_corner_palette_map.asm
diff --git a/tilesets/gate_palette_map.asm b/gfx/tilesets/gate_palette_map.asm
similarity index 100%
rename from tilesets/gate_palette_map.asm
rename to gfx/tilesets/gate_palette_map.asm
diff --git a/tilesets/gym_1_palette_map.asm b/gfx/tilesets/gym_1_palette_map.asm
similarity index 100%
rename from tilesets/gym_1_palette_map.asm
rename to gfx/tilesets/gym_1_palette_map.asm
diff --git a/tilesets/ho_oh_word_room_palette_map.asm b/gfx/tilesets/ho_oh_word_room_palette_map.asm
similarity index 100%
rename from tilesets/ho_oh_word_room_palette_map.asm
rename to gfx/tilesets/ho_oh_word_room_palette_map.asm
diff --git a/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_1_palette_map.asm
similarity index 100%
rename from tilesets/house_1_palette_map.asm
rename to gfx/tilesets/house_1_palette_map.asm
diff --git a/tilesets/ice_path_palette_map.asm b/gfx/tilesets/ice_path_palette_map.asm
similarity index 100%
rename from tilesets/ice_path_palette_map.asm
rename to gfx/tilesets/ice_path_palette_map.asm
diff --git a/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/ilex_forest_palette_map.asm
similarity index 100%
rename from tilesets/ilex_forest_palette_map.asm
rename to gfx/tilesets/ilex_forest_palette_map.asm
diff --git a/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_1_palette_map.asm
similarity index 100%
rename from tilesets/johto_1_palette_map.asm
rename to gfx/tilesets/johto_1_palette_map.asm
diff --git a/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_2_palette_map.asm
similarity index 100%
rename from tilesets/johto_2_palette_map.asm
rename to gfx/tilesets/johto_2_palette_map.asm
diff --git a/tilesets/kabuto_word_room_palette_map.asm b/gfx/tilesets/kabuto_word_room_palette_map.asm
similarity index 100%
rename from tilesets/kabuto_word_room_palette_map.asm
rename to gfx/tilesets/kabuto_word_room_palette_map.asm
diff --git a/tilesets/kanto_palette_map.asm b/gfx/tilesets/kanto_palette_map.asm
similarity index 100%
rename from tilesets/kanto_palette_map.asm
rename to gfx/tilesets/kanto_palette_map.asm
diff --git a/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/kurts_house_palette_map.asm
similarity index 100%
rename from tilesets/kurts_house_palette_map.asm
rename to gfx/tilesets/kurts_house_palette_map.asm
diff --git a/tilesets/lab_palette_map.asm b/gfx/tilesets/lab_palette_map.asm
similarity index 100%
rename from tilesets/lab_palette_map.asm
rename to gfx/tilesets/lab_palette_map.asm
diff --git a/tilesets/lighthouse_palette_map.asm b/gfx/tilesets/lighthouse_palette_map.asm
similarity index 100%
rename from tilesets/lighthouse_palette_map.asm
rename to gfx/tilesets/lighthouse_palette_map.asm
diff --git a/tilesets/mart_palette_map.asm b/gfx/tilesets/mart_palette_map.asm
similarity index 100%
rename from tilesets/mart_palette_map.asm
rename to gfx/tilesets/mart_palette_map.asm
diff --git a/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/olivine_gym_palette_map.asm
similarity index 100%
rename from tilesets/olivine_gym_palette_map.asm
rename to gfx/tilesets/olivine_gym_palette_map.asm
diff --git a/tilesets/omanyte_word_room_palette_map.asm b/gfx/tilesets/omanyte_word_room_palette_map.asm
similarity index 100%
rename from tilesets/omanyte_word_room_palette_map.asm
rename to gfx/tilesets/omanyte_word_room_palette_map.asm
diff --git a/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
similarity index 53%
rename from tilesets/palette_maps.asm
rename to gfx/tilesets/palette_maps.asm
index c893c767c..a0efab45d 100644
--- a/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
@@ -10,77 +10,77 @@ ENDM
 
 
 TilesetKantoPalMap: ; 0x4c075
-INCLUDE "tilesets/kanto_palette_map.asm"
+INCLUDE "gfx/tilesets/kanto_palette_map.asm"
 ; 0x4c0e5
 
 Tileset0PalMap: ; 0x4c0e5
 TilesetJohto1PalMap: ; 0x4c0e5
-INCLUDE "tilesets/johto_1_palette_map.asm"
+INCLUDE "gfx/tilesets/johto_1_palette_map.asm"
 ; 0x4c155
 
 TilesetJohto2PalMap: ; 0x4c155
-INCLUDE "tilesets/johto_2_palette_map.asm"
+INCLUDE "gfx/tilesets/johto_2_palette_map.asm"
 ; 0x4c1c5
 
 TilesetHouse1PalMap: ; 0x4c1c5
-INCLUDE "tilesets/house_1_palette_map.asm"
+INCLUDE "gfx/tilesets/house_1_palette_map.asm"
 ; 0x4c235
 
 TilesetPlayersHousePalMap: ; 0x4c235
-INCLUDE "tilesets/players_house_palette_map.asm"
+INCLUDE "gfx/tilesets/players_house_palette_map.asm"
 ; 0x4c2a5
 
 TilesetPokecenterPalMap: ; 0x4c2a5
-INCLUDE "tilesets/pokecenter_palette_map.asm"
+INCLUDE "gfx/tilesets/pokecenter_palette_map.asm"
 ; 0x4c315
 
 TilesetGatePalMap: ; 0x4c315
-INCLUDE "tilesets/gate_palette_map.asm"
+INCLUDE "gfx/tilesets/gate_palette_map.asm"
 ; 0x4c385
 
 TilesetPortPalMap: ; 0x4c385
-INCLUDE "tilesets/port_palette_map.asm"
+INCLUDE "gfx/tilesets/port_palette_map.asm"
 ; 0x4c3f5
 
 TilesetLabPalMap: ; 0x4c3f5
-INCLUDE "tilesets/lab_palette_map.asm"
+INCLUDE "gfx/tilesets/lab_palette_map.asm"
 ; 0x4c465
 
 TilesetPowerPlantPalMap: ; 0x4c465
-INCLUDE "tilesets/power_plant_palette_map.asm"
+INCLUDE "gfx/tilesets/power_plant_palette_map.asm"
 ; 0x4c4d5
 
 TilesetMartPalMap: ; 0x4c4d5
-INCLUDE "tilesets/mart_palette_map.asm"
+INCLUDE "gfx/tilesets/mart_palette_map.asm"
 ; 0x4c545
 
 TilesetCeladonMansionPalMap: ; 0x4c545
-INCLUDE "tilesets/celadon_mansion_palette_map.asm"
+INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm"
 ; 0x4c5b5
 
 TilesetGameCornerPalMap: ; 0x4c5b5
-INCLUDE "tilesets/game_corner_palette_map.asm"
+INCLUDE "gfx/tilesets/game_corner_palette_map.asm"
 ; 0x4c625
 
 TilesetGym1PalMap: ; 0x4c625
-INCLUDE "tilesets/gym_1_palette_map.asm"
+INCLUDE "gfx/tilesets/gym_1_palette_map.asm"
 ; 0x4c695
 
 TilesetKurtsHousePalMap: ; 0x4c695
-INCLUDE "tilesets/kurts_house_palette_map.asm"
+INCLUDE "gfx/tilesets/kurts_house_palette_map.asm"
 ; 0x4c705
 
 TilesetSproutTowerPalMap: ; 0x4c705
-INCLUDE "tilesets/sprout_tower_palette_map.asm"
+INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm"
 ; 0x4c775
 
 TilesetCavePalMap: ; 0x4c775
 TilesetWhirlIslandsPalMap: ; 0x4c775
-INCLUDE "tilesets/cave_palette_map.asm"
+INCLUDE "gfx/tilesets/cave_palette_map.asm"
 ; 0x4c7e5
 
 TilesetParkPalMap: ; 0x4c7e5
-INCLUDE "tilesets/park_palette_map.asm"
+INCLUDE "gfx/tilesets/park_palette_map.asm"
 ; 0x4c855
 
 TilesetRuinsOfAlphPalMap: ; 0x4c855
@@ -89,53 +89,53 @@ TilesetHoOhWordRoomPalMap: ; 0x4c855
 TilesetKabutoWordRoomPalMap: ; 0x4c855
 TilesetOmanyteWordRoomPalMap: ; 0x4c855
 TilesetAerodactylWordRoomPalMap: ; 0x4c855
-INCLUDE "tilesets/ruins_of_alph_palette_map.asm"
+INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm"
 ; 0x4c8c5
 
 TilesetRadioTowerPalMap: ; 0x4c8c5
-INCLUDE "tilesets/radio_tower_palette_map.asm"
+INCLUDE "gfx/tilesets/radio_tower_palette_map.asm"
 ; 0x4c935
 
 TilesetTrainStationPalMap: ; 0x4c935
-INCLUDE "tilesets/train_station_palette_map.asm"
+INCLUDE "gfx/tilesets/train_station_palette_map.asm"
 ; 0x4c9a5
 
 TilesetUndergroundPalMap: ; 0x4c9a5
-INCLUDE "tilesets/underground_palette_map.asm"
+INCLUDE "gfx/tilesets/underground_palette_map.asm"
 ; 0x4ca15
 
 TilesetOlivineGymPalMap: ; 0x4ca15
-INCLUDE "tilesets/olivine_gym_palette_map.asm"
+INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm"
 ; 0x4ca85
 
 TilesetLighthousePalMap: ; 0x4ca85
-INCLUDE "tilesets/lighthouse_palette_map.asm"
+INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
 ; 0x4caf5
 
 TilesetPlayersHouse2FPalMap: ; 0x4caf5
-INCLUDE "tilesets/players_house_2f_palette_map.asm"
+INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm"
 ; 0x4cb65
 
 UnusedMuseumPalMap: ; 0x4cb65
-INCLUDE "tilesets/unused_museum_palette_map.asm"
+INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
 ; 4cbd5
 
 TilesetIcePathPalMap: ; 0x4cbd5
-INCLUDE "tilesets/ice_path_palette_map.asm"
+INCLUDE "gfx/tilesets/ice_path_palette_map.asm"
 ; 0x4cc45
 
 TilesetIlexForestPalMap: ; 0x4cc45
-INCLUDE "tilesets/ilex_forest_palette_map.asm"
+INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm"
 ; 0x4ccb5
 
 TilesetPokeComCenterPalMap: ; 0x4ccb5
-INCLUDE "tilesets/pokecom_center_palette_map.asm"
+INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm"
 ; 0x4cd25
 
 TilesetBattleTowerPalMap: ; 0x4cd25
-INCLUDE "tilesets/battle_tower_palette_map.asm"
+INCLUDE "gfx/tilesets/battle_tower_palette_map.asm"
 ; 0x4cd95
 
 TilesetBattleTowerOutsidePalMap: ; 0x4cd95
-INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
+INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
 ; 0x4ce05
diff --git a/tilesets/park_palette_map.asm b/gfx/tilesets/park_palette_map.asm
similarity index 100%
rename from tilesets/park_palette_map.asm
rename to gfx/tilesets/park_palette_map.asm
diff --git a/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_house_2f_palette_map.asm
similarity index 100%
rename from tilesets/players_house_2f_palette_map.asm
rename to gfx/tilesets/players_house_2f_palette_map.asm
diff --git a/tilesets/players_house_palette_map.asm b/gfx/tilesets/players_house_palette_map.asm
similarity index 100%
rename from tilesets/players_house_palette_map.asm
rename to gfx/tilesets/players_house_palette_map.asm
diff --git a/tilesets/pokecenter_palette_map.asm b/gfx/tilesets/pokecenter_palette_map.asm
similarity index 100%
rename from tilesets/pokecenter_palette_map.asm
rename to gfx/tilesets/pokecenter_palette_map.asm
diff --git a/tilesets/pokecom_center_palette_map.asm b/gfx/tilesets/pokecom_center_palette_map.asm
similarity index 100%
rename from tilesets/pokecom_center_palette_map.asm
rename to gfx/tilesets/pokecom_center_palette_map.asm
diff --git a/tilesets/port_palette_map.asm b/gfx/tilesets/port_palette_map.asm
similarity index 100%
rename from tilesets/port_palette_map.asm
rename to gfx/tilesets/port_palette_map.asm
diff --git a/tilesets/power_plant_palette_map.asm b/gfx/tilesets/power_plant_palette_map.asm
similarity index 100%
rename from tilesets/power_plant_palette_map.asm
rename to gfx/tilesets/power_plant_palette_map.asm
diff --git a/tilesets/radio_tower_palette_map.asm b/gfx/tilesets/radio_tower_palette_map.asm
similarity index 100%
rename from tilesets/radio_tower_palette_map.asm
rename to gfx/tilesets/radio_tower_palette_map.asm
diff --git a/tilesets/ruins_of_alph_palette_map.asm b/gfx/tilesets/ruins_of_alph_palette_map.asm
similarity index 100%
rename from tilesets/ruins_of_alph_palette_map.asm
rename to gfx/tilesets/ruins_of_alph_palette_map.asm
diff --git a/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/sprout_tower_palette_map.asm
similarity index 100%
rename from tilesets/sprout_tower_palette_map.asm
rename to gfx/tilesets/sprout_tower_palette_map.asm
diff --git a/tilesets/train_station_palette_map.asm b/gfx/tilesets/train_station_palette_map.asm
similarity index 100%
rename from tilesets/train_station_palette_map.asm
rename to gfx/tilesets/train_station_palette_map.asm
diff --git a/tilesets/underground_palette_map.asm b/gfx/tilesets/underground_palette_map.asm
similarity index 100%
rename from tilesets/underground_palette_map.asm
rename to gfx/tilesets/underground_palette_map.asm
diff --git a/tilesets/unused_museum_palette_map.asm b/gfx/tilesets/unused_museum_palette_map.asm
similarity index 100%
rename from tilesets/unused_museum_palette_map.asm
rename to gfx/tilesets/unused_museum_palette_map.asm
diff --git a/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/whirl_islands_palette_map.asm
similarity index 100%
rename from tilesets/whirl_islands_palette_map.asm
rename to gfx/tilesets/whirl_islands_palette_map.asm
diff --git a/main.asm b/main.asm
index 4667de12f..b375060f4 100644
--- a/main.asm
+++ b/main.asm
@@ -85,14 +85,12 @@ INCLUDE "engine/events/daycare.asm"
 INCLUDE "engine/events/print_unown.asm"
 INCLUDE "engine/events/print_photo.asm"
 INCLUDE "engine/breeding.asm"
-
-
-INCLUDE "tilesets/data.asm"
+INCLUDE "data/tileset_data.asm"
 
 
 SECTION "Roofs", ROMX
 
-INCLUDE "tilesets/roofs.asm"
+INCLUDE "engine/mapgroup_roofs.asm"
 
 
 SECTION "Clock Reset", ROMX
@@ -208,7 +206,7 @@ INCLUDE "engine/events/buena_menu.asm"
 SECTION "bank13", ROMX
 
 INCLUDE "engine/map_palettes.asm"
-INCLUDE "tilesets/palette_maps.asm"
+INCLUDE "gfx/tilesets/palette_maps.asm"
 
 ; unreferenced
 ; 0x4ce05
@@ -233,7 +231,7 @@ INCBIN "gfx/shrink/shrink2.2bpp.lz"
 
 INCLUDE "engine/link_2.asm"
 INCLUDE "engine/delete_save_change_clock.asm"
-INCLUDE "tilesets/tilesets.asm"
+INCLUDE "data/tilesets.asm"
 INCLUDE "engine/routines/flagpredef.asm"
 INCLUDE "engine/routines/trademonfrontpic.asm"
 INCLUDE "engine/events/pokerus/check_pokerus.asm"
@@ -490,7 +488,7 @@ INCLUDE "engine/battle/misc.asm"
 
 SECTION "bank3F", ROMX
 
-INCLUDE "tilesets/animations.asm"
+INCLUDE "engine/tileset_anims.asm"
 INCLUDE "engine/npctrade.asm"
 INCLUDE "engine/events/mom_phone.asm"