diff --git a/Makefile b/Makefile
index 0c5e1a82..9a2a878d 100644
--- a/Makefile
+++ b/Makefile
@@ -47,13 +47,13 @@ SRCDIR_KERNAL  = $(SRCDIR_COMMON) \
                  src/kernal/board_m65 \
                  src/kernal/board_u64 \
                  src/kernal/board_x16 \
-                 src/kernal/extapi_m65 \
                  src/kernal/iec \
                  src/kernal/iec_fast \
                  src/kernal/init \
                  src/kernal/interrupts \
                  src/kernal/iostack \
                  src/kernal/jumptable \
+                 src/kernal/jumptable_m65 \
                  src/kernal/keyboard \
                  src/kernal/keyboard_m65 \
                  src/kernal/memory \
diff --git a/src/kernal/extapi_m65/mega65_modeget.s b/src/kernal/board_m65/mega65_modeget.s
similarity index 100%
rename from src/kernal/extapi_m65/mega65_modeget.s
rename to src/kernal/board_m65/mega65_modeget.s
diff --git a/src/kernal/extapi_m65/mega65_modeset.s b/src/kernal/board_m65/mega65_modeset.s
similarity index 100%
rename from src/kernal/extapi_m65/mega65_modeset.s
rename to src/kernal/board_m65/mega65_modeset.s
diff --git a/src/kernal/extapi_m65/mega65__jumptable.s b/src/kernal/jumptable_m65/mega65__jumptable.s
similarity index 81%
rename from src/kernal/extapi_m65/mega65__jumptable.s
rename to src/kernal/jumptable_m65/mega65__jumptable.s
index 301226a2..c54021bd 100644
--- a/src/kernal/extapi_m65/mega65__jumptable.s
+++ b/src/kernal/jumptable_m65/mega65__jumptable.s
@@ -4,8 +4,7 @@
 ;
 ; Not this is not an official Kernal API extension (yet)! It is subject to change!
 ;
-; XXX consider turning this into vector table, the only jumptable extension
-; would copy the vector table to given memory location
+; XXX assign addresses
 
 
 M65_JMODEGET: