diff --git a/Makefile b/Makefile
index afeb42d..7f29f8e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ ACME=acme
 CADIUS=cadius
 
 asm: md
-	$(ACME) -r build/grue.system.lst src/grue.system.s
+	$(ACME) -r build/grue.system.lst src/loader/grue.system.s
 	$(ACME) -r build/pitchdark.lst src/pitchdark.a
 	$(ACME) -r build/onbeyond.system.lst src/onbeyond/onbeyond.system.s
 	$(ACME) -r build/z1.lst src/onbeyond/z1/z1.s
diff --git a/src/launch.a b/src/glue.onbeyond.a
similarity index 100%
rename from src/launch.a
rename to src/glue.onbeyond.a
diff --git a/src/grue.system.s b/src/loader/grue.system.s
similarity index 100%
rename from src/grue.system.s
rename to src/loader/grue.system.s
diff --git a/src/pitchdark.a b/src/pitchdark.a
index 9e11a4d..c76481f 100644
--- a/src/pitchdark.a
+++ b/src/pitchdark.a
@@ -7,6 +7,9 @@
 ; Public functions
 ; - ExitWeeGUI
 ;
+; Public variables
+; - gGamesListStore
+;
 
 !cpu 65c02
 !ct "src/lcase.ct"
@@ -22,16 +25,16 @@
          !source "src/WeeGUI_MLI.s"
 
          !source "src/okvs.a"
-         !source "src/prodos.a"
-         !source "src/ramdisk.a"
-         !source "src/path.a"
-         !source "src/sound.a"
-         !source "src/launch.a"
+         !source "src/prodos.mli.a"
+         !source "src/prodos.ramdisk.a"
+         !source "src/prodos.path.a"
+         !source "src/glue.onbeyond.a"
          !source "src/parse.common.a"
          !source "src/parse.gamelist.a"
          !source "src/parse.gameinfo.a"
          !source "src/parse.prefs.a"
          !source "src/ui.common.a"
+         !source "src/ui.sound.a"
          !source "src/ui.main.a"
          !source "src/ui.main.keys.a"
          !source "src/ui.options.a"
diff --git a/src/prodos.a b/src/prodos.mli.a
similarity index 100%
rename from src/prodos.a
rename to src/prodos.mli.a
diff --git a/src/path.a b/src/prodos.path.a
similarity index 100%
rename from src/path.a
rename to src/prodos.path.a
diff --git a/src/ramdisk.a b/src/prodos.ramdisk.a
similarity index 100%
rename from src/ramdisk.a
rename to src/prodos.ramdisk.a
diff --git a/src/sound.a b/src/ui.sound.a
similarity index 100%
rename from src/sound.a
rename to src/ui.sound.a