diff --git a/Source/Images/Test/z80ccf.com b/Source/Images/Common/Test/z80ccf.com
similarity index 100%
rename from Source/Images/Test/z80ccf.com
rename to Source/Images/Common/Test/z80ccf.com
diff --git a/Source/Images/Test/z80doc.com b/Source/Images/Common/Test/z80doc.com
similarity index 100%
rename from Source/Images/Test/z80doc.com
rename to Source/Images/Common/Test/z80doc.com
diff --git a/Source/Images/Test/z80docf.com b/Source/Images/Common/Test/z80docf.com
similarity index 100%
rename from Source/Images/Test/z80docf.com
rename to Source/Images/Common/Test/z80docf.com
diff --git a/Source/Images/Test/z80flags.com b/Source/Images/Common/Test/z80flags.com
similarity index 100%
rename from Source/Images/Test/z80flags.com
rename to Source/Images/Common/Test/z80flags.com
diff --git a/Source/Images/Test/z80full.com b/Source/Images/Common/Test/z80full.com
similarity index 100%
rename from Source/Images/Test/z80full.com
rename to Source/Images/Common/Test/z80full.com
diff --git a/Source/Images/Test/z80mptr.com b/Source/Images/Common/Test/z80mptr.com
similarity index 100%
rename from Source/Images/Test/z80mptr.com
rename to Source/Images/Common/Test/z80mptr.com
diff --git a/Source/Images/Test/zexall.com b/Source/Images/Common/Test/zexall.com
similarity index 100%
rename from Source/Images/Test/zexall.com
rename to Source/Images/Common/Test/zexall.com
diff --git a/Source/Images/Test/zexdoc.com b/Source/Images/Common/Test/zexdoc.com
similarity index 100%
rename from Source/Images/Test/zexdoc.com
rename to Source/Images/Common/Test/zexdoc.com
diff --git a/Source/Images/d_cpm22/ReadMe.txt b/Source/Images/d_cpm22/ReadMe.txt
index b00a471c..d3855964 100644
--- a/Source/Images/d_cpm22/ReadMe.txt
+++ b/Source/Images/d_cpm22/ReadMe.txt
@@ -134,7 +134,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR
diff --git a/Source/Images/d_cpm3/u0/ROMWBW.TXT b/Source/Images/d_cpm3/ReadMe.txt
similarity index 100%
rename from Source/Images/d_cpm3/u0/ROMWBW.TXT
rename to Source/Images/d_cpm3/ReadMe.txt
diff --git a/Source/Images/d_nzcom/ReadMe.txt b/Source/Images/d_nzcom/ReadMe.txt
index e2b27ab7..2c05fa80 100644
--- a/Source/Images/d_nzcom/ReadMe.txt
+++ b/Source/Images/d_nzcom/ReadMe.txt
@@ -302,7 +302,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR
diff --git a/Source/Images/d_qpm/ReadMe.txt b/Source/Images/d_qpm/ReadMe.txt
index d76c741d..7765bc86 100644
--- a/Source/Images/d_qpm/ReadMe.txt
+++ b/Source/Images/d_qpm/ReadMe.txt
@@ -175,7 +175,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR
diff --git a/Source/Images/d_z80asm/Readme.txt b/Source/Images/d_z80asm/Readme.txt
index 539a7b42..03d79c26 100644
--- a/Source/Images/d_z80asm/Readme.txt
+++ b/Source/Images/d_z80asm/Readme.txt
@@ -6,7 +6,7 @@ and stores the output in either a core-image, Intel hex format, or relocatable
 object file. The mnemonics recognized are those of Zilog/Mostek. The optional
 listing output may be sent to a disk file, the console and/or the printer, in
 any combination. Output files may also be generated containing cross-reference
-information on each symbol used.
+information on each symbol used.
 
 The manual is available in the Doc/Language directory,
 z80asm (SLR Systems).pdf
diff --git a/Source/Images/d_zpm3/u0/ROMWBW.TXT b/Source/Images/d_zpm3/ReadMe.txt
similarity index 100%
rename from Source/Images/d_zpm3/u0/ROMWBW.TXT
rename to Source/Images/d_zpm3/ReadMe.txt
diff --git a/Source/Images/d_zsdos/ReadMe.txt b/Source/Images/d_zsdos/ReadMe.txt
index e3316534..02be339b 100644
--- a/Source/Images/d_zsdos/ReadMe.txt
+++ b/Source/Images/d_zsdos/ReadMe.txt
@@ -275,7 +275,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR
diff --git a/Source/Images/fd_cpm3.txt b/Source/Images/fd_cpm3.txt
index ee2fe4f8..f4968287 100644
--- a/Source/Images/fd_cpm3.txt
+++ b/Source/Images/fd_cpm3.txt
@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_cpm3/ReadMe.txt 0:
+#
 # Add files from CPM3 build
 #
 ../CPM3/cpmldr.com 0:
