diff --git a/.gitattributes b/.gitattributes
index bc973be0..4f4d8c38 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,7 +12,7 @@
 *.rle binary
 *.tilecoll binary
 *.bst binary
-*.map binary
+*.tilemap binary
 *.wav binary
 *.blk binary
 *.pic binary
diff --git a/Makefile b/Makefile
index 59e593e8..2b077082 100644
--- a/Makefile
+++ b/Makefile
@@ -83,17 +83,22 @@ pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE"
 
 ### Misc file-specific graphics rules
 
-gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h
-gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h
-gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h
+gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
+gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
+
+gfx/intro_credits/blue_jigglypuff_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/blue_jigglypuff_3.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_1.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_2.2bpp: $(RGBGFX) += -h
+gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h
+
+gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
 
-gfx/game_boy.2bpp: tools/gfx += --remove-duplicates
-gfx/theend.2bpp: tools/gfx += --interleave --png=$<
 gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
 
+gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
+
 
 ### Catch-all graphics rules
 
diff --git a/data/sgb_border.asm b/data/sgb_border.asm
index c2afc193..aa11a326 100755
--- a/data/sgb_border.asm
+++ b/data/sgb_border.asm
@@ -1,9 +1,9 @@
 BorderPalettes:
 IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.map"
+	INCBIN "gfx/sgb/red_border.tilemap"
 ENDC
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.map"
+	INCBIN "gfx/sgb/blue_border.tilemap"
 ENDC
 
 	ds $100
@@ -55,8 +55,8 @@ ENDC
 
 SGBBorderGraphics:
 IF DEF(_RED)
-	INCBIN "gfx/red/sgbborder.2bpp"
+	INCBIN "gfx/sgb/red_border.2bpp"
 ENDC
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/sgbborder.2bpp"
+	INCBIN "gfx/sgb/blue_border.2bpp"
 ENDC
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 7e08631c..f820aae3 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm"
 INCLUDE "text/credits_text.asm"
 
 TheEndGfx:
-	INCBIN "gfx/theend.2bpp"
+	INCBIN "gfx/intro_credits/the_end.2bpp"
 TheEndGfxEnd:
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 9eb7badb..fcc3c99f 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -361,17 +361,17 @@ AnimationTilesetPointers:
 	db $FF
 
 AnimationTileset1:
-	INCBIN "gfx/attack_anim_1.2bpp"
+	INCBIN "gfx/battle/attack_anim_1.2bpp"
 
 AnimationTileset2:
-	INCBIN "gfx/attack_anim_2.2bpp"
+	INCBIN "gfx/battle/attack_anim_2.2bpp"
 
 SlotMachineTiles2:
 IF DEF(_RED)
-	INCBIN "gfx/red/slotmachine2.2bpp"
+	INCBIN "gfx/slots/red_slots_2.2bpp"
 ENDC
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/slotmachine2.2bpp"
+	INCBIN "gfx/slots/blue_slots_2.2bpp"
 ENDC
 
 MoveAnimation:
@@ -1710,7 +1710,7 @@ AnimationMinimizeMon:
 	jp AnimationShowMonPic
 
 MinimizedMonSprite:
-	INCBIN "gfx/minimized_mon_sprite.1bpp"
+	INCBIN "gfx/battle/minimize.1bpp"
 MinimizedMonSpriteEnd:
 
 AnimationSlideMonDownAndHide:
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index f2e26ed5..62b023b0 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -160,7 +160,7 @@ LoadBattleTransitionTile:
 	jp CopyVideoData
 
 BattleTransitionTile:
-	INCBIN "gfx/battle_transition.2bpp"
+	INCBIN "gfx/overworld/battle_transition.2bpp"
 BattleTransitionTileEnd:
 
 BattleTransition_BlackScreen:
diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm
index 323dd167..c0a91949 100644
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -188,5 +188,5 @@ SetupPlayerAndEnemyPokeballs:
 
 ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon)
 PokeballTileGraphics::
-	INCBIN "gfx/pokeball.2bpp"
+	INCBIN "gfx/battle/balls.2bpp"
 PokeballTileGraphicsEnd:
diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm
index 5226072b..78e48384 100755
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -239,5 +239,5 @@ GameFreakShootingStarOAMData:
 GameFreakShootingStarOAMDataEnd:
 
 FallingStar:
-	INCBIN "gfx/falling_star.2bpp"
+	INCBIN "gfx/intro_credits/falling_star.2bpp"
 FallingStarEnd:
