diff --git a/.gitmodules b/.gitmodules
index 8ac31f4..3ea8291 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "mescc-tools-seed"]
-	path = mescc-tools-seed
+	path = sysa/mescc-tools-seed
 	url = https://github.com/oriansj/mescc-tools-seed/
 [submodule "bootstrap-seeds"]
 	path = bootstrap-seeds
 	url = https://github.com/oriansj/bootstrap-seeds
 [submodule "blynn-compiler-oriansj"]
-	path = blynn-compiler-oriansj
+	path = sysa/blynn-compiler-oriansj
 	url = https://github.com/oriansj/blynn-compiler
diff --git a/rootfs.sh b/rootfs.sh
index 8171089..dbedb99 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 set -ex
 
+pushd sysa
+
+# SYSTEM A
+
 # Setup tmp 
 mkdir -p tmp/
 sudo mount -t tmpfs -o size=8G tmpfs tmp
 
-# Now copy everything over
-
 # base: mescc-tools-seed
 cp -r mescc-tools-seed/x86/* tmp
 cp -r mescc-tools-seed/{M2-Planet,mes-m2,mescc-tools} tmp/
-cp bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/init
-cp bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/
-cp -r bootstrap-seeds tmp/
+cp ../bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/init
+cp ../bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/
+cp -r ../bootstrap-seeds tmp/
 mkdir tmp/bin
 
 # blynn-compiler
@@ -35,7 +37,9 @@ qemu-system-x86_64 -enable-kvm \
     -m 16G \
     -nographic \
     -no-reboot \
-    -kernel ../kernel -initrd initramfs.igz -append console=ttyS0,kernel.panic=2
+    -kernel ../../kernel -initrd initramfs.igz -append console=ttyS0,kernel.panic=2
 
 # Cleanup
 sudo umount tmp
+
+popd
diff --git a/blynn-compiler-extras/go.kaem b/sysa/blynn-compiler-extras/go.kaem
similarity index 100%
rename from blynn-compiler-extras/go.kaem
rename to sysa/blynn-compiler-extras/go.kaem
diff --git a/blynn-compiler-extras/kaem.patch b/sysa/blynn-compiler-extras/kaem.patch
similarity index 100%
rename from blynn-compiler-extras/kaem.patch
rename to sysa/blynn-compiler-extras/kaem.patch
diff --git a/blynn-compiler-oriansj b/sysa/blynn-compiler-oriansj
similarity index 100%
rename from blynn-compiler-oriansj
rename to sysa/blynn-compiler-oriansj
diff --git a/mescc-tools-seed b/sysa/mescc-tools-seed
similarity index 100%
rename from mescc-tools-seed
rename to sysa/mescc-tools-seed