diff --git a/disassembly/GE007.rom.asm b/disassembly/GE007.rom.asm
index 34cab12..3fae540 100644
--- a/disassembly/GE007.rom.asm
+++ b/disassembly/GE007.rom.asm
@@ -1,6 +1,7 @@
 arch n64.cpu
 endian msb
 output "GE007.n64", create
+fill $00c00000, $FF
 include "lib/N64.INC"
 origin $00000000
 
@@ -11,9 +12,23 @@ include "code/rarezip.asm"
 include "code/tlb_code.asm"
 include "unk/unknown.asm"
 include "ramrom/ramrom.asm"
+include "font/fonts.asm"
+include "m/music.asm"
+include "bg/bg.asm"
+include "chr/chr.asm"
+include "g_view/g_items.asm"
+include "props/props.asm"
+include "bg/Tbg.asm"
+include "brief/brief.asm"
+include "bg/setup.asm"
+include "text/text.asm"
 
-include "bss/bss.asm"
-include "bss/80300000.asm"
+ob_end:
+insert ob_end.seg, "ob/ob_end.seg", (origin() - $008f7de0)
+
+include "images/images.asm"
+
+include "code/bss.asm"
+include "code/80300000.asm"
 
-insert retailrom_raw, "GoldenEye007.z64", origin()
 
diff --git a/disassembly/GE007.sym.REMOVED.git-id b/disassembly/GE007.sym.REMOVED.git-id
index af3d24a..ed69eb8 100644
--- a/disassembly/GE007.sym.REMOVED.git-id
+++ b/disassembly/GE007.sym.REMOVED.git-id
@@ -1 +1 @@
-b1e915d996fec4c302cfa732c4a771f7d7e52e2f
\ No newline at end of file
+bc2e8453577ce480fb810ded3b4e2466849e21c5
\ No newline at end of file
diff --git a/disassembly/bg/Tbg.asm.REMOVED.git-id b/disassembly/bg/Tbg.asm.REMOVED.git-id
new file mode 100644
index 0000000..9f2df73
--- /dev/null
+++ b/disassembly/bg/Tbg.asm.REMOVED.git-id
@@ -0,0 +1 @@
+c0342c6c68303e3869db34dad297b3ad3acc3932
\ No newline at end of file
diff --git a/disassembly/bg/Tbg_arec_all_p_stanZ b/disassembly/bg/Tbg_arec_all_p_stanZ
new file mode 100644
index 0000000..e69de29
diff --git a/disassembly/bg/bg.asm.REMOVED.git-id b/disassembly/bg/bg.asm.REMOVED.git-id
new file mode 100644
index 0000000..b8e355e
--- /dev/null
+++ b/disassembly/bg/bg.asm.REMOVED.git-id
@@ -0,0 +1 @@
+50974df7a9eef5b88a6ba402d435007ba58f3dd2
\ No newline at end of file
diff --git a/disassembly/bg/setup.asm.REMOVED.git-id b/disassembly/bg/setup.asm.REMOVED.git-id
new file mode 100644
index 0000000..396fe00
--- /dev/null
+++ b/disassembly/bg/setup.asm.REMOVED.git-id
@@ -0,0 +1 @@
+3b92b5a06b18b4d223ab86b4f14cf90cc11b959a
\ No newline at end of file
diff --git a/disassembly/bg/UbriefarchZ b/disassembly/brief/UbriefarchZ
similarity index 100%
rename from disassembly/bg/UbriefarchZ
rename to disassembly/brief/UbriefarchZ
diff --git a/disassembly/bg/UbriefarkZ b/disassembly/brief/UbriefarkZ
similarity index 100%
rename from disassembly/bg/UbriefarkZ
rename to disassembly/brief/UbriefarkZ
diff --git a/disassembly/bg/UbriefaztZ b/disassembly/brief/UbriefaztZ
similarity index 100%
rename from disassembly/bg/UbriefaztZ
rename to disassembly/brief/UbriefaztZ
diff --git a/disassembly/bg/UbriefcaveZ b/disassembly/brief/UbriefcaveZ
similarity index 100%
rename from disassembly/bg/UbriefcaveZ
rename to disassembly/brief/UbriefcaveZ
diff --git a/disassembly/bg/UbriefcontrolZ b/disassembly/brief/UbriefcontrolZ
similarity index 100%
rename from disassembly/bg/UbriefcontrolZ
rename to disassembly/brief/UbriefcontrolZ
diff --git a/disassembly/bg/UbriefcradZ b/disassembly/brief/UbriefcradZ
similarity index 100%
rename from disassembly/bg/UbriefcradZ
rename to disassembly/brief/UbriefcradZ
diff --git a/disassembly/bg/UbriefcrypZ b/disassembly/brief/UbriefcrypZ
similarity index 100%
rename from disassembly/bg/UbriefcrypZ
rename to disassembly/brief/UbriefcrypZ
diff --git a/disassembly/bg/UbriefdamZ b/disassembly/brief/UbriefdamZ
similarity index 100%
rename from disassembly/bg/UbriefdamZ
rename to disassembly/brief/UbriefdamZ
diff --git a/disassembly/bg/UbriefdepoZ b/disassembly/brief/UbriefdepoZ
similarity index 100%
rename from disassembly/bg/UbriefdepoZ
rename to disassembly/brief/UbriefdepoZ
diff --git a/disassembly/bg/UbriefdestZ b/disassembly/brief/UbriefdestZ
similarity index 100%
rename from disassembly/bg/UbriefdestZ
rename to disassembly/brief/UbriefdestZ
diff --git a/disassembly/bg/UbriefjunZ b/disassembly/brief/UbriefjunZ
similarity index 100%
rename from disassembly/bg/UbriefjunZ
rename to disassembly/brief/UbriefjunZ
diff --git a/disassembly/bg/UbriefpeteZ b/disassembly/brief/UbriefpeteZ
similarity index 100%
rename from disassembly/bg/UbriefpeteZ
rename to disassembly/brief/UbriefpeteZ
diff --git a/disassembly/bg/UbriefrunZ b/disassembly/brief/UbriefrunZ
similarity index 100%
rename from disassembly/bg/UbriefrunZ
rename to disassembly/brief/UbriefrunZ
diff --git a/disassembly/bg/UbriefsevbZ b/disassembly/brief/UbriefsevbZ
similarity index 100%
rename from disassembly/bg/UbriefsevbZ
rename to disassembly/brief/UbriefsevbZ
diff --git a/disassembly/bg/UbriefsevbunkerZ b/disassembly/brief/UbriefsevbunkerZ
similarity index 100%
rename from disassembly/bg/UbriefsevbunkerZ
rename to disassembly/brief/UbriefsevbunkerZ
diff --git a/disassembly/bg/UbriefsevxZ b/disassembly/brief/UbriefsevxZ
similarity index 100%
rename from disassembly/bg/UbriefsevxZ
rename to disassembly/brief/UbriefsevxZ
diff --git a/disassembly/bg/UbriefsevxbZ b/disassembly/brief/UbriefsevxbZ
similarity index 100%
rename from disassembly/bg/UbriefsevxbZ
rename to disassembly/brief/UbriefsevxbZ
diff --git a/disassembly/bg/UbriefsiloZ b/disassembly/brief/UbriefsiloZ
similarity index 100%
rename from disassembly/bg/UbriefsiloZ
rename to disassembly/brief/UbriefsiloZ
diff --git a/disassembly/bg/UbriefstatueZ b/disassembly/brief/UbriefstatueZ
similarity index 100%
rename from disassembly/bg/UbriefstatueZ
rename to disassembly/brief/UbriefstatueZ
diff --git a/disassembly/bg/UbrieftraZ b/disassembly/brief/UbrieftraZ
similarity index 100%
rename from disassembly/bg/UbrieftraZ
rename to disassembly/brief/UbrieftraZ
diff --git a/disassembly/brief/brief.asm.REMOVED.git-id b/disassembly/brief/brief.asm.REMOVED.git-id
new file mode 100644
index 0000000..4ac5d80
--- /dev/null
+++ b/disassembly/brief/brief.asm.REMOVED.git-id
@@ -0,0 +1 @@
+a51b538ff604bb62ae28a61b1739e1b3c495521e
\ No newline at end of file
diff --git a/disassembly/chr/chr.asm.REMOVED.git-id b/disassembly/chr/chr.asm.REMOVED.git-id
new file mode 100644
index 0000000..63a6859
--- /dev/null
+++ b/disassembly/chr/chr.asm.REMOVED.git-id
@@ -0,0 +1 @@
+728eab89627d5396e9cd983e4eaf308dd3487480
\ No newline at end of file
diff --git a/disassembly/bss/80300000.asm b/disassembly/code/80300000.asm
similarity index 100%
rename from disassembly/bss/80300000.asm
rename to disassembly/code/80300000.asm
diff --git a/disassembly/bss/bss.asm b/disassembly/code/bss.asm
similarity index 100%
rename from disassembly/bss/bss.asm
rename to disassembly/code/bss.asm
diff --git a/disassembly/font/fonts.asm b/disassembly/font/fonts.asm
new file mode 100644
index 0000000..42b6116
--- /dev/null
+++ b/disassembly/font/fonts.asm
@@ -0,0 +1,14 @@
+base origin()
+font_rom_start:
+
+//vaddr is unknown
+//base $vaddr
+//font_vaddr:
+
+insert font_table1_controller_small, "first_font_table_controller_small", (origin() - $002E63F0)
+insert font_table2_controller_small, "second_font_table_controller_small", (origin() - $002E6694)
+insert font_table1_controller_large, "first_font_table_controller_large", (origin() - $002E88A0)
+insert font_table2_controller_large, "second_font_table_controller_large", (origin() - $002E8B44)
+
+
+font_rom_end:
diff --git a/disassembly/g_view/GgoldengunZ.REMOVED.git-id b/disassembly/g_view/GgoldengunZ.REMOVED.git-id
new file mode 100644
index 0000000..cf52f1f
--- /dev/null
+++ b/disassembly/g_view/GgoldengunZ.REMOVED.git-id
@@ -0,0 +1 @@
+a3d1c27d1b93f5f3562768ae726c0acf45a01474
\ No newline at end of file
diff --git a/disassembly/g_view/g_items.asm.REMOVED.git-id b/disassembly/g_view/g_items.asm.REMOVED.git-id
new file mode 100644
index 0000000..4f47ae5
--- /dev/null
+++ b/disassembly/g_view/g_items.asm.REMOVED.git-id
@@ -0,0 +1 @@
+c70f02d762a71c39ae8fbbd9c4f710a9707563af
\ No newline at end of file
diff --git a/disassembly/images/images.asm b/disassembly/images/images.asm
new file mode 100644
index 0000000..7f6ebaf
--- /dev/null
+++ b/disassembly/images/images.asm
@@ -0,0 +1,10 @@
+base origin()
+images_rom_start:
+
+//vaddr is unknown
+//base $vaddr
+//images_vaddr:
+
+insert images, "images", (origin() - $008f7df0)
+
+images_rom_end:
diff --git a/disassembly/m/music.asm.REMOVED.git-id b/disassembly/m/music.asm.REMOVED.git-id
new file mode 100644
index 0000000..1f2ae19
--- /dev/null
+++ b/disassembly/m/music.asm.REMOVED.git-id
@@ -0,0 +1 @@
+a925b59646af1f1959609294980517fc768679f3
\ No newline at end of file
diff --git a/disassembly/props/props.asm.REMOVED.git-id b/disassembly/props/props.asm.REMOVED.git-id
new file mode 100644
index 0000000..d58805c
--- /dev/null
+++ b/disassembly/props/props.asm.REMOVED.git-id
@@ -0,0 +1 @@
+fa7aa332e1f366b30d6585798ca799c6288a1b59
\ No newline at end of file
diff --git a/disassembly/ramrom/ramrom.asm b/disassembly/ramrom/ramrom.asm
index 0478cb8..79638d1 100644
--- a/disassembly/ramrom/ramrom.asm
+++ b/disassembly/ramrom/ramrom.asm
@@ -3,7 +3,7 @@ ramrom_rom_start:
 
 //vaddr is unknown
 //base $vaddr