diff --git a/engine/intro.asm b/engine/intro.asm
index a016b365..9a13c96f 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -438,35 +438,33 @@ IntroNidorinoAnimation7:
 	db ANIMATION_END
 
 GameFreakIntro:
-	INCBIN "gfx/gamefreak_intro.2bpp"
-	INCBIN "gfx/gamefreak_logo.2bpp"
-	rept 16
-	db $00 ; blank tile
-	endr
+	INCBIN "gfx/intro_credits/gamefreak_presents.2bpp"
+	INCBIN "gfx/intro_credits/gamefreak_logo.2bpp"
+	ds 16, $00 ; blank tile
 GameFreakIntroEnd:
 
 FightIntroBackMon:
-	INCBIN "gfx/intro_fight.2bpp"
+	INCBIN "gfx/intro_credits/gengar.2bpp"
 FightIntroBackMonEnd:
 
 FightIntroFrontMon:
 
 IF DEF(_RED)
-	INCBIN "gfx/red/intro_nido_1.2bpp"
+	INCBIN "gfx/intro_credits/red_nidorino_1.2bpp"
 FightIntroFrontMon2:
-	INCBIN "gfx/red/intro_nido_2.2bpp"
+	INCBIN "gfx/intro_credits/red_nidorino_2.2bpp"
 FightIntroFrontMon3:
-	INCBIN "gfx/red/intro_nido_3.2bpp"
+	INCBIN "gfx/intro_credits/red_nidorino_3.2bpp"
 ENDC
 
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/intro_purin_1.2bpp"
+	INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp"
 FightIntroFrontMon2:
-	INCBIN "gfx/blue/intro_purin_2.2bpp"
+	INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp"
 FightIntroFrontMon3:
-	INCBIN "gfx/blue/intro_purin_3.2bpp"
+	INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp"
 ENDC
 
 FightIntroFrontMonEnd:
 
-	ds $10 ; blank tile
+	ds 16, $00 ; blank tile
diff --git a/engine/menu/draw_badges.asm b/engine/menu/draw_badges.asm
index 9e6262a0..1888e32f 100644
--- a/engine/menu/draw_badges.asm
+++ b/engine/menu/draw_badges.asm
@@ -117,4 +117,4 @@ DrawBadges:
 	db $20, $28, $30, $38, $40, $48, $50, $58
 
 GymLeaderFaceAndBadgeTileGraphics:
-	INCBIN "gfx/badges.2bpp"
+	INCBIN "gfx/trainer_card/badges.2bpp"
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index e2973988..2b86d6f4 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -332,7 +332,7 @@ LoadEDTile:
 	jp CopyVideoDataDouble
 
 ED_Tile:
-	INCBIN "gfx/ED_tile.1bpp"
+	INCBIN "gfx/font/ED.1bpp"
 ED_TileEnd:
 
 PrintAlphabet:
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index ef94f13c..20bee0ee 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -241,8 +241,8 @@ DrawLineBox:
 	ld [hl], $6f ; ← (halfarrow ending)
 	ret
 
-PTile: ; This is a single 1bpp "P" tile
-	INCBIN "gfx/p_tile.1bpp"
+PTile:
+	INCBIN "gfx/font/P.1bpp"
 PTileEnd:
 
 PrintStatsBox:
diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm
index 1e0f9c59..994f5086 100755
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -281,4 +281,4 @@ GetPartyMonSpriteID:
 INCLUDE "data/mon_party_sprites.asm"
 
 MonPartySprites:
-	INCBIN "gfx/mon_ow_sprites.2bpp"
+	INCBIN "gfx/trade/mon_ow_sprites.2bpp"
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index ac4276bd..20309fc1 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -62,13 +62,15 @@ EmotionBubble:
 	jp UpdateSprites
 
 EmotionBubblesPointerTable:
-	dw EmotionBubbles
-	dw EmotionBubbles + $40
-	dw EmotionBubbles + $80
+	dw ShockEmote
+	dw QuestionEmote
+	dw HappyEmote
 
 EmotionBubblesOAM:
 	db $F8,$00,$F9,$00
 	db $FA,$00,$FB,$00
 
 EmotionBubbles:
