diff --git a/include/JKernel/JKRDisposer.h b/include/JSystem/JKernel/JKRDisposer.h
similarity index 86%
rename from include/JKernel/JKRDisposer.h
rename to include/JSystem/JKernel/JKRDisposer.h
index 8bbb6fbf899..dd7f32aecf3 100644
--- a/include/JKernel/JKRDisposer.h
+++ b/include/JSystem/JKernel/JKRDisposer.h
@@ -2,7 +2,7 @@
 #define __JKRDISPOSER_H__
 
 #include "dolphin/types.h"
-#include "JSupport/JSUList.h"
+#include "JSystem/JSupport/JSUList.h"
 
 class JKRHeap;
 class JKRDisposer {
diff --git a/include/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
similarity index 96%
rename from include/JKernel/JKRHeap.h
rename to include/JSystem/JKernel/JKRHeap.h
index f2c17d2a471..f03176d2c44 100644
--- a/include/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -1,6 +1,6 @@
 
 #include "dolphin/types.h"
-#include "JKernel/JKRDisposer.h"
+#include "JSystem/JKernel/JKRDisposer.h"
 
 typedef void (*JKRErrorHandler)(void*, unsigned long, int);
 class JKRHeap : JKRDisposer {
diff --git a/include/JKernel/asm/func_802CE138.s b/include/JSystem/JKernel/asm/func_802CE138.s
similarity index 100%
rename from include/JKernel/asm/func_802CE138.s
rename to include/JSystem/JKernel/asm/func_802CE138.s
diff --git a/include/JKernel/asm/func_802CE264.s b/include/JSystem/JKernel/asm/func_802CE264.s
similarity index 100%
rename from include/JKernel/asm/func_802CE264.s
rename to include/JSystem/JKernel/asm/func_802CE264.s
diff --git a/include/JKernel/asm/func_802CE378.s b/include/JSystem/JKernel/asm/func_802CE378.s
similarity index 100%
rename from include/JKernel/asm/func_802CE378.s
rename to include/JSystem/JKernel/asm/func_802CE378.s
diff --git a/include/JKernel/asm/func_802CE428.s b/include/JSystem/JKernel/asm/func_802CE428.s
similarity index 100%
rename from include/JKernel/asm/func_802CE428.s
rename to include/JSystem/JKernel/asm/func_802CE428.s
diff --git a/include/JKernel/asm/func_802CE438.s b/include/JSystem/JKernel/asm/func_802CE438.s
similarity index 100%
rename from include/JKernel/asm/func_802CE438.s
rename to include/JSystem/JKernel/asm/func_802CE438.s
diff --git a/include/JKernel/asm/func_802CE448.s b/include/JSystem/JKernel/asm/func_802CE448.s
similarity index 100%
rename from include/JKernel/asm/func_802CE448.s
rename to include/JSystem/JKernel/asm/func_802CE448.s
diff --git a/include/JKernel/asm/func_802CE474.s b/include/JSystem/JKernel/asm/func_802CE474.s
similarity index 100%
rename from include/JKernel/asm/func_802CE474.s
rename to include/JSystem/JKernel/asm/func_802CE474.s
diff --git a/include/JKernel/asm/func_802CE4D4.s b/include/JSystem/JKernel/asm/func_802CE4D4.s
similarity index 100%
rename from include/JKernel/asm/func_802CE4D4.s
rename to include/JSystem/JKernel/asm/func_802CE4D4.s
diff --git a/include/JKernel/asm/func_802CE500.s b/include/JSystem/JKernel/asm/func_802CE500.s
similarity index 100%
rename from include/JKernel/asm/func_802CE500.s
rename to include/JSystem/JKernel/asm/func_802CE500.s
diff --git a/include/JKernel/asm/func_802CE548.s b/include/JSystem/JKernel/asm/func_802CE548.s
similarity index 100%
rename from include/JKernel/asm/func_802CE548.s
rename to include/JSystem/JKernel/asm/func_802CE548.s
diff --git a/include/JKernel/asm/func_802CE574.s b/include/JSystem/JKernel/asm/func_802CE574.s
similarity index 100%
rename from include/JKernel/asm/func_802CE574.s
rename to include/JSystem/JKernel/asm/func_802CE574.s
diff --git a/include/JKernel/asm/func_802CE5CC.s b/include/JSystem/JKernel/asm/func_802CE5CC.s
similarity index 100%
rename from include/JKernel/asm/func_802CE5CC.s
rename to include/JSystem/JKernel/asm/func_802CE5CC.s
diff --git a/include/JKernel/asm/func_802CE5F8.s b/include/JSystem/JKernel/asm/func_802CE5F8.s
similarity index 100%
rename from include/JKernel/asm/func_802CE5F8.s
rename to include/JSystem/JKernel/asm/func_802CE5F8.s
diff --git a/include/JKernel/asm/func_802CE624.s b/include/JSystem/JKernel/asm/func_802CE624.s
similarity index 100%
rename from include/JKernel/asm/func_802CE624.s
rename to include/JSystem/JKernel/asm/func_802CE624.s
diff --git a/include/JKernel/asm/func_802CE684.s b/include/JSystem/JKernel/asm/func_802CE684.s
similarity index 100%
rename from include/JKernel/asm/func_802CE684.s
rename to include/JSystem/JKernel/asm/func_802CE684.s
diff --git a/include/JKernel/asm/func_802CE6B0.s b/include/JSystem/JKernel/asm/func_802CE6B0.s
similarity index 100%
rename from include/JKernel/asm/func_802CE6B0.s
rename to include/JSystem/JKernel/asm/func_802CE6B0.s
diff --git a/include/JKernel/asm/func_802CE700.s b/include/JSystem/JKernel/asm/func_802CE700.s
similarity index 100%
rename from include/JKernel/asm/func_802CE700.s
rename to include/JSystem/JKernel/asm/func_802CE700.s
diff --git a/include/JKernel/asm/func_802CE72C.s b/include/JSystem/JKernel/asm/func_802CE72C.s
similarity index 100%
rename from include/JKernel/asm/func_802CE72C.s
rename to include/JSystem/JKernel/asm/func_802CE72C.s
diff --git a/include/JKernel/asm/func_802CE758.s b/include/JSystem/JKernel/asm/func_802CE758.s
similarity index 100%
rename from include/JKernel/asm/func_802CE758.s
rename to include/JSystem/JKernel/asm/func_802CE758.s
diff --git a/include/JKernel/asm/func_802CE784.s b/include/JSystem/JKernel/asm/func_802CE784.s
similarity index 100%
rename from include/JKernel/asm/func_802CE784.s
rename to include/JSystem/JKernel/asm/func_802CE784.s
diff --git a/include/JKernel/asm/func_802CE7B0.s b/include/JSystem/JKernel/asm/func_802CE7B0.s
similarity index 100%
rename from include/JKernel/asm/func_802CE7B0.s
rename to include/JSystem/JKernel/asm/func_802CE7B0.s
diff --git a/include/JKernel/asm/func_802CE7DC.s b/include/JSystem/JKernel/asm/func_802CE7DC.s
similarity index 100%
rename from include/JKernel/asm/func_802CE7DC.s
rename to include/JSystem/JKernel/asm/func_802CE7DC.s
diff --git a/include/JKernel/asm/func_802CE83C.s b/include/JSystem/JKernel/asm/func_802CE83C.s
similarity index 100%
rename from include/JKernel/asm/func_802CE83C.s
rename to include/JSystem/JKernel/asm/func_802CE83C.s
diff --git a/include/JKernel/asm/func_802CE894.s b/include/JSystem/JKernel/asm/func_802CE894.s
similarity index 100%
rename from include/JKernel/asm/func_802CE894.s
rename to include/JSystem/JKernel/asm/func_802CE894.s
diff --git a/include/JKernel/asm/func_802CE93C.s b/include/JSystem/JKernel/asm/func_802CE93C.s
similarity index 100%
rename from include/JKernel/asm/func_802CE93C.s
rename to include/JSystem/JKernel/asm/func_802CE93C.s
diff --git a/include/JKernel/asm/func_802CE9E4.s b/include/JSystem/JKernel/asm/func_802CE9E4.s
similarity index 100%
rename from include/JKernel/asm/func_802CE9E4.s
rename to include/JSystem/JKernel/asm/func_802CE9E4.s
diff --git a/include/JKernel/asm/func_802CEA78.s b/include/JSystem/JKernel/asm/func_802CEA78.s
similarity index 100%
rename from include/JKernel/asm/func_802CEA78.s
rename to include/JSystem/JKernel/asm/func_802CEA78.s
diff --git a/include/JKernel/asm/func_802CEAA0.s b/include/JSystem/JKernel/asm/func_802CEAA0.s
similarity index 100%
rename from include/JKernel/asm/func_802CEAA0.s
rename to include/JSystem/JKernel/asm/func_802CEAA0.s
diff --git a/include/JKernel/asm/func_802CEAC0.s b/include/JSystem/JKernel/asm/func_802CEAC0.s
similarity index 100%
rename from include/JKernel/asm/func_802CEAC0.s
rename to include/JSystem/JKernel/asm/func_802CEAC0.s
diff --git a/include/JKernel/asm/func_802CEB18.s b/include/JSystem/JKernel/asm/func_802CEB18.s
similarity index 100%
rename from include/JKernel/asm/func_802CEB18.s
rename to include/JSystem/JKernel/asm/func_802CEB18.s
diff --git a/include/JKernel/asm/func_802CEB40.s b/include/JSystem/JKernel/asm/func_802CEB40.s
similarity index 100%
rename from include/JKernel/asm/func_802CEB40.s
rename to include/JSystem/JKernel/asm/func_802CEB40.s
diff --git a/include/JKernel/asm/func_802CEB78.s b/include/JSystem/JKernel/asm/func_802CEB78.s
similarity index 100%
rename from include/JKernel/asm/func_802CEB78.s
rename to include/JSystem/JKernel/asm/func_802CEB78.s
diff --git a/include/JKernel/asm/func_802CEB88.s b/include/JSystem/JKernel/asm/func_802CEB88.s
similarity index 100%
rename from include/JKernel/asm/func_802CEB88.s
rename to include/JSystem/JKernel/asm/func_802CEB88.s
diff --git a/include/JKernel/asm/func_802CEBA8.s b/include/JSystem/JKernel/asm/func_802CEBA8.s
similarity index 100%
rename from include/JKernel/asm/func_802CEBA8.s
rename to include/JSystem/JKernel/asm/func_802CEBA8.s
diff --git a/include/JKernel/asm/func_802CEC4C.s b/include/JSystem/JKernel/asm/func_802CEC4C.s
similarity index 100%
rename from include/JKernel/asm/func_802CEC4C.s
rename to include/JSystem/JKernel/asm/func_802CEC4C.s
diff --git a/include/JKernel/asm/func_802CEC74.s b/include/JSystem/JKernel/asm/func_802CEC74.s
similarity index 100%
rename from include/JKernel/asm/func_802CEC74.s
rename to include/JSystem/JKernel/asm/func_802CEC74.s
diff --git a/include/JKernel/asm/func_802CEC98.s b/include/JSystem/JKernel/asm/func_802CEC98.s
similarity index 100%
rename from include/JKernel/asm/func_802CEC98.s
rename to include/JSystem/JKernel/asm/func_802CEC98.s
diff --git a/include/JKernel/asm/func_802CECC4.s b/include/JSystem/JKernel/asm/func_802CECC4.s
similarity index 100%
rename from include/JKernel/asm/func_802CECC4.s
rename to include/JSystem/JKernel/asm/func_802CECC4.s
diff --git a/include/JKernel/asm/func_802CECEC.s b/include/JSystem/JKernel/asm/func_802CECEC.s
similarity index 100%
rename from include/JKernel/asm/func_802CECEC.s
rename to include/JSystem/JKernel/asm/func_802CECEC.s
diff --git a/include/JKernel/asm/func_802CED10.s b/include/JSystem/JKernel/asm/func_802CED10.s
similarity index 100%
rename from include/JKernel/asm/func_802CED10.s
rename to include/JSystem/JKernel/asm/func_802CED10.s
diff --git a/include/JKernel/asm/func_802CED3C.s b/include/JSystem/JKernel/asm/func_802CED3C.s
similarity index 100%
rename from include/JKernel/asm/func_802CED3C.s
rename to include/JSystem/JKernel/asm/func_802CED3C.s
diff --git a/include/JKernel/asm/func_802CED60.s b/include/JSystem/JKernel/asm/func_802CED60.s
similarity index 100%
rename from include/JKernel/asm/func_802CED60.s
rename to include/JSystem/JKernel/asm/func_802CED60.s
diff --git a/include/JKernel/asm/func_802D147C.s b/include/JSystem/JKernel/asm/func_802D147C.s
similarity index 100%
rename from include/JKernel/asm/func_802D147C.s
rename to include/JSystem/JKernel/asm/func_802D147C.s
diff --git a/include/JKernel/asm/func_802D14E4.s b/include/JSystem/JKernel/asm/func_802D14E4.s
similarity index 100%
rename from include/JKernel/asm/func_802D14E4.s
rename to include/JSystem/JKernel/asm/func_802D14E4.s
diff --git a/include/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h
similarity index 100%
rename from include/JSupport/JSUList.h
rename to include/JSystem/JSupport/JSUList.h
diff --git a/include/JSupport/asm/func_802DBDFC.s b/include/JSystem/JSupport/asm/func_802DBDFC.s
similarity index 100%
rename from include/JSupport/asm/func_802DBDFC.s
rename to include/JSystem/JSupport/asm/func_802DBDFC.s
diff --git a/include/JSupport/asm/func_802DBE14.s b/include/JSystem/JSupport/asm/func_802DBE14.s
similarity index 100%
rename from include/JSupport/asm/func_802DBE14.s
rename to include/JSystem/JSupport/asm/func_802DBE14.s
diff --git a/include/JSupport/asm/func_802DBE74.s b/include/JSystem/JSupport/asm/func_802DBE74.s
similarity index 100%
rename from include/JSupport/asm/func_802DBE74.s
rename to include/JSystem/JSupport/asm/func_802DBE74.s
diff --git a/include/JSupport/asm/func_802DBEAC.s b/include/JSystem/JSupport/asm/func_802DBEAC.s
similarity index 100%
rename from include/JSupport/asm/func_802DBEAC.s
rename to include/JSystem/JSupport/asm/func_802DBEAC.s
diff --git a/include/JSupport/asm/func_802DBF14.s b/include/JSystem/JSupport/asm/func_802DBF14.s
similarity index 100%
rename from include/JSupport/asm/func_802DBF14.s
rename to include/JSystem/JSupport/asm/func_802DBF14.s
diff --git a/include/JSupport/asm/func_802DBF28.s b/include/JSystem/JSupport/asm/func_802DBF28.s
similarity index 100%
rename from include/JSupport/asm/func_802DBF28.s
rename to include/JSystem/JSupport/asm/func_802DBF28.s
diff --git a/include/JSupport/asm/func_802DBF4C.s b/include/JSystem/JSupport/asm/func_802DBF4C.s
similarity index 100%
rename from include/JSupport/asm/func_802DBF4C.s
rename to include/JSystem/JSupport/asm/func_802DBF4C.s
diff --git a/include/JSupport/asm/func_802DBFF0.s b/include/JSystem/JSupport/asm/func_802DBFF0.s
similarity index 100%
rename from include/JSupport/asm/func_802DBFF0.s
rename to include/JSystem/JSupport/asm/func_802DBFF0.s
diff --git a/include/JSupport/asm/func_802DC094.s b/include/JSystem/JSupport/asm/func_802DC094.s
similarity index 100%
rename from include/JSupport/asm/func_802DC094.s
rename to include/JSystem/JSupport/asm/func_802DC094.s
diff --git a/include/JSupport/asm/func_802DC15C.s b/include/JSystem/JSupport/asm/func_802DC15C.s
similarity index 100%
rename from include/JSupport/asm/func_802DC15C.s
rename to include/JSystem/JSupport/asm/func_802DC15C.s
diff --git a/include/JSupport/asm/func_802DC20C.s b/include/JSystem/JSupport/asm/func_802DC20C.s
similarity index 100%
rename from include/JSupport/asm/func_802DC20C.s
rename to include/JSystem/JSupport/asm/func_802DC20C.s
diff --git a/include/func_8000585C.s b/include/d/d_save/d_save/asm/func_8000585C.s
similarity index 100%
rename from include/func_8000585C.s
rename to include/d/d_save/d_save/asm/func_8000585C.s
diff --git a/include/func_80032AF8.s b/include/d/d_save/d_save/asm/func_80032AF8.s
similarity index 100%
rename from include/func_80032AF8.s
rename to include/d/d_save/d_save/asm/func_80032AF8.s
diff --git a/include/func_80032BB0.s b/include/d/d_save/d_save/asm/func_80032BB0.s
similarity index 100%
rename from include/func_80032BB0.s
rename to include/d/d_save/d_save/asm/func_80032BB0.s
diff --git a/include/func_80032BEC.s b/include/d/d_save/d_save/asm/func_80032BEC.s
similarity index 100%
rename from include/func_80032BEC.s
rename to include/d/d_save/d_save/asm/func_80032BEC.s
diff --git a/include/func_80032CC8.s b/include/d/d_save/d_save/asm/func_80032CC8.s
similarity index 100%
rename from include/func_80032CC8.s
rename to include/d/d_save/d_save/asm/func_80032CC8.s
diff --git a/include/func_80032D1C.s b/include/d/d_save/d_save/asm/func_80032D1C.s
similarity index 100%
rename from include/func_80032D1C.s
rename to include/d/d_save/d_save/asm/func_80032D1C.s
diff --git a/include/func_80032E78.s b/include/d/d_save/d_save/asm/func_80032E78.s
similarity index 100%
rename from include/func_80032E78.s
rename to include/d/d_save/d_save/asm/func_80032E78.s
diff --git a/include/func_80032FB8 .s b/include/d/d_save/d_save/asm/func_80032FB8 .s
similarity index 100%
rename from include/func_80032FB8 .s
rename to include/d/d_save/d_save/asm/func_80032FB8 .s
diff --git a/include/func_80032FB8.s b/include/d/d_save/d_save/asm/func_80032FB8.s
similarity index 100%
rename from include/func_80032FB8.s
rename to include/d/d_save/d_save/asm/func_80032FB8.s
diff --git a/include/func_80033030.s b/include/d/d_save/d_save/asm/func_80033030.s
similarity index 100%
rename from include/func_80033030.s
rename to include/d/d_save/d_save/asm/func_80033030.s
diff --git a/include/func_800332F8.s b/include/d/d_save/d_save/asm/func_800332F8.s
similarity index 100%
rename from include/func_800332F8.s
rename to include/d/d_save/d_save/asm/func_800332F8.s
diff --git a/include/func_80033370.s b/include/d/d_save/d_save/asm/func_80033370.s
similarity index 100%
rename from include/func_80033370.s
rename to include/d/d_save/d_save/asm/func_80033370.s
diff --git a/include/func_80033450.s b/include/d/d_save/d_save/asm/func_80033450.s
similarity index 100%
rename from include/func_80033450.s
rename to include/d/d_save/d_save/asm/func_80033450.s
diff --git a/include/func_80033494.s b/include/d/d_save/d_save/asm/func_80033494.s
similarity index 100%
rename from include/func_80033494.s
rename to include/d/d_save/d_save/asm/func_80033494.s
diff --git a/include/func_80033514.s b/include/d/d_save/d_save/asm/func_80033514.s
similarity index 100%
rename from include/func_80033514.s
rename to include/d/d_save/d_save/asm/func_80033514.s
diff --git a/include/func_80033598.s b/include/d/d_save/d_save/asm/func_80033598.s
similarity index 100%
rename from include/func_80033598.s
rename to include/d/d_save/d_save/asm/func_80033598.s
diff --git a/include/func_800336BC.s b/include/d/d_save/d_save/asm/func_800336BC.s
similarity index 100%
rename from include/func_800336BC.s
rename to include/d/d_save/d_save/asm/func_800336BC.s
diff --git a/include/func_80033754.s b/include/d/d_save/d_save/asm/func_80033754.s
similarity index 100%
rename from include/func_80033754.s
rename to include/d/d_save/d_save/asm/func_80033754.s
diff --git a/include/func_80033828.s b/include/d/d_save/d_save/asm/func_80033828.s
similarity index 100%
rename from include/func_80033828.s
rename to include/d/d_save/d_save/asm/func_80033828.s
diff --git a/include/func_80033910.s b/include/d/d_save/d_save/asm/func_80033910.s
similarity index 100%
rename from include/func_80033910.s
rename to include/d/d_save/d_save/asm/func_80033910.s
diff --git a/include/func_80033A88.s b/include/d/d_save/d_save/asm/func_80033A88.s
similarity index 100%
rename from include/func_80033A88.s
rename to include/d/d_save/d_save/asm/func_80033A88.s
diff --git a/include/func_80033B08.s b/include/d/d_save/d_save/asm/func_80033B08.s
similarity index 100%
rename from include/func_80033B08.s
rename to include/d/d_save/d_save/asm/func_80033B08.s
diff --git a/include/func_80033BEC.s b/include/d/d_save/d_save/asm/func_80033BEC.s
similarity index 100%
rename from include/func_80033BEC.s
rename to include/d/d_save/d_save/asm/func_80033BEC.s
diff --git a/include/func_80033C2C.s b/include/d/d_save/d_save/asm/func_80033C2C.s
similarity index 100%
rename from include/func_80033C2C.s
rename to include/d/d_save/d_save/asm/func_80033C2C.s
diff --git a/include/func_80033CBC.s b/include/d/d_save/d_save/asm/func_80033CBC.s
similarity index 100%
rename from include/func_80033CBC.s
rename to include/d/d_save/d_save/asm/func_80033CBC.s
diff --git a/include/func_80033D40.s b/include/d/d_save/d_save/asm/func_80033D40.s
similarity index 100%
rename from include/func_80033D40.s
rename to include/d/d_save/d_save/asm/func_80033D40.s
diff --git a/include/func_80033E60.s b/include/d/d_save/d_save/asm/func_80033E60.s
similarity index 100%
rename from include/func_80033E60.s
rename to include/d/d_save/d_save/asm/func_80033E60.s
diff --git a/include/func_80033E94.s b/include/d/d_save/d_save/asm/func_80033E94.s
similarity index 100%
rename from include/func_80033E94.s
rename to include/d/d_save/d_save/asm/func_80033E94.s
diff --git a/include/func_80033EC8.s b/include/d/d_save/d_save/asm/func_80033EC8.s
similarity index 100%
rename from include/func_80033EC8.s
rename to include/d/d_save/d_save/asm/func_80033EC8.s
diff --git a/include/func_80033F9C.s b/include/d/d_save/d_save/asm/func_80033F9C.s
similarity index 100%
rename from include/func_80033F9C.s
rename to include/d/d_save/d_save/asm/func_80033F9C.s
diff --git a/include/func_80034040.s b/include/d/d_save/d_save/asm/func_80034040.s
similarity index 100%
rename from include/func_80034040.s
rename to include/d/d_save/d_save/asm/func_80034040.s
diff --git a/include/func_800340B8.s b/include/d/d_save/d_save/asm/func_800340B8.s
similarity index 100%
rename from include/func_800340B8.s
rename to include/d/d_save/d_save/asm/func_800340B8.s
diff --git a/include/func_800340F8.s b/include/d/d_save/d_save/asm/func_800340F8.s
similarity index 100%
rename from include/func_800340F8.s
rename to include/d/d_save/d_save/asm/func_800340F8.s
diff --git a/include/func_800341AC.s b/include/d/d_save/d_save/asm/func_800341AC.s
similarity index 100%
rename from include/func_800341AC.s
rename to include/d/d_save/d_save/asm/func_800341AC.s
diff --git a/include/func_800341E8.s b/include/d/d_save/d_save/asm/func_800341E8.s
similarity index 100%
rename from include/func_800341E8.s
rename to include/d/d_save/d_save/asm/func_800341E8.s
diff --git a/include/func_80034428.s b/include/d/d_save/d_save/asm/func_80034428.s
similarity index 100%
rename from include/func_80034428.s
rename to include/d/d_save/d_save/asm/func_80034428.s
diff --git a/include/func_8003444C.s b/include/d/d_save/d_save/asm/func_8003444C.s
similarity index 100%
rename from include/func_8003444C.s
rename to include/d/d_save/d_save/asm/func_8003444C.s
diff --git a/include/func_80034474.s b/include/d/d_save/d_save/asm/func_80034474.s
similarity index 100%
rename from include/func_80034474.s
rename to include/d/d_save/d_save/asm/func_80034474.s
diff --git a/include/func_8003449C.s b/include/d/d_save/d_save/asm/func_8003449C.s
similarity index 100%
rename from include/func_8003449C.s
rename to include/d/d_save/d_save/asm/func_8003449C.s
diff --git a/include/func_800344FC.s b/include/d/d_save/d_save/asm/func_800344FC.s
similarity index 100%
rename from include/func_800344FC.s
rename to include/d/d_save/d_save/asm/func_800344FC.s
diff --git a/include/func_80034518.s b/include/d/d_save/d_save/asm/func_80034518.s
similarity index 100%
rename from include/func_80034518.s
rename to include/d/d_save/d_save/asm/func_80034518.s
diff --git a/include/func_80034644.s b/include/d/d_save/d_save/asm/func_80034644.s
similarity index 100%
rename from include/func_80034644.s
rename to include/d/d_save/d_save/asm/func_80034644.s
diff --git a/include/func_800347A0.s b/include/d/d_save/d_save/asm/func_800347A0.s
similarity index 100%
rename from include/func_800347A0.s
rename to include/d/d_save/d_save/asm/func_800347A0.s
diff --git a/include/func_800347C4.s b/include/d/d_save/d_save/asm/func_800347C4.s
similarity index 100%
rename from include/func_800347C4.s
rename to include/d/d_save/d_save/asm/func_800347C4.s
diff --git a/include/func_800347E8.s b/include/d/d_save/d_save/asm/func_800347E8.s
similarity index 100%
rename from include/func_800347E8.s
rename to include/d/d_save/d_save/asm/func_800347E8.s
diff --git a/include/func_80034810.s b/include/d/d_save/d_save/asm/func_80034810.s
similarity index 100%
rename from include/func_80034810.s
rename to include/d/d_save/d_save/asm/func_80034810.s
diff --git a/include/func_80034838.s b/include/d/d_save/d_save/asm/func_80034838.s
similarity index 100%
rename from include/func_80034838.s
rename to include/d/d_save/d_save/asm/func_80034838.s
diff --git a/include/func_80034860.s b/include/d/d_save/d_save/asm/func_80034860.s
similarity index 100%
rename from include/func_80034860.s
rename to include/d/d_save/d_save/asm/func_80034860.s
diff --git a/include/func_8003488C.s b/include/d/d_save/d_save/asm/func_8003488C.s
similarity index 100%
rename from include/func_8003488C.s
rename to include/d/d_save/d_save/asm/func_8003488C.s
diff --git a/include/func_800348C4.s b/include/d/d_save/d_save/asm/func_800348C4.s
similarity index 100%
rename from include/func_800348C4.s
rename to include/d/d_save/d_save/asm/func_800348C4.s
diff --git a/include/func_800348EC.s b/include/d/d_save/d_save/asm/func_800348EC.s
similarity index 100%
rename from include/func_800348EC.s
rename to include/d/d_save/d_save/asm/func_800348EC.s
diff --git a/include/func_8003498C.s b/include/d/d_save/d_save/asm/func_8003498C.s
similarity index 100%
rename from include/func_8003498C.s
rename to include/d/d_save/d_save/asm/func_8003498C.s
diff --git a/include/func_800349A4.s b/include/d/d_save/d_save/asm/func_800349A4.s
similarity index 100%
rename from include/func_800349A4.s
rename to include/d/d_save/d_save/asm/func_800349A4.s
diff --git a/include/func_800349BC.s b/include/d/d_save/d_save/asm/func_800349BC.s
similarity index 100%
rename from include/func_800349BC.s
rename to include/d/d_save/d_save/asm/func_800349BC.s
diff --git a/include/func_80034AA4.s b/include/d/d_save/d_save/asm/func_80034AA4.s
similarity index 100%
rename from include/func_80034AA4.s
rename to include/d/d_save/d_save/asm/func_80034AA4.s
diff --git a/include/func_80034AC8.s b/include/d/d_save/d_save/asm/func_80034AC8.s
similarity index 100%
rename from include/func_80034AC8.s
rename to include/d/d_save/d_save/asm/func_80034AC8.s
diff --git a/include/func_80034AEC.s b/include/d/d_save/d_save/asm/func_80034AEC.s
similarity index 100%
rename from include/func_80034AEC.s
rename to include/d/d_save/d_save/asm/func_80034AEC.s
diff --git a/include/func_80034B98.s b/include/d/d_save/d_save/asm/func_80034B98.s
similarity index 100%
rename from include/func_80034B98.s
rename to include/d/d_save/d_save/asm/func_80034B98.s
diff --git a/include/func_80034BC0.s b/include/d/d_save/d_save/asm/func_80034BC0.s
similarity index 100%
rename from include/func_80034BC0.s
rename to include/d/d_save/d_save/asm/func_80034BC0.s
diff --git a/include/func_80034BE8.s b/include/d/d_save/d_save/asm/func_80034BE8.s
similarity index 100%
rename from include/func_80034BE8.s
rename to include/d/d_save/d_save/asm/func_80034BE8.s
diff --git a/include/func_80034C14.s b/include/d/d_save/d_save/asm/func_80034C14.s
similarity index 100%
rename from include/func_80034C14.s
rename to include/d/d_save/d_save/asm/func_80034C14.s
diff --git a/include/func_80034C4C.s b/include/d/d_save/d_save/asm/func_80034C4C.s
similarity index 100%
rename from include/func_80034C4C.s
rename to include/d/d_save/d_save/asm/func_80034C4C.s
diff --git a/include/func_80034C74.s b/include/d/d_save/d_save/asm/func_80034C74.s
similarity index 100%
rename from include/func_80034C74.s
rename to include/d/d_save/d_save/asm/func_80034C74.s
diff --git a/include/func_80034D04.s b/include/d/d_save/d_save/asm/func_80034D04.s
similarity index 100%
rename from include/func_80034D04.s
rename to include/d/d_save/d_save/asm/func_80034D04.s
diff --git a/include/func_80034D2C.s b/include/d/d_save/d_save/asm/func_80034D2C.s
similarity index 100%
rename from include/func_80034D2C.s
rename to include/d/d_save/d_save/asm/func_80034D2C.s
diff --git a/include/func_80034D50.s b/include/d/d_save/d_save/asm/func_80034D50.s
similarity index 100%
rename from include/func_80034D50.s
rename to include/d/d_save/d_save/asm/func_80034D50.s
diff --git a/include/func_80034D78.s b/include/d/d_save/d_save/asm/func_80034D78.s
similarity index 100%
rename from include/func_80034D78.s
rename to include/d/d_save/d_save/asm/func_80034D78.s
diff --git a/include/func_8003501C.s b/include/d/d_save/d_save/asm/func_8003501C.s
similarity index 100%
rename from include/func_8003501C.s
rename to include/d/d_save/d_save/asm/func_8003501C.s
diff --git a/include/func_800350A8.s b/include/d/d_save/d_save/asm/func_800350A8.s
similarity index 100%
rename from include/func_800350A8.s
rename to include/d/d_save/d_save/asm/func_800350A8.s
diff --git a/include/func_800350BC.s b/include/d/d_save/d_save/asm/func_800350BC.s
similarity index 100%
rename from include/func_800350BC.s
rename to include/d/d_save/d_save/asm/func_800350BC.s
diff --git a/include/func_800350F0.s b/include/d/d_save/d_save/asm/func_800350F0.s
similarity index 100%
rename from include/func_800350F0.s
rename to include/d/d_save/d_save/asm/func_800350F0.s
diff --git a/include/func_8003514C.s b/include/d/d_save/d_save/asm/func_8003514C.s
similarity index 100%
rename from include/func_8003514C.s
rename to include/d/d_save/d_save/asm/func_8003514C.s
diff --git a/include/func_800351A4.s b/include/d/d_save/d_save/asm/func_800351A4.s
similarity index 100%
rename from include/func_800351A4.s
rename to include/d/d_save/d_save/asm/func_800351A4.s
diff --git a/include/func_80035200.s b/include/d/d_save/d_save/asm/func_80035200.s
similarity index 100%
rename from include/func_80035200.s
rename to include/d/d_save/d_save/asm/func_80035200.s
diff --git a/include/func_80035360.s b/include/d/d_save/d_save/asm/func_80035360.s
similarity index 100%
rename from include/func_80035360.s
rename to include/d/d_save/d_save/asm/func_80035360.s
diff --git a/include/func_80035590.s b/include/d/d_save/d_save/asm/func_80035590.s
similarity index 100%
rename from include/func_80035590.s
rename to include/d/d_save/d_save/asm/func_80035590.s
diff --git a/include/func_800356B4.s b/include/d/d_save/d_save/asm/func_800356B4.s
similarity index 100%
rename from include/func_800356B4.s
rename to include/d/d_save/d_save/asm/func_800356B4.s
diff --git a/include/func_80035724.s b/include/d/d_save/d_save/asm/func_80035724.s
similarity index 100%
rename from include/func_80035724.s
rename to include/d/d_save/d_save/asm/func_80035724.s
diff --git a/include/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s
similarity index 100%
rename from include/func_80035798.s
rename to include/d/d_save/d_save/asm/func_80035798.s
diff --git a/include/func_80035A04.s b/include/d/d_save/d_save/asm/func_80035A04.s
similarity index 100%
rename from include/func_80035A04.s
rename to include/d/d_save/d_save/asm/func_80035A04.s
diff --git a/include/d_save.h b/include/d/d_save/d_save/d_save.h
similarity index 100%
rename from include/d_save.h
rename to include/d/d_save/d_save/d_save.h
diff --git a/include/func_8025BB78.s b/include/d/d_save/d_save_HIO/asm/func_8025BB78.s
similarity index 100%
rename from include/func_8025BB78.s
rename to include/d/d_save/d_save_HIO/asm/func_8025BB78.s
diff --git a/include/func_8025BBAC.s b/include/d/d_save/d_save_HIO/asm/func_8025BBAC.s
similarity index 100%
rename from include/func_8025BBAC.s
rename to include/d/d_save/d_save_HIO/asm/func_8025BBAC.s
diff --git a/include/d_save_HIO.h b/include/d/d_save/d_save_HIO/d_save_HIO.h
similarity index 100%
rename from include/d_save_HIO.h
rename to include/d/d_save/d_save_HIO/d_save_HIO.h
diff --git a/include/func_8000578C.s b/include/m_Do/m_Do_main/asm/func_8000578C.s
similarity index 100%
rename from include/func_8000578C.s
rename to include/m_Do/m_Do_main/asm/func_8000578C.s
diff --git a/include/func_80005848.s b/include/m_Do/m_Do_main/asm/func_80005848.s
similarity index 100%
rename from include/func_80005848.s
rename to include/m_Do/m_Do_main/asm/func_80005848.s
diff --git a/include/m_Do_main.h b/include/m_Do/m_Do_main/m_Do_main.h
similarity index 100%
rename from include/m_Do_main.h
rename to include/m_Do/m_Do_main/m_Do_main.h
diff --git a/include/ok.cpp b/include/ok.cpp
deleted file mode 100644
index 4bd8d7e1697..00000000000
--- a/include/ok.cpp
+++ /dev/null
@@ -1 +0,0 @@
-: int dSv_info_c::createZone(int param_1) { dSv_zone_c* zone = this->zones; for (int i = 0; i < 0x20; zone++, i++) { if (zone->unk0 < 0) { zone->init(param_1); return i; } } return -1; }
\ No newline at end of file
diff --git a/libs/JSystem/JKernel/JKRDisposer.cpp b/libs/JSystem/JKernel/JKRDisposer.cpp
index 2bbe0c84338..de4a00b5c32 100644
--- a/libs/JSystem/JKernel/JKRDisposer.cpp
+++ b/libs/JSystem/JKernel/JKRDisposer.cpp
@@ -1,8 +1,8 @@
-#include "JKernel/JKRDisposer.h"
+#include "JSystem/JKernel/JKRDisposer.h"
 #include "global.h"
-#include "JKernel/JKRHeap.h"
+#include "JSystem/JKernel/JKRHeap.h"
 
-// #include "JKernel/asm/func_802D147C.s"
+// #include "JSystem/JKernel/asm/func_802D147C.s"
 JKRDisposer::JKRDisposer() : __vt(lbl_803CC0F0), ptr_link(this) {
     this->heap     = JKRHeap::findFromRoot(this);
     if (this->heap != 0) {
@@ -22,6 +22,6 @@ JKRDisposer::~JKRDisposer() {
 #else
 asm JKRDisposer::~JKRDisposer() {
     nofralloc
-#include "JKernel/asm/func_802D14E4.s"
+#include "JSystem/JKernel/asm/func_802D14E4.s"
 }
 #endif
diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp
index 21db4e3cb6e..3df4803695c 100644
--- a/libs/JSystem/JKernel/JKRHeap.cpp
+++ b/libs/JSystem/JKernel/JKRHeap.cpp
@@ -1,4 +1,4 @@
-#include "JKernel/JKRHeap.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
 
 #ifdef NONMATCHING
@@ -7,211 +7,211 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_handler) {
 #else
 asm JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error_handler) {
     nofralloc
-#include "JKernel/asm/func_802CE138.s"
+#include "JSystem/JKernel/asm/func_802CE138.s"
 }
 #endif
 
 asm JKRHeap::~JKRHeap() {
     nofralloc
-#include "JKernel/asm/func_802CE264.s"
+#include "JSystem/JKernel/asm/func_802CE264.s"
 }
 
 asm bool JKRHeap::initArena(char**, u32*, int) {
     nofralloc
-#include "JKernel/asm/func_802CE378.s"
+#include "JSystem/JKernel/asm/func_802CE378.s"
 }
 
 asm void JKRHeap::becomeSystemHeap() {
     nofralloc
-#include "JKernel/asm/func_802CE428.s"
+#include "JSystem/JKernel/asm/func_802CE428.s"
 }
 
 asm void JKRHeap::becomeCurrentHeap() {
     nofralloc
-#include "JKernel/asm/func_802CE438.s"
+#include "JSystem/JKernel/asm/func_802CE438.s"
 }
 
 asm void JKRHeap::destroy() {
     nofralloc
-#include "JKernel/asm/func_802CE448.s"
+#include "JSystem/JKernel/asm/func_802CE448.s"
 }
 
 asm void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
     nofralloc
-#include "JKernel/asm/func_802CE474.s"
+#include "JSystem/JKernel/asm/func_802CE474.s"
 }
 
 asm void* JKRHeap::alloc(u32 size, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CE4D4.s"
+#include "JSystem/JKernel/asm/func_802CE4D4.s"
 }
 
 asm void JKRHeap::free(void* ptr, JKRHeap* heap) {
     nofralloc
-#include "JKernel/asm/func_802CE500.s"
+#include "JSystem/JKernel/asm/func_802CE500.s"
 }
 
 asm void JKRHeap::free(void* ptr) {
     nofralloc
-#include "JKernel/asm/func_802CE548.s"
+#include "JSystem/JKernel/asm/func_802CE548.s"
 }
 
 asm void JKRHeap::callAllDisposer() {
     nofralloc
-#include "JKernel/asm/func_802CE574.s"
+#include "JSystem/JKernel/asm/func_802CE574.s"
 }
 
 asm void JKRHeap::freeAll() {
     nofralloc
-#include "JKernel/asm/func_802CE5CC.s"
+#include "JSystem/JKernel/asm/func_802CE5CC.s"
 }
 
 asm void JKRHeap::freeTail() {
     nofralloc
-#include "JKernel/asm/func_802CE5F8.s"
+#include "JSystem/JKernel/asm/func_802CE5F8.s"
 }
 
 asm s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) {
     nofralloc
-#include "JKernel/asm/func_802CE624.s"
+#include "JSystem/JKernel/asm/func_802CE624.s"
 }
 
 asm s32 JKRHeap::resize(void* ptr, u32 size) {
     nofralloc
-#include "JKernel/asm/func_802CE684.s"
+#include "JSystem/JKernel/asm/func_802CE684.s"
 }
 
 asm s32 JKRHeap::getSize(void* ptr, JKRHeap* heap) {
     nofralloc
-#include "JKernel/asm/func_802CE6B0.s"
+#include "JSystem/JKernel/asm/func_802CE6B0.s"
 }
 
 asm s32 JKRHeap::getSize(void* ptr) {
     nofralloc
-#include "JKernel/asm/func_802CE700.s"
+#include "JSystem/JKernel/asm/func_802CE700.s"
 }
 
 asm u32 JKRHeap::getFreeSize() {
     nofralloc
-#include "JKernel/asm/func_802CE72C.s"
+#include "JSystem/JKernel/asm/func_802CE72C.s"
 }
 
 asm u32 JKRHeap::getMaxFreeBlock() {
     nofralloc
-#include "JKernel/asm/func_802CE758.s"
+#include "JSystem/JKernel/asm/func_802CE758.s"
 }
 
 asm u32 JKRHeap::getTotalFreeSize() {
     nofralloc
-#include "JKernel/asm/func_802CE784.s"
+#include "JSystem/JKernel/asm/func_802CE784.s"
 }
 
 asm u8 JKRHeap::changeGroupID(u8 param_1) {
     nofralloc
-#include "JKernel/asm/func_802CE7B0.s"
+#include "JSystem/JKernel/asm/func_802CE7B0.s"
 }
 
 asm u32 JKRHeap::getMaxAllocatableSize(int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CE7DC.s"
+#include "JSystem/JKernel/asm/func_802CE7DC.s"
 }
 
 asm JKRHeap* JKRHeap::findFromRoot(void* ptr) {
     nofralloc
-#include "JKernel/asm/func_802CE83C.s"
+#include "JSystem/JKernel/asm/func_802CE83C.s"
 }
 
 asm JKRHeap* JKRHeap::find(void* ptr) const {
     nofralloc
-#include "JKernel/asm/func_802CE894.s"
+#include "JSystem/JKernel/asm/func_802CE894.s"
 }
 
 asm JKRHeap* JKRHeap::findAllHeap(void* ptr) const {
     nofralloc
-#include "JKernel/asm/func_802CE93C.s"
+#include "JSystem/JKernel/asm/func_802CE93C.s"
 }
 
 asm void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
     nofralloc
-#include "JKernel/asm/func_802CE9E4.s"
+#include "JSystem/JKernel/asm/func_802CE9E4.s"
 }
 
 asm void JKRHeap::dispose(void* ptr, u32 size) {
     nofralloc
-#include "JKernel/asm/func_802CEA78.s"
+#include "JSystem/JKernel/asm/func_802CEA78.s"
 }
 
 asm void JKRHeap::dispose(void* begin, void* end) {
     nofralloc
-#include "JKernel/asm/func_802CEAA0.s"
+#include "JSystem/JKernel/asm/func_802CEAA0.s"
 }
 
 asm void JKRHeap::dispose() {
     nofralloc
-#include "JKernel/asm/func_802CEAC0.s"
+#include "JSystem/JKernel/asm/func_802CEAC0.s"
 }
 
 asm void JKRHeap::copyMemory(void* dst, void* src, u32 size) {
     nofralloc
-#include "JKernel/asm/func_802CEB18.s"
+#include "JSystem/JKernel/asm/func_802CEB18.s"
 }
 
 asm void JKRHeap::JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CEB40.s"
+#include "JSystem/JKernel/asm/func_802CEB40.s"
 }
 
 asm bool JKRHeap::setErrorFlag(bool param_1) {
     nofralloc
-#include "JKernel/asm/func_802CEB78.s"
+#include "JSystem/JKernel/asm/func_802CEB78.s"
 }
 
 asm JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler param_1) {
     nofralloc
-#include "JKernel/asm/func_802CEB88.s"
+#include "JSystem/JKernel/asm/func_802CEB88.s"
 }
 
 asm bool JKRHeap::isSubHeap(JKRHeap* heap) const {
     nofralloc
-#include "JKernel/asm/func_802CEBA8.s"
+#include "JSystem/JKernel/asm/func_802CEBA8.s"
 }
 
 asm void* operator new(u32 size) {
     nofralloc
-#include "JKernel/asm/func_802CEC4C.s"
+#include "JSystem/JKernel/asm/func_802CEC4C.s"
 }
 
 asm void* operator new(u32 size, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CEC74.s"
+#include "JSystem/JKernel/asm/func_802CEC74.s"
 }
 
 asm void* operator new(u32 size, JKRHeap* heap, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CEC98.s"
+#include "JSystem/JKernel/asm/func_802CEC98.s"
 }
 
 asm void* operator new[](u32 size) {
     nofralloc
-#include "JKernel/asm/func_802CECC4.s"
+#include "JSystem/JKernel/asm/func_802CECC4.s"
 }
 
 asm void* operator new[](u32 size, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CECEC.s"
+#include "JSystem/JKernel/asm/func_802CECEC.s"
 }
 
 asm void* operator new[](u32 size, JKRHeap* heap, int alignment) {
     nofralloc
-#include "JKernel/asm/func_802CED10.s"
+#include "JSystem/JKernel/asm/func_802CED10.s"
 }
 
 asm void operator delete(void* ptr) {
     nofralloc
-#include "JKernel/asm/func_802CED3C.s"
+#include "JSystem/JKernel/asm/func_802CED3C.s"
 }
 
 asm void operator delete[](void* ptr) {
     nofralloc
-#include "JKernel/asm/func_802CED60.s"
+#include "JSystem/JKernel/asm/func_802CED60.s"
 }
