diff --git a/src/libultra/io/ai.c b/src/libultra/io/ai.c
new file mode 100644
index 00000000..a6fdfea1
--- /dev/null
+++ b/src/libultra/io/ai.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/ai/func_80029B40.s")
diff --git a/src/libultra/io/epirawread.c b/src/libultra/io/epirawread.c
new file mode 100644
index 00000000..da1aadf6
--- /dev/null
+++ b/src/libultra/io/epirawread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawread/func_8002AEC0.s")
diff --git a/src/libultra/io/epirawwrite.c b/src/libultra/io/epirawwrite.c
new file mode 100644
index 00000000..28f17f9f
--- /dev/null
+++ b/src/libultra/io/epirawwrite.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawwrite/func_8002AE70.s")
diff --git a/src/libultra/io/pirawread.c b/src/libultra/io/pirawread.c
new file mode 100644
index 00000000..fa80fb64
--- /dev/null
+++ b/src/libultra/io/pirawread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawread/func_80028CE0.s")
diff --git a/src/libultra/io/si.c b/src/libultra/io/si.c
new file mode 100644
index 00000000..8e41d5d1
--- /dev/null
+++ b/src/libultra/io/si.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/si/func_80029B70.s")
diff --git a/src/libultra/leointerrupt.c b/src/libultra/leointerrupt.c
new file mode 100644
index 00000000..18cb06fa
--- /dev/null
+++ b/src/libultra/leointerrupt.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/func_8002A210.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/func_8002A8B4.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/leointerrupt/func_8002A99C.s")
diff --git a/src/libultra/libc/ldiv.c b/src/libultra/libc/ldiv.c
new file mode 100644
index 00000000..c27e0739
--- /dev/null
+++ b/src/libultra/libc/ldiv.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/func_8002AFB0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ldiv/func_8002B0B0.s")
diff --git a/src/libultra/os/destroythread.c b/src/libultra/os/destroythread.c
new file mode 100644
index 00000000..cc0fd401
--- /dev/null
+++ b/src/libultra/os/destroythread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/destroythread/func_8002AB30.s")
diff --git a/src/libultra/os/resetglobalintmask.c b/src/libultra/os/resetglobalintmask.c
new file mode 100644
index 00000000..8e16f25e
--- /dev/null
+++ b/src/libultra/os/resetglobalintmask.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/resetglobalintmask/func_8002AE10.s")
diff --git a/src/libultra/os/setglobalintmask.c b/src/libultra/os/setglobalintmask.c
new file mode 100644
index 00000000..6f77a5ad
--- /dev/null
+++ b/src/libultra/os/setglobalintmask.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/setglobalintmask/func_8002AF10.s")
diff --git a/src/libultra/os/yieldthread.c b/src/libultra/os/yieldthread.c
new file mode 100644
index 00000000..dc28fa83
--- /dev/null
+++ b/src/libultra/os/yieldthread.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/yieldthread/func_8002AF60.s")
diff --git a/src/libultra/rmon/xlitob.c b/src/libultra/rmon/xlitob.c
new file mode 100644
index 00000000..51b6fee0
--- /dev/null
+++ b/src/libultra/rmon/xlitob.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/rmon/xlitob/func_80028DE0.s")
diff --git a/src/main/ai.c b/src/main/ai.c
deleted file mode 100644
index abe0f5f2..00000000
--- a/src/main/ai.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ai/func_80029B40.s")
diff --git a/src/main/destroythread.c b/src/main/destroythread.c
deleted file mode 100644
index 4f8b34de..00000000
--- a/src/main/destroythread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/destroythread/func_8002AB30.s")
diff --git a/src/main/epirawread.c b/src/main/epirawread.c
deleted file mode 100644
index aabb3bd9..00000000
--- a/src/main/epirawread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/epirawread/func_8002AEC0.s")
diff --git a/src/main/epirawwrite.c b/src/main/epirawwrite.c
deleted file mode 100644
index ed5716f5..00000000
--- a/src/main/epirawwrite.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/epirawwrite/func_8002AE70.s")
diff --git a/src/main/ldiv.c b/src/main/ldiv.c
deleted file mode 100644
index 10084de4..00000000
--- a/src/main/ldiv.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ldiv/func_8002AFB0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ldiv/func_8002B0B0.s")
diff --git a/src/main/leointerrupt.c b/src/main/leointerrupt.c
deleted file mode 100644
index aa02d0ef..00000000
--- a/src/main/leointerrupt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/leointerrupt/func_8002A210.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/leointerrupt/func_8002A8B4.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/leointerrupt/func_8002A99C.s")
diff --git a/src/main/pirawread.c b/src/main/pirawread.c
deleted file mode 100644
index c15b2b00..00000000
--- a/src/main/pirawread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pirawread/func_80028CE0.s")
diff --git a/src/main/resetglobalintmask.c b/src/main/resetglobalintmask.c
deleted file mode 100644
index dfa1ee23..00000000
--- a/src/main/resetglobalintmask.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/resetglobalintmask/func_8002AE10.s")
diff --git a/src/main/setglobalintmask.c b/src/main/setglobalintmask.c
deleted file mode 100644
index ca6caadf..00000000
--- a/src/main/setglobalintmask.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/setglobalintmask/func_8002AF10.s")
diff --git a/src/main/si.c b/src/main/si.c
deleted file mode 100644
index 0be6b357..00000000
--- a/src/main/si.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/si/func_80029B70.s")
diff --git a/src/main/xlitob.c b/src/main/xlitob.c
deleted file mode 100644
index b5daebbf..00000000
--- a/src/main/xlitob.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/xlitob/func_80028DE0.s")
diff --git a/src/main/yieldthread.c b/src/main/yieldthread.c
deleted file mode 100644
index fe124770..00000000
--- a/src/main/yieldthread.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/yieldthread/func_8002AF60.s")
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 20ae1771..1de43897 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -84,7 +84,7 @@
       - [0x25D60, c, ../libultra/io/sirawdma]
       - [0x25E10, asm]
       - [0x25ED0, hasm, interrupt]