-	INCBIN "gfx/emotion_bubbles.2bpp"
+ShockEmote:    INCBIN "gfx/emotes/shock.2bpp"
+QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
+HappyEmote:    INCBIN "gfx/emotes/happy.2bpp"
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 73b3fa1f..510f963b 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -63,7 +63,7 @@ AnimateHealingMachine:
 	jp UpdateSprites
 
 PokeCenterFlashingMonitorAndHealBall:
-	INCBIN "gfx/pokecenter_ball.2bpp"
+	INCBIN "gfx/overworld/heal_machine.2bpp"
 
 PokeCenterOAMData:
 	db $24,$34,$7C,$10 ; heal machine monitor
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index b0ec703a..290c8c80 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -68,7 +68,7 @@ LoadHoppingShadowOAM:
 	ret
 
 LedgeHoppingShadow:
-	INCBIN "gfx/ledge_hopping_shadow.1bpp"
+	INCBIN "gfx/overworld/shadow.1bpp"
 LedgeHoppingShadowEnd:
 
 LedgeHoppingShadowOAM:
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index c226a5c5..6c26b712 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -89,5 +89,5 @@ LoadSmokeTile:
 	jp CopyVideoData
 
 SSAnneSmokePuffTile:
-	INCBIN "gfx/ss_anne_smoke_puff.2bpp"
+	INCBIN "gfx/overworld/smoke.2bpp"
 SSAnneSmokePuffTileEnd:
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 3a46687f..0a92c69b 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -878,15 +878,15 @@ LoadSlotMachineTiles:
 	jp SlotMachine_AnimWheel3
 
 SlotMachineMap:
-	INCBIN "gfx/tilemaps/slotmachine.map"
+	INCBIN "gfx/slots/slots.tilemap"
 SlotMachineMapEnd:
 
 INCLUDE "data/slot_machine_wheels.asm"
 
 SlotMachineTiles1:
 IF DEF(_RED)
-	INCBIN "gfx/red/slotmachine1.2bpp"
+	INCBIN "gfx/slots/red_slots_1.2bpp"
 ENDC
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/slotmachine1.2bpp"
+	INCBIN "gfx/slots/blue_slots_1.2bpp"
 ENDC
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 1bb8d561..9cc55161 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -106,7 +106,7 @@ DisplayTownMap:
 INCLUDE "data/town_map_order.asm"
 
 TownMapCursor:
-	INCBIN "gfx/town_map_cursor.1bpp"
+	INCBIN "gfx/town_map/town_map_cursor.1bpp"
 TownMapCursorEnd:
 
 LoadTownMap_Nest:
@@ -271,7 +271,7 @@ BuildFlyLocationsList:
 	ret
 
 TownMapUpArrow:
-	INCBIN "gfx/up_arrow.1bpp"
+	INCBIN "gfx/town_map/up_arrow.1bpp"
 TownMapUpArrowEnd:
 
 LoadTownMap:
@@ -325,8 +325,7 @@ LoadTownMap:
 	ret
 
 CompressedMap:
-; you can decompress this file with the redrle program in the extras/ dir
-	INCBIN "gfx/town_map.rle"
+	INCBIN "gfx/town_map/town_map.rle"
 
 ExitTownMap:
 ; clear town map graphics data and load usual graphics data
@@ -587,7 +586,7 @@ INCLUDE "data/town_map_entries.asm"
 INCLUDE "text/map_names.asm"
 
 MonNestIcon:
-	INCBIN "gfx/mon_nest_icon.1bpp"
+	INCBIN "gfx/pokedex/mon_nest_icon.1bpp"
 MonNestIconEnd:
 
 TownMapSpriteBlinkingAnimation::
diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png
deleted file mode 100644
index 12bd7aa2..00000000
Binary files a/gfx/attack_anim_1.png and /dev/null differ
diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png
deleted file mode 100644
index 57abbfde..00000000
Binary files a/gfx/attack_anim_2.png and /dev/null differ
diff --git a/gfx/battle/attack_anim_1.png b/gfx/battle/attack_anim_1.png
new file mode 100644
index 00000000..f3728737
Binary files /dev/null and b/gfx/battle/attack_anim_1.png differ
diff --git a/gfx/battle/attack_anim_2.png b/gfx/battle/attack_anim_2.png
new file mode 100644
index 00000000..6867d650
Binary files /dev/null and b/gfx/battle/attack_anim_2.png differ
diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png
new file mode 100644
index 00000000..21bb5e37
Binary files /dev/null and b/gfx/battle/balls.png differ
diff --git a/gfx/battle/battle_hud_1.png b/gfx/battle/battle_hud_1.png
new file mode 100644
index 00000000..ed9d4a56
Binary files /dev/null and b/gfx/battle/battle_hud_1.png differ
diff --git a/gfx/battle/battle_hud_2.png b/gfx/battle/battle_hud_2.png
new file mode 100644
index 00000000..0f6954b5
Binary files /dev/null and b/gfx/battle/battle_hud_2.png differ
diff --git a/gfx/battle/battle_hud_3.png b/gfx/battle/battle_hud_3.png
new file mode 100644
index 00000000..fd1c57f7
Binary files /dev/null and b/gfx/battle/battle_hud_3.png differ
diff --git a/gfx/minimized_mon_sprite.png b/gfx/battle/minimize.png
similarity index 100%
rename from gfx/minimized_mon_sprite.png
rename to gfx/battle/minimize.png
diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png
deleted file mode 100644
index 74e6361f..00000000
Binary files a/gfx/battle_hud1.png and /dev/null differ
diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png
deleted file mode 100644
index a5df75c8..00000000
Binary files a/gfx/battle_hud2.png and /dev/null differ
diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png
deleted file mode 100644
index 00643de7..00000000
Binary files a/gfx/battle_hud3.png and /dev/null differ
diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png
new file mode 100644
index 00000000..dd65f4d1
Binary files /dev/null and b/gfx/emotes/happy.png differ
diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png
new file mode 100644
index 00000000..ef1d770b
Binary files /dev/null and b/gfx/emotes/question.png differ
diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png
new file mode 100644
index 00000000..f15cf50f
Binary files /dev/null and b/gfx/emotes/shock.png differ
diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png
deleted file mode 100644
index 31deacf4..00000000
Binary files a/gfx/emotion_bubbles.png and /dev/null differ
diff --git a/gfx/AB.png b/gfx/font/AB.png
similarity index 100%
rename from gfx/AB.png
rename to gfx/font/AB.png
diff --git a/gfx/ED_tile.png b/gfx/font/ED.png
similarity index 100%
rename from gfx/ED_tile.png
rename to gfx/font/ED.png
diff --git a/gfx/p_tile.png b/gfx/font/P.png
similarity index 100%
rename from gfx/p_tile.png
rename to gfx/font/P.png
diff --git a/gfx/font.png b/gfx/font/font.png
similarity index 100%
rename from gfx/font.png
rename to gfx/font/font.png
diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png
new file mode 100644
index 00000000..d00ae7bc
Binary files /dev/null and b/gfx/font/font_battle_extra.png differ
diff --git a/gfx/font/font_extra.png b/gfx/font/font_extra.png
new file mode 100644
index 00000000..243acda0
Binary files /dev/null and b/gfx/font/font_extra.png differ
diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png
deleted file mode 100644
index 1a832831..00000000
Binary files a/gfx/hp_bar_and_status.png and /dev/null differ
diff --git a/gfx/blue/intro_purin_1.png b/gfx/intro_credits/blue_jigglypuff_1.png
similarity index 100%
rename from gfx/blue/intro_purin_1.png
rename to gfx/intro_credits/blue_jigglypuff_1.png
diff --git a/gfx/blue/intro_purin_2.png b/gfx/intro_credits/blue_jigglypuff_2.png
similarity index 100%
rename from gfx/blue/intro_purin_2.png
rename to gfx/intro_credits/blue_jigglypuff_2.png
diff --git a/gfx/blue/intro_purin_3.png b/gfx/intro_credits/blue_jigglypuff_3.png
similarity index 100%
rename from gfx/blue/intro_purin_3.png
rename to gfx/intro_credits/blue_jigglypuff_3.png
diff --git a/gfx/copyright.png b/gfx/intro_credits/copyright.png
similarity index 100%
rename from gfx/copyright.png
rename to gfx/intro_credits/copyright.png
diff --git a/gfx/falling_star.png b/gfx/intro_credits/falling_star.png
similarity index 100%
rename from gfx/falling_star.png
rename to gfx/intro_credits/falling_star.png
diff --git a/gfx/gamefreak_logo.png b/gfx/intro_credits/gamefreak_logo.png
similarity index 100%
rename from gfx/gamefreak_logo.png
rename to gfx/intro_credits/gamefreak_logo.png
diff --git a/gfx/gamefreak_intro.png b/gfx/intro_credits/gamefreak_presents.png
similarity index 100%
rename from gfx/gamefreak_intro.png
rename to gfx/intro_credits/gamefreak_presents.png
diff --git a/gfx/intro_credits/gengar.png b/gfx/intro_credits/gengar.png
new file mode 100644
index 00000000..99fcda8d
Binary files /dev/null and b/gfx/intro_credits/gengar.png differ
diff --git a/gfx/red/intro_nido_1.png b/gfx/intro_credits/red_nidorino_1.png
similarity index 100%
rename from gfx/red/intro_nido_1.png
rename to gfx/intro_credits/red_nidorino_1.png
diff --git a/gfx/red/intro_nido_2.png b/gfx/intro_credits/red_nidorino_2.png
similarity index 100%
rename from gfx/red/intro_nido_2.png
rename to gfx/intro_credits/red_nidorino_2.png
diff --git a/gfx/red/intro_nido_3.png b/gfx/intro_credits/red_nidorino_3.png
similarity index 100%
rename from gfx/red/intro_nido_3.png
rename to gfx/intro_credits/red_nidorino_3.png
diff --git a/gfx/theend.png b/gfx/intro_credits/the_end.png
similarity index 100%
rename from gfx/theend.png
rename to gfx/intro_credits/the_end.png
diff --git a/gfx/intro_fight.png b/gfx/intro_fight.png
deleted file mode 100644
index d7774c01..00000000
Binary files a/gfx/intro_fight.png and /dev/null differ
diff --git a/gfx/battle_transition.png b/gfx/overworld/battle_transition.png
similarity index 100%
rename from gfx/battle_transition.png
rename to gfx/overworld/battle_transition.png
diff --git a/gfx/red_fishingrod_tiles.png b/gfx/overworld/fishing_rod.png
similarity index 100%
rename from gfx/red_fishingrod_tiles.png
rename to gfx/overworld/fishing_rod.png
diff --git a/gfx/pokecenter_ball.png b/gfx/overworld/heal_machine.png
similarity index 100%
rename from gfx/pokecenter_ball.png
rename to gfx/overworld/heal_machine.png
diff --git a/gfx/red_fishing_tile_back.png b/gfx/overworld/red_fish_back.png
similarity index 100%
rename from gfx/red_fishing_tile_back.png
rename to gfx/overworld/red_fish_back.png
diff --git a/gfx/red_fishing_tile_front.png b/gfx/overworld/red_fish_front.png
similarity index 100%
rename from gfx/red_fishing_tile_front.png
rename to gfx/overworld/red_fish_front.png
diff --git a/gfx/red_fishing_tile_side.png b/gfx/overworld/red_fish_side.png
similarity index 100%
rename from gfx/red_fishing_tile_side.png
rename to gfx/overworld/red_fish_side.png
diff --git a/gfx/ledge_hopping_shadow.png b/gfx/overworld/shadow.png
similarity index 100%
rename from gfx/ledge_hopping_shadow.png
rename to gfx/overworld/shadow.png
diff --git a/gfx/ss_anne_smoke_puff.png b/gfx/overworld/smoke.png
similarity index 100%
rename from gfx/ss_anne_smoke_puff.png
rename to gfx/overworld/smoke.png
diff --git a/gfx/spinner_arrow.png b/gfx/overworld/spinners.png
similarity index 100%
rename from gfx/spinner_arrow.png
rename to gfx/overworld/spinners.png
diff --git a/gfx/pokeball.png b/gfx/pokeball.png
deleted file mode 100644
index 830f72b2..00000000
Binary files a/gfx/pokeball.png and /dev/null differ
diff --git a/gfx/mon_nest_icon.png b/gfx/pokedex/mon_nest_icon.png
similarity index 100%
rename from gfx/mon_nest_icon.png
rename to gfx/pokedex/mon_nest_icon.png
diff --git a/gfx/pokedex.png b/gfx/pokedex/pokedex.png
similarity index 100%
rename from gfx/pokedex.png
rename to gfx/pokedex/pokedex.png
diff --git a/gfx/blue/sgbborder.png b/gfx/sgb/blue_border.png
similarity index 100%
rename from gfx/blue/sgbborder.png
rename to gfx/sgb/blue_border.png
diff --git a/gfx/blue/sgbborder.map b/gfx/sgb/blue_border.tilemap
similarity index 100%
rename from gfx/blue/sgbborder.map
rename to gfx/sgb/blue_border.tilemap
diff --git a/gfx/red/sgbborder.png b/gfx/sgb/red_border.png
similarity index 100%
rename from gfx/red/sgbborder.png
rename to gfx/sgb/red_border.png
diff --git a/gfx/red/sgbborder.map b/gfx/sgb/red_border.tilemap
similarity index 100%
rename from gfx/red/sgbborder.map
rename to gfx/sgb/red_border.tilemap
diff --git a/gfx/blue/slotmachine1.png b/gfx/slots/blue_slots_1.png
similarity index 100%
rename from gfx/blue/slotmachine1.png
rename to gfx/slots/blue_slots_1.png
diff --git a/gfx/blue/slotmachine2.png b/gfx/slots/blue_slots_2.png
similarity index 100%
rename from gfx/blue/slotmachine2.png
rename to gfx/slots/blue_slots_2.png
diff --git a/gfx/red/slotmachine1.png b/gfx/slots/red_slots_1.png
similarity index 100%
rename from gfx/red/slotmachine1.png
rename to gfx/slots/red_slots_1.png
diff --git a/gfx/red/slotmachine2.png b/gfx/slots/red_slots_2.png
similarity index 100%
rename from gfx/red/slotmachine2.png
rename to gfx/slots/red_slots_2.png
diff --git a/gfx/tilemaps/slotmachine.map b/gfx/slots/slots.tilemap
similarity index 61%
rename from gfx/tilemaps/slotmachine.map
rename to gfx/slots/slots.tilemap
index 68807bbd..8af0cdd3 100644
Binary files a/gfx/tilemaps/slotmachine.map and b/gfx/slots/slots.tilemap differ
diff --git a/gfx/text_box.png b/gfx/text_box.png
deleted file mode 100644
index 3673e74c..00000000
Binary files a/gfx/text_box.png and /dev/null differ
diff --git a/gfx/blue/blueversion.png b/gfx/title/blue_version.png
similarity index 100%
rename from gfx/blue/blueversion.png
rename to gfx/title/blue_version.png
diff --git a/gfx/gamefreak.png b/gfx/title/gamefreak_inc.png
similarity index 100%
rename from gfx/gamefreak.png
rename to gfx/title/gamefreak_inc.png
diff --git a/gfx/player_title.png b/gfx/title/player.png
similarity index 100%
rename from gfx/player_title.png
rename to gfx/title/player.png
diff --git a/gfx/pokemon_logo.png b/gfx/title/pokemon_logo.png
similarity index 100%
rename from gfx/pokemon_logo.png
rename to gfx/title/pokemon_logo.png
diff --git a/gfx/red/redgreenversion.png b/gfx/title/red_version.png
similarity index 100%
rename from gfx/red/redgreenversion.png
rename to gfx/title/red_version.png
diff --git a/gfx/town_map.png b/gfx/town_map/town_map.png
similarity index 100%
rename from gfx/town_map.png
rename to gfx/town_map/town_map.png
diff --git a/gfx/town_map.rle b/gfx/town_map/town_map.rle
similarity index 100%
rename from gfx/town_map.rle
rename to gfx/town_map/town_map.rle
diff --git a/gfx/town_map_cursor.png b/gfx/town_map/town_map_cursor.png
similarity index 100%
rename from gfx/town_map_cursor.png
rename to gfx/town_map/town_map_cursor.png
diff --git a/gfx/up_arrow.png b/gfx/town_map/up_arrow.png
similarity index 100%
rename from gfx/up_arrow.png
rename to gfx/town_map/up_arrow.png
diff --git a/gfx/trade2.png b/gfx/trade/cable_ball.png
similarity index 100%
rename from gfx/trade2.png
rename to gfx/trade/cable_ball.png
diff --git a/gfx/game_boy.png b/gfx/trade/game_boy.png
similarity index 100%
rename from gfx/game_boy.png
rename to gfx/trade/game_boy.png
diff --git a/gfx/link_cable.png b/gfx/trade/link_cable.png
similarity index 100%
rename from gfx/link_cable.png
rename to gfx/trade/link_cable.png
diff --git a/gfx/mon_ow_sprites.png b/gfx/trade/mon_ow_sprites.png
similarity index 100%
rename from gfx/mon_ow_sprites.png
rename to gfx/trade/mon_ow_sprites.png
diff --git a/gfx/badge_numbers.png b/gfx/trainer_card/badge_numbers.png
similarity index 100%
rename from gfx/badge_numbers.png
rename to gfx/trainer_card/badge_numbers.png
diff --git a/gfx/badges.png b/gfx/trainer_card/badges.png
similarity index 100%
rename from gfx/badges.png
rename to gfx/trainer_card/badges.png
diff --git a/gfx/blank_leader_names.png b/gfx/trainer_card/blank_leader_names.png
similarity index 100%
rename from gfx/blank_leader_names.png
rename to gfx/trainer_card/blank_leader_names.png
diff --git a/gfx/circle_tile.png b/gfx/trainer_card/circle_tile.png
similarity index 100%
rename from gfx/circle_tile.png
rename to gfx/trainer_card/circle_tile.png
diff --git a/gfx/trainer_info.png b/gfx/trainer_card/trainer_info.png
similarity index 100%
rename from gfx/trainer_info.png
rename to gfx/trainer_card/trainer_info.png
diff --git a/gfx/yellow/slotmachine1.png b/gfx/yellow/slotmachine1.png
deleted file mode 100644
index 335ce97c..00000000
Binary files a/gfx/yellow/slotmachine1.png and /dev/null differ
diff --git a/gfx/yellow/slotmachine2.png b/gfx/yellow/slotmachine2.png
deleted file mode 100644
index b4bdf8a8..00000000
Binary files a/gfx/yellow/slotmachine2.png and /dev/null differ
diff --git a/main.asm b/main.asm
index 1c5aa223..abe13d5b 100755
--- a/main.asm
+++ b/main.asm
@@ -79,27 +79,27 @@ INCLUDE "engine/hidden_object_functions3.asm"
 
 SECTION "Graphics (BANK 4)", ROMX
 
