diff --git a/empty.d64 b/empty.d64
deleted file mode 100644
index cb9940fe..00000000
Binary files a/empty.d64 and /dev/null differ
diff --git a/src/basic/basic_vector_defaults.s b/src/basic/assets/basic_vector_defaults.s
similarity index 100%
rename from src/basic/basic_vector_defaults.s
rename to src/basic/assets/basic_vector_defaults.s
diff --git a/src/basic/c000.skip_gap.s b/src/basic/assets/c000.skip_gap.s
similarity index 100%
rename from src/basic/c000.skip_gap.s
rename to src/basic/assets/c000.skip_gap.s
diff --git a/src/basic/basic_commands/cmd_list.s b/src/basic/basic_commands/cmd_list.s
index d1b8b75b..3da8ca4f 100644
--- a/src/basic/basic_commands/cmd_list.s
+++ b/src/basic/basic_commands/cmd_list.s
@@ -34,11 +34,11 @@ list_loop:
 	jmp shell_main_loop
 
 list_more_lines:
+
 	lda STKEY
 	bmi !+
 	jmp cmd_stop
 !:
 	jsr list_single_line
-	// Now link to the next line
-	jsr basic_find_next_line
+	jsr follow_link_to_next_line
 	jmp list_loop
diff --git a/src/basic/basic_find_next_line.s b/src/basic/basic_find_next_line.s
deleted file mode 100644
index cd38025f..00000000
--- a/src/basic/basic_find_next_line.s
+++ /dev/null
@@ -1,35 +0,0 @@
-// #LAYOUT# STD *       #TAKE
-// #LAYOUT# *   BASIC_0 #TAKE
-// #LAYOUT# *   *       #IGNORE
-
-// Advance OLDTXT by following the
-// link to the next line
-
-basic_find_next_line:
-
-	ldy #0
-
-#if CONFIG_MEMORY_MODEL_60K
-	ldx #<OLDTXT+0
-	jsr peek_under_roms
-#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-	jsr peek_under_roms_via_OLDTXT
-#else // CONFIG_MEMORY_MODEL_38K
-	lda (OLDTXT),y
-#endif
-
-	pha
-	iny
-
-#if CONFIG_MEMORY_MODEL_60K
-	jsr peek_under_roms
-#elif CONFIG_MEMORY_MODEL_46K || CONFIG_MEMORY_MODEL_50K
-	jsr peek_under_roms_via_OLDTXT
-#else // CONFIG_MEMORY_MODEL_38K
-	lda (OLDTXT),y
-#endif
-
-	sta OLDTXT+1
-	pla
-	sta OLDTXT+0
-	rts
diff --git a/src/basic/editor/update_vartab_do_clr.s b/src/basic/editor/update_vartab_do_clr.s
index 40624baa..e8f67a38 100644
--- a/src/basic/editor/update_vartab_do_clr.s
+++ b/src/basic/editor/update_vartab_do_clr.s
@@ -18,7 +18,7 @@ update_VARTAB_do_clr:
 	lda OLDTXT+1
 	sta VARTAB+1
 
-	jsr basic_follow_link_to_next_line
+	jsr follow_link_to_next_line
 
 	lda OLDTXT+0
 	ora OLDTXT+1
diff --git a/src/basic/engine/execute_line_statements.s b/src/basic/engine/execute_line_statements.s
index 306c3b2c..51f34df4 100644
--- a/src/basic/engine/execute_line_statements.s
+++ b/src/basic/engine/execute_line_statements.s
@@ -177,7 +177,7 @@ execute_statements_end_of_line:
 	// Advance the basic line pointer to the next line; if end,
 	// go to the main loop
 
-	jsr basic_follow_link_to_next_line
+	jsr follow_link_to_next_line
 
 	lda OLDTXT+0
 	ora OLDTXT+1
diff --git a/src/basic/basic_follow_link_to_next_line.s b/src/basic/engine/follow_link_to_next_line.s
similarity index 94%
rename from src/basic/basic_follow_link_to_next_line.s
rename to src/basic/engine/follow_link_to_next_line.s
index b0b4e57a..99899f20 100644
--- a/src/basic/basic_follow_link_to_next_line.s
+++ b/src/basic/engine/follow_link_to_next_line.s
@@ -2,7 +2,8 @@
 // #LAYOUT# *   BASIC_0 #TAKE
 // #LAYOUT# *   *       #IGNORE
 
-basic_follow_link_to_next_line:
+follow_link_to_next_line:
+
 	ldy #0
 
 #if CONFIG_MEMORY_MODEL_60K
@@ -28,4 +29,5 @@ basic_follow_link_to_next_line:
 	sta OLDTXT+1
 	pla
 	sta OLDTXT+0
+
 	rts
diff --git a/src/basic/select_device.s b/src/basic/engine/select_device.s
similarity index 100%
rename from src/basic/select_device.s
rename to src/basic/engine/select_device.s