diff --git a/src/libultra/conteepprobe.c b/src/libultra/conteepprobe.c
new file mode 100644
index 00000000..e22592ba
--- /dev/null
+++ b/src/libultra/conteepprobe.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepprobe/func_80023F50.s")
diff --git a/src/libultra/conteepread.c b/src/libultra/conteepread.c
new file mode 100644
index 00000000..9af9acf2
--- /dev/null
+++ b/src/libultra/conteepread.c
@@ -0,0 +1,5 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepread/func_800234B0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepread/func_800236A0.s")
diff --git a/src/libultra/conteepwrite.c b/src/libultra/conteepwrite.c
new file mode 100644
index 00000000..496080fe
--- /dev/null
+++ b/src/libultra/conteepwrite.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_800237B0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_80023960.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/conteepwrite/func_80023A6C.s")
diff --git a/src/libultra/io/aisetfreq.c b/src/libultra/io/aisetfreq.c
new file mode 100644
index 00000000..6573b4eb
--- /dev/null
+++ b/src/libultra/io/aisetfreq.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aisetfreq/func_80024D60.s")
diff --git a/src/libultra/io/epirawdma.c b/src/libultra/io/epirawdma.c
new file mode 100644
index 00000000..d2a4c669
--- /dev/null
+++ b/src/libultra/io/epirawdma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epirawdma/func_80028230.s")
diff --git a/src/libultra/io/pfsisplug.c b/src/libultra/io/pfsisplug.c
new file mode 100644
index 00000000..5a53ea59
--- /dev/null
+++ b/src/libultra/io/pfsisplug.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_800260D0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_80026270.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pfsisplug/func_8002636C.s")
diff --git a/src/libultra/io/pigetcmdq.c b/src/libultra/io/pigetcmdq.c
new file mode 100644
index 00000000..77bcb29d
--- /dev/null
+++ b/src/libultra/io/pigetcmdq.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pigetcmdq/func_80027090.s")
diff --git a/src/libultra/io/pirawdma.c b/src/libultra/io/pirawdma.c
new file mode 100644
index 00000000..80505ec0
--- /dev/null
+++ b/src/libultra/io/pirawdma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pirawdma/func_80028150.s")
diff --git a/src/libultra/io/sirawdma.c b/src/libultra/io/sirawdma.c
new file mode 100644
index 00000000..ab4a01dc
--- /dev/null
+++ b/src/libultra/io/sirawdma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sirawdma/func_80025160.s")
diff --git a/src/libultra/io/sp.c b/src/libultra/io/sp.c
new file mode 100644
index 00000000..b12926ab
--- /dev/null
+++ b/src/libultra/io/sp.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sp/func_80027700.s")
diff --git a/src/libultra/io/spgetstat.c b/src/libultra/io/spgetstat.c
new file mode 100644
index 00000000..c971198f
--- /dev/null
+++ b/src/libultra/io/spgetstat.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spgetstat/func_80027200.s")
diff --git a/src/libultra/io/sprawdma.c b/src/libultra/io/sprawdma.c
new file mode 100644
index 00000000..1cb7f3fc
--- /dev/null
+++ b/src/libultra/io/sprawdma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sprawdma/func_80027670.s")
diff --git a/src/libultra/io/spsetpc.c b/src/libultra/io/spsetpc.c
new file mode 100644
index 00000000..3f0f0b2f
--- /dev/null
+++ b/src/libultra/io/spsetpc.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetpc/func_80027630.s")
diff --git a/src/libultra/io/spsetstat.c b/src/libultra/io/spsetstat.c
new file mode 100644
index 00000000..613f9ae8
--- /dev/null
+++ b/src/libultra/io/spsetstat.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/spsetstat/func_80027210.s")
diff --git a/src/libultra/io/vi.c b/src/libultra/io/vi.c
new file mode 100644
index 00000000..4544e9ed
--- /dev/null
+++ b/src/libultra/io/vi.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vi/func_800270C0.s")
diff --git a/src/libultra/io/viswapcontext.c b/src/libultra/io/viswapcontext.c
new file mode 100644
index 00000000..51479bdf
--- /dev/null
+++ b/src/libultra/io/viswapcontext.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapcontext/func_80027C30.s")
diff --git a/src/libultra/libc/ll.c b/src/libultra/libc/ll.c
new file mode 100644
index 00000000..e1fd6230
--- /dev/null
+++ b/src/libultra/libc/ll.c
@@ -0,0 +1,21 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023C90.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023CBC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023CF8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D34.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D60.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023D9C.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023DF8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023E28.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023E88.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/ll/func_80023F24.s")
diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c
new file mode 100644
index 00000000..81223887
--- /dev/null
+++ b/src/libultra/libc/string.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80023FC0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80023FEC.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/libc/string/func_80024014.s")
diff --git a/src/libultra/mtxutil.c b/src/libultra/mtxutil.c
new file mode 100644
index 00000000..9fc64c67
--- /dev/null
+++ b/src/libultra/mtxutil.c
@@ -0,0 +1,9 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026CD0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026DD0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026E58.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/mtxutil/func_80026E88.s")
diff --git a/src/libultra/os/getthreadpri.c b/src/libultra/os/getthreadpri.c
new file mode 100644
index 00000000..78973dc7
--- /dev/null
+++ b/src/libultra/os/getthreadpri.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/getthreadpri/func_80027C00.s")
diff --git a/src/libultra/os/jammesg.c b/src/libultra/os/jammesg.c
new file mode 100644
index 00000000..c5b1913b
--- /dev/null
+++ b/src/libultra/os/jammesg.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/jammesg/func_80026F40.s")
diff --git a/src/libultra/os/settime.c b/src/libultra/os/settime.c
new file mode 100644
index 00000000..b78ea7ed
--- /dev/null
+++ b/src/libultra/os/settime.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settime/func_80024D20.s")
diff --git a/src/libultra/os/settimer.c b/src/libultra/os/settimer.c
new file mode 100644
index 00000000..2efdc575
--- /dev/null
+++ b/src/libultra/os/settimer.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/settimer/func_800233D0.s")
diff --git a/src/libultra/os/virtualtophysical.c b/src/libultra/os/virtualtophysical.c
new file mode 100644
index 00000000..16158b43
--- /dev/null
+++ b/src/libultra/os/virtualtophysical.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/virtualtophysical/func_80027530.s")
diff --git a/src/main/aisetfreq.c b/src/main/aisetfreq.c
deleted file mode 100644
index b12ca340..00000000
--- a/src/main/aisetfreq.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/aisetfreq/func_80024D60.s")
diff --git a/src/main/conteepprobe.c b/src/main/conteepprobe.c
deleted file mode 100644
index 390c2a89..00000000
--- a/src/main/conteepprobe.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepprobe/func_80023F50.s")
diff --git a/src/main/conteepread.c b/src/main/conteepread.c
deleted file mode 100644
index aea88ac4..00000000
--- a/src/main/conteepread.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepread/func_800234B0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepread/func_800236A0.s")
diff --git a/src/main/conteepwrite.c b/src/main/conteepwrite.c
deleted file mode 100644
index 7b9df277..00000000
--- a/src/main/conteepwrite.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepwrite/func_800237B0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepwrite/func_80023960.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/conteepwrite/func_80023A6C.s")
diff --git a/src/main/epirawdma.c b/src/main/epirawdma.c
deleted file mode 100644
index e3be81e2..00000000
--- a/src/main/epirawdma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/epirawdma/func_80028230.s")
diff --git a/src/main/getthreadpri.c b/src/main/getthreadpri.c
deleted file mode 100644
index cc9c185b..00000000
--- a/src/main/getthreadpri.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/getthreadpri/func_80027C00.s")
diff --git a/src/main/jammesg.c b/src/main/jammesg.c
deleted file mode 100644
index e93623fa..00000000
--- a/src/main/jammesg.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/jammesg/func_80026F40.s")
diff --git a/src/main/ll.c b/src/main/ll.c
deleted file mode 100644
index b953615c..00000000
--- a/src/main/ll.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023C90.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023CBC.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023CF8.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023D34.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023D60.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023D9C.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023DF8.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023E28.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023E88.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/ll/func_80023F24.s")
diff --git a/src/main/mtxutil.c b/src/main/mtxutil.c
deleted file mode 100644
index 1ca28653..00000000
--- a/src/main/mtxutil.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/mtxutil/func_80026CD0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/mtxutil/func_80026DD0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/mtxutil/func_80026E58.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/mtxutil/func_80026E88.s")
diff --git a/src/main/pfsisplug.c b/src/main/pfsisplug.c
deleted file mode 100644
index f8fd01e6..00000000
--- a/src/main/pfsisplug.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pfsisplug/func_800260D0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pfsisplug/func_80026270.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pfsisplug/func_8002636C.s")
diff --git a/src/main/pigetcmdq.c b/src/main/pigetcmdq.c
deleted file mode 100644
index adf3a2bc..00000000
--- a/src/main/pigetcmdq.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pigetcmdq/func_80027090.s")
diff --git a/src/main/pirawdma.c b/src/main/pirawdma.c
deleted file mode 100644
index 2e767b79..00000000
--- a/src/main/pirawdma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/pirawdma/func_80028150.s")
diff --git a/src/main/settime.c b/src/main/settime.c
deleted file mode 100644
index 15c0d608..00000000
--- a/src/main/settime.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/settime/func_80024D20.s")
diff --git a/src/main/settimer.c b/src/main/settimer.c
deleted file mode 100644
index 21675548..00000000
--- a/src/main/settimer.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/settimer/func_800233D0.s")
diff --git a/src/main/sirawdma.c b/src/main/sirawdma.c
deleted file mode 100644
index 9b55ef44..00000000
--- a/src/main/sirawdma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sirawdma/func_80025160.s")
diff --git a/src/main/sp.c b/src/main/sp.c
deleted file mode 100644
index bf9de997..00000000
--- a/src/main/sp.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sp/func_80027700.s")
diff --git a/src/main/spgetstat.c b/src/main/spgetstat.c
deleted file mode 100644
index 1bf44c2c..00000000
--- a/src/main/spgetstat.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/spgetstat/func_80027200.s")
diff --git a/src/main/sprawdma.c b/src/main/sprawdma.c
deleted file mode 100644
index ab9816c7..00000000
--- a/src/main/sprawdma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sprawdma/func_80027670.s")
diff --git a/src/main/spsetpc.c b/src/main/spsetpc.c
deleted file mode 100644
index 065408e4..00000000
--- a/src/main/spsetpc.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/spsetpc/func_80027630.s")
diff --git a/src/main/spsetstat.c b/src/main/spsetstat.c
deleted file mode 100644
index dc9cdf6b..00000000
--- a/src/main/spsetstat.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/spsetstat/func_80027210.s")
diff --git a/src/main/string.c b/src/main/string.c
deleted file mode 100644
index 60d30ef4..00000000
--- a/src/main/string.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/string/func_80023FC0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/string/func_80023FEC.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/string/func_80024014.s")
diff --git a/src/main/vi.c b/src/main/vi.c
deleted file mode 100644
index 53f796b8..00000000
--- a/src/main/vi.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/vi/func_800270C0.s")
diff --git a/src/main/virtualtophysical.c b/src/main/virtualtophysical.c
deleted file mode 100644
index 2d7df0af..00000000
--- a/src/main/virtualtophysical.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/virtualtophysical/func_80027530.s")
diff --git a/src/main/viswapcontext.c b/src/main/viswapcontext.c
deleted file mode 100644
index bec90bfc..00000000
--- a/src/main/viswapcontext.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/viswapcontext/func_80027C30.s")
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 396ef359..3b2f05c8 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -64,51 +64,51 @@
       - [0x23760, asm]
       - [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]
-      - [0x240B0, c, conteepread]
-      - [0x243B0, c, conteepwrite]
-      - [0x24890, c, ll]
-      - [0x24B50, c, conteepprobe]
-      - [0x24BC0, c, string]
+      - [0x23E50, asm, ../libultra/gu/cosf] # Problem when trying to C
+      - [0x23FC0, hasm, ../libultra/gu/sqrtf]
+      - [0x23FD0, c, ../libultra/os/settimer]
+      - [0x240B0, c, ../libultra/conteepread]
+      - [0x243B0, c, ../libultra/conteepwrite]
+      - [0x24890, c, ../libultra/libc/ll]
+      - [0x24B50, c, ../libultra/conteepprobe]
+      - [0x24BC0, c, ../libultra/libc/string]
       - [0x24C60, asm, 24C60]
-      - [0x25920, c, settime]
+      - [0x25920, c, ../libultra/os/settime]
       - [0x25950, asm]
-      - [0x25960, c, aisetfreq]
+      - [0x25960, c, ../libultra/io/aisetfreq]
       - [0x25AC0, asm]
       - [0x25BB0, c, ../libultra/io/epidma]
       - [0x25C90, c, ../libultra/io/aigetlen]
       - [0x25CA0, asm]
       - [0x25D50, hasm, getcount]
