diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c
new file mode 100644
index 00000000..461de476
--- /dev/null
+++ b/src/libultra/gu/lookat.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/func_800211D0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/func_80021488.s")
diff --git a/src/libultra/gu/ortho.c b/src/libultra/gu/ortho.c
new file mode 100644
index 00000000..d2b8e4b6
--- /dev/null
+++ b/src/libultra/gu/ortho.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/func_80021500.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/func_80021654.s")
diff --git a/src/libultra/io/contquery.c b/src/libultra/io/contquery.c
new file mode 100644
index 00000000..358fe299
--- /dev/null
+++ b/src/libultra/io/contquery.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/func_80020870.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/func_800208F4.s")
diff --git a/src/libultra/io/dpsetstat.c b/src/libultra/io/dpsetstat.c
new file mode 100644
index 00000000..6d436f29
--- /dev/null
+++ b/src/libultra/io/dpsetstat.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/dpsetstat/func_80022190.s")
diff --git a/src/libultra/io/pidma.c b/src/libultra/io/pidma.c
new file mode 100644
index 00000000..52d0e8a1
--- /dev/null
+++ b/src/libultra/io/pidma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pidma/func_800217F0.s")
diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c
new file mode 100644
index 00000000..3bf5d9b5
--- /dev/null
+++ b/src/libultra/io/sptask.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_80021EA0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_80021FBC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptask/func_8002214C.s")
diff --git a/src/libultra/io/sptaskyield.c b/src/libultra/io/sptaskyield.c
new file mode 100644
index 00000000..9106b84b
--- /dev/null
+++ b/src/libultra/io/sptaskyield.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyield/func_80021E80.s")
diff --git a/src/libultra/io/sptaskyielded.c b/src/libultra/io/sptaskyielded.c
new file mode 100644
index 00000000..57771931
--- /dev/null
+++ b/src/libultra/io/sptaskyielded.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyielded/func_80021E00.s")
diff --git a/src/libultra/io/viblack.c b/src/libultra/io/viblack.c
new file mode 100644
index 00000000..9087d9ea
--- /dev/null
+++ b/src/libultra/io/viblack.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viblack/func_80021900.s")
diff --git a/src/libultra/io/vimgr.c b/src/libultra/io/vimgr.c
new file mode 100644
index 00000000..a70c0119
--- /dev/null
+++ b/src/libultra/io/vimgr.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vimgr/func_80022440.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vimgr/func_800225C8.s")
diff --git a/src/libultra/io/virepeatline.c b/src/libultra/io/virepeatline.c
new file mode 100644
index 00000000..10999172
--- /dev/null
+++ b/src/libultra/io/virepeatline.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/virepeatline/func_800219F0.s")
diff --git a/src/libultra/io/visetevent.c b/src/libultra/io/visetevent.c
new file mode 100644
index 00000000..3ef9f0fa
--- /dev/null
+++ b/src/libultra/io/visetevent.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetevent/func_80021D90.s")
diff --git a/src/libultra/io/visetmode.c b/src/libultra/io/visetmode.c
new file mode 100644
index 00000000..1a7a629a
--- /dev/null
+++ b/src/libultra/io/visetmode.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetmode/func_80021AC0.s")
diff --git a/src/libultra/io/visetspecial.c b/src/libultra/io/visetspecial.c
new file mode 100644
index 00000000..a3929221
--- /dev/null
+++ b/src/libultra/io/visetspecial.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetspecial/func_80021B30.s")
diff --git a/src/libultra/io/viswapbuf.c b/src/libultra/io/viswapbuf.c
new file mode 100644
index 00000000..ca2f485b
--- /dev/null
+++ b/src/libultra/io/viswapbuf.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapbuf/func_800219A0.s")
diff --git a/src/libultra/os/createthread.c b/src/libultra/os/createthread.c
new file mode 100644
index 00000000..f113caee
--- /dev/null
+++ b/src/libultra/os/createthread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createthread/func_800221A0.s")
diff --git a/src/libultra/os/gettime.c b/src/libultra/os/gettime.c
new file mode 100644
index 00000000..654dd346
--- /dev/null
+++ b/src/libultra/os/gettime.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/gettime/func_80023000.s")
diff --git a/src/libultra/os/recvmesg.c b/src/libultra/os/recvmesg.c
new file mode 100644
index 00000000..badf7468
--- /dev/null
+++ b/src/libultra/os/recvmesg.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/recvmesg/func_800205E0.s")
diff --git a/src/libultra/os/sendmesg.c b/src/libultra/os/sendmesg.c
new file mode 100644
index 00000000..58a3c062
--- /dev/null
+++ b/src/libultra/os/sendmesg.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/sendmesg/func_80020720.s")
diff --git a/src/libultra/os/setthreadpri.c b/src/libultra/os/setthreadpri.c
new file mode 100644
index 00000000..ff5a72be
--- /dev/null
+++ b/src/libultra/os/setthreadpri.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/setthreadpri/func_80022A80.s")
diff --git a/src/libultra/os/startthread.c b/src/libultra/os/startthread.c
new file mode 100644
index 00000000..e29f1dad
--- /dev/null
+++ b/src/libultra/os/startthread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/startthread/func_800222F0.s")
diff --git a/src/main/B99D0.c b/src/main/B99D0.c
index c22d9149..bcbb9a5a 100644
--- a/src/main/B99D0.c
+++ b/src/main/B99D0.c
@@ -1,20 +1,10 @@
 #include "common.h"
 