-PokemonLogoGraphics:            INCBIN "gfx/pokemon_logo.2bpp"
-FontGraphics::                  INCBIN "gfx/font.1bpp"
+PokemonLogoGraphics:            INCBIN "gfx/title/pokemon_logo.2bpp"
+FontGraphics::                  INCBIN "gfx/font/font.1bpp"
 FontGraphicsEnd::
-ABTiles:                        INCBIN "gfx/AB.2bpp"
-HpBarAndStatusGraphics::        INCBIN "gfx/hp_bar_and_status.2bpp"
+ABTiles:                        INCBIN "gfx/font/AB.2bpp"
+HpBarAndStatusGraphics::        INCBIN "gfx/font/font_battle_extra.2bpp"
 HpBarAndStatusGraphicsEnd::
-BattleHudTiles1:                INCBIN "gfx/battle_hud1.1bpp"
+BattleHudTiles1:                INCBIN "gfx/battle/battle_hud_1.1bpp"
 BattleHudTiles1End:
-BattleHudTiles2:                INCBIN "gfx/battle_hud2.1bpp"
-BattleHudTiles3:                INCBIN "gfx/battle_hud3.1bpp"
+BattleHudTiles2:                INCBIN "gfx/battle/battle_hud_2.1bpp"
+BattleHudTiles3:                INCBIN "gfx/battle/battle_hud_3.1bpp"
 BattleHudTiles3End:
-NintendoCopyrightLogoGraphics:  INCBIN "gfx/copyright.2bpp"
-GamefreakLogoGraphics:          INCBIN "gfx/gamefreak.2bpp"
+NintendoCopyrightLogoGraphics:  INCBIN "gfx/intro_credits/copyright.2bpp"
+GamefreakLogoGraphics:          INCBIN "gfx/title/gamefreak_inc.2bpp"
 GamefreakLogoGraphicsEnd:
-TextBoxGraphics::               INCBIN "gfx/text_box.2bpp"
+TextBoxGraphics::               INCBIN "gfx/font/font_extra.2bpp"
 TextBoxGraphicsEnd::
-PokedexTileGraphics:            INCBIN "gfx/pokedex.2bpp"
+PokedexTileGraphics:            INCBIN "gfx/pokedex/pokedex.2bpp"
 PokedexTileGraphicsEnd:
-WorldMapTileGraphics:           INCBIN "gfx/town_map.2bpp"
+WorldMapTileGraphics:           INCBIN "gfx/town_map/town_map.2bpp"
 WorldMapTileGraphicsEnd:
-PlayerCharacterTitleGraphics:   INCBIN "gfx/player_title.2bpp"
+PlayerCharacterTitleGraphics:   INCBIN "gfx/title/player.2bpp"
 PlayerCharacterTitleGraphicsEnd:
 
 
@@ -176,11 +176,11 @@ SECTION "Battle (BANK B)", ROMX
 
 INCLUDE "engine/battle/display_effectiveness.asm"
 
-TrainerInfoTextBoxTileGraphics:  INCBIN "gfx/trainer_info.2bpp"
+TrainerInfoTextBoxTileGraphics:  INCBIN "gfx/trainer_card/trainer_info.2bpp"
 TrainerInfoTextBoxTileGraphicsEnd:
-BlankLeaderNames:                INCBIN "gfx/blank_leader_names.2bpp"
-CircleTile:                      INCBIN "gfx/circle_tile.2bpp"
-BadgeNumbersTileGraphics:        INCBIN "gfx/badge_numbers.2bpp"
+BlankLeaderNames:                INCBIN "gfx/trainer_card/blank_leader_names.2bpp"
+CircleTile:                      INCBIN "gfx/trainer_card/circle_tile.2bpp"
+BadgeNumbersTileGraphics:        INCBIN "gfx/trainer_card/badge_numbers.2bpp"
 
 INCLUDE "engine/items/tmhm.asm"
 INCLUDE "engine/battle/scale_sprites.asm"
@@ -215,12 +215,12 @@ INCLUDE "engine/battle/trainer_ai.asm"
 INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
 
 TradingAnimationGraphics:
