diff --git a/src/libultra/io/aigetlen.c b/src/libultra/io/aigetlen.c
new file mode 100644
index 00000000..3adcc77e
--- /dev/null
+++ b/src/libultra/io/aigetlen.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/aigetlen/func_80025090.s")
diff --git a/src/libultra/io/controller.c b/src/libultra/io/controller.c
new file mode 100644
index 00000000..d0f90fa4
--- /dev/null
+++ b/src/libultra/io/controller.c
@@ -0,0 +1,7 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_8001FFC0.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_800201B8.s")
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_80020288.s")
diff --git a/src/libultra/io/epidma.c b/src/libultra/io/epidma.c
new file mode 100644
index 00000000..e70d39f7
--- /dev/null
+++ b/src/libultra/io/epidma.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/epidma/func_80024FB0.s")
diff --git a/src/libultra/os/createmesgqueue.c b/src/libultra/os/createmesgqueue.c
new file mode 100644
index 00000000..b46a79f2
--- /dev/null
+++ b/src/libultra/os/createmesgqueue.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createmesgqueue/func_80021CF0.s")
diff --git a/src/libultra/os/seteventmesg.c b/src/libultra/os/seteventmesg.c
new file mode 100644
index 00000000..c089efc0
--- /dev/null
+++ b/src/libultra/os/seteventmesg.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/seteventmesg/func_80021D20.s")
diff --git a/src/main/aigetlen.c b/src/main/aigetlen.c
deleted file mode 100644
index 4621ae1c..00000000
--- a/src/main/aigetlen.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/aigetlen/func_80025090.s")
diff --git a/src/main/controller.c b/src/main/controller.c
deleted file mode 100644
index c7ee4358..00000000
--- a/src/main/controller.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/controller/func_8001FFC0.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/controller/func_800201B8.s")
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/controller/func_80020288.s")
diff --git a/src/main/createmesgqueue.c b/src/main/createmesgqueue.c
deleted file mode 100644
index 685345c9..00000000
--- a/src/main/createmesgqueue.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/createmesgqueue/func_80021CF0.s")
diff --git a/src/main/epidma.c b/src/main/epidma.c
deleted file mode 100644
index 9de51e4c..00000000
--- a/src/main/epidma.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/epidma/func_80024FB0.s")
diff --git a/src/main/seteventmesg.c b/src/main/seteventmesg.c
deleted file mode 100644
index 321a9d85..00000000
--- a/src/main/seteventmesg.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-#pragma GLOBAL_ASM("asm/us/nonmatchings/main/seteventmesg/func_80021D20.s")
diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index e0df0096..10c2d924 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -30,7 +30,7 @@
       - [0x205E0, c]
       - [0x206B0, asm, 206B0]
       - [0x20A60, asm]
-      - [0x20BC0, c, controller]
+      - [0x20BC0, c, ../libultra/io/controller]
       - [0x20F80, c, contreaddata]
       - [0x211E0, c, recvmesg]
       - [0x21320, c, sendmesg]
@@ -49,8 +49,8 @@
       - [0x22660, asm]
       - [0x226C0, c, visetmode]
       - [0x22730, c, visetspecial]
-      - [0x228F0, c, createmesgqueue]
-      - [0x22920, c, seteventmesg]
+      - [0x228F0, c, ../libultra/os/createmesgqueue]
+      - [0x22920, c, ../libultra/os/seteventmesg]
       - [0x22990, c, visetevent]
       - [0x22A00, c, sptaskyielded]
       - [0x22A80, c, sptaskyield]
@@ -77,8 +77,8 @@
       - [0x25950, asm]
       - [0x25960, c, aisetfreq]
       - [0x25AC0, asm]
-      - [0x25BB0, c, epidma]
-      - [0x25C90, c, aigetlen]
+      - [0x25BB0, c, ../libultra/io/epidma]
+      - [0x25C90, c, ../libultra/io/aigetlen]
       - [0x25CA0, asm]
       - [0x25D50, hasm, getcount]
       - [0x25D60, c, sirawdma]