-extern s32 D_800D31B0[];
-extern s64* D_80137E64;
-
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8DD0.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8E14.s")
 
-void func_800B8F18(void) {
-    s32* temp_v1 = (s32*)D_80137E64;
-
-    D_80137E64++;
-    // clang-format off
-    temp_v1[0] = 0x06000000; temp_v1[1] = (s32)D_800D31B0;
-    // clang-format on
-}
+#pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F18.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/B99D0/func_800B8F48.s")
 
diff --git a/src/main/C870.c b/src/main/C870.c
index 33d96ef3..c8901c8c 100644
--- a/src/main/C870.c
+++ b/src/main/C870.c
@@ -10,17 +10,7 @@
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/C870/func_8000BF14.s")
 
-// Matches with IDO 5.3 -02 -g0
-#ifdef NON_MATCHING
-void func_8000BF6C(s32* arg0, s32 arg1, s32 arg2) {
-    arg0[0] = (arg1 + 0xF) & ~0xF;
-    arg0[1] = (arg1 + 0xF) & ~0xF;
-    arg0[2] = arg2 - (arg1 & 0xF);
-    arg0[3] = 0;
-}
-#else
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/C870/func_8000BF6C.s")
-#endif
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/main/C870/func_8000BF94.s")
 
diff --git a/src/main/contquery.c b/src/main/contquery.c
deleted file mode 100644
index 9d38dc9f..00000000
--- a/src/main/contquery.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/contquery/func_80020870.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/contquery/func_800208F4.s")
diff --git a/src/main/createthread.c b/src/main/createthread.c
deleted file mode 100644
index 7fb0fcbc..00000000
--- a/src/main/createthread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/createthread/func_800221A0.s")
diff --git a/src/main/dpsetstat.c b/src/main/dpsetstat.c
deleted file mode 100644
index 459c2074..00000000
--- a/src/main/dpsetstat.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/dpsetstat/func_80022190.s")
diff --git a/src/main/gettime.c b/src/main/gettime.c
deleted file mode 100644
index 866696e9..00000000
--- a/src/main/gettime.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/gettime/func_80023000.s")
diff --git a/src/main/lookat.c b/src/main/lookat.c
deleted file mode 100644
index b5cea7dd..00000000
--- a/src/main/lookat.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/lookat/func_800211D0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/lookat/func_80021488.s")
diff --git a/src/main/ortho.c b/src/main/ortho.c
deleted file mode 100644
index 3ade06f1..00000000
--- a/src/main/ortho.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ortho/func_80021500.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ortho/func_80021654.s")
diff --git a/src/main/pidma.c b/src/main/pidma.c
deleted file mode 100644
index a3f5ea94..00000000
--- a/src/main/pidma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pidma/func_800217F0.s")
diff --git a/src/main/recvmesg.c b/src/main/recvmesg.c
deleted file mode 100644
index ae47654d..00000000
--- a/src/main/recvmesg.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/recvmesg/func_800205E0.s")
diff --git a/src/main/sendmesg.c b/src/main/sendmesg.c
deleted file mode 100644
index 6ecb1599..00000000
--- a/src/main/sendmesg.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sendmesg/func_80020720.s")
diff --git a/src/main/setthreadpri.c b/src/main/setthreadpri.c
deleted file mode 100644
index 6ee5383c..00000000
--- a/src/main/setthreadpri.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/setthreadpri/func_80022A80.s")
diff --git a/src/main/sptask.c b/src/main/sptask.c
deleted file mode 100644
index ec8ddda7..00000000
--- a/src/main/sptask.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sptask/func_80021EA0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sptask/func_80021FBC.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sptask/func_8002214C.s")
diff --git a/src/main/sptaskyield.c b/src/main/sptaskyield.c
deleted file mode 100644
index 6a2730ad..00000000
--- a/src/main/sptaskyield.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sptaskyield/func_80021E80.s")
diff --git a/src/main/sptaskyielded.c b/src/main/sptaskyielded.c
deleted file mode 100644
index d179826a..00000000
--- a/src/main/sptaskyielded.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sptaskyielded/func_80021E00.s")
diff --git a/src/main/startthread.c b/src/main/startthread.c
deleted file mode 100644
index 880630de..00000000
--- a/src/main/startthread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/startthread/func_800222F0.s")
diff --git a/src/main/viblack.c b/src/main/viblack.c
deleted file mode 100644
index ef4fabbc..00000000
--- a/src/main/viblack.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/viblack/func_80021900.s")
diff --git a/src/main/vimgr.c b/src/main/vimgr.c
deleted file mode 100644
index 3e3f8a60..00000000
--- a/src/main/vimgr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/vimgr/func_80022440.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/vimgr/func_800225C8.s")
diff --git a/src/main/virepeatline.c b/src/main/virepeatline.c
deleted file mode 100644
index 12cda1ba..00000000
--- a/src/main/virepeatline.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/virepeatline/func_800219F0.s")
diff --git a/src/main/visetevent.c b/src/main/visetevent.c
deleted file mode 100644
index 9abaea28..00000000
--- a/src/main/visetevent.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/visetevent/func_80021D90.s")
diff --git a/src/main/visetmode.c b/src/main/visetmode.c
deleted file mode 100644
index 16a352c4..00000000
--- a/src/main/visetmode.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/visetmode/func_80021AC0.s")
diff --git a/src/main/visetspecial.c b/src/main/visetspecial.c
deleted file mode 100644
index 0097e2f6..00000000
--- a/src/main/visetspecial.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/visetspecial/func_80021B30.s")
diff --git a/src/main/viswapbuf.c b/src/main/viswapbuf.c
deleted file mode 100644
index 61cb1d2b..00000000
--- a/src/main/viswapbuf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/viswapbuf/func_800219A0.s")
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 84b55c67..396ef359 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -32,38 +32,38 @@
       - [0x20A60, asm]
       - [0x20BC0, c, ../libultra/io/controller]
       - [0x20F80, c, ../libultra/io/contreaddata]