-ramrom_start:
+//ramrom_vaddr:
 
 insert ramrom_Dam_1, "Dam_1", (origin() - $002BF2D0)
 insert ramrom_Dam_2, "Dam_2",  (origin() - $002C44D0)
@@ -20,4 +20,4 @@ insert ramrom_Frigate_1, "Frigate_1",  (origin() - $002DD770)
 insert ramrom_Frigate_2, "Frigate_2",  (origin() - $002DF120)
 insert ramrom_Train, "Train",  (origin() - $002E2600)
 
-ramrom_end:
+ramrom_rom_end:
diff --git a/disassembly/rodata/021990.rz.REMOVED.git-id b/disassembly/rodata/021990.rz.REMOVED.git-id
index ab28902..3cb13ba 100644
--- a/disassembly/rodata/021990.rz.REMOVED.git-id
+++ b/disassembly/rodata/021990.rz.REMOVED.git-id
@@ -1 +1 @@
-4506f249c41dba6300ea0debdf3931e80990c229
\ No newline at end of file
+8cbf680f259288e6802946bdf5b16bca1e78437b
\ No newline at end of file
diff --git a/out/unk/Null331e0_33590 b/disassembly/rodata/pad_to_33590
similarity index 100%
rename from out/unk/Null331e0_33590
rename to disassembly/rodata/pad_to_33590
diff --git a/disassembly/rodata/rodata.asm b/disassembly/rodata/rodata.asm
index 5926479..2ce7672 100644
--- a/disassembly/rodata/rodata.asm
+++ b/disassembly/rodata/rodata.asm
@@ -16,4 +16,5 @@ insert rodata_rz, "021990.rz"
 base $8005D2E0
 rodata_end:
 
+insert padding,"pad_to_33590"
 
diff --git a/disassembly/text/LoatJ b/disassembly/text/LoatJ
new file mode 100644
index 0000000..2b60d65
Binary files /dev/null and b/disassembly/text/LoatJ differ
diff --git a/disassembly/text/text.asm.REMOVED.git-id b/disassembly/text/text.asm.REMOVED.git-id
new file mode 100644
index 0000000..1b98e01
--- /dev/null
+++ b/disassembly/text/text.asm.REMOVED.git-id
@@ -0,0 +1 @@
+6e674f0a50ba9db472c4a70531ce657f140a8cc5
\ No newline at end of file
diff --git a/out/unk/117880_24EB30.REMOVED.git-id b/out/unk/117880_24EB30.REMOVED.git-id
deleted file mode 100644
index 8aaf950..0000000
--- a/out/unk/117880_24EB30.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-565dc801a6fc3526360e4ce5675f06417a1d2e07
\ No newline at end of file
diff --git a/out/unk/24EB30_296565.REMOVED.git-id b/out/unk/24EB30_296565.REMOVED.git-id
deleted file mode 100644
index fd39013..0000000
--- a/out/unk/24EB30_296565.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-b5acadeb72800c568ec60093abdd6714d960318b
\ No newline at end of file
diff --git a/out/unk/296565_298587.rz.REMOVED.git-id b/out/unk/296565_298587.rz.REMOVED.git-id
deleted file mode 100644
index 32a0840..0000000
--- a/out/unk/296565_298587.rz.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-81dc1120bd7f215359fd65a7ea6cc0eb2a2459fe
\ No newline at end of file
diff --git a/out/unk/298587_2bf2d0.REMOVED.git-id b/out/unk/298587_2bf2d0.REMOVED.git-id
deleted file mode 100644
index 976201b..0000000
--- a/out/unk/298587_2bf2d0.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-64ceb0175981d09dfe8df12b672d63c62280380b
\ No newline at end of file
diff --git a/out/unk/FF_to_eof.REMOVED.git-id b/out/unk/FF_to_eof.REMOVED.git-id
deleted file mode 100644
index b22cca2..0000000
--- a/out/unk/FF_to_eof.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-0a59782186349bf0b2f92de096549012b66c82f4
\ No newline at end of file