diff --git a/Makefile b/Makefile
index be1ca99c7..6979e7ce9 100644
--- a/Makefile
+++ b/Makefile
@@ -197,11 +197,10 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
 
 gfx/battle/dude.2bpp: rgbgfx += -h
 
-gfx/misc/unknown_egg.2bpp: rgbgfx += -h
-
 gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
+gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
 gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
 gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip
 gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
diff --git a/engine/color.asm b/engine/color.asm
index 29b6656d5..add8c24ac 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1859,7 +1859,7 @@ SGBBorderPalettes:
 	RGB 31, 31, 25
 
 SGBBorder:
-INCBIN "gfx/misc/sgb_border.2bpp"
+INCBIN "gfx/sgb/sgb_border.2bpp"
 
 Palettes_a8be:
 	RGB 30, 26, 15
diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm
index ae40d0992..8204ab332 100755
--- a/engine/mysterygift.asm
+++ b/engine/mysterygift.asm
@@ -1411,7 +1411,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153)
 	ret
 
 MysteryGiftGFX: ; 105258
-INCBIN "gfx/misc/mystery_gift.2bpp"
+INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
 MysteryGiftGFXEnd:
 
 Function105688: ; 105688 (41:5688)
@@ -1732,4 +1732,4 @@ Function1057d7: ; 1057d7 (41:57d7)
 
 ; japanese mystery gift gfx
 MysteryGiftJP_GFX: ; 105930
-INCBIN "gfx/misc/mystery_gift_jp.2bpp"
+INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp"
diff --git a/gfx/misc/mobile_adapter.png b/gfx/mobile/mobile_adapter.png
similarity index 100%
rename from gfx/misc/mobile_adapter.png
rename to gfx/mobile/mobile_adapter.png
diff --git a/gfx/misc/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png
similarity index 100%
rename from gfx/misc/mystery_gift.png
rename to gfx/mystery_gift/mystery_gift.png
diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png
similarity index 100%
rename from gfx/misc/mystery_gift_jp.png
rename to gfx/mystery_gift/mystery_gift_jp.png
diff --git a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
similarity index 100%
rename from gfx/misc/gbc_only.2bpp.lz.4a5bba0e
rename to gfx/sgb/gbc_only.2bpp.lz.4a5bba0e
diff --git a/gfx/misc/gbc_only.png b/gfx/sgb/gbc_only.png
similarity index 100%
rename from gfx/misc/gbc_only.png
rename to gfx/sgb/gbc_only.png
diff --git a/gfx/misc/sgb_border.png b/gfx/sgb/sgb_border.png
similarity index 100%
rename from gfx/misc/sgb_border.png
rename to gfx/sgb/sgb_border.png
diff --git a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
similarity index 100%
rename from gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa
rename to gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa
diff --git a/gfx/misc/unknown_egg.png b/gfx/unknown/unknown_egg.png
similarity index 100%
rename from gfx/misc/unknown_egg.png
rename to gfx/unknown/unknown_egg.png
diff --git a/main.asm b/main.asm
index c65cea3d4..d5354fe72 100644
--- a/main.asm
+++ b/main.asm
@@ -4611,7 +4611,7 @@ Unknown_53d84: ; unreferenced
 
 UnknownEggPic:: ; 53d9c
 ; Another egg pic. This is shifted up a few pixels.
-INCBIN "gfx/misc/unknown_egg.2bpp.lz"
+INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
 
 SECTION "bank19", ROMX
 
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index fb9637d4c..aa5c704fd 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -4,7 +4,7 @@ INCLUDE "includes.asm"
 SECTION "Misc Crystal", ROMX
 
 MobileAdapterGFX::
-INCBIN "gfx/misc/mobile_adapter.2bpp"
+INCBIN "gfx/mobile/mobile_adapter.2bpp"
 
 
 Function17a68f:: ; 17a68f (5e:668f)
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index f4b3eba8b..a77a44d72 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
 
 
 GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.2bpp.lz"
+INCBIN "gfx/sgb/gbc_only.2bpp.lz"
 ; 4f0bc