-      - [0x25D60, c, sirawdma]
+      - [0x25D60, c, ../libultra/io/sirawdma]
       - [0x25E10, asm]
       - [0x25ED0, hasm, interrupt]
       - [0x25F10, asm, thread] # Problem when trying to C
       - [0x25F50, asm]
-      - [0x26CD0, c, pfsisplug]
+      - [0x26CD0, c, ../libultra/io/pfsisplug]
       - [0x27040, c, ../libultra/io/crc]
       - [0x271C0, asm]
-      - [0x278D0, c, mtxutil]
-      - [0x27B40, c, jammesg]
-      - [0x27C90, c, pigetcmdq]
-      - [0x27CC0, c, vi]
-      - [0x27E00, c, spgetstat]
-      - [0x27E10, c, spsetstat]
+      - [0x278D0, c, ../libultra/mtxutil]
+      - [0x27B40, c, ../libultra/os/jammesg]
+      - [0x27C90, c, ../libultra/io/pigetcmdq]
+      - [0x27CC0, c, ../libultra/io/vi]
+      - [0x27E00, c, ../libultra/io/spgetstat]
+      - [0x27E10, c, ../libultra/io/spsetstat]
       - [0x27E20, hasm, bcopy]
-      - [0x28130, c, virtualtophysical]
+      - [0x28130, c, ../libultra/os/virtualtophysical]
       - [0x281B0, hasm, writebackdcache]
-      - [0x28230, c, spsetpc]
-      - [0x28270, c, sprawdma]
-      - [0x28300, c, sp]
+      - [0x28230, c, ../libultra/io/spsetpc]
+      - [0x28270, c, ../libultra/io/sprawdma]
+      - [0x28300, c, ../libultra/io/sp]
       - [0x28330, asm]
-      - [0x28800, c, getthreadpri]
+      - [0x28800, c, ../libultra/os/getthreadpri]
       - [0x28820, asm]
-      - [0x28830, c, viswapcontext]
+      - [0x28830, c, ../libultra/io/viswapcontext]
       - [0x28B90, asm]
       - [0x28C90, asm]
-      - [0x28D50, c, pirawdma]
-      - [0x28E30, c, epirawdma] # Problem when trying to C
+      - [0x28D50, c, ../libultra/io/pirawdma]
+      - [0x28E30, c, ../libultra/io/epirawdma] # Problem when trying to C
       - [0x29060, asm, devmgr]
       - [0x294F0, asm]
       - [0x297B0, hasm, setsr]