diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 00d628e..8eb4d4a 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -103,7 +103,7 @@ incsrc icepalacegraphics.asm
 warnpc $A18000
 
 org $1C8000 ; text tables for translation
-incbin i18n_en.bin
+incbin "data/i18n_en.bin"
 warnpc $1CF356
 
 org $A18000 ; static mapping area
@@ -178,84 +178,84 @@ incsrc spc.asm
 
 org $318000 ; bank #$31
 GFX_Mire_Bombos:
-incbin 99ff1_bombos.gfx
+incbin "data/99ff1_bombos.gfx"
 warnpc $318800
 
 org $318800
 GFX_Mire_Quake:
-incbin 99ff1_quake.gfx
+incbin "data/99ff1_quake.gfx"
 warnpc $319000
 
 org $319000
 GFX_TRock_Bombos:
-incbin a6fc4_bombos.gfx
+incbin "data/a6fc4_bombos.gfx"
 warnpc $319800
 
 org $319800
 GFX_TRock_Ether:
-incbin a6fc4_ether.gfx
+incbin "data/a6fc4_ether.gfx"
 warnpc $31A000
 
 org $31A000
 GFX_HUD_Items:
-incbin c2807_v4.gfx
+incbin "data/c2807_v4.gfx"
 warnpc $31A800
 
 org $31A800
 GFX_New_Items:
-incbin newitems.gfx
+incbin "data/newitems.gfx"
 ;incbin eventitems.gfx ; *EVENT*
 warnpc $31B000
 
 org $31B000
 GFX_HUD_Main:
-incbin c2e3e.gfx
+incbin "data/c2e3e.gfx"
 warnpc $31B800
 
 org $31C000
 IcePalaceFloorGfx:
-incbin ice_palace_floor.bin
+incbin "data/ice_palace_floor.bin"
 warnpc $31C801
 
 org $31C800
 Damage_Table:
-incbin damage_table.bin
+incbin "data/damage_table.bin"
 warnpc $31D001
 
 org $31D000
 FileSelectNewGraphics:
-incbin fileselect.chr.gfx
+incbin "data/fileselect.chr.gfx"
 warnpc $31E001
 
 org $31E000
 InvertedCastleHole: ;address used by front end. DO NOT MOVE!
-incbin sheet73.gfx
+incbin "data/sheet73.gfx"
 warnpc $31E501
 
 org $338000
 GFX_HUD_Palette:
-incbin hudpalette.pal
+incbin "data/hudpalette.pal"
 warnpc $338041
 
 org $339000
-incbin sheet178.gfx
+incbin "data/sheet178.gfx"
 warnpc $339600
 
 org $339600
 BossMapIconGFX:
-incbin bossicons.4bpp
+incbin "data/bossicons.4bpp"
 
 if !FEATURE_NEW_TEXT
     org $339C00
     NewFont:
-    incbin newfont.bin
+    incbin "data/newfont.bin"
     NewFontInverted:
-    incbin newfont_inverted.bin
+    incbin "data/newfont_inverted.bin"
 
     org $0CD7DF
-    incbin text_unscramble1.bin
+    incbin "data/text_unscramble1.bin"
     org $0CE4D5
-    incbin text_unscramble2.bin
+    incbin "data/text_unscramble2.bin"
 endif
 
 org $328000
@@ -265,7 +265,7 @@ incsrc itemtext.asm
 incsrc externalhooks.asm
 ;================================================================================
 org $119100 ; PC 0x89100
-incbin map_icons.gfx
+incbin "data/map_icons.gfx"
 warnpc $119401
 ;================================================================================
 org $AF8000 ; PC 0x178000