-      - [0x211E0, c, recvmesg]
-      - [0x21320, c, sendmesg]
-      - [0x21470, c, contquery]
+      - [0x211E0, c, ../libultra/os/recvmesg]
+      - [0x21320, c, ../libultra/os/sendmesg]
+      - [0x21470, c, ../libultra/io/contquery]
       - [0x21520, asm]
-      - [0x21B40, asm, perspective] # Problem when trying to C
-      - [0x21DD0, c, lookat]
-      - [0x22100, c, ortho]
+      - [0x21B40, asm, ../libultra/gu/perspective] # Problem when trying to C
+      - [0x21DD0, c, ../libultra/gu/lookat]
+      - [0x22100, c, ../libultra/gu/ortho]
       - [0x222C0, hasm, invalicache]
       - [0x22340, hasm, invaldcache]
-      - [0x223F0, c, pidma]
-      - [0x22500, c, viblack]
+      - [0x223F0, c, ../libultra/io/pidma]
+      - [0x22500, c, ../libultra/io/viblack]
       - [0x22570, hasm, writebackdcacheall]
-      - [0x225A0, c, viswapbuf]
-      - [0x225F0, c, virepeatline]
+      - [0x225A0, c, ../libultra/io/viswapbuf]
+      - [0x225F0, c, ../libultra/io/virepeatline]
       - [0x22660, asm]
-      - [0x226C0, c, visetmode]
-      - [0x22730, c, visetspecial]
+      - [0x226C0, c, ../libultra/io/visetmode]
+      - [0x22730, c, ../libultra/io/visetspecial]
       - [0x228F0, c, ../libultra/os/createmesgqueue]
       - [0x22920, c, ../libultra/os/seteventmesg]
-      - [0x22990, c, visetevent]
-      - [0x22A00, c, sptaskyielded]
-      - [0x22A80, c, sptaskyield]
-      - [0x22AA0, c, sptask]
-      - [0x22D90, c, dpsetstat]
-      - [0x22DA0, c, createthread]
-      - [0x22EF0, c, startthread]
-      - [0x23040, c, vimgr]
+      - [0x22990, c, ../libultra/io/visetevent]
+      - [0x22A00, c, ../libultra/io/sptaskyielded]
+      - [0x22A80, c, ../libultra/io/sptaskyield]
+      - [0x22AA0, c, ../libultra/io/sptask]
+      - [0x22D90, c, ../libultra/io/dpsetstat]
+      - [0x22DA0, c, ../libultra/os/createthread]
+      - [0x22EF0, c, ../libultra/os/startthread]
+      - [0x23040, c, ../libultra/io/vimgr]
       - [0x233A0, asm]
-      - [0x23680, c, setthreadpri]
+      - [0x23680, c, ../libultra/os/setthreadpri]
       - [0x23760, asm]
-      - [0x23C00, c, gettime]
-      - [0x23C90, asm, sinf] # Problem when trying to C
+      - [0x23C00, c, ../libultra/os/gettime]
+      - [0x23C90, asm, ../libultra/gu/sinf] # Problem when trying to C
       - [0x23E50, asm, cosf] # Problem when trying to C
       - [0x23FC0, hasm, sqrtf]
       - [0x23FD0, c, settimer]