-      - [0x25F10, asm, thread] # Problem when trying to C
+      - [0x25F10, asm, ../libultra/os/thread] # Problem when trying to C
       - [0x25F50, asm]
       - [0x26CD0, c, ../libultra/io/pfsisplug]
       - [0x27040, c, ../libultra/io/crc]
@@ -111,33 +111,33 @@
       - [0x28E30, c, ../libultra/io/epirawdma] # Problem when trying to C
       - [0x29060, asm, ../libultra/io/devmgr]
       - [0x294F0, asm]
-      - [0x297B0, hasm, setsr]
-      - [0x297C0, hasm, getsr]
-      - [0x297D0, hasm, setfpccsr]
+      - [0x297B0, hasm, ../libultra/setsr]
+      - [0x297C0, hasm, ../libultra/getsr]
+      - [0x297D0, hasm, ../libultra/setfpccsr]
       - [0x297E0, asm]
-      - [0x29880, hasm, maptlbrdb]
-      - [0x298E0, c, pirawread]
-      - [0x29940, hasm, bzero]
-      - [0x299E0, c, xlitob]
-      - [0x29C80, asm, xldtob] # Problem when trying to C
-      - [0x2A740, c, ai]
-      - [0x2A770, c, si]
+      - [0x29880, hasm, ../libultra/maptlbrdb]
+      - [0x298E0, c, ../libultra/io/pirawread]
+      - [0x29940, hasm, ../libultra/bzero]
+      - [0x299E0, c, ../libultra/rmon/xlitob]
+      - [0x29C80, asm, ../libultra/rmon/xldtob] # Problem when trying to C
+      - [0x2A740, c, ../libultra/io/ai]
+      - [0x2A770, c, ../libultra/io/si]
       - [0x2A7A0, asm]
       - [0x2AAB0, asm]
       - [0x2AD80, asm]
-      - [0x2AE10, c, leointerrupt]
-      - [0x2B690, hasm, setintmask]
-      - [0x2B730, c, destroythread]
+      - [0x2AE10, c, ../libultra/leointerrupt]
+      - [0x2B690, hasm, ../libultra/setintmask]
+      - [0x2B730, c, ../libultra/os/destroythread]
       - [0x2B830, asm]
-      - [0x2B940, hasm, probetlb]
-      - [0x2BA00, hasm, setcompare]
-      - [0x2BA10, c, resetglobalintmask]
-      - [0x2BA70, c, epirawwrite]
-      - [0x2BAC0, c, epirawread]
-      - [0x2BB10, c, setglobalintmask]
-      - [0x2BB60, c, yieldthread]
-      - [0x2BBB0, c, ldiv]
-      - [0x2BD40, hasm, getcause]
+      - [0x2B940, hasm, ../libultra/probetlb]
+      - [0x2BA00, hasm, ../libultra/setcompare]
+      - [0x2BA10, c, ../libultra/os/resetglobalintmask]
+      - [0x2BA70, c, ../libultra/io/epirawwrite]
+      - [0x2BAC0, c, ../libultra/io/epirawread]
+      - [0x2BB10, c, ../libultra/os/setglobalintmask]
+      - [0x2BB60, c, ../libultra/os/yieldthread]
+      - [0x2BBB0, c, ../libultra/libc/ldiv]
+      - [0x2BD40, hasm, ../libultra/getcause]
       - [0x2BD50, asm]
       - [0x2BDF0, c, 2BDF0]
       - [0x2C700, c]
@@ -146,7 +146,7 @@
       - [0x2E9E0, asm]
       - [0x2EDE0, asm]
       - [0x2EE30, asm, 2EE30]
-      - [0x2EE80, asm, stopthread] # Problem when trying to C
+      - [0x2EE80, asm, ../libultra/os/stopthread] # Problem when trying to C
       - [0x36930, asm, 36930]  # don't touch before fixing rodata
       - [0x3EDE0, asm] # could be a fake split
       - [0x43AC0, asm]  # don't touch before fixing rodata
@@ -187,10 +187,10 @@
       - [0xC9F40, rodata, ../libultra/gu/sinf]
       - [0xC9F90, rodata, ../libultra/gu/cosf]
       - [0xC9FE0, rodata, 24C60]
-      - [0xCA0E0, rodata, thread]
+      - [0xCA0E0, rodata, ../libultra/os/thread]
       - [0xCA150, rodata, ../libultra/io/devmgr]
       - [0xCA170, rodata]
-      - [0xCA180, rodata, xldtob]
+      - [0xCA180, rodata, ../libultra/rmon/xldtob]
       - [0xCA1E0, .rodata, 2BDF0]
       - [0xCA5A0, rodata, 2DF00]
       - [0xCA650, rodata]