diff --git a/99ff1_bombos.gfx b/data/99ff1_bombos.gfx
similarity index 100%
rename from 99ff1_bombos.gfx
rename to data/99ff1_bombos.gfx
diff --git a/99ff1_quake.gfx b/data/99ff1_quake.gfx
similarity index 100%
rename from 99ff1_quake.gfx
rename to data/99ff1_quake.gfx
diff --git a/a6fc4_bombos.gfx b/data/a6fc4_bombos.gfx
similarity index 100%
rename from a6fc4_bombos.gfx
rename to data/a6fc4_bombos.gfx
diff --git a/a6fc4_ether.gfx b/data/a6fc4_ether.gfx
similarity index 100%
rename from a6fc4_ether.gfx
rename to data/a6fc4_ether.gfx
diff --git a/bossicons.4bpp b/data/bossicons.4bpp
similarity index 100%
rename from bossicons.4bpp
rename to data/bossicons.4bpp
diff --git a/bsodencode.txt b/data/bsodencode.txt
similarity index 100%
rename from bsodencode.txt
rename to data/bsodencode.txt
diff --git a/bsodfont.1bpp b/data/bsodfont.1bpp
similarity index 100%
rename from bsodfont.1bpp
rename to data/bsodfont.1bpp
diff --git a/bsodhex.2bpp b/data/bsodhex.2bpp
similarity index 100%
rename from bsodhex.2bpp
rename to data/bsodhex.2bpp
diff --git a/c2807_v3.bin b/data/c2807_v3.bin
similarity index 100%
rename from c2807_v3.bin
rename to data/c2807_v3.bin
diff --git a/c2807_v3.gfx b/data/c2807_v3.gfx
similarity index 100%
rename from c2807_v3.gfx
rename to data/c2807_v3.gfx
diff --git a/c2807_v4.bin b/data/c2807_v4.bin
similarity index 100%
rename from c2807_v4.bin
rename to data/c2807_v4.bin
diff --git a/c2807_v4.gfx b/data/c2807_v4.gfx
similarity index 100%
rename from c2807_v4.gfx
rename to data/c2807_v4.gfx
diff --git a/c2e3e.bin b/data/c2e3e.bin
similarity index 100%
rename from c2e3e.bin
rename to data/c2e3e.bin
diff --git a/c2e3e.gfx b/data/c2e3e.gfx
similarity index 100%
rename from c2e3e.gfx
rename to data/c2e3e.gfx
diff --git a/credits.txt b/data/credits.txt
similarity index 100%
rename from credits.txt
rename to data/credits.txt
diff --git a/creditscharmapbighi.txt b/data/creditscharmapbighi.txt
similarity index 100%
rename from creditscharmapbighi.txt
rename to data/creditscharmapbighi.txt
diff --git a/creditscharmapbiglo.txt b/data/creditscharmapbiglo.txt
similarity index 100%
rename from creditscharmapbiglo.txt
rename to data/creditscharmapbiglo.txt
diff --git a/creditscharmapsmall_green.txt b/data/creditscharmapsmall_green.txt
similarity index 100%
rename from creditscharmapsmall_green.txt
rename to data/creditscharmapsmall_green.txt
diff --git a/creditscharmapsmall_red.txt b/data/creditscharmapsmall_red.txt
similarity index 100%
rename from creditscharmapsmall_red.txt
rename to data/creditscharmapsmall_red.txt
diff --git a/creditscharmapsmall_yellow.txt b/data/creditscharmapsmall_yellow.txt
similarity index 100%
rename from creditscharmapsmall_yellow.txt
rename to data/creditscharmapsmall_yellow.txt
diff --git a/damage_table.bin b/data/damage_table.bin
similarity index 100%
rename from damage_table.bin
rename to data/damage_table.bin
diff --git a/eventitems.bin b/data/eventitems.bin
similarity index 100%
rename from eventitems.bin
rename to data/eventitems.bin
diff --git a/eventitems.gfx b/data/eventitems.gfx
similarity index 100%
rename from eventitems.gfx
rename to data/eventitems.gfx
diff --git a/fileselect.chr.gfx b/data/fileselect.chr.gfx
similarity index 100%
rename from fileselect.chr.gfx
rename to data/fileselect.chr.gfx
diff --git a/hudpalette.pal b/data/hudpalette.pal
similarity index 100%
rename from hudpalette.pal
rename to data/hudpalette.pal
diff --git a/i18n_en.bin b/data/i18n_en.bin
similarity index 100%
rename from i18n_en.bin
rename to data/i18n_en.bin
diff --git a/ice_bombos.bin b/data/ice_bombos.bin
similarity index 100%
rename from ice_bombos.bin
rename to data/ice_bombos.bin
diff --git a/ice_palace_floor.bin b/data/ice_palace_floor.bin
similarity index 100%
rename from ice_palace_floor.bin
rename to data/ice_palace_floor.bin
diff --git a/map_icons.gfx b/data/map_icons.gfx
similarity index 100%
rename from map_icons.gfx
rename to data/map_icons.gfx
diff --git a/newfont.bin b/data/newfont.bin
similarity index 100%
rename from newfont.bin
rename to data/newfont.bin
diff --git a/newfont_inverted.bin b/data/newfont_inverted.bin
similarity index 100%
rename from newfont_inverted.bin
rename to data/newfont_inverted.bin
diff --git a/newitems.bin b/data/newitems.bin
similarity index 100%
rename from newitems.bin
rename to data/newitems.bin
diff --git a/newitems.gfx b/data/newitems.gfx
similarity index 100%
rename from newitems.gfx
rename to data/newitems.gfx
diff --git a/newitems.pal b/data/newitems.pal
similarity index 100%
rename from newitems.pal
rename to data/newitems.pal
diff --git a/newitems2.bin b/data/newitems2.bin
similarity index 100%
rename from newitems2.bin
rename to data/newitems2.bin
diff --git a/newitems2.gfx b/data/newitems2.gfx
similarity index 100%
rename from newitems2.gfx
rename to data/newitems2.gfx
diff --git a/output.txt b/data/output.txt
similarity index 100%
rename from output.txt
rename to data/output.txt
diff --git a/sheet178.gfx b/data/sheet178.gfx
similarity index 100%
rename from sheet178.gfx
rename to data/sheet178.gfx
diff --git a/sheet73.bin b/data/sheet73.bin
similarity index 100%
rename from sheet73.bin
rename to data/sheet73.bin
diff --git a/sheet73.gfx b/data/sheet73.gfx
similarity index 100%
rename from sheet73.gfx
rename to data/sheet73.gfx
diff --git a/text_unscramble1.bin b/data/text_unscramble1.bin
similarity index 100%
rename from text_unscramble1.bin
rename to data/text_unscramble1.bin
diff --git a/text_unscramble2.bin b/data/text_unscramble2.bin
similarity index 100%
rename from text_unscramble2.bin
rename to data/text_unscramble2.bin
diff --git a/zsnes_pal.bin b/data/zsnes_pal.bin
similarity index 100%
rename from zsnes_pal.bin
rename to data/zsnes_pal.bin
diff --git a/zsnes_tilemap.bin b/data/zsnes_tilemap.bin
similarity index 100%
rename from zsnes_tilemap.bin
rename to data/zsnes_tilemap.bin
diff --git a/zsnes_tiles.bin b/data/zsnes_tiles.bin
similarity index 100%
rename from zsnes_tiles.bin
rename to data/zsnes_tiles.bin
diff --git a/failure.asm b/failure.asm
index 64f6f52..1ae00ca 100644
--- a/failure.asm
+++ b/failure.asm
@@ -1,6 +1,6 @@
 pushtable
 
-table "bsodencode.txt"
+table "data/bsodencode.txt"
 
 ; Uncomment this to force a crash to test message
 ; pushpc : org $008132 : db 0 : pullpc
@@ -545,10 +545,10 @@ ConfigurePPUForFailureReport:
 ;===================================================================================================
 
 BSODHex:
-incbin "bsodhex.2bpp"
+incbin "data/bsodhex.2bpp"
 
 BSODFontGFX:
-incbin "bsodfont.1bpp"
+incbin "data/bsodfont.1bpp"
 
 BSODCharWidths:
 	; [space]
diff --git a/stats/credits.asm b/stats/credits.asm
index 3731f25..3bf95ef 100644
--- a/stats/credits.asm
+++ b/stats/credits.asm
@@ -1,13 +1,13 @@
 ;===================================================================================================
 ; LEAVE THIS HERE FOR PHP WRITES
 ;===================================================================================================
-table "creditscharmapbighi.txt"
+table "data/creditscharmapbighi.txt"
 YourSpriteCreditsHi:
 db 2
 db 55
 db "                            " ; $238002
 
-table "creditscharmapbiglo.txt"
+table "data/creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
 db 2
 db 55
@@ -26,7 +26,7 @@ CreditsLineTable:
 
 macro smallcredits(text, color)
 	!CLINE #= !CLINE+1
-	table "creditscharmapsmall_<color>.txt"
+	table "data/creditscharmapsmall_<color>.txt"
 
 	?line:
 		db (32-(?end-?text))/2
@@ -44,7 +44,7 @@ endmacro
 ;---------------------------------------------------------------------------------------------------
 macro bigcredits(text)
 	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
+	table "data/creditscharmapbighi.txt"
 
 	?line_top:
 		db (32-(?end-?text))/2
@@ -58,7 +58,7 @@ macro bigcredits(text)
 	pullpc
 
 
-	table "creditscharmapbiglo.txt"
+	table "data/creditscharmapbiglo.txt"
 	?line_bottom:
 		db (32-(?end-?text))/2
 		db 2*(?end-?text)-1
@@ -76,7 +76,7 @@ endmacro
 
 macro bigcreditsleft(text)
 	!CLINE #= !CLINE+1
-	table "creditscharmapbighi.txt"
+	table "data/creditscharmapbighi.txt"
 
 	?line_top:
 		db 2
@@ -90,7 +90,7 @@ macro bigcreditsleft(text)
 	pullpc
 
 
-	table "creditscharmapbiglo.txt"
+	table "data/creditscharmapbiglo.txt"
 	?line_bottom:
 		db 2
 		db 2*(?end-?text)-1