diff --git a/Makefile b/Makefile
index 59ec4e96..6e67c942 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,9 @@ SRCDIR_KERNAL  = $(SRCDIR_COMMON) \
                 c64/kernal/assets \
                 c64/kernal/jumptable \
                 c64/kernal/iec \
+                c64/kernal/init \
                 c64/kernal/interrupts \
+                c64/kernal/iostack \
                 c64/kernal/keyboard \
                 c64/kernal/print \
                 c64/kernal/screen
diff --git a/c64/kernal/cartridge_check.s b/c64/kernal/init/cartridge_check.s
similarity index 100%
rename from c64/kernal/cartridge_check.s
rename to c64/kernal/init/cartridge_check.s
diff --git a/c64/kernal/cint_real.s b/c64/kernal/init/cint_real.s
similarity index 100%
rename from c64/kernal/cint_real.s
rename to c64/kernal/init/cint_real.s
diff --git a/c64/kernal/e5a0.setup_vicii.s b/c64/kernal/init/e5a0.setup_vicii.s
similarity index 100%
rename from c64/kernal/e5a0.setup_vicii.s
rename to c64/kernal/init/e5a0.setup_vicii.s
diff --git a/c64/kernal/fd50.interop b/c64/kernal/init/fd50.interop
similarity index 100%
rename from c64/kernal/fd50.interop
rename to c64/kernal/init/fd50.interop
diff --git a/c64/kernal/fd50.ramtas.jmp.s b/c64/kernal/init/fd50.ramtas.jmp.s
similarity index 100%
rename from c64/kernal/fd50.ramtas.jmp.s
rename to c64/kernal/init/fd50.ramtas.jmp.s
diff --git a/c64/kernal/fda3.ioinit.s b/c64/kernal/init/fda3.ioinit.s
similarity index 100%
rename from c64/kernal/fda3.ioinit.s
rename to c64/kernal/init/fda3.ioinit.s
diff --git a/c64/kernal/ff5b.cint.jmp.s b/c64/kernal/init/ff5b.cint.jmp.s
similarity index 100%
rename from c64/kernal/ff5b.cint.jmp.s
rename to c64/kernal/init/ff5b.cint.jmp.s
diff --git a/c64/kernal/ff5b.interop b/c64/kernal/init/ff5b.interop
similarity index 100%
rename from c64/kernal/ff5b.interop
rename to c64/kernal/init/ff5b.interop
diff --git a/c64/kernal/clall_real.s b/c64/kernal/iostack/clall_real.s
similarity index 100%
rename from c64/kernal/clall_real.s
rename to c64/kernal/iostack/clall_real.s
diff --git a/c64/kernal/f32f.clall.jmp.s b/c64/kernal/iostack/f32f.clall.jmp.s
similarity index 100%
rename from c64/kernal/f32f.clall.jmp.s
rename to c64/kernal/iostack/f32f.clall.jmp.s
diff --git a/c64/kernal/f32f.interop b/c64/kernal/iostack/f32f.interop
similarity index 100%
rename from c64/kernal/f32f.interop
rename to c64/kernal/iostack/f32f.interop
diff --git a/c64/kernal/lvs_helpers.s b/c64/kernal/iostack/lvs_helpers.s
similarity index 100%
rename from c64/kernal/lvs_helpers.s
rename to c64/kernal/iostack/lvs_helpers.s
diff --git a/c64/kernal/readst.s b/c64/kernal/iostack/readst.s
similarity index 100%
rename from c64/kernal/readst.s
rename to c64/kernal/iostack/readst.s
diff --git a/c64/kernal/setfls.s b/c64/kernal/iostack/setfls.s
similarity index 100%
rename from c64/kernal/setfls.s
rename to c64/kernal/iostack/setfls.s
diff --git a/c64/kernal/setmsg.s b/c64/kernal/iostack/setmsg.s
similarity index 100%
rename from c64/kernal/setmsg.s
rename to c64/kernal/iostack/setmsg.s
diff --git a/c64/kernal/setnam.s b/c64/kernal/iostack/setnam.s
similarity index 100%
rename from c64/kernal/setnam.s
rename to c64/kernal/iostack/setnam.s
diff --git a/c64/kernal/settmo.s b/c64/kernal/iostack/settmo.s
similarity index 100%
rename from c64/kernal/settmo.s
rename to c64/kernal/iostack/settmo.s
diff --git a/c64/kernal/e50a.interop b/c64/kernal/screen/e50a.interop
similarity index 100%
rename from c64/kernal/e50a.interop
rename to c64/kernal/screen/e50a.interop
diff --git a/c64/kernal/e50a.plot.s b/c64/kernal/screen/e50a.plot.s
similarity index 100%
rename from c64/kernal/e50a.plot.s
rename to c64/kernal/screen/e50a.plot.s