diff --git a/Source/Images/fd_zpm3.txt b/Source/Images/fd_zpm3.txt
index 2175a1c3..c8180eef 100644
--- a/Source/Images/fd_zpm3.txt
+++ b/Source/Images/fd_zpm3.txt
@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_zpm3/ReadMe.txt 0:
+#
 # Add files from ZPM3 build
 #
 ../ZPM3/zpmldr.com 0:
diff --git a/Source/Images/hd_bp.txt b/Source/Images/hd_bp.txt
index 49459a31..4cee53bf 100644
--- a/Source/Images/hd_bp.txt
+++ b/Source/Images/hd_bp.txt
@@ -11,12 +11,12 @@
 #
 #../../Binary/Apps/*.com 15:
 ../../Binary/Apps/assign.com 15:
-../../Binary/Apps/bbcbasic.com 0:
-../../Binary/Apps/bbcbasic.txt 0:
+../../Binary/Apps/bbcbasic.com 15:
+../../Binary/Apps/bbcbasic.txt 15:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 15:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 15:
@@ -44,7 +44,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -56,7 +56,6 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM22/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:
diff --git a/Source/Images/hd_cpm22.txt b/Source/Images/hd_cpm22.txt
index 6dff8024..26691f51 100644
--- a/Source/Images/hd_cpm22.txt
+++ b/Source/Images/hd_cpm22.txt
@@ -40,7 +40,7 @@ d_cpm22/ReadMe.txt 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/hd_cpm3.txt b/Source/Images/hd_cpm3.txt
index 49ef0ec5..71be7363 100644
--- a/Source/Images/hd_cpm3.txt
+++ b/Source/Images/hd_cpm3.txt
@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_cpm3/ReadMe.txt 0:
+#
 # Add files from CPM3 build
 #
 ../CPM3/cpmldr.com 0:
@@ -56,7 +60,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/hd_nzcom.txt b/Source/Images/hd_nzcom.txt
index 5d0b07a7..ec4cfbf1 100644
--- a/Source/Images/hd_nzcom.txt
+++ b/Source/Images/hd_nzcom.txt
@@ -34,8 +34,8 @@ d_zsdos/u0/*.DAT 15:
 ../../Binary/Apps/bbcbasic.txt 10:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 10:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 10:
@@ -63,7 +63,7 @@ d_zsdos/u0/*.DAT 15:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -79,7 +79,6 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM22/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:
diff --git a/Source/Images/hd_qpm.txt b/Source/Images/hd_qpm.txt
index ab16a818..aa73fc18 100644
--- a/Source/Images/hd_qpm.txt
+++ b/Source/Images/hd_qpm.txt
@@ -44,7 +44,7 @@ d_cpm22/u0/*.* 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/hd_zpm3.txt b/Source/Images/hd_zpm3.txt
index c22ecb9d..fe1e4f2c 100644
--- a/Source/Images/hd_zpm3.txt
+++ b/Source/Images/hd_zpm3.txt
@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_zpm3/ReadMe.txt 0:
+#
 # Add files from ZPM3 build
 #
 ../ZPM3/zpmldr.com 0:
@@ -22,12 +26,12 @@
 #
 #../../Binary/Apps/*.com 15:
 ../../Binary/Apps/assign.com 15:
-../../Binary/Apps/bbcbasic.com 0:
-../../Binary/Apps/bbcbasic.txt 0:
+../../Binary/Apps/bbcbasic.com 15:
+../../Binary/Apps/bbcbasic.txt 15:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 15:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 15:
@@ -55,7 +59,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -67,11 +71,10 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM3/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:
 Common/Z3/u14/*.* 14:
 Common/Z3/u15/*.* 15:
 Common/SIMH/*.* 13:
-Common/UTILS/*.* 0:
+Common/UTILS/*.* 15:
diff --git a/Source/Images/hd_zsdos.txt b/Source/Images/hd_zsdos.txt
index 82440d53..e834d764 100644
--- a/Source/Images/hd_zsdos.txt
+++ b/Source/Images/hd_zsdos.txt
@@ -53,7 +53,7 @@ d_cpm22/u0/XSUB.COM 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -69,7 +69,6 @@ Test/*.* 2:
 #
 Common/All/*.* 0:
 Common/CPM22/*.* 0:
-#Common/Z/u10/*.* 0:
 Common/Z/u14/*.* 0:
 Common/Z/u15/*.* 0:
 Common/SIMH/*.* 13: