diff --git a/asm/src/AppImpl_80452b00.s b/asm/src/AppImpl_80452b00.s
deleted file mode 100644
index 56c34e18..00000000
--- a/asm/src/AppImpl_80452b00.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global __vt__Q23app7AppImpl
-__vt__Q23app7AppImpl:
-
-	.4byte 0
-	.4byte 0
-	.4byte __dt__Q23app7AppImplFv
-	.4byte drawerExecDraw__Q23app7AppImplFv
-	.4byte 0
-	.4byte 0
-	.4byte "@4@__dt__Q23app7AppImplFv"
-
-.global "@STRING@NoName__Q33hel6common15RuntimeTypeInfoFv"
-"@STRING@NoName__Q33hel6common15RuntimeTypeInfoFv":
-
-	.4byte 0x6E6F206E
-	.4byte 0x616D6520
-	.4byte 0x636C6173
-	.4byte 0x73000000
-	.4byte 0
diff --git a/asm/src/AppImpl_8055d0f0.s b/asm/src/AppImpl_8055d0f0.s
deleted file mode 100644
index ff308ea6..00000000
--- a/asm/src/AppImpl_8055d0f0.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "@GUARD@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@GUARD@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "@LOCAL@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@LOCAL@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "@GUARD@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@GUARD@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "@LOCAL@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@LOCAL@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "@GUARD@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@GUARD@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "@LOCAL@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
-"@LOCAL@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
-	.skip 0x8
-
-.global "object___Q33hel6common32ExplicitSingleton<Q23mem6Memory>"
-"object___Q33hel6common32ExplicitSingleton<Q23mem6Memory>":
-	.skip 0x4
-
-.global "object___Q33hel6common39ExplicitSingleton<Q23snd12SoundManager>"
-"object___Q33hel6common39ExplicitSingleton<Q23snd12SoundManager>":
-	.skip 0x4
-
-.global "object___Q33hel6common35ExplicitSingleton<Q23gfx9VISetting>"
-"object___Q33hel6common35ExplicitSingleton<Q23gfx9VISetting>":
-	.skip 0x4
-
-.global "ptr___Q33hel6common34ProtectedSingleton<Q23app7AppImpl>"
-"ptr___Q33hel6common34ProtectedSingleton<Q23app7AppImpl>":
-	.skip 0x4
diff --git a/asm/src/Application_8055d130.s b/asm/src/Application_8055d130.s
deleted file mode 100644
index 74ab283f..00000000
--- a/asm/src/Application_8055d130.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "object___Q33hel6common38ExplicitSingleton<Q23app11Application>"
-"object___Q33hel6common38ExplicitSingleton<Q23app11Application>":
-	.skip 0x8
diff --git a/asm/src/AutoResetTimer_8055d138.s b/asm/src/AutoResetTimer_8055d138.s
deleted file mode 100644
index 2289670f..00000000
--- a/asm/src/AutoResetTimer_8055d138.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "object___Q33hel6common37ExplicitSingleton<Q23hid10HIDManager>"
-"object___Q33hel6common37ExplicitSingleton<Q23hid10HIDManager>":
-	.skip 0x8
diff --git a/asm/src/DvdWatch_80452b30.s b/asm/src/DvdWatch_80452b30.s
deleted file mode 100644
index a38113c8..00000000
--- a/asm/src/DvdWatch_80452b30.s
+++ /dev/null
@@ -1,54 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl@0"
-"@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl@0":
-
-	.4byte 0x4E573452
-	.4byte 0x3A506F69
-	.4byte 0x6E746572
-	.4byte 0x20457272
-	.4byte 0x6F720A74
-	.4byte 0x68697328
-	.4byte 0x3D257029
-	.4byte 0x20697320
-	.4byte 0x6E6F7420
-	.4byte 0x76616C69
-	.4byte 0x6420706F
-	.4byte 0x696E7465
-	.4byte 0x722E0000
-
-.global "@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl"
-"@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl":
-
-	.4byte 0x54657874
-	.4byte 0x57726974
-	.4byte 0x65724261
-	.4byte 0x73652E68
-	.4byte 0
-
-.global "@STRING@SetCursor__Q34nw4r2ut10CharWriterFff@0"
-"@STRING@SetCursor__Q34nw4r2ut10CharWriterFff@0":
-
-	.4byte 0x4E573452
-	.4byte 0x3A506F69
-	.4byte 0x6E746572
-	.4byte 0x20457272
-	.4byte 0x6F720A74
-	.4byte 0x68697328
-	.4byte 0x3D257029
-	.4byte 0x20697320
-	.4byte 0x6E6F7420
-	.4byte 0x76616C69
-	.4byte 0x6420706F
-	.4byte 0x696E7465
-	.4byte 0x722E0000
-
-.global "@STRING@SetCursor__Q34nw4r2ut10CharWriterFff"
-"@STRING@SetCursor__Q34nw4r2ut10CharWriterFff":
-
-	.4byte 0x43686172
-	.4byte 0x57726974
-	.4byte 0x65722E68
-	.4byte 0
-	.4byte 0
diff --git a/asm/src/DvdWatch_8055f5a8.s b/asm/src/DvdWatch_8055f5a8.s
deleted file mode 100644
index fc57fe3f..00000000
--- a/asm/src/DvdWatch_8055f5a8.s
+++ /dev/null
@@ -1,58 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@53258_8055F5A8"
-"@53258_8055F5A8":
-
-	.4byte 0
-
-.global "@53259_8055F5AC"
-"@53259_8055F5AC":
-
-	.4byte 0x3F800000
-
-.global "@53260"
-"@53260":
-
-	.4byte 0x43E40000
-
-.global "@53261"
-"@53261":
-
-	.4byte 0x3C23D70A
-
-.global "@53262"
-"@53262":
-
-	.4byte 0x42C80000
-
-.global "@53263"
-"@53263":
-
-	.4byte 0xBF800000
-
-.global "@53264_8055F5C0"
-"@53264_8055F5C0":
-
-	.4byte 0x41F00000
-
-.global "@53265_8055F5C4"
-"@53265_8055F5C4":
-
-	.4byte 0x41D00000
-
-.global "@53266_8055F5C8"
-"@53266_8055F5C8":
-
-	.4byte 0x3F000000
-
-.global "@53267_8055F5CC"
-"@53267_8055F5CC":
-
-	.4byte 0x43640000
-
-.global "@53272"
-"@53272":
-
-	.4byte 0x43300000
-	.4byte 0
diff --git a/asm/src/DvdWatch_ENG_804144c8.s b/asm/src/DvdWatch_ENG_804144c8.s
deleted file mode 100644
index a598169a..00000000
--- a/asm/src/DvdWatch_ENG_804144c8.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global ERROR_MSG_ENG__Q23app8DvdWatch
-ERROR_MSG_ENG__Q23app8DvdWatch:
-
-	.4byte "@48836_80556B78"
-	.4byte "@48837_80452BC0"
-	.4byte "@48837_80452BC0"
-	.4byte "@48838_80452C04"
-	.4byte "@48839_80452C50"
-	.4byte 0
diff --git a/asm/src/DvdWatch_ENG_80556b78.s b/asm/src/DvdWatch_ENG_80556b78.s
deleted file mode 100644
index d79faff9..00000000
--- a/asm/src/DvdWatch_ENG_80556b78.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@48836_80556B78"
-"@48836_80556B78":
-
-	.4byte 0
-	.4byte 0
diff --git a/asm/src/EntryPoint_80452cf8.s b/asm/src/EntryPoint_80452cf8.s
deleted file mode 100644
index 062fc44a..00000000
--- a/asm/src/EntryPoint_80452cf8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@49240_80452CF8"
-"@49240_80452CF8":
-
-	.4byte 0x48424D5F
-	.4byte 0x52455345
-	.4byte 0x54000000
-	.4byte 0
-
-.global "@49241_80452D08"
-"@49241_80452D08":
-
-	.4byte 0x57494953
-	.4byte 0x59535445
-	.4byte 0x4D5F5245
-	.4byte 0x53455400
diff --git a/asm/src/EntryPoint_8055d140.s b/asm/src/EntryPoint_8055d140.s
deleted file mode 100644
index 623a46a6..00000000
--- a/asm/src/EntryPoint_8055d140.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "isExist___Q33hel6common31PrivateSingleton<Q23app6System>"
-"isExist___Q33hel6common31PrivateSingleton<Q23app6System>":
-	.skip 0x8
diff --git a/asm/src/HIDErrorMenu_80452d18.s b/asm/src/HIDErrorMenu_80452d18.s
deleted file mode 100644
index e60f7b03..00000000
--- a/asm/src/HIDErrorMenu_80452d18.s
+++ /dev/null
@@ -1,160 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@52181_80452D18"
-"@52181_80452D18":
-
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63745469
-	.4byte 0x746C6500
-	.4byte "@52181_80452D18"
-	.4byte "@52181_80452D18"
-	.4byte "@52181_80452D18"
-
-.global "@52182_80452D34"
-"@52182_80452D34":
-
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63745469
-	.4byte 0x746C6553
-	.4byte 0x75625769
-	.4byte 0x74684361
-	.4byte 0x6E63656C
-	.4byte 0
-
-.global "@52183_80452D54"
-"@52183_80452D54":
-
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63745469
-	.4byte 0x746C6553
-	.4byte 0x75625769
-	.4byte 0x74685175
-	.4byte 0x69740000
-	.4byte "@52181_80452D18"
-	.4byte "@52182_80452D34"
-	.4byte "@52183_80452D54"
-
-.global "@52184_80452D7C"
-"@52184_80452D7C":
-
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x6374436F
-	.4byte 0x6E74696E
-	.4byte 0x75650000
-
-.global "@52185_80452D90"
-"@52185_80452D90":
-
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63745175
-	.4byte 0x69740000
-	.4byte "@52184_80452D7C"
-	.4byte "@52184_80452D7C"
-	.4byte "@52185_80452D90"
-
-.global "@54504_80452DAC"
-"@54504_80452DAC":
-
-	.4byte 0x4572726F
-	.4byte 0x724D656E
-	.4byte 0x75000000
-	.4byte 0x636F6D6D
-	.4byte 0x6F6E2F4D
-	.4byte 0x61696E00
-	.4byte 0x42617474
-	.4byte 0x65727957
-	.4byte 0x696E646F
-	.4byte 0x77000000
-	.4byte 0x42757474
-	.4byte 0x6F6E3031
-	.4byte 0x4E000000
-	.4byte 0x42757474
-	.4byte 0x6F6E3032
-	.4byte 0x4E000000
-	.4byte 0x436F6E66
-	.4byte 0x69726D59
-	.4byte 0x65730000
-	.4byte 0x436F6E66
-	.4byte 0x69726D4E
-	.4byte 0x6F000000
-
-.global "@54699_80452E04"
-"@54699_80452E04":
-
-	.4byte 0x53776974
-	.4byte 0x63683031
-	.4byte 0
-
-.global "@54701_80452E10"
-"@54701_80452E10":
-
-	.4byte lbl_801784F4
-	.4byte lbl_80178514
-	.4byte lbl_80178530
-	.4byte lbl_801785B4
-	.4byte lbl_801785D0
-	.4byte lbl_801786F0
-	.4byte lbl_80178738
-	.4byte lbl_80178754
-	.4byte lbl_80178774
-	.4byte 0
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63745469
-	.4byte 0x746C6500
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x63744578
-	.4byte 0x74546974
-	.4byte 0x6C650000
-	.4byte 0x436F6E6E
-	.4byte 0x65637443
-	.4byte 0x6C617373
-	.4byte 0x69634374
-	.4byte 0x726C0000
-	.4byte 0x44697363
-	.4byte 0x6F6E6E65
-	.4byte 0x6374436C
-	.4byte 0x61737369
-	.4byte 0x63437472
-	.4byte 0x6C000000
-	.4byte 0x4D61696E
-	.4byte 0x54657874
-	.4byte 0
-	.4byte 0x436F6E66
-	.4byte 0x69726D54
-	.4byte 0x65787400
-
-.global "@54876_80452EA0"
-"@54876_80452EA0":
-
-	.4byte 0x53776974
-	.4byte 0x63683032
-	.4byte 0
-
-.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>@0"
-"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>@0":
-
-	.4byte 0x4E573452
-	.4byte 0x3A506F69
-	.4byte 0x6E746572
-	.4byte 0x206D7573
-	.4byte 0x74206E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C202870
-	.4byte 0x29000000
-
-.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>"
-"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>":
-
-	.4byte 0x4C696E6B
-	.4byte 0x4C697374
-	.4byte 0x2E680000
-	.4byte 0
diff --git a/asm/src/HIDErrorMenu_80556b80.s b/asm/src/HIDErrorMenu_80556b80.s
deleted file mode 100644
index 2b4c458b..00000000
--- a/asm/src/HIDErrorMenu_80556b80.s
+++ /dev/null
@@ -1,100 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@54615"
-"@54615":
-
-	.4byte 0x436F6E66
-	.4byte 0x69726D00
-
-.global "@54619_80556B88"
-"@54619_80556B88":
-
-	.4byte 0x57696E4E
-	.4byte 0
-
-.global "@54816"
-"@54816":
-
-	.4byte 0x5374644E
-	.4byte 0
-
-.global "@54817_80556B98"
-"@54817_80556B98":
-
-	.4byte 0x53656C4E
-	.4byte 0
-
-.global "@54818"
-"@54818":
-
-	.4byte 0x4578744E
-	.4byte 0
-
-.global "@54819"
-"@54819":
-
-	.4byte 0x436C614E
-	.4byte 0
-
-.global "@54820_80556BB0"
-"@54820_80556BB0":
-
-	.4byte 0x53746172
-	.4byte 0x74000000
-
-.global "@54821"
-"@54821":
-
-	.4byte 0
-	.4byte 0
-
-.global "@54827_80556BC0"
-"@54827_80556BC0":
-
-	.4byte 0x53756254
-	.4byte 0x65787400
-
-.global "@54829"
-"@54829":
-
-	.4byte 0x4F70656E
-	.4byte 0
-
-.global "@54873_80556BD0"
-"@54873_80556BD0":
-
-	.4byte 0x436F6E6E
-	.4byte 0x65637400
-
-.global "@54880_80556BD8"
-"@54880_80556BD8":
-
-	.4byte 0x436C6F73
-	.4byte 0x65000000
-
-.global "@54896"
-"@54896":
-
-	.4byte 0x53746400
-
-.global "@54897"
-"@54897":
-
-	.4byte 0x53656C00
-
-.global "@54898"
-"@54898":
-
-	.4byte 0x45787400
-
-.global "@54899"
-"@54899":
-
-	.4byte 0x436C6100
-
-.global "@54900"
-"@54900":
-
-	.4byte 0x25732573
-	.4byte 0
diff --git a/asm/src/Locale_801793ac.s b/asm/src/Locale_801793ac.s
deleted file mode 100644
index c4db6b3c..00000000
--- a/asm/src/Locale_801793ac.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global FilePostfix__Q23app6LocaleFv
-FilePostfix__Q23app6LocaleFv:
-/* 801793AC 001751EC  3C 60 80 41 */	lis r3, "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"@ha
-/* 801793B0 001751F0  38 63 44 E0 */	addi r3, r3, "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"@l
-/* 801793B4 001751F4  80 63 00 04 */	lwz r3, 0x4(r3)
-/* 801793B8 001751F8  4E 80 00 20 */	blr
diff --git a/asm/src/Locale_804144e0.s b/asm/src/Locale_804144e0.s
deleted file mode 100644
index 05ea4069..00000000
--- a/asm/src/Locale_804144e0.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"
-"T_POSTS_US__Q23app20@unnamed@Locale_cpp@":
-
-	.4byte "@50071_80556BF8"
-	.4byte "@50072_80556C00"
-	.4byte "@50073_80556C08"
-	.4byte "@50074_80556C10"
-	.4byte "@50075_80556C18"
-	.4byte "@50076"
-	.4byte "@50077_80556C28"
-	.4byte 0
diff --git a/asm/src/Locale_80556bf8.s b/asm/src/Locale_80556bf8.s
deleted file mode 100644
index dc490257..00000000
--- a/asm/src/Locale_80556bf8.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@50071_80556BF8"
-"@50071_80556BF8":
-
-	.4byte 0x55535F4A
-	.4byte 0x504E0000
-
-.global "@50072_80556C00"
-"@50072_80556C00":
-
-	.4byte 0x55535F45
-	.4byte 0x4E470000
-
-.global "@50073_80556C08"
-"@50073_80556C08":
-
-	.4byte 0x55535F47
-	.4byte 0x45520000
-
-.global "@50074_80556C10"
-"@50074_80556C10":
-
-	.4byte 0x55535F46
-	.4byte 0x52410000
-
-.global "@50075_80556C18"
-"@50075_80556C18":
-
-	.4byte 0x55535F53
-	.4byte 0x50410000
-
-.global "@50076"
-"@50076":
-
-	.4byte 0x55535F49
-	.4byte 0x54410000
-
-.global "@50077_80556C28"
-"@50077_80556C28":
-
-	.4byte 0x55535F4E
-	.4byte 0x45440000
diff --git a/asm/src/Main_80174ad8.s b/asm/src/Main.s
similarity index 80%
rename from asm/src/Main_80174ad8.s
rename to asm/src/Main.s
index 65ffac76..544b652a 100644
--- a/asm/src/Main_80174ad8.s
+++ b/asm/src/Main.s
@@ -15,3 +15,11 @@ lbl_80174AF0:
 .global lbl_80174AF4
 lbl_80174AF4:
 /* 80174AF4 00170934  48 00 2B C8 */	b Run__Q23app10EntryPointFbPCc
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@48781_80556B70"
+"@48781_80556B70":
+
+	.4byte 0
+	.4byte 0
diff --git a/asm/src/Main_80556b70.s b/asm/src/Main_80556b70.s
deleted file mode 100644
index 1b89dccc..00000000
--- a/asm/src/Main_80556b70.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@48781_80556B70"
-"@48781_80556B70":
-
-	.4byte 0
-	.4byte 0
diff --git a/asm/src/NANDErrorMenu_80452ee0.s b/asm/src/NANDErrorMenu_80452ee0.s
deleted file mode 100644
index c46e4004..00000000
--- a/asm/src/NANDErrorMenu_80452ee0.s
+++ /dev/null
@@ -1,110 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@51882_80452EE0"
-"@51882_80452EE0":
-
-	.4byte 0x72657369
-	.4byte 0x64656E74
-	.4byte 0x2F4D6169
-	.4byte 0x6E000000
-
-.global "@53133_80452EF0"
-"@53133_80452EF0":
-
-	.4byte 0x4E414E44
-	.4byte 0x4572726F
-	.4byte 0x72000000
-
-.global "@53141_80452EFC"
-"@53141_80452EFC":
-
-	.4byte 0x4E414E44
-	.4byte 0x4572726F
-	.4byte 0x724D656E
-	.4byte 0x75000000
-	.4byte 0x53617665
-	.4byte 0x43686563
-	.4byte 0x6B426173
-	.4byte 0x65000000
-	.4byte 0x53617665
-	.4byte 0x43686563
-	.4byte 0x6B000000
-	.4byte 0x42757474
-	.4byte 0x6F6E3031
-	.4byte 0x4E000000
-	.4byte 0x42757474
-	.4byte 0x6F6E3032
-	.4byte 0x4E000000
-	.4byte 0x52657475
-	.4byte 0x726E546F
-	.4byte 0x4D656E75
-	.4byte 0
-	.4byte 0x4E6F5361
-	.4byte 0x76654C6F
-	.4byte 0x61640000
-	.4byte 0x44656C65
-	.4byte 0x74654669
-	.4byte 0x6C650000
-	.4byte 0x456D7074
-	.4byte 0x79426C6F
-	.4byte 0x636B0000
-	.4byte 0x456D7074
-	.4byte 0x79494E6F
-	.4byte 0x64650000
-	.4byte 0x42726F6B
-	.4byte 0x656E5761
-	.4byte 0x726E0000
-	.4byte 0x57696E53
-	.4byte 0x656C6563
-	.4byte 0x74546578
-	.4byte 0x74000000
-
-.global "@53323"
-"@53323":
-
-	.4byte lbl_8017A0E8
-	.4byte lbl_8017A074
-	.4byte lbl_8017A080
-	.4byte lbl_8017A08C
-	.4byte lbl_8017A098
-	.4byte lbl_8017A0AC
-	.4byte lbl_8017A0C0
-	.4byte lbl_8017A0AC
-	.4byte lbl_8017A0D4
-	.4byte lbl_8017A0E8
-	.4byte lbl_8017A0AC
-
-.global "@53362_80452FC8"
-"@53362_80452FC8":
-
-	.4byte 0x53617665
-	.4byte 0x43686563
-	.4byte 0x6B427574
-	.4byte 0x746F6E00
-
-.global "@53374"
-"@53374":
-
-	.4byte 0x4E6F4368
-	.4byte 0x6F696365
-	.4byte 0
-
-.global "@53377"
-"@53377":
-
-	.4byte 0x42757474
-	.4byte 0x6F6E5465
-	.4byte 0x78740000
-	.4byte 0x4E573452
-	.4byte 0x3A506F69
-	.4byte 0x6E746572
-	.4byte 0x206D7573
-	.4byte 0x74206E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C202870
-	.4byte 0x29000000
-	.4byte 0x4C696E6B
-	.4byte 0x4C697374
-	.4byte 0x2E680000
diff --git a/asm/src/NANDErrorMenu_80556c30.s b/asm/src/NANDErrorMenu_80556c30.s
deleted file mode 100644
index 992bfadb..00000000
--- a/asm/src/NANDErrorMenu_80556c30.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "T_LYT_RES__Q23app27@unnamed@NANDErrorMenu_cpp@"
-"T_LYT_RES__Q23app27@unnamed@NANDErrorMenu_cpp@":
-
-	.4byte "@51882_80452EE0"
-
-.global "@53132_80556C34"
-"@53132_80556C34":
-
-	.4byte 0x25732573
-	.4byte 0x25730000
-
-.global "@53198"
-"@53198":
-
-	.4byte 0x57696E4E
-	.4byte 0
-
-.global "@53304"
-"@53304":
-
-	.4byte 0x4E6F5361
-	.4byte 0x76650000
-
-.global "@53305"
-"@53305":
-
-	.4byte 0x59657300
-
-.global "@53306"
-"@53306":
-
-	.4byte 0x43616E63
-	.4byte 0x656C0000
-
-.global "@53309"
-"@53309":
-
-	.4byte 0
-
-.global "@53310_80556C5C"
-"@53310_80556C5C":
-
-	.4byte 0x4572726F
-	.4byte 0x72000000
-
-.global "@53311_80556C64"
-"@53311_80556C64":
-
-	.4byte 0x4661696C
-	.4byte 0x65640000
-	.4byte 0
-
-.global "@53312_80556C70"
-"@53312_80556C70":
-
-	.4byte 0x436F7272
-	.4byte 0x75707400
-
-.global "@53316"
-"@53316":
-
-	.4byte 0x57616974
-	.4byte 0x30320000
-
-.global "@53317"
-"@53317":
-
-	.4byte 0x57696E54
-	.4byte 0x65787400
-
-.global "@53318_80556C88"
-"@53318_80556C88":
-
-	.4byte 0x57616974
-	.4byte 0x30310000
-
-.global "@53320"
-"@53320":
-
-	.4byte 0x4974656D
-	.4byte 0
-
-.global "@53321_80556C98"
-"@53321_80556C98":
-
-	.4byte 0x4F70656E
-	.4byte 0
-
-.global "@53359"
-"@53359":
-
-	.4byte 0x436C6F73
-	.4byte 0x65000000
-
-.global "@53373_80556CA8"
-"@53373_80556CA8":
-
-	.4byte 0x43686F69
-	.4byte 0x63650000
-
-.global "@53381_80556CB0"
-"@53381_80556CB0":
-
-	.4byte 0x44656369
-	.4byte 0x64650000
diff --git a/asm/src/PerformanceController_804062dc.s b/asm/src/PerformanceController_804062dc.s
deleted file mode 100644
index 7f2fd4fb..00000000
--- a/asm/src/PerformanceController_804062dc.s
+++ /dev/null
@@ -1,4 +0,0 @@
-.include "macros.inc"
-
-.section .ctors, "wa"  # 0x80406260 - 0x80406540 ; 0x000002E0
-	.4byte "__sinit_@@1PerformanceController_cpp"
diff --git a/asm/src/PerformanceController_80414500.s b/asm/src/PerformanceController_80414500.s
deleted file mode 100644
index ab434283..00000000
--- a/asm/src/PerformanceController_80414500.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global "T_DRAW_FRAME_INTERVAL_TABLE__35@unnamed@PerformanceController_cpp@"
-"T_DRAW_FRAME_INTERVAL_TABLE__35@unnamed@PerformanceController_cpp@":
-
-	.4byte 0x00000001
-	.4byte 0x00000002
-	.4byte 0x00000003
-	.4byte 0x00000004
-	.4byte 0x00000005
-	.4byte 0x00000006
diff --git a/asm/src/PerformanceController_8055d148.s b/asm/src/PerformanceController_8055d148.s
deleted file mode 100644
index e1d86182..00000000
--- a/asm/src/PerformanceController_8055d148.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "t_instance__35@unnamed@PerformanceController_cpp@"
-"t_instance__35@unnamed@PerformanceController_cpp@":
-	.skip 0x4
-
-.global "isExist___Q33hel6common47PrivateSingleton<Q23app21PerformanceController>"
-"isExist___Q33hel6common47PrivateSingleton<Q23app21PerformanceController>":
-	.skip 0x4
diff --git a/asm/src/Reset_80556cb8.s b/asm/src/Reset_80556cb8.s
deleted file mode 100644
index 083245ae..00000000
--- a/asm/src/Reset_80556cb8.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@50602_80556CB8"
-"@50602_80556CB8":
-
-	.4byte 0
-
-.global "@50603_80556CBC"
-"@50603_80556CBC":
-
-	.4byte 0x437F0000
diff --git a/asm/src/Reset_8055d150.s b/asm/src/Reset_8055d150.s
deleted file mode 100644
index a92999ad..00000000
--- a/asm/src/Reset_8055d150.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "tIsPushedReset__Q23app19@unnamed@Reset_cpp@"
-"tIsPushedReset__Q23app19@unnamed@Reset_cpp@":
-	.skip 0x1
-
-.global "tIsPushedPower__Q23app19@unnamed@Reset_cpp@"
-"tIsPushedPower__Q23app19@unnamed@Reset_cpp@":
-	.skip 0x3
-
-.global "object___Q33hel6common41ExplicitSingleton<Q23hbm14HomeButtonMenu>"
-"object___Q33hel6common41ExplicitSingleton<Q23hbm14HomeButtonMenu>":
-	.skip 0x4
-
-.global "object___Q33hel6common31ExplicitSingleton<Q23app5Reset>"
-"object___Q33hel6common31ExplicitSingleton<Q23app5Reset>":
-	.skip 0x8
diff --git a/asm/src/Reset_8055f5d8.s b/asm/src/Reset_8055f5d8.s
deleted file mode 100644
index 8434213a..00000000
--- a/asm/src/Reset_8055f5d8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@51058"
-"@51058":
-
-	.4byte 0x41A00000
-	.4byte 0
-
-.global "@51061"
-"@51061":
-
-	.4byte 0x43300000
-	.4byte 0x80000000
diff --git a/asm/src/ResidentFile_80453020.s b/asm/src/ResidentFile_80453020.s
deleted file mode 100644
index 70b475f8..00000000
--- a/asm/src/ResidentFile_80453020.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@51961"
-"@51961":
-
-	.4byte 0x6C79742F
-	.4byte 0x72657369
-	.4byte 0x64656E74
-	.4byte 0x2F4D6169
-	.4byte 0x6E2E6172
-	.4byte 0x632E636D
-	.4byte 0x70000000
-
-.global "@52401_8045303C"
-"@52401_8045303C":
-
-	.4byte 0x52657369
-	.4byte 0x64656E74
-	.4byte 0x46696C65
-	.4byte 0x4C6F6164
-	.4byte 0x54687265
-	.4byte 0x61640000
-
-.global "@52478"
-"@52478":
-
-	.4byte 0x52657369
-	.4byte 0x64656E74
-	.4byte 0x2E6D7362
-	.4byte 0x74000000
-	.4byte 0
diff --git a/asm/src/ResidentFile_8055f5e8.s b/asm/src/ResidentFile_8055f5e8.s
deleted file mode 100644
index a5108cc8..00000000
--- a/asm/src/ResidentFile_8055f5e8.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "T_FILE_TABLE__Q23app26@unnamed@ResidentFile_cpp@"
-"T_FILE_TABLE__Q23app26@unnamed@ResidentFile_cpp@":
-
-	.4byte "@51961"
-	.4byte 0
diff --git a/asm/src/SaveInfo_80453068.s b/asm/src/SaveInfo_80453068.s
deleted file mode 100644
index cf49bf42..00000000
--- a/asm/src/SaveInfo_80453068.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@52513_80453068"
-"@52513_80453068":
-
-	.4byte 0x72657369
-	.4byte 0x64656E74
-	.4byte 0x2F4D6169
-	.4byte 0x6E000000
-	.4byte 0x53617665
-	.4byte 0x496E666F
-	.4byte 0x42617365
-	.4byte 0
-	.4byte 0x53617665
-	.4byte 0x496E666F
-	.4byte 0
-	.4byte 0x54657874
-	.4byte 0x53617665
-	.4byte 0
-	.4byte 0x53617665
-	.4byte 0x496E666F
-	.4byte 0x4E6F7753
-	.4byte 0x6176696E
-	.4byte 0x67000000
-
-.global "@52582_804530B4"
-"@52582_804530B4":
-
-	.4byte 0x53617665
-	.4byte 0x42617365
-	.4byte 0x314E0000
-
-.global "@52583_804530C0"
-"@52583_804530C0":
-
-	.4byte 0x53617665
-	.4byte 0x42617365
-	.4byte 0x324E0000
-	.4byte 0x4E573452
-	.4byte 0x3A506F69
-	.4byte 0x6E746572
-	.4byte 0x206D7573
-	.4byte 0x74206E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C202870
-	.4byte 0x29000000
-	.4byte 0x4C696E6B
-	.4byte 0x4C697374
-	.4byte 0x2E680000
-	.4byte 0
diff --git a/asm/src/SaveInfo_80556cc0.s b/asm/src/SaveInfo_80556cc0.s
deleted file mode 100644
index 48f954ed..00000000
--- a/asm/src/SaveInfo_80556cc0.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@52516_80556CC0"
-"@52516_80556CC0":
-
-	.4byte 0x57616974
-	.4byte 0
-
-.global "@52584_80556CC8"
-"@52584_80556CC8":
-
-	.4byte 0
-
-.global "@52585_80556CCC"
-"@52585_80556CCC":
-
-	.4byte 0x53746172
-	.4byte 0x74000000
-
-.global "@52621_80556CD4"
-"@52621_80556CD4":
-
-	.4byte 0x456E6400
diff --git a/asm/src/TPL_80174af8.s b/asm/src/TPL.s
similarity index 100%
rename from asm/src/TPL_80174af8.s
rename to asm/src/TPL.s
diff --git a/asm/src/AddOnMint_80174cb8.s b/asm/src/app/AddOnMint.s
similarity index 100%
rename from asm/src/AddOnMint_80174cb8.s
rename to asm/src/app/AddOnMint.s
diff --git a/asm/src/AppImpl_80174cec.s b/asm/src/app/AppImpl.s
similarity index 97%
rename from asm/src/AppImpl_80174cec.s
rename to asm/src/app/AppImpl.s
index 1fcaf869..2b607c40 100644
--- a/asm/src/AppImpl_80174cec.s
+++ b/asm/src/app/AppImpl.s
@@ -1574,3 +1574,67 @@ lbl_8017624C:
 "@4@__dt__Q23app7AppImplFv":
 /* 80176260 001720A0  38 63 FF FC */	addi r3, r3, -0x4
 /* 80176264 001720A4  4B FF F1 00 */	b __dt__Q23app7AppImplFv
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global __vt__Q23app7AppImpl
+__vt__Q23app7AppImpl:
+
+	.4byte 0
+	.4byte 0
+	.4byte __dt__Q23app7AppImplFv
+	.4byte drawerExecDraw__Q23app7AppImplFv
+	.4byte 0
+	.4byte 0
+	.4byte "@4@__dt__Q23app7AppImplFv"
+
+.global "@STRING@NoName__Q33hel6common15RuntimeTypeInfoFv"
+"@STRING@NoName__Q33hel6common15RuntimeTypeInfoFv":
+
+	.4byte 0x6E6F206E
+	.4byte 0x616D6520
+	.4byte 0x636C6173
+	.4byte 0x73000000
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "@GUARD@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@GUARD@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "@LOCAL@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@LOCAL@RuntimeTypeInfoImpl<Q23scn6IScene>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "@GUARD@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@GUARD@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "@LOCAL@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@LOCAL@RuntimeTypeInfoImpl<Q23seq9ISequence>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "@GUARD@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@GUARD@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "@LOCAL@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti"
+"@LOCAL@RuntimeTypeInfoImpl<Q23seq12SequenceRoot>__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo@ti":
+	.skip 0x8
+
+.global "object___Q33hel6common32ExplicitSingleton<Q23mem6Memory>"
+"object___Q33hel6common32ExplicitSingleton<Q23mem6Memory>":
+	.skip 0x4
+
+.global "object___Q33hel6common39ExplicitSingleton<Q23snd12SoundManager>"
+"object___Q33hel6common39ExplicitSingleton<Q23snd12SoundManager>":
+	.skip 0x4
+
+.global "object___Q33hel6common35ExplicitSingleton<Q23gfx9VISetting>"
+"object___Q33hel6common35ExplicitSingleton<Q23gfx9VISetting>":
+	.skip 0x4
+
+.global "ptr___Q33hel6common34ProtectedSingleton<Q23app7AppImpl>"
+"ptr___Q33hel6common34ProtectedSingleton<Q23app7AppImpl>":
+	.skip 0x4
diff --git a/asm/src/Application_80176268.s b/asm/src/app/Application.s
similarity index 98%
rename from asm/src/Application_80176268.s
rename to asm/src/app/Application.s
index ad7c8df3..25c1bfe1 100644
--- a/asm/src/Application_80176268.s
+++ b/asm/src/app/Application.s
@@ -354,3 +354,9 @@ saveInfo__Q23app11ApplicationFv:
 /* 80176708 00172548  7C 08 03 A6 */	mtlr r0
 /* 8017670C 0017254C  38 21 00 10 */	addi r1, r1, 0x10
 /* 80176710 00172550  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "object___Q33hel6common38ExplicitSingleton<Q23app11Application>"
+"object___Q33hel6common38ExplicitSingleton<Q23app11Application>":
+	.skip 0x8
diff --git a/asm/src/AutoResetTimer_80176714.s b/asm/src/app/AutoResetTimer.s
similarity index 94%
rename from asm/src/AutoResetTimer_80176714.s
rename to asm/src/app/AutoResetTimer.s
index 2bfb2c45..92510861 100644
--- a/asm/src/AutoResetTimer_80176714.s
+++ b/asm/src/app/AutoResetTimer.s
@@ -75,3 +75,9 @@ lbl_801767EC:
 /* 801767F8 00172638  7C 08 03 A6 */	mtlr r0
 /* 801767FC 0017263C  38 21 00 20 */	addi r1, r1, 0x20
 /* 80176800 00172640  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "object___Q33hel6common37ExplicitSingleton<Q23hid10HIDManager>"
+"object___Q33hel6common37ExplicitSingleton<Q23hid10HIDManager>":
+	.skip 0x8
diff --git a/asm/src/BackupFileAccessor_80176804.s b/asm/src/app/BackupFileAccessor.s
similarity index 100%
rename from asm/src/BackupFileAccessor_80176804.s
rename to asm/src/app/BackupFileAccessor.s
diff --git a/asm/src/Constant_8055f5a0.s b/asm/src/app/Constant.s
similarity index 100%
rename from asm/src/Constant_8055f5a0.s
rename to asm/src/app/Constant.s
diff --git a/asm/src/DvdWatch_801768b4.s b/asm/src/app/DvdWatch.s
similarity index 96%
rename from asm/src/DvdWatch_801768b4.s
rename to asm/src/app/DvdWatch.s
index 61f77a3d..24c06c0b 100644
--- a/asm/src/DvdWatch_801768b4.s
+++ b/asm/src/app/DvdWatch.s
@@ -1065,3 +1065,115 @@ lbl_8017769C:
 /* 801776B0 001734F0  7C 08 03 A6 */	mtlr r0
 /* 801776B4 001734F4  38 21 01 00 */	addi r1, r1, 0x100
 /* 801776B8 001734F8  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl@0"
+"@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl@0":
+
+	.4byte 0x4E573452
+	.4byte 0x3A506F69
+	.4byte 0x6E746572
+	.4byte 0x20457272
+	.4byte 0x6F720A74
+	.4byte 0x68697328
+	.4byte 0x3D257029
+	.4byte 0x20697320
+	.4byte 0x6E6F7420
+	.4byte 0x76616C69
+	.4byte 0x6420706F
+	.4byte 0x696E7465
+	.4byte 0x722E0000
+
+.global "@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl"
+"@STRING@SetDrawFlag__Q34nw4r2ut17TextWriterBase<c>FUl":
+
+	.4byte 0x54657874
+	.4byte 0x57726974
+	.4byte 0x65724261
+	.4byte 0x73652E68
+	.4byte 0
+
+.global "@STRING@SetCursor__Q34nw4r2ut10CharWriterFff@0"
+"@STRING@SetCursor__Q34nw4r2ut10CharWriterFff@0":
+
+	.4byte 0x4E573452
+	.4byte 0x3A506F69
+	.4byte 0x6E746572
+	.4byte 0x20457272
+	.4byte 0x6F720A74
+	.4byte 0x68697328
+	.4byte 0x3D257029
+	.4byte 0x20697320
+	.4byte 0x6E6F7420
+	.4byte 0x76616C69
+	.4byte 0x6420706F
+	.4byte 0x696E7465
+	.4byte 0x722E0000
+
+.global "@STRING@SetCursor__Q34nw4r2ut10CharWriterFff"
+"@STRING@SetCursor__Q34nw4r2ut10CharWriterFff":
+
+	.4byte 0x43686172
+	.4byte 0x57726974
+	.4byte 0x65722E68
+	.4byte 0
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@53258_8055F5A8"
+"@53258_8055F5A8":
+
+	.4byte 0
+
+.global "@53259_8055F5AC"
+"@53259_8055F5AC":
+
+	.4byte 0x3F800000
+
+.global "@53260"
+"@53260":
+
+	.4byte 0x43E40000
+
+.global "@53261"
+"@53261":
+
+	.4byte 0x3C23D70A
+
+.global "@53262"
+"@53262":
+
+	.4byte 0x42C80000
+
+.global "@53263"
+"@53263":
+
+	.4byte 0xBF800000
+
+.global "@53264_8055F5C0"
+"@53264_8055F5C0":
+
+	.4byte 0x41F00000
+
+.global "@53265_8055F5C4"
+"@53265_8055F5C4":
+
+	.4byte 0x41D00000
+
+.global "@53266_8055F5C8"
+"@53266_8055F5C8":
+
+	.4byte 0x3F000000
+
+.global "@53267_8055F5CC"
+"@53267_8055F5CC":
+
+	.4byte 0x43640000
+
+.global "@53272"
+"@53272":
+
+	.4byte 0x43300000
+	.4byte 0
diff --git a/asm/src/DvdWatch_ENG_80452bc0.s b/asm/src/app/DvdWatch_ENG.s
similarity index 79%
rename from asm/src/DvdWatch_ENG_80452bc0.s
rename to asm/src/app/DvdWatch_ENG.s
index 9a36d645..c0fe69bf 100644
--- a/asm/src/DvdWatch_ENG_80452bc0.s
+++ b/asm/src/app/DvdWatch_ENG.s
@@ -1,5 +1,17 @@
 .include "macros.inc"
 
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global ERROR_MSG_ENG__Q23app8DvdWatch
+ERROR_MSG_ENG__Q23app8DvdWatch:
+
+	.4byte "@48836_80556B78"
+	.4byte "@48837_80452BC0"
+	.4byte "@48837_80452BC0"
+	.4byte "@48838_80452C04"
+	.4byte "@48839_80452C50"
+	.4byte 0
+.include "macros.inc"
+
 .section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
 .global "@48837_80452BC0"
 "@48837_80452BC0":
@@ -90,3 +102,11 @@
 	.4byte 0x74727563
 	.4byte 0x74696F6E
 	.4byte 0x732E0000
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@48836_80556B78"
+"@48836_80556B78":
+
+	.4byte 0
+	.4byte 0
diff --git a/asm/src/EntryPoint_801776bc.s b/asm/src/app/EntryPoint.s
similarity index 94%
rename from asm/src/EntryPoint_801776bc.s
rename to asm/src/app/EntryPoint.s
index 48376162..bd33bd29 100644
--- a/asm/src/EntryPoint_801776bc.s
+++ b/asm/src/app/EntryPoint.s
@@ -183,3 +183,27 @@ lbl_80177920:
 /* 80177930 00173770  7C 08 03 A6 */	mtlr r0
 /* 80177934 00173774  38 21 00 10 */	addi r1, r1, 0x10
 /* 80177938 00173778  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@49240_80452CF8"
+"@49240_80452CF8":
+
+	.4byte 0x48424D5F
+	.4byte 0x52455345
+	.4byte 0x54000000
+	.4byte 0
+
+.global "@49241_80452D08"
+"@49241_80452D08":
+
+	.4byte 0x57494953
+	.4byte 0x59535445
+	.4byte 0x4D5F5245
+	.4byte 0x53455400
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "isExist___Q33hel6common31PrivateSingleton<Q23app6System>"
+"isExist___Q33hel6common31PrivateSingleton<Q23app6System>":
+	.skip 0x8
diff --git a/asm/src/HIDErrorMenu_8017793c.s b/asm/src/app/HIDErrorMenu.s
similarity index 95%
rename from asm/src/HIDErrorMenu_8017793c.s
rename to asm/src/app/HIDErrorMenu.s
index 039aa549..7c05e6b0 100644
--- a/asm/src/HIDErrorMenu_8017793c.s
+++ b/asm/src/app/HIDErrorMenu.s
@@ -2006,3 +2006,263 @@ lbl_801793A0:
 /* 801793A0 001751E0  7C 83 23 78 */	mr r3, r4
 /* 801793A4 001751E4  38 80 00 01 */	li r4, 0x1
 /* 801793A8 001751E8  48 02 8E AC */	b isTrigger__Q23hid6ButtonCFUl
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@52181_80452D18"
+"@52181_80452D18":
+
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63745469
+	.4byte 0x746C6500
+	.4byte "@52181_80452D18"
+	.4byte "@52181_80452D18"
+	.4byte "@52181_80452D18"
+
+.global "@52182_80452D34"
+"@52182_80452D34":
+
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63745469
+	.4byte 0x746C6553
+	.4byte 0x75625769
+	.4byte 0x74684361
+	.4byte 0x6E63656C
+	.4byte 0
+
+.global "@52183_80452D54"
+"@52183_80452D54":
+
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63745469
+	.4byte 0x746C6553
+	.4byte 0x75625769
+	.4byte 0x74685175
+	.4byte 0x69740000
+	.4byte "@52181_80452D18"
+	.4byte "@52182_80452D34"
+	.4byte "@52183_80452D54"
+
+.global "@52184_80452D7C"
+"@52184_80452D7C":
+
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x6374436F
+	.4byte 0x6E74696E
+	.4byte 0x75650000
+
+.global "@52185_80452D90"
+"@52185_80452D90":
+
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63745175
+	.4byte 0x69740000
+	.4byte "@52184_80452D7C"
+	.4byte "@52184_80452D7C"
+	.4byte "@52185_80452D90"
+
+.global "@54504_80452DAC"
+"@54504_80452DAC":
+
+	.4byte 0x4572726F
+	.4byte 0x724D656E
+	.4byte 0x75000000
+	.4byte 0x636F6D6D
+	.4byte 0x6F6E2F4D
+	.4byte 0x61696E00
+	.4byte 0x42617474
+	.4byte 0x65727957
+	.4byte 0x696E646F
+	.4byte 0x77000000
+	.4byte 0x42757474
+	.4byte 0x6F6E3031
+	.4byte 0x4E000000
+	.4byte 0x42757474
+	.4byte 0x6F6E3032
+	.4byte 0x4E000000
+	.4byte 0x436F6E66
+	.4byte 0x69726D59
+	.4byte 0x65730000
+	.4byte 0x436F6E66
+	.4byte 0x69726D4E
+	.4byte 0x6F000000
+
+.global "@54699_80452E04"
+"@54699_80452E04":
+
+	.4byte 0x53776974
+	.4byte 0x63683031
+	.4byte 0
+
+.global "@54701_80452E10"
+"@54701_80452E10":
+
+	.4byte lbl_801784F4
+	.4byte lbl_80178514
+	.4byte lbl_80178530
+	.4byte lbl_801785B4
+	.4byte lbl_801785D0
+	.4byte lbl_801786F0
+	.4byte lbl_80178738
+	.4byte lbl_80178754
+	.4byte lbl_80178774
+	.4byte 0
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63745469
+	.4byte 0x746C6500
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x63744578
+	.4byte 0x74546974
+	.4byte 0x6C650000
+	.4byte 0x436F6E6E
+	.4byte 0x65637443
+	.4byte 0x6C617373
+	.4byte 0x69634374
+	.4byte 0x726C0000
+	.4byte 0x44697363
+	.4byte 0x6F6E6E65
+	.4byte 0x6374436C
+	.4byte 0x61737369
+	.4byte 0x63437472
+	.4byte 0x6C000000
+	.4byte 0x4D61696E
+	.4byte 0x54657874
+	.4byte 0
+	.4byte 0x436F6E66
+	.4byte 0x69726D54
+	.4byte 0x65787400
+
+.global "@54876_80452EA0"
+"@54876_80452EA0":
+
+	.4byte 0x53776974
+	.4byte 0x63683032
+	.4byte 0
+
+.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>@0"
+"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>@0":
+
+	.4byte 0x4E573452
+	.4byte 0x3A506F69
+	.4byte 0x6E746572
+	.4byte 0x206D7573
+	.4byte 0x74206E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C202870
+	.4byte 0x29000000
+
+.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>"
+"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>,0>FPQ24util52ObjListNode<Q23lyt6Layout,Q24util16ObjListDummyType>":
+
+	.4byte 0x4C696E6B
+	.4byte 0x4C697374
+	.4byte 0x2E680000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@54615"
+"@54615":
+
+	.4byte 0x436F6E66
+	.4byte 0x69726D00
+
+.global "@54619_80556B88"
+"@54619_80556B88":
+
+	.4byte 0x57696E4E
+	.4byte 0
+
+.global "@54816"
+"@54816":
+
+	.4byte 0x5374644E
+	.4byte 0
+
+.global "@54817_80556B98"
+"@54817_80556B98":
+
+	.4byte 0x53656C4E
+	.4byte 0
+
+.global "@54818"
+"@54818":
+
+	.4byte 0x4578744E
+	.4byte 0
+
+.global "@54819"
+"@54819":
+
+	.4byte 0x436C614E
+	.4byte 0
+
+.global "@54820_80556BB0"
+"@54820_80556BB0":
+
+	.4byte 0x53746172
+	.4byte 0x74000000
+
+.global "@54821"
+"@54821":
+
+	.4byte 0
+	.4byte 0
+
+.global "@54827_80556BC0"
+"@54827_80556BC0":
+
+	.4byte 0x53756254
+	.4byte 0x65787400
+
+.global "@54829"
+"@54829":
+
+	.4byte 0x4F70656E
+	.4byte 0
+
+.global "@54873_80556BD0"
+"@54873_80556BD0":
+
+	.4byte 0x436F6E6E
+	.4byte 0x65637400
+
+.global "@54880_80556BD8"
+"@54880_80556BD8":
+
+	.4byte 0x436C6F73
+	.4byte 0x65000000
+
+.global "@54896"
+"@54896":
+
+	.4byte 0x53746400
+
+.global "@54897"
+"@54897":
+
+	.4byte 0x53656C00
+
+.global "@54898"
+"@54898":
+
+	.4byte 0x45787400
+
+.global "@54899"
+"@54899":
+
+	.4byte 0x436C6100
+
+.global "@54900"
+"@54900":
+
+	.4byte 0x25732573
+	.4byte 0
diff --git a/asm/src/app/Locale.s b/asm/src/app/Locale.s
new file mode 100644
index 00000000..629d9642
--- /dev/null
+++ b/asm/src/app/Locale.s
@@ -0,0 +1,67 @@
+.include "macros.inc"
+
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global FilePostfix__Q23app6LocaleFv
+FilePostfix__Q23app6LocaleFv:
+/* 801793AC 001751EC  3C 60 80 41 */	lis r3, "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"@ha
+/* 801793B0 001751F0  38 63 44 E0 */	addi r3, r3, "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"@l
+/* 801793B4 001751F4  80 63 00 04 */	lwz r3, 0x4(r3)
+/* 801793B8 001751F8  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global "T_POSTS_US__Q23app20@unnamed@Locale_cpp@"
+"T_POSTS_US__Q23app20@unnamed@Locale_cpp@":
+
+	.4byte "@50071_80556BF8"
+	.4byte "@50072_80556C00"
+	.4byte "@50073_80556C08"
+	.4byte "@50074_80556C10"
+	.4byte "@50075_80556C18"
+	.4byte "@50076"
+	.4byte "@50077_80556C28"
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@50071_80556BF8"
+"@50071_80556BF8":
+
+	.4byte 0x55535F4A
+	.4byte 0x504E0000
+
+.global "@50072_80556C00"
+"@50072_80556C00":
+
+	.4byte 0x55535F45
+	.4byte 0x4E470000
+
+.global "@50073_80556C08"
+"@50073_80556C08":
+
+	.4byte 0x55535F47
+	.4byte 0x45520000
+
+.global "@50074_80556C10"
+"@50074_80556C10":
+
+	.4byte 0x55535F46
+	.4byte 0x52410000
+
+.global "@50075_80556C18"
+"@50075_80556C18":
+
+	.4byte 0x55535F53
+	.4byte 0x50410000
+
+.global "@50076"
+"@50076":
+
+	.4byte 0x55535F49
+	.4byte 0x54410000
+
+.global "@50077_80556C28"
+"@50077_80556C28":
+
+	.4byte 0x55535F4E
+	.4byte 0x45440000
diff --git a/asm/src/Message_801793bc.s b/asm/src/app/Message.s
similarity index 100%
rename from asm/src/Message_801793bc.s
rename to asm/src/app/Message.s
diff --git a/asm/src/NANDErrorMenu_801798a8.s b/asm/src/app/NANDErrorMenu.s
similarity index 93%
rename from asm/src/NANDErrorMenu_801798a8.s
rename to asm/src/app/NANDErrorMenu.s
index 15463f7a..cedd51e8 100644
--- a/asm/src/NANDErrorMenu_801798a8.s
+++ b/asm/src/app/NANDErrorMenu.s
@@ -997,3 +997,221 @@ decide__Q33app17NANDErrorMenuImpl6ButtonFv:
 /* 8017A57C 001763BC  7C 08 03 A6 */	mtlr r0
 /* 8017A580 001763C0  38 21 00 10 */	addi r1, r1, 0x10
 /* 8017A584 001763C4  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@51882_80452EE0"
+"@51882_80452EE0":
+
+	.4byte 0x72657369
+	.4byte 0x64656E74
+	.4byte 0x2F4D6169
+	.4byte 0x6E000000
+
+.global "@53133_80452EF0"
+"@53133_80452EF0":
+
+	.4byte 0x4E414E44
+	.4byte 0x4572726F
+	.4byte 0x72000000
+
+.global "@53141_80452EFC"
+"@53141_80452EFC":
+
+	.4byte 0x4E414E44
+	.4byte 0x4572726F
+	.4byte 0x724D656E
+	.4byte 0x75000000
+	.4byte 0x53617665
+	.4byte 0x43686563
+	.4byte 0x6B426173
+	.4byte 0x65000000
+	.4byte 0x53617665
+	.4byte 0x43686563
+	.4byte 0x6B000000
+	.4byte 0x42757474
+	.4byte 0x6F6E3031
+	.4byte 0x4E000000
+	.4byte 0x42757474
+	.4byte 0x6F6E3032
+	.4byte 0x4E000000
+	.4byte 0x52657475
+	.4byte 0x726E546F
+	.4byte 0x4D656E75
+	.4byte 0
+	.4byte 0x4E6F5361
+	.4byte 0x76654C6F
+	.4byte 0x61640000
+	.4byte 0x44656C65
+	.4byte 0x74654669
+	.4byte 0x6C650000
+	.4byte 0x456D7074
+	.4byte 0x79426C6F
+	.4byte 0x636B0000
+	.4byte 0x456D7074
+	.4byte 0x79494E6F
+	.4byte 0x64650000
+	.4byte 0x42726F6B
+	.4byte 0x656E5761
+	.4byte 0x726E0000
+	.4byte 0x57696E53
+	.4byte 0x656C6563
+	.4byte 0x74546578
+	.4byte 0x74000000
+
+.global "@53323"
+"@53323":
+
+	.4byte lbl_8017A0E8
+	.4byte lbl_8017A074
+	.4byte lbl_8017A080
+	.4byte lbl_8017A08C
+	.4byte lbl_8017A098
+	.4byte lbl_8017A0AC
+	.4byte lbl_8017A0C0
+	.4byte lbl_8017A0AC
+	.4byte lbl_8017A0D4
+	.4byte lbl_8017A0E8
+	.4byte lbl_8017A0AC
+
+.global "@53362_80452FC8"
+"@53362_80452FC8":
+
+	.4byte 0x53617665
+	.4byte 0x43686563
+	.4byte 0x6B427574
+	.4byte 0x746F6E00
+
+.global "@53374"
+"@53374":
+
+	.4byte 0x4E6F4368
+	.4byte 0x6F696365
+	.4byte 0
+
+.global "@53377"
+"@53377":
+
+	.4byte 0x42757474
+	.4byte 0x6F6E5465
+	.4byte 0x78740000
+	.4byte 0x4E573452
+	.4byte 0x3A506F69
+	.4byte 0x6E746572
+	.4byte 0x206D7573
+	.4byte 0x74206E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C202870
+	.4byte 0x29000000
+	.4byte 0x4C696E6B
+	.4byte 0x4C697374
+	.4byte 0x2E680000
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "T_LYT_RES__Q23app27@unnamed@NANDErrorMenu_cpp@"
+"T_LYT_RES__Q23app27@unnamed@NANDErrorMenu_cpp@":
+
+	.4byte "@51882_80452EE0"
+
+.global "@53132_80556C34"
+"@53132_80556C34":
+
+	.4byte 0x25732573
+	.4byte 0x25730000
+
+.global "@53198"
+"@53198":
+
+	.4byte 0x57696E4E
+	.4byte 0
+
+.global "@53304"
+"@53304":
+
+	.4byte 0x4E6F5361
+	.4byte 0x76650000
+
+.global "@53305"
+"@53305":
+
+	.4byte 0x59657300
+
+.global "@53306"
+"@53306":
+
+	.4byte 0x43616E63
+	.4byte 0x656C0000
+
+.global "@53309"
+"@53309":
+
+	.4byte 0
+
+.global "@53310_80556C5C"
+"@53310_80556C5C":
+
+	.4byte 0x4572726F
+	.4byte 0x72000000
+
+.global "@53311_80556C64"
+"@53311_80556C64":
+
+	.4byte 0x4661696C
+	.4byte 0x65640000
+	.4byte 0
+
+.global "@53312_80556C70"
+"@53312_80556C70":
+
+	.4byte 0x436F7272
+	.4byte 0x75707400
+
+.global "@53316"
+"@53316":
+
+	.4byte 0x57616974
+	.4byte 0x30320000
+
+.global "@53317"
+"@53317":
+
+	.4byte 0x57696E54
+	.4byte 0x65787400
+
+.global "@53318_80556C88"
+"@53318_80556C88":
+
+	.4byte 0x57616974
+	.4byte 0x30310000
+
+.global "@53320"
+"@53320":
+
+	.4byte 0x4974656D
+	.4byte 0
+
+.global "@53321_80556C98"
+"@53321_80556C98":
+
+	.4byte 0x4F70656E
+	.4byte 0
+
+.global "@53359"
+"@53359":
+
+	.4byte 0x436C6F73
+	.4byte 0x65000000
+
+.global "@53373_80556CA8"
+"@53373_80556CA8":
+
+	.4byte 0x43686F69
+	.4byte 0x63650000
+
+.global "@53381_80556CB0"
+"@53381_80556CB0":
+
+	.4byte 0x44656369
+	.4byte 0x64650000
diff --git a/asm/src/PerformanceController_8017a588.s b/asm/src/app/PerformanceController.s
similarity index 95%
rename from asm/src/PerformanceController_8017a588.s
rename to asm/src/app/PerformanceController.s
index a9f623f6..dc9ae4d6 100644
--- a/asm/src/PerformanceController_8017a588.s
+++ b/asm/src/app/PerformanceController.s
@@ -343,3 +343,29 @@ calcedFrameCount__Q23app21PerformanceControllerCFv:
 "__sinit_@@1PerformanceController_cpp":
 /* 8017A9D4 00176814  38 6D ED 28 */	addi r3, r13, "t_instance__35@unnamed@PerformanceController_cpp@"@sda21
 /* 8017A9D8 00176818  4B F6 2A 08 */	b __ct__Q34nw4r3g3d8LightObjFv