diff --git a/libs/JSystem/JSupport/JSUList.cpp b/libs/JSystem/JSupport/JSUList.cpp
index d5edffb8c18..eebb1fdfb61 100644
--- a/libs/JSystem/JSupport/JSUList.cpp
+++ b/libs/JSystem/JSupport/JSUList.cpp
@@ -1,4 +1,4 @@
-#include "JSupport/JSUList.h"
+#include "JSystem/JSupport/JSUList.h"
 #include "global.h"
 
 // #include "JSupport/asm/func_802DBDFC.s"
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 33097edd193..81cdc3e5de8 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -1,4 +1,4 @@
-#include "d_save.h"
+#include "d/d_save/d_save/d_save.h"
 #include "global.h"
 
 u8 dSv_item_rename(u8 item_id) {
@@ -86,7 +86,7 @@ u16 dSv_player_status_a_c::getRupeeMax(void) const {
 
 asm bool dSv_player_status_a_c::isMagicFlag(u8) const {
     nofralloc
-    #include "func_80032AF8.s"
+    #include "d/d_save/d_save/asm/func_80032AF8.s"
 }
 
 void dSv_player_status_b_c::init() {
@@ -241,7 +241,7 @@ void dSv_player_item_c::init(void) {
 
 asm void dSv_player_item_c::setItem(int current_items_index, u8 new_items_index) {
     nofralloc
-    #include "func_80032FB8.s"
+    #include "d/d_save/d_save/asm/func_80032FB8.s"
 }
 
 #ifdef NONMATCHING
@@ -310,7 +310,7 @@ u8 dSv_player_item_c::getItem(int param_1, bool param_2) const {
 #else
 asm u8 dSv_player_item_c::getItem(int param_1, bool param_2) const {
     nofralloc
-    #include "func_80033030.s"
+    #include "d/d_save/d_save/asm/func_80033030.s"
 
 }
 #endif
@@ -336,7 +336,7 @@ void dSv_player_item_c::setLineUpItem(void) {
 #else
 asm void dSv_player_item_c::setLineUpItem(void) {
     nofralloc
-    #include "func_800332F8.s"
+    #include "d/d_save/d_save/asm/func_800332F8.s"
 }
 #endif
 
@@ -375,7 +375,7 @@ void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2){
 #else
 asm void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2){
     nofralloc 
-    #include "func_80033370.s"
+    #include "d/d_save/d_save/asm/func_80033370.s"
 }
 #endif
 
@@ -388,23 +388,23 @@ void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id){
 #else
 asm void dSv_player_item_c::setEmptyBottleItemIn(u8 i_item_id){
     nofralloc
-    #include "func_80033450.s"
+    #include "d/d_save/d_save/asm/func_80033450.s"
 }
 #endif
 
 asm void dSv_player_item_c::setEmptyBottle(void) {
     nofralloc 
-    #include "func_80033494.s"
+    #include "d/d_save/d_save/asm/func_80033494.s"
 }
 
 asm void dSv_player_item_c::setEmptyBottle(u8){
     nofralloc
-    #include "func_80033514.s" 
+    #include "d/d_save/d_save/asm/func_80033514.s" 
 }
 
 asm void dSv_player_item_c::setEquipBottleItemIn(u8, u8) {
     nofralloc
-    #include "func_80033598.s"
+    #include "d/d_save/d_save/asm/func_80033598.s"
 }
 
 void dSv_player_item_c::setEquipBottleItemEmpty(u8 selected_index) {
@@ -426,7 +426,7 @@ u8 dSv_player_item_c::checkBottle(u8 i_item_id){
 
 asm u8 dSv_player_item_c::checkInsectBottle(void){
     nofralloc
-    #include "func_80033754.s"
+    #include "d/d_save/d_save/asm/func_80033754.s"
 }
 
 u8 dSv_player_item_c::checkEmptyBottle(void) {
@@ -442,12 +442,12 @@ u8 dSv_player_item_c::checkEmptyBottle(void) {
 
 asm void dSv_player_item_c::setBombBagItemIn(u8, u8, bool) {
     nofralloc
-    #include "func_80033828.s"
+    #include "d/d_save/d_save/asm/func_80033828.s"
 }
 
 asm void dSv_player_item_c::setBombBagItemIn(u8, u8, u8, bool) {
     nofralloc
-    #include "func_80033910.s"
+    #include "d/d_save/d_save/asm/func_80033910.s"
 }
 
 void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,bool param_2) {
@@ -478,13 +478,13 @@ void dSv_player_item_c::setEmptyBombBag(void) {
 #else
 asm void dSv_player_item_c::setEmptyBombBag(void) {
     nofralloc
-    #include "func_80033A88.s"
+    #include "d/d_save/d_save/asm/func_80033A88.s"
 }
 #endif
 
 asm void dSv_player_item_c::setEmptyBombBag(u8, u8) {
     nofralloc
-    #include "func_80033B08.s"
+    #include "d/d_save/d_save/asm/func_80033B08.s"
 }
 
 u8 dSv_player_item_c::checkBombBag(u8 param_1) {
@@ -500,7 +500,7 @@ u8 dSv_player_item_c::checkBombBag(u8 param_1) {
 
 asm void dSv_player_item_c::setWarashibeItem(u8) {
     nofralloc
-    #include "func_80033C2C.s"
+    #include "d/d_save/d_save/asm/func_80033C2C.s"
 }
 
 void dSv_player_item_c::setRodTypeLevelUp(void) {
@@ -551,7 +551,7 @@ void dSv_player_item_c::setBaitItem(u8 param_1) {
 #else
 asm void dSv_player_item_c::setBaitItem(u8 param_1) {
     nofralloc
-    #include "func_80033D40.s"
+    #include "d/d_save/d_save/asm/func_80033D40.s"
 }
 #endif
 
@@ -570,18 +570,18 @@ void dSv_player_get_item_c::onFirstBit(u8 param_1) {
 #else
 asm void dSv_player_get_item_c::onFirstBit(u8) {
     nofralloc
-    #include "func_80033E60.s"
+    #include "d/d_save/d_save/asm/func_80033E60.s"
 }
 #endif
 
 asm void dSv_player_get_item_c::offFirstBit(u8) {
     nofralloc
-    #include "func_80033E94.s"
+    #include "d/d_save/d_save/asm/func_80033E94.s"
 }
 
 asm bool dSv_player_get_item_c::isFirstBit(u8) const {
     nofralloc
-    #include "func_80033EC8.s"
+    #include "d/d_save/d_save/asm/func_80033EC8.s"
 }
 
 void dSv_player_item_record_c::init(void) {
@@ -634,7 +634,7 @@ u8 dSv_player_item_record_c::addBottleNum(u8 param_1, short param_2) {
 #else
 asm u8 dSv_player_item_record_c::addBottleNum(u8 param_1, short param_2) {
     nofralloc
-    #include "func_80033F9C.s"
+    #include "d/d_save/d_save/asm/func_80033F9C.s"
 }
 #endif
 
@@ -681,7 +681,7 @@ u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
 #else
 asm u8 dSv_player_item_max_c::getBombNum(u8 param_1) const {
     nofralloc
-    #include "func_800340F8.s"
+    #include "d/d_save/d_save/asm/func_800340F8.s"
 }
 #endif
 
@@ -802,7 +802,7 @@ bool dSv_letter_info_c::isLetterReadFlag(int param_1) const {
 #else
 asm bool dSv_letter_info_c::isLetterReadFlag(int) const {
     nofralloc
-    #include "func_8003449C.s"
+    #include "d/d_save/d_save/asm/func_8003449C.s"
 }
 #endif
 
@@ -855,7 +855,7 @@ void dSv_player_info_c::init(void) {
 #else
 asm void dSv_player_info_c::init(void) {
     nofralloc
-    #include "func_80034518.s"
+    #include "d/d_save/d_save/asm/func_80034518.s"
 }
 #endif
 
@@ -891,7 +891,7 @@ u32 dSv_player_config_c::checkVibration(void) const {
 #else
 asm u32 dSv_player_config_c::checkVibration(void) const {
     nofralloc
-    #include "func_80034644.s"
+    #include "d/d_save/d_save/asm/func_80034644.s"
 }
 #endif
 
@@ -979,7 +979,7 @@ bool dSv_memBit_c::revSwitch(int param_1) {
 #else
 asm u8 dSv_memBit_c::revSwitch(int){
     nofralloc
-    #include "func_8003488C.s"
+    #include "d/d_save/d_save/asm/func_8003488C.s"
 }
 #endif
 
@@ -1157,7 +1157,7 @@ bool dSv_zoneBit_c::revSwitch(int param_1) {
 #else
 asm bool dSv_zoneBit_c::revSwitch(int param_1) {
     nofralloc
-    #include "func_80034D78.s"
+    #include "d/d_save/d_save/asm/func_80034D78.s"
 }
 #endif
 
@@ -1268,7 +1268,7 @@ void dSv_info_c::getSave(int) {
 #else
 asm void dSv_info_c::getSave(int) {
     nofralloc
-    #include "func_800350BC.s"
+    #include "d/d_save/d_save/asm/func_800350BC.s"
 }
 #endif
 
@@ -1285,7 +1285,7 @@ void dSv_info_c::getSave(int) {
 #else
 asm void dSv_info_c::putSave(int) {
     nofralloc
-    #include "func_800350F0.s"
+    #include "d/d_save/d_save/asm/func_800350F0.s"
 }
 #endif
 
@@ -1376,7 +1376,7 @@ bool dSv_info_c::isSwitch(int param_1, int param_2) const {
 #else
 asm bool dSv_info_c::isSwitch(int param_1, int param_2) const {
     nofralloc
-    #include "func_80035360.s"
+    #include "d/d_save/d_save/asm/func_80035360.s"
 }
 #endif
 
@@ -1404,7 +1404,7 @@ void dSv_info_c::onItem(int param_1, int param_2) {
 
 asm bool dSv_info_c::isItem(int param_1, int param_2) const {
     nofralloc
-    #include "func_80035590.s"
+    #include "d/d_save/d_save/asm/func_80035590.s"
 }
 
 
@@ -1428,20 +1428,20 @@ void dSv_info_c::offActor(int param_1, int param_2) {
 
 asm bool dSv_info_c::isActor(int param_1, int param_2) const {
     nofralloc
-    #include "func_80035724.s"
+    #include "d/d_save/d_save/asm/func_80035724.s"
 }
 
 asm void dSv_info_c::memory_to_card(char*, int) {
     nofralloc
-    #include "func_80035798.s"
+    #include "d/d_save/d_save/asm/func_80035798.s"
 }
 
 asm void dSv_info_c::card_to_memory(char*, int) {
     nofralloc
-    #include "func_80035A04.s"
+    #include "d/d_save/d_save/asm/func_80035A04.s"
 }
 
 // asm void dSv_info_c::initdata_to_card(char*, int) {
 //     nofralloc
-//     #include "func_80035BD0.s"
+//     #include "d/d_save/d_save/asm/func_80035BD0.s"
 // }
\ No newline at end of file
diff --git a/src/d/d_save/d_save_HIO.cpp b/src/d/d_save/d_save_HIO.cpp
index f2926f95bca..27b43d03997 100644
--- a/src/d/d_save/d_save_HIO.cpp
+++ b/src/d/d_save/d_save_HIO.cpp
@@ -1,4 +1,4 @@
-#include "d_save_HIO.h"
+#include "d/d_save/d_save_HIO/d_save_HIO.h"
 #include "global.h"
 
 #ifdef NONMATCHING
@@ -12,12 +12,12 @@ dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
 #else
 asm dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     nofralloc
-    #include "func_8025BB78.s"
+    #include "d/d_save/d_save_HIO/asm/func_8025BB78.s"
 }
 #endif
 
 
 asm void dSvBit_childSwPerfectionHIO_c::init(void) {
     nofralloc
-    #include "func_8025BBAC.s"
+    #include "d/d_save/d_save_HIO/asm/func_8025BBAC.s"
 }
\ No newline at end of file
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index f7c5ec1e527..744c996d0e7 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -1,4 +1,4 @@
-#include "m_Do_main.h"
+#include "m_Do/m_Do_main/m_Do_main.h"
 #include "global.h"
 
 void version_check(void) {  
@@ -68,13 +68,13 @@ void CheapHeap(u32 param_1) {
 #else
 asm void CheckHeap(u32 param_1) {
     nofralloc
-    #include "func_8000578C.s"
+    #include "m_Do/m_Do_main/asm/func_8000578C.s"
 }
 #endif
 
 asm int countUsed(JKRExpHeap *heap) {
     nofralloc
-    #include "func_80005848.s"
+    #include "m_Do/m_Do_main/asm/func_80005848.s"
 }
 
 s32 HeapCheck::getUsedCount(void) const {