diff --git a/6502/C64/Makefile b/6502/C64/Makefile
index c05f595..05a0157 100644
--- a/6502/C64/Makefile
+++ b/6502/C64/Makefile
@@ -54,17 +54,17 @@ cbmfiles/tcbase: emulator/c64-vf-390.T64 emulator/build-tcbase.sh \
 
 cbmfiles/c64-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
-	emulator/build-vf.sh vf-c64-main.fth c64-vf-latest
+	emulator/build-vf.sh vf-main-c64.fth c64-vf-latest
 
 # C16 with 64 kB RAM or Plus4 - called (C16+ in the sources.
 cbmfiles/c16-vf-latest: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
-	emulator/build-vf.sh vf-c16-main.fth c16-vf-latest
+	emulator/build-vf.sh vf-main-c16+.fth c16-vf-latest
 
 # C16 with 32 kB RAM - called (C16- in the sources.
 cbmfiles/c16-vf-32k: emulator/tcbase.T64 emulator/build-vf.sh \
     disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
-	emulator/build-vf.sh vf-c16-32k.fth c16-vf-32k
+	emulator/build-vf.sh vf-main-c16-.fth c16-vf-32k
 
 
 # Core test targets
diff --git a/6502/C64/src/vf-c16-32k.fth b/6502/C64/src/vf-c16-32k.fth
deleted file mode 100644
index 5b2e038..0000000
--- a/6502/C64/src/vf-c16-32k.fth
+++ /dev/null
@@ -1,38 +0,0 @@
-
-hex
-
-\ load transient part of target compiler
-2 drive 27 30 thru
-
-
-Onlyforth hex
-
-\ clear memory and clr labels  .status
-include vf-tc-prep.fth
-
-\ Host and target settings and display
-cr .( Host is: )
-    (64  .( C64) C)
-    (16  .( C16) C)
-
-: )     ; immediate
-: (C    ; immediate
-
-: (C16  ; immediate
-: (C16- ; immediate
-: (C64  [compile] ( ; immediate
-: (C16+ [compile] ( ; immediate
-\ ) - just to unconfuse my editor
-include vf-pr-target.fth
-
-\ The actual volksForth sources
-
-include vf-head-c16.fth
-include vf-cbm-core.fth
-include vf-sys-c16.fth
-include vf-cbm-file.fth
-include vf-cbm-bufs.fth
-include vf-finalize.fth
-
-include vf-pr-target.fth
-quit
diff --git a/6502/C64/src/vf-c16-main.fth b/6502/C64/src/vf-c16-main.fth
deleted file mode 100644
index d9768b4..0000000
--- a/6502/C64/src/vf-c16-main.fth
+++ /dev/null
@@ -1,40 +0,0 @@
-
-hex
-
-\ load transient part of target compiler
-2 drive 27 30 thru
-
-
-Onlyforth hex
-
-\ clear memory and clr labels  .status
-include vf-tc-prep.fth
-
-\ Host and target settings and display
-cr .( Host is: )
-    (64  .( C64) C)
-    (16  .( C16) C)
-
-: )     ; immediate
-: (C    ; immediate
-
-: (C16  ; immediate
-: (C16+ ; immediate
-: (C64  [compile] ( ; immediate
-: (C16- [compile] ( ; immediate
-\ ) - just to unconfuse my editor
-include vf-pr-target.fth
-
-\ The actual volksForth sources
-\ including an initial C16+ tweak
-
-include vf-c16+jsr.fth
-include vf-head-c16.fth
-include vf-cbm-core.fth
-include vf-sys-c16.fth
-include vf-cbm-file.fth
-include vf-cbm-bufs.fth
-include vf-finalize.fth
-
-include vf-pr-target.fth
-quit
diff --git a/6502/C64/src/vf-c64-main.fth b/6502/C64/src/vf-c64-main.fth
deleted file mode 100644
index 7bf6f4f..0000000
--- a/6502/C64/src/vf-c64-main.fth
+++ /dev/null
@@ -1,38 +0,0 @@
-
-hex
-
-\ load transient part of target compiler
-2 drive 27 30 thru
-
-
-Onlyforth hex
-
-\ clear memory and clr labels  .status
-include vf-tc-prep.fth
-
-\ Host and target settings and display
-cr .( Host is: )
-    (64  .( C64) C)
-    (16  .( C16) C)
-
-: )     ; immediate
-: (C    ; immediate
-
-: (C64  ; immediate
-: (C16  [compile] ( ; immediate
-: (C16+ [compile] ( ; immediate
-: (C16- [compile] ( ; immediate
-\ ) - just to unconfuse my editor
-include vf-pr-target.fth
-
-\ The actual volksForth sources
-
-include vf-head-c64.fth
-include vf-cbm-core.fth
-include vf-sys-c64.fth
-include vf-cbm-file.fth
-include vf-cbm-bufs.fth
-include vf-finalize.fth
-
-include vf-pr-target.fth
-quit
diff --git a/6502/C64/src/vf-main-c16+.fth b/6502/C64/src/vf-main-c16+.fth
new file mode 100644
index 0000000..becf82f
--- /dev/null
+++ b/6502/C64/src/vf-main-c16+.fth
@@ -0,0 +1,16 @@
+
+include vf-tc-prep.fth
+
+include vf-trg-c16+.fth
+
+\ The actual volksForth sources
+
+include vf-head-c16.fth
+include vf-cbm-core.fth
+include vf-sys-c16.fth
+include vf-cbm-file.fth
+include vf-cbm-bufs.fth
+include vf-finalize.fth
+
+include vf-pr-target.fth
+quit
diff --git a/6502/C64/src/vf-main-c16-.fth b/6502/C64/src/vf-main-c16-.fth
new file mode 100644
index 0000000..c2185ca
--- /dev/null
+++ b/6502/C64/src/vf-main-c16-.fth
@@ -0,0 +1,16 @@
+
+include vf-tc-prep.fth
+
+include vf-trg-c16-.fth
+
+\ The actual volksForth sources
+
+include vf-head-c16.fth
+include vf-cbm-core.fth
+include vf-sys-c16.fth
+include vf-cbm-file.fth
+include vf-cbm-bufs.fth
+include vf-finalize.fth
+
+include vf-pr-target.fth
+quit
diff --git a/6502/C64/src/vf-main-c64.fth b/6502/C64/src/vf-main-c64.fth
new file mode 100644
index 0000000..c805888
--- /dev/null
+++ b/6502/C64/src/vf-main-c64.fth
@@ -0,0 +1,16 @@
+
+include vf-tc-prep.fth
+
+include vf-trg-c64.fth
+
+\ The actual volksForth sources
+
+include vf-head-c64.fth
+include vf-cbm-core.fth
+include vf-sys-c64.fth
+include vf-cbm-file.fth
+include vf-cbm-bufs.fth
+include vf-finalize.fth
+
+include vf-pr-target.fth
+quit
diff --git a/6502/C64/src/vf-tc-prep.fth b/6502/C64/src/vf-tc-prep.fth
index 6885d64..5635d61 100644
--- a/6502/C64/src/vf-tc-prep.fth
+++ b/6502/C64/src/vf-tc-prep.fth
@@ -1,3 +1,13 @@
+
+hex
+
+\ load transient part of target compiler
+2 drive 27 30 thru
+
+
+Onlyforth hex
+
+\ clear memory and clr labels  .status
 \ *** Block No. 12, Hexblock c
 
 \ ramfill                             3:
@@ -73,3 +83,8 @@ variable current-page   0 current-page !
   current-page @ ;
 
 ' blk-or-page@ is blk@
+
+\ Host and target settings and display
+cr .( Host is: )
+    (64  .( C64) C)
+    (16  .( C16) C)
diff --git a/6502/C64/src/vf-trg-c16+.fth b/6502/C64/src/vf-trg-c16+.fth
new file mode 100644
index 0000000..842b483
--- /dev/null
+++ b/6502/C64/src/vf-trg-c16+.fth
@@ -0,0 +1,13 @@
+
+: )     ; immediate
+: (C    ; immediate
+
+: (C16  ; immediate
+: (C16+ ; immediate
+: (C64  [compile] ( ; immediate
+: (C16- [compile] ( ; immediate
+
+include vf-pr-target.fth
+
+\ C16+ jsr tweak
+include vf-c16+jsr.fth
diff --git a/6502/C64/src/vf-trg-c16-.fth b/6502/C64/src/vf-trg-c16-.fth
new file mode 100644
index 0000000..309658e
--- /dev/null
+++ b/6502/C64/src/vf-trg-c16-.fth
@@ -0,0 +1,10 @@
+
+: )     ; immediate
+: (C    ; immediate
+
+: (C16  ; immediate
+: (C16- ; immediate
+: (C64  [compile] ( ; immediate
+: (C16+ [compile] ( ; immediate
+
+include vf-pr-target.fth
diff --git a/6502/C64/src/vf-trg-c64.fth b/6502/C64/src/vf-trg-c64.fth
new file mode 100644
index 0000000..b190a52
--- /dev/null
+++ b/6502/C64/src/vf-trg-c64.fth
@@ -0,0 +1,10 @@
+
+: )     ; immediate
+: (C    ; immediate
+
+: (C64  ; immediate
+: (C16  [compile] ( ; immediate
+: (C16+ [compile] ( ; immediate
+: (C16- [compile] ( ; immediate
+
+include vf-pr-target.fth