+.include "macros.inc"
+
+.section .ctors, "wa"  # 0x80406260 - 0x80406540 ; 0x000002E0
+	.4byte "__sinit_@@1PerformanceController_cpp"
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global "T_DRAW_FRAME_INTERVAL_TABLE__35@unnamed@PerformanceController_cpp@"
+"T_DRAW_FRAME_INTERVAL_TABLE__35@unnamed@PerformanceController_cpp@":
+
+	.4byte 0x00000001
+	.4byte 0x00000002
+	.4byte 0x00000003
+	.4byte 0x00000004
+	.4byte 0x00000005
+	.4byte 0x00000006
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "t_instance__35@unnamed@PerformanceController_cpp@"
+"t_instance__35@unnamed@PerformanceController_cpp@":
+	.skip 0x4
+
+.global "isExist___Q33hel6common47PrivateSingleton<Q23app21PerformanceController>"
+"isExist___Q33hel6common47PrivateSingleton<Q23app21PerformanceController>":
+	.skip 0x4
diff --git a/asm/src/Random_8017a9dc.s b/asm/src/app/Random.s
similarity index 100%
rename from asm/src/Random_8017a9dc.s
rename to asm/src/app/Random.s
diff --git a/asm/src/Reset_8017ac2c.s b/asm/src/app/Reset.s
similarity index 95%
rename from asm/src/Reset_8017ac2c.s
rename to asm/src/app/Reset.s
index 0ef0e669..682d8dac 100644
--- a/asm/src/Reset_8017ac2c.s
+++ b/asm/src/app/Reset.s
@@ -468,3 +468,47 @@ dvdCheckDiskCallback__Q23app5ResetFlP15DVDCommandBlock:
 /* 8017B1EC 0017702C  80 6D ED 38 */	lwz r3, "object___Q33hel6common31ExplicitSingleton<Q23app5Reset>"@sda21(r13)
 /* 8017B1F0 00177030  38 80 00 02 */	li r4, 0x2
 /* 8017B1F4 00177034  4B FF FF 10 */	b onCallback__Q23app5ResetFQ33app5Reset12CallbackKindl
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@50602_80556CB8"
+"@50602_80556CB8":
+
+	.4byte 0
+
+.global "@50603_80556CBC"
+"@50603_80556CBC":
+
+	.4byte 0x437F0000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "tIsPushedReset__Q23app19@unnamed@Reset_cpp@"
+"tIsPushedReset__Q23app19@unnamed@Reset_cpp@":
+	.skip 0x1
+
+.global "tIsPushedPower__Q23app19@unnamed@Reset_cpp@"
+"tIsPushedPower__Q23app19@unnamed@Reset_cpp@":
+	.skip 0x3
+
+.global "object___Q33hel6common41ExplicitSingleton<Q23hbm14HomeButtonMenu>"
+"object___Q33hel6common41ExplicitSingleton<Q23hbm14HomeButtonMenu>":
+	.skip 0x4
+
+.global "object___Q33hel6common31ExplicitSingleton<Q23app5Reset>"
+"object___Q33hel6common31ExplicitSingleton<Q23app5Reset>":
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@51058"
+"@51058":
+
+	.4byte 0x41A00000
+	.4byte 0
+
+.global "@51061"
+"@51061":
+
+	.4byte 0x43300000
+	.4byte 0x80000000
diff --git a/asm/src/ResidentFile_8017b1f8.s b/asm/src/app/ResidentFile.s
similarity index 94%
rename from asm/src/ResidentFile_8017b1f8.s
rename to asm/src/app/ResidentFile.s
index 8f2f3e62..f977541b 100644
--- a/asm/src/ResidentFile_8017b1f8.s
+++ b/asm/src/app/ResidentFile.s
@@ -243,3 +243,43 @@ lbl_8017B500:
 /* 8017B53C 0017737C  7C 08 03 A6 */	mtlr r0
 /* 8017B540 00177380  38 21 00 C0 */	addi r1, r1, 0xc0
 /* 8017B544 00177384  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@51961"
+"@51961":
+
+	.4byte 0x6C79742F
+	.4byte 0x72657369
+	.4byte 0x64656E74
+	.4byte 0x2F4D6169
+	.4byte 0x6E2E6172
+	.4byte 0x632E636D
+	.4byte 0x70000000
+
+.global "@52401_8045303C"
+"@52401_8045303C":
+
+	.4byte 0x52657369
+	.4byte 0x64656E74
+	.4byte 0x46696C65
+	.4byte 0x4C6F6164
+	.4byte 0x54687265
+	.4byte 0x61640000
+
+.global "@52478"
+"@52478":
+
+	.4byte 0x52657369
+	.4byte 0x64656E74
+	.4byte 0x2E6D7362
+	.4byte 0x74000000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "T_FILE_TABLE__Q23app26@unnamed@ResidentFile_cpp@"
+"T_FILE_TABLE__Q23app26@unnamed@ResidentFile_cpp@":
+
+	.4byte "@51961"
+	.4byte 0
diff --git a/asm/src/RomFontWrapper_8017b548.s b/asm/src/app/RomFontWrapper.s
similarity index 100%
rename from asm/src/RomFontWrapper_8017b548.s
rename to asm/src/app/RomFontWrapper.s
diff --git a/asm/src/SaveInfo_8017b63c.s b/asm/src/app/SaveInfo.s
similarity index 94%
rename from asm/src/SaveInfo_8017b63c.s
rename to asm/src/app/SaveInfo.s
index 26b56e95..2ae458ca 100644
--- a/asm/src/SaveInfo_8017b63c.s
+++ b/asm/src/app/SaveInfo.s
@@ -433,3 +433,79 @@ requestSave__Q23app8SaveInfoFv:
 /* 8017BBD0 00177A10  7C 08 03 A6 */	mtlr r0
 /* 8017BBD4 00177A14  38 21 00 10 */	addi r1, r1, 0x10
 /* 8017BBD8 00177A18  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@52513_80453068"
+"@52513_80453068":
+
+	.4byte 0x72657369
+	.4byte 0x64656E74
+	.4byte 0x2F4D6169
+	.4byte 0x6E000000
+	.4byte 0x53617665
+	.4byte 0x496E666F
+	.4byte 0x42617365
+	.4byte 0
+	.4byte 0x53617665
+	.4byte 0x496E666F
+	.4byte 0
+	.4byte 0x54657874
+	.4byte 0x53617665
+	.4byte 0
+	.4byte 0x53617665
+	.4byte 0x496E666F
+	.4byte 0x4E6F7753
+	.4byte 0x6176696E
+	.4byte 0x67000000
+
+.global "@52582_804530B4"
+"@52582_804530B4":
+
+	.4byte 0x53617665
+	.4byte 0x42617365
+	.4byte 0x314E0000
+
+.global "@52583_804530C0"
+"@52583_804530C0":
+
+	.4byte 0x53617665
+	.4byte 0x42617365
+	.4byte 0x324E0000
+	.4byte 0x4E573452
+	.4byte 0x3A506F69
+	.4byte 0x6E746572
+	.4byte 0x206D7573
+	.4byte 0x74206E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C202870
+	.4byte 0x29000000
+	.4byte 0x4C696E6B
+	.4byte 0x4C697374
+	.4byte 0x2E680000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@52516_80556CC0"
+"@52516_80556CC0":
+
+	.4byte 0x57616974
+	.4byte 0
+
+.global "@52584_80556CC8"
+"@52584_80556CC8":
+
+	.4byte 0
+
+.global "@52585_80556CCC"
+"@52585_80556CCC":
+
+	.4byte 0x53746172
+	.4byte 0x74000000
+
+.global "@52621_80556CD4"
+"@52621_80556CD4":
+
+	.4byte 0x456E6400
diff --git a/asm/src/System_8017bbdc.s b/asm/src/app/System.s
similarity index 100%
rename from asm/src/System_8017bbdc.s
rename to asm/src/app/System.s
diff --git a/obj_files.mk b/obj_files.mk
index c417ae61..52031dd2 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -632,28 +632,31 @@ $(BUILD_DIR)/asm/libms/msgfile.o \
 $(BUILD_DIR)/asm/libms/commonbin.o \
 $(BUILD_DIR)/asm/libms/projfile.o \
 \
+$(BUILD_DIR)/asm/src/Main.o \
+$(BUILD_DIR)/asm/src/TPL.o \
+$(BUILD_DIR)/asm/src/app/AddOnMint.o \
+$(BUILD_DIR)/asm/src/app/AppImpl.o \
+$(BUILD_DIR)/asm/src/app/Application.o \
+$(BUILD_DIR)/asm/src/app/AutoResetTimer.o \
+$(BUILD_DIR)/asm/src/app/BackupFileAccessor.o \
+$(BUILD_DIR)/asm/src/app/Constant.o \
+$(BUILD_DIR)/asm/src/app/DvdWatch.o \
+$(BUILD_DIR)/asm/src/app/DvdWatch_ENG.o \
+$(BUILD_DIR)/asm/src/app/EntryPoint.o \
+$(BUILD_DIR)/asm/src/app/HIDErrorMenu.o \
+$(BUILD_DIR)/asm/src/app/Locale.o \
+$(BUILD_DIR)/asm/src/app/Message.o \
+$(BUILD_DIR)/asm/src/app/NANDErrorMenu.o \
+$(BUILD_DIR)/asm/src/app/PerformanceController.o \
+$(BUILD_DIR)/asm/src/app/Random.o \
+$(BUILD_DIR)/asm/src/app/Reset.o \
+$(BUILD_DIR)/asm/src/app/ResidentFile.o \
+$(BUILD_DIR)/asm/src/app/RomFontWrapper.o \
+$(BUILD_DIR)/asm/src/app/SaveInfo.o \
+$(BUILD_DIR)/asm/src/app/System.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/src/Main_80174ad8.o \
-$(BUILD_DIR)/asm/src/TPL_80174af8.o \
-$(BUILD_DIR)/asm/src/AddOnMint_80174cb8.o \
-$(BUILD_DIR)/asm/src/AppImpl_80174cec.o \
-$(BUILD_DIR)/asm/src/Application_80176268.o \
-$(BUILD_DIR)/asm/src/AutoResetTimer_80176714.o \
-$(BUILD_DIR)/asm/src/BackupFileAccessor_80176804.o \
-$(BUILD_DIR)/asm/src/DvdWatch_801768b4.o \
-$(BUILD_DIR)/asm/src/EntryPoint_801776bc.o \
-$(BUILD_DIR)/asm/src/HIDErrorMenu_8017793c.o \
-$(BUILD_DIR)/asm/src/Locale_801793ac.o \
-$(BUILD_DIR)/asm/src/Message_801793bc.o \
-$(BUILD_DIR)/asm/src/NANDErrorMenu_801798a8.o \
-$(BUILD_DIR)/asm/src/PerformanceController_8017a588.o \
-$(BUILD_DIR)/asm/src/Random_8017a9dc.o \
-$(BUILD_DIR)/asm/src/Reset_8017ac2c.o \
-$(BUILD_DIR)/asm/src/ResidentFile_8017b1f8.o \
-$(BUILD_DIR)/asm/src/RomFontWrapper_8017b548.o \
-$(BUILD_DIR)/asm/src/SaveInfo_8017b63c.o \
-$(BUILD_DIR)/asm/src/System_8017bbdc.o \
 $(BUILD_DIR)/asm/src/Dynamics_8017bd88.o \
 $(BUILD_DIR)/asm/src/ModelNode_8017c2a8.o \
 $(BUILD_DIR)/asm/src/ModelTree_8017d2ec.o \
@@ -2922,8 +2925,9 @@ $(BUILD_DIR)/asm/src/Mutex_80405a9c.o \
 $(BUILD_DIR)/asm/src/SIntAABBox_80405b68.o \
 $(BUILD_DIR)/asm/src/StateChanger_80405cd0.o \
 $(BUILD_DIR)/asm/src/Thread_80405f14.o \
-$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o \
-$(BUILD_DIR)/asm/src/PerformanceController_804062dc.o \
+$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o 
+# .ctors
+O_FILES += \
 $(BUILD_DIR)/asm/src/MintModelAccessor_804062e0.o \
 $(BUILD_DIR)/asm/src/MintNodeAccessor_804062e4.o \
 $(BUILD_DIR)/asm/src/EasyRender3D_804062e8.o \
@@ -2998,11 +3002,14 @@ $(BUILD_DIR)/asm/src/ModelDesc_804064e8.o \
 $(BUILD_DIR)/asm/src/MintCommander_80406520.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \
 $(BUILD_DIR)/asm/src/Alarm_80406528.o \
-$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \
-$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \
-$(BUILD_DIR)/asm/src/DvdWatch_ENG_804144c8.o \
-$(BUILD_DIR)/asm/src/Locale_804144e0.o \
-$(BUILD_DIR)/asm/src/PerformanceController_80414500.o \
+$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o 
+
+#.dtors
+O_FILES += \
+$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o
+
+# .rodata
+O_FILES += \
 $(BUILD_DIR)/asm/src/FDGManager_80414518.o \
 $(BUILD_DIR)/asm/src/FontKindUtil_80414528.o \
 $(BUILD_DIR)/asm/src/FreezeThread_80414570.o \
@@ -3133,15 +3140,9 @@ $(BUILD_DIR)/asm/src/Explanation_80420b40.o \
 $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
 $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
 $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
-$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
-$(BUILD_DIR)/asm/src/AppImpl_80452b00.o \
-$(BUILD_DIR)/asm/src/DvdWatch_80452b30.o \
-$(BUILD_DIR)/asm/src/DvdWatch_ENG_80452bc0.o \
-$(BUILD_DIR)/asm/src/EntryPoint_80452cf8.o \
-$(BUILD_DIR)/asm/src/HIDErrorMenu_80452d18.o \
-$(BUILD_DIR)/asm/src/NANDErrorMenu_80452ee0.o \
-$(BUILD_DIR)/asm/src/ResidentFile_80453020.o \
-$(BUILD_DIR)/asm/src/SaveInfo_80453068.o \
+$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
+# .data
+O_FILES += \
 $(BUILD_DIR)/asm/src/Dynamics_80453100.o \
 $(BUILD_DIR)/asm/src/ModelNode_80453130.o \
 $(BUILD_DIR)/asm/src/Util_80453168.o \
@@ -4727,7 +4728,9 @@ $(BUILD_DIR)/asm/src/SoundManager_80496600.o \
 $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \
 $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \
 $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
-$(BUILD_DIR)/asm/src/StateChanger_804966f0.o \
+$(BUILD_DIR)/asm/src/StateChanger_804966f0.o
+# .bss
+O_FILES += \
 $(BUILD_DIR)/asm/src/FreezeManager_80544520.o \
 $(BUILD_DIR)/asm/src/MintModelAccessor_805447e8.o \
 $(BUILD_DIR)/asm/src/MintNodeAccessor_80544808.o \
@@ -4779,14 +4782,9 @@ $(BUILD_DIR)/asm/src/Food_805533c0.o \
 $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
 $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
 $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
-$(BUILD_DIR)/asm/src/Table_80556398.o \
-$(BUILD_DIR)/asm/src/Main_80556b70.o \
-$(BUILD_DIR)/asm/src/DvdWatch_ENG_80556b78.o \
-$(BUILD_DIR)/asm/src/HIDErrorMenu_80556b80.o \
-$(BUILD_DIR)/asm/src/Locale_80556bf8.o \
-$(BUILD_DIR)/asm/src/NANDErrorMenu_80556c30.o \
-$(BUILD_DIR)/asm/src/Reset_80556cb8.o \
-$(BUILD_DIR)/asm/src/SaveInfo_80556cc0.o \
+$(BUILD_DIR)/asm/src/Table_80556398.o
+# .sdata
+O_FILES += \
 $(BUILD_DIR)/asm/src/GenContext_80556cd8.o \
 $(BUILD_DIR)/asm/src/PolyEffect_80556ce0.o \
 $(BUILD_DIR)/asm/src/FDGManager_80556d10.o \
@@ -5149,13 +5147,9 @@ $(BUILD_DIR)/asm/src/StaffRoll_8055c628.o \
 $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
 $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
 $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
-$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
-$(BUILD_DIR)/asm/src/AppImpl_8055d0f0.o \
-$(BUILD_DIR)/asm/src/Application_8055d130.o \
-$(BUILD_DIR)/asm/src/AutoResetTimer_8055d138.o \
-$(BUILD_DIR)/asm/src/EntryPoint_8055d140.o \
-$(BUILD_DIR)/asm/src/PerformanceController_8055d148.o \
-$(BUILD_DIR)/asm/src/Reset_8055d150.o \
+$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
+# .sbss
+O_FILES += \
 $(BUILD_DIR)/asm/src/Manager_8055d160.o \
 $(BUILD_DIR)/asm/src/EffectManager_8055d168.o \
 $(BUILD_DIR)/asm/src/PtclEffectManager_8055d170.o \
@@ -5290,11 +5284,9 @@ $(BUILD_DIR)/asm/src/SequenceGrandMenu_8055df18.o \
 $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
 $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
-$(BUILD_DIR)/asm/src/Alarm_8055df68.o \
-$(BUILD_DIR)/asm/src/Constant_8055f5a0.o \
-$(BUILD_DIR)/asm/src/DvdWatch_8055f5a8.o \
-$(BUILD_DIR)/asm/src/Reset_8055f5d8.o \
-$(BUILD_DIR)/asm/src/ResidentFile_8055f5e8.o \
+$(BUILD_DIR)/asm/src/Alarm_8055df68.o
+# .sdata2
+O_FILES += \
 $(BUILD_DIR)/asm/src/ModelNode_8055f5f0.o \
 $(BUILD_DIR)/asm/src/Util_8055f608.o \
 $(BUILD_DIR)/asm/src/CameraInfo_8055f630.o \
@@ -6303,7 +6295,9 @@ $(BUILD_DIR)/asm/src/Alarm_80564378.o \
 $(BUILD_DIR)/asm/src/AnimController_80564388.o \
 $(BUILD_DIR)/asm/src/CurveUtility_80564390.o \
 $(BUILD_DIR)/asm/src/FrameCounter_80564398.o \
-$(BUILD_DIR)/asm/src/UIntAABBox_805643a8.o \
+$(BUILD_DIR)/asm/src/UIntAABBox_805643a8.o
+# .sbss2
+O_FILES += \
 $(BUILD_DIR)/asm/src/RenderSetting_805643d8.o \
 $(BUILD_DIR)/asm/src/LandLayer_805643e0.o \
 $(BUILD_DIR)/asm/src/MoveGridGroup_805643e8.o \