-INCBIN "gfx/game_boy.2bpp"
-INCBIN "gfx/link_cable.2bpp"
+INCBIN "gfx/trade/game_boy.2bpp"
+INCBIN "gfx/trade/link_cable.2bpp"
 TradingAnimationGraphicsEnd:
 
 ; Pokeball traveling through the link cable.
-TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp"
+TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp"
 TradingAnimationGraphics2End:
 
 INCLUDE "engine/evos_moves.asm"
@@ -323,10 +323,10 @@ INCLUDE "engine/battle/decrement_pp.asm"
 
 Version_GFX:
 IF DEF(_RED)
-	INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles
+	INCBIN "gfx/title/red_version.1bpp" ; 10 tiles
 ENDC
 IF DEF(_BLUE)
-	INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles
+	INCBIN "gfx/title/blue_version.1bpp" ; 8 tiles
 ENDC
 Version_GFXEnd:
 
@@ -370,10 +370,10 @@ INCLUDE "engine/battle/animations.asm"
 INCLUDE "engine/overworld/cut2.asm"
 INCLUDE "engine/overworld/ssanne.asm"
 
-RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp"
-RedFishingTilesBack:  INCBIN "gfx/red_fishing_tile_back.2bpp"
-RedFishingTilesSide:  INCBIN "gfx/red_fishing_tile_side.2bpp"
-RedFishingRodTiles:   INCBIN "gfx/red_fishingrod_tiles.2bpp"
+RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp"
+RedFishingTilesBack:  INCBIN "gfx/overworld/red_fish_back.2bpp"
+RedFishingTilesSide:  INCBIN "gfx/overworld/red_fish_side.2bpp"
+RedFishingRodTiles:   INCBIN "gfx/overworld/fishing_rod.2bpp"
 
 INCLUDE "data/animations.asm"
 INCLUDE "engine/evolution.asm"
diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm
index 7805f67a..40e2acc4 100755
--- a/scripts/RocketHideoutB2F.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -411,7 +411,7 @@ SpinnerPlayerFacingDirections:
 
 ; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ
 SpinnerArrowAnimTiles:
-	INCBIN "gfx/spinner_arrow.2bpp"
+	INCBIN "gfx/overworld/spinners.2bpp"
 
 RocketHideoutB2F_TextPointers:
 	dw RocketHideout2Text1
diff --git a/tilesets.asm b/tilesets.asm
index 01a8f933..ed6b6223 100644
--- a/tilesets.asm
+++ b/tilesets.asm
@@ -5,7 +5,7 @@ Overworld_Block::   INCBIN "gfx/blocksets/overworld.bst"
 
 RedsHouse1_GFX::
 RedsHouse2_GFX::    INCBIN "gfx/tilesets/reds_house.2bpp"
-	ds 16
+	ds 16, $00 ; blank tile
 RedsHouse1_Block::
 RedsHouse2_Block::  INCBIN "gfx/blocksets/reds_house.bst"