diff --git a/Source/Apps/Build.cmd b/Source/Apps/Build.cmd
index 4a754e6b..92bcb2a1 100644
--- a/Source/Apps/Build.cmd
+++ b/Source/Apps/Build.cmd
@@ -2,50 +2,37 @@
 setlocal
 
 set TOOLS=..\..\Tools
-set APPBIN=..\..\Binary\Apps
 set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 set CPMDIR80=%TOOLS%/cpm/
 
-call :asm syscopy || exit /b
-call :asm assign || exit /b
-call :asm format || exit /b
-call :asm talk || exit /b
-call :asm mode || exit /b
-call :asm rtc || exit /b
-call :asm timer || exit /b
-call :asm rtchb || exit /b
+call :build syscopy || exit /b
+call :build assign || exit /b
+call :build format || exit /b
+call :build talk || exit /b
+call :build mode || exit /b
+call :build rtc || exit /b
+call :build timer || exit /b
+call :build sysgen || exit /b
+call :build XM || exit /b
+call :build FDU || exit /b
+call :build Tune || exit /b
+call :build FAT || exit /b
+call :build Test || exit /b
+call :build ZMP || exit /b
+call :build ZMD || exit /b
+call :build Dev || exit /b
+call :build VGM || exit /b
+call :build cpuspd || exit /b
+call :build reboot || exit /b
+call :build Survey || exit /b
+call :build HTalk || exit /b
+call :build BBCBASIC || exit /b
+call :build copysl || exit /b
 
-zxcc Z80ASM -SYSGEN/F || exit /b
-
-pushd XM && call Build || exit /b & popd
-pushd FDU && call Build || exit /b & popd
-pushd Tune && call Build || exit /b & popd
-pushd FAT && call Build || exit /b & popd
-pushd Test && call Build || exit /b & popd
-pushd ZMP && call Build || exit /b & popd
-pushd ZMD && call Build || exit /b & popd
-pushd Dev && call Build || exit /b & popd
-pushd VGM && call Build || exit /b & popd
-pushd cpuspd && call Build || exit /b & popd
-pushd reboot && call Build || exit /b & popd
-pushd Survey && call Build || exit /b & popd
-pushd HTalk && call Build || exit /b & popd
-pushd BBCBASIC && call Build || exit /b & popd
-pushd copysl && call Build || exit /b & popd
-
-copy *.com %APPBIN%\ || exit /b
-
-goto :eof
-
-:asm
-echo.
-echo Building %1...
-tasm -t80 -g3 -fFF %1.asm %1.com %1.lst || exit /b
 goto :eof
 
-:asm180
-echo.
-echo Building %1...
-tasm -t180 -g3 -fFF %1.asm %1.com %1.lst || exit /b
+:build
+echo Building %1
+pushd %1 && call Build || exit /b & popd
 goto :eof
diff --git a/Source/Apps/Clean.cmd b/Source/Apps/Clean.cmd
index af7592b0..aee7b56c 100644
--- a/Source/Apps/Clean.cmd
+++ b/Source/Apps/Clean.cmd
@@ -1,24 +1,32 @@
 @echo off
 setlocal
 
-if exist *.bin del *.bin
-if exist *.com del *.com
-if exist *.lst del *.lst
-if exist *.hex del *.hex
-if exist *.prn del *.prn
+call :clean syscopy || exit /b
+call :clean assign || exit /b
+call :clean format || exit /b
+call :clean talk || exit /b
+call :clean mode || exit /b
+call :clean rtc || exit /b
+call :clean timer || exit /b
+call :clean sysgen || exit /b
+call :clean XM || exit /b
+call :clean FDU || exit /b
+call :clean Tune || exit /b
+call :clean FAT || exit /b
+call :clean Test || exit /b
+call :clean ZMP || exit /b
+call :clean ZMD || exit /b
+call :clean Dev || exit /b
+call :clean VGM || exit /b
+call :clean cpuspd || exit /b
+call :clean reboot || exit /b
+call :clean Survey || exit /b
+call :clean HTalk || exit /b
+call :clean BBCBASIC || exit /b
+call :clean copysl || exit /b
 
-pushd XM && call Clean || exit /b 1 & popd
-pushd FDU && call Clean || exit /b 1 & popd
-pushd Tune && call Clean || exit /b 1 & popd
-pushd FAT && call Clean || exit /b 1 & popd
-pushd Test && call Clean || exit /b 1 & popd
-pushd ZMP && call Clean || exit /b 1 & popd
-pushd ZMD && call Clean || exit /b 1 & popd
-pushd Dev && call Clean || exit /b 1 & popd
-pushd VGM && call Clean || exit /b 1 & popd
-pushd cpuspd && call Clean || exit /b 1 & popd
-pushd reboot && call Clean || exit /b 1 & popd
-pushd Survey && call Clean || exit /b 1 & popd
-pushd HTalk && call Clean || exit /b 1 & popd
-pushd BBCBASIC && call Clean || exit /b 1 & popd
-pushd copysl && call Clean || exit /b 1 & popd
+goto :eof
+
+:clean
+pushd %1 && call Clean || exit /b & popd
+goto :eof
diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile
index ebc293f6..f6abf7b2 100644
--- a/Source/Apps/Makefile
+++ b/Source/Apps/Makefile
@@ -1,9 +1,5 @@
-OBJECTS = sysgen.com syscopy.com assign.com format.com talk.com \
-	mode.com rtc.com timer.com rtchb.com
-SUBDIRS = HTalk XM FDU FAT Tune Test ZMP ZMD Dev VGM cpuspd reboot Survey BBCBASIC copysl
-DEST = ../../Binary/Apps
+SUBDIRS = HTalk XM FDU FAT Tune Test ZMP ZMD Dev VGM cpuspd reboot Survey BBCBASIC copysl \
+	sysgen syscopy assign format talk mode rtc timer
 TOOLS =../../Tools
 
 include $(TOOLS)/Makefile.inc
-
-USETASM = 1
diff --git a/Source/Apps/Test/2piotst/Build.cmd b/Source/Apps/Test/2piotst/Build.cmd
index 8d719eab..004b4bc9 100644
--- a/Source/Apps/Test/2piotst/Build.cmd
+++ b/Source/Apps/Test/2piotst/Build.cmd
@@ -1,10 +1,8 @@
 @echo off
 setlocal
 
-set TOOLS=..\..\..\..\Tools
-
+set TOOLS=../../../../Tools
 set PATH=%TOOLS%\zxcc;%PATH%
-
 set CPMDIR80=%TOOLS%/cpm/
 
 zxcc M80 -=2piotst/l || exit /b
diff --git a/Source/Apps/Test/Build.cmd b/Source/Apps/Test/Build.cmd
index def4c1fc..55688dfa 100644
--- a/Source/Apps/Test/Build.cmd
+++ b/Source/Apps/Test/Build.cmd
@@ -1,42 +1,31 @@
 @echo off
 setlocal
 
-set TOOLS=../../../Tools
-set APPBIN=..\..\Binary\Apps
-
+set TOOLS=..\..\..\Tools
 set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
-
 set TASMTABS=%TOOLS%\tasm32
-
 set CPMDIR80=%TOOLS%/cpm/
 
-pushd DMAmon && call Build || exit /b & popd
-pushd tstdskng && call Build || exit /b & popd
-pushd inttest && call Build || exit /b & popd
-pushd ppidetst && call Build || exit /b & popd
-pushd ramtest && call Build || exit /b & popd
-pushd I2C && call Build || exit /b & popd
-pushd rzsz && call Build || exit /b & popd
-pushd vdctest && call Build || exit /b & popd
-pushd kbdtest && call Build || exit /b & popd
-pushd ps2info && call Build || exit /b & popd
-pushd 2piotst && call Build || exit /b & popd
-pushd piomon && call Build || exit /b & popd
-pushd banktest && call Build || exit /b & popd
-pushd portscan && call Build || exit /b & popd
-pushd sound && call Build || exit /b & popd
-pushd testh8p && call Build || exit /b & popd
-
-goto :eof
+call :build DMAmon || exit /b
+call :build tstdskng || exit /b
+call :build inttest || exit /b
+call :build ppidetst || exit /b
+call :build ramtest || exit /b
+call :build I2C || exit /b
+call :build rzsz || exit /b
+call :build vdctest || exit /b
+call :build kbdtest || exit /b
+call :build ps2info || exit /b
+call :build 2piotst || exit /b
+call :build piomon || exit /b
+call :build banktest || exit /b
+call :build portscan || exit /b
+call :build sound || exit /b
+call :build testh8p || exit /b
 
-:asm
-echo.
-echo Building %1...
-tasm -t80 -g3 -fFF %1.asm %1.com %1.lst || exit /b
 goto :eof
 
-:asm180
-echo.
-echo Building %1...
-tasm -t180 -g3 -fFF %1.asm %1.com %1.lst || exit /b
+:build
+echo Building %1
+pushd %1 && call Build || exit /b & popd
 goto :eof
diff --git a/Source/Apps/Test/I2C/Build.cmd b/Source/Apps/Test/I2C/Build.cmd
index 6821c4e3..1c6ad0e5 100644
--- a/Source/Apps/Test/I2C/Build.cmd
+++ b/Source/Apps/Test/I2C/Build.cmd
@@ -5,9 +5,9 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
-tasm -t180 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
-tasm -t180 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
+tasm -t80 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
+tasm -t80 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
+tasm -t80 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
 tasm -t80 -g3 -ff srom.asm srom.com srom.lst || exit /b
 
 copy /Y i2c*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/Test/Makefile b/Source/Apps/Test/Makefile
index 2eb38d98..8697fdcf 100644
--- a/Source/Apps/Test/Makefile
+++ b/Source/Apps/Test/Makefile
@@ -1,6 +1,6 @@
-OBJECTS =
+# OBJECTS =
 SUBDIRS = DMAmon I2C inttest ppidetst ramtest tstdskng rzsz vdctest kbdtest ps2info 2piotst piomon banktest portscan sound testh8p
-DEST = ../../../Binary/Apps/Test
+# DEST = ../../../Binary/Apps/Test
 TOOLS =../../../Tools
 
 include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/Test/inttest/Build.cmd b/Source/Apps/Test/inttest/Build.cmd
index 0d05f824..e0a3ff6d 100644
--- a/Source/Apps/Test/inttest/Build.cmd
+++ b/Source/Apps/Test/inttest/Build.cmd
@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
+tasm -t80 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
 
 copy /Y inttest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 copy /Y inttest.doc ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/Test/kbdtest/Build.cmd b/Source/Apps/Test/kbdtest/Build.cmd
index 5ae6b746..283ad2fa 100644
--- a/Source/Apps/Test/kbdtest/Build.cmd
+++ b/Source/Apps/Test/kbdtest/Build.cmd
@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF kbdtest.asm kbdtest.com kbdtest.lst || exit /b
+tasm -t80 -g3 -fFF kbdtest.asm kbdtest.com kbdtest.lst || exit /b
 
 copy /Y kbdtest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/Test/piomon/Build.cmd b/Source/Apps/Test/piomon/Build.cmd
index f0e405e1..a648d875 100644
--- a/Source/Apps/Test/piomon/Build.cmd
+++ b/Source/Apps/Test/piomon/Build.cmd
@@ -5,6 +5,6 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF piomon.asm piomon.com piomon.lst || exit /b
+tasm -t80 -g3 -fFF piomon.asm piomon.com piomon.lst || exit /b
 
 copy /Y piomon.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/Test/ppidetst/Build.cmd b/Source/Apps/Test/ppidetst/Build.cmd
index 5b7becb0..3367763e 100644
--- a/Source/Apps/Test/ppidetst/Build.cmd
+++ b/Source/Apps/Test/ppidetst/Build.cmd
@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
+tasm -t80 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
 
 copy /Y ppidetst.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/Test/ps2info/Build.cmd b/Source/Apps/Test/ps2info/Build.cmd
index 965883ce..9753c099 100644
--- a/Source/Apps/Test/ps2info/Build.cmd
+++ b/Source/Apps/Test/ps2info/Build.cmd
@@ -5,6 +5,6 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF ps2info.asm ps2info.com ps2info.lst || exit /b
+tasm -t80 -g3 -fFF ps2info.asm ps2info.com ps2info.lst || exit /b
 
 copy /Y ps2info.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/Test/ramtest/Makefile b/Source/Apps/Test/ramtest/Makefile
index 3c5e6515..311b3bdc 100644
--- a/Source/Apps/Test/ramtest/Makefile
+++ b/Source/Apps/Test/ramtest/Makefile
@@ -2,7 +2,7 @@ OBJECTS = ramtest.com
 DEST = ../../../../Binary/Apps/Test
 DOCDEST = ../../../../Doc
 TOOLS = ../../../../Tools
-OTHERS = loader.bin dbgmon.bin
+OTHERS = *.bin
 include $(TOOLS)/Makefile.inc
 
 ramtest.com: loader.bin dbgmon.bin
diff --git a/Source/Apps/Test/tstdskng/Build.cmd b/Source/Apps/Test/tstdskng/Build.cmd
index a56e8dbc..313a450d 100644
--- a/Source/Apps/Test/tstdskng/Build.cmd
+++ b/Source/Apps/Test/tstdskng/Build.cmd
@@ -5,7 +5,7 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
+tasm -t80 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
 
 copy /Y tstdskng.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/Test/vdctest/Build.cmd b/Source/Apps/Test/vdctest/Build.cmd
index 814cb585..c8c336dc 100644
--- a/Source/Apps/Test/vdctest/Build.cmd
+++ b/Source/Apps/Test/vdctest/Build.cmd
@@ -5,8 +5,8 @@ set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF vdctest.asm vdctest.com vdctest.lst || exit /b
-tasm -t180 -g3 -fFF vdconly.asm vdconly.com vdconly.lst || exit /b
+tasm -t80 -g3 -fFF vdctest.asm vdctest.com vdctest.lst || exit /b
+tasm -t80 -g3 -fFF vdconly.asm vdconly.com vdconly.lst || exit /b
 
 copy /Y vdctest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 copy /Y vdconly.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/Tune/Build.cmd b/Source/Apps/Tune/Build.cmd
index 6c601548..eb16f4c7 100644
--- a/Source/Apps/Tune/Build.cmd
+++ b/Source/Apps/Tune/Build.cmd
@@ -5,9 +5,9 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF -dWBW tune.asm tune.com tune.lst || exit /b
-tasm -t180 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst || exit /b
-tasm -t180 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW tune.asm tune.com tune.lst || exit /b
+tasm -t80 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst || exit /b
+tasm -t80 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst || exit /b
 
 copy /Y tune*.com ..\..\..\Binary\Apps\ || exit /b
 copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ || exit /b
\ No newline at end of file
diff --git a/Source/Apps/VGM/Build.cmd b/Source/Apps/VGM/Build.cmd
index 08e013f5..0a032701 100644
--- a/Source/Apps/VGM/Build.cmd
+++ b/Source/Apps/VGM/Build.cmd
@@ -5,8 +5,8 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF -dWBW vgmplay.asm vgmplay.com vgmplay.lst || exit /b
-tasm -t180 -g3 -fFF -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW vgmplay.asm vgmplay.com vgmplay.lst || exit /b
+tasm -t80 -g3 -fFF -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst || exit /b
 
 copy /Y vgmplay.com ..\..\..\Binary\Apps\ || exit /b
 copy /Y Tunes\*.vgm ..\..\..\Binary\Apps\Tunes\ || exit /b
diff --git a/Source/Apps/assign/Build.cmd b/Source/Apps/assign/Build.cmd
new file mode 100644
index 00000000..25dd7385
--- /dev/null
+++ b/Source/Apps/assign/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF assign.asm assign.com assign.lst || exit /b
+
+copy /Y assign.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/assign/Clean.cmd b/Source/Apps/assign/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/assign/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/assign/Makefile b/Source/Apps/assign/Makefile
new file mode 100644
index 00000000..597d0cee
--- /dev/null
+++ b/Source/Apps/assign/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = assign.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/assign.asm b/Source/Apps/assign/assign.asm
similarity index 96%
rename from Source/Apps/assign.asm
rename to Source/Apps/assign/assign.asm
index 7bc6d154..8ba6f9f5 100644
--- a/Source/Apps/assign.asm
+++ b/Source/Apps/assign/assign.asm
@@ -51,7 +51,7 @@ bnksel	.equ	$FFF3		; HBIOS bank select vector
 ;
 stamp	.equ	$40		; loc of RomWBW CBIOS zero page stamp
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
 ;
 ;===============================================================================
 ; Code Section
diff --git a/Source/Apps/cpuspd/Build.cmd b/Source/Apps/cpuspd/Build.cmd
index 1e3fe0a5..cf0a2a5b 100644
--- a/Source/Apps/cpuspd/Build.cmd
+++ b/Source/Apps/cpuspd/Build.cmd
@@ -5,6 +5,6 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF cpuspd.asm cpuspd.com cpuspd.lst || exit /b
+tasm -t80 -g3 -fFF cpuspd.asm cpuspd.com cpuspd.lst || exit /b
 
 copy /Y cpuspd.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/format/Build.cmd b/Source/Apps/format/Build.cmd
new file mode 100644
index 00000000..29301f5a
--- /dev/null
+++ b/Source/Apps/format/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF format.asm format.com format.lst || exit /b
+
+copy /Y format.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/format/Clean.cmd b/Source/Apps/format/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/format/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/format/Makefile b/Source/Apps/format/Makefile
new file mode 100644
index 00000000..fd1dea62
--- /dev/null
+++ b/Source/Apps/format/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = format.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/format.asm b/Source/Apps/format/format.asm
similarity index 95%
rename from Source/Apps/format.asm
rename to Source/Apps/format/format.asm
index 3021b958..150cfd10 100644
--- a/Source/Apps/format.asm
+++ b/Source/Apps/format/format.asm
@@ -19,7 +19,7 @@
 ;  1) Actually implement this
 ;_______________________________________________________________________________
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
 ;
 ;===============================================================================
 ; Definitions
diff --git a/Source/Apps/mode/Build.cmd b/Source/Apps/mode/Build.cmd
new file mode 100644
index 00000000..2829ee8c
--- /dev/null
+++ b/Source/Apps/mode/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF mode.asm mode.com mode.lst || exit /b
+
+copy /Y mode.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/mode/Clean.cmd b/Source/Apps/mode/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/mode/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/mode/Makefile b/Source/Apps/mode/Makefile
new file mode 100644
index 00000000..ba868101
--- /dev/null
+++ b/Source/Apps/mode/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = mode.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/bcd.asm b/Source/Apps/mode/bcd.asm
similarity index 100%
rename from Source/Apps/bcd.asm
rename to Source/Apps/mode/bcd.asm
diff --git a/Source/Apps/decode.asm b/Source/Apps/mode/decode.asm
similarity index 100%
rename from Source/Apps/decode.asm
rename to Source/Apps/mode/decode.asm
diff --git a/Source/Apps/encode.asm b/Source/Apps/mode/encode.asm
similarity index 100%
rename from Source/Apps/encode.asm
rename to Source/Apps/mode/encode.asm
diff --git a/Source/Apps/mode.asm b/Source/Apps/mode/mode.asm
similarity index 95%
rename from Source/Apps/mode.asm
rename to Source/Apps/mode/mode.asm
index 0a52ee69..45f3a91f 100644
--- a/Source/Apps/mode.asm
+++ b/Source/Apps/mode/mode.asm
@@ -37,7 +37,7 @@
 ;  1) Implement flow control settings
 ;_______________________________________________________________________________
 ;
-#include "../ver.inc"
+#include "../../ver.inc"
 ;
 ;===============================================================================
 ; Definitions
diff --git a/Source/Apps/reboot/Build.cmd b/Source/Apps/reboot/Build.cmd
index cb64d1fe..ec727ea5 100644
--- a/Source/Apps/reboot/Build.cmd
+++ b/Source/Apps/reboot/Build.cmd
@@ -5,6 +5,6 @@ set TOOLS=../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
-tasm -t180 -g3 -fFF reboot.asm reboot.com reboot.lst || exit /b
+tasm -t80 -g3 -fFF reboot.asm reboot.com reboot.lst || exit /b
 
 copy /Y reboot.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/rtc/Build.cmd b/Source/Apps/rtc/Build.cmd
new file mode 100644
index 00000000..02c4f50a
--- /dev/null
+++ b/Source/Apps/rtc/Build.cmd
@@ -0,0 +1,12 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF rtc.asm rtc.com rtc.lst || exit /b
+tasm -t80 -g3 -fFF rtchb.asm rtchb.com rtchb.lst || exit /b
+
+copy /Y rtc.com ..\..\..\Binary\Apps\ || exit /b
+copy /Y rtchb.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/rtc/Clean.cmd b/Source/Apps/rtc/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/rtc/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/rtc/Makefile b/Source/Apps/rtc/Makefile
new file mode 100644
index 00000000..5a0e4f0c
--- /dev/null
+++ b/Source/Apps/rtc/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = rtc.com rtchb.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/rtc.asm b/Source/Apps/rtc/rtc.asm
similarity index 100%
rename from Source/Apps/rtc.asm
rename to Source/Apps/rtc/rtc.asm
diff --git a/Source/Apps/rtchb.asm b/Source/Apps/rtc/rtchb.asm
similarity index 100%
rename from Source/Apps/rtchb.asm
rename to Source/Apps/rtc/rtchb.asm
diff --git a/Source/Apps/startup.asm b/Source/Apps/startup/startup.asm
similarity index 100%
rename from Source/Apps/startup.asm
rename to Source/Apps/startup/startup.asm
diff --git a/Source/Apps/syscopy/Build.cmd b/Source/Apps/syscopy/Build.cmd
new file mode 100644
index 00000000..ccf37eb9
--- /dev/null
+++ b/Source/Apps/syscopy/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF syscopy.asm syscopy.com syscopy.lst || exit /b
+
+copy /Y syscopy.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/syscopy/Clean.cmd b/Source/Apps/syscopy/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/syscopy/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/syscopy/Makefile b/Source/Apps/syscopy/Makefile
new file mode 100644
index 00000000..c8e41bdb
--- /dev/null
+++ b/Source/Apps/syscopy/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = syscopy.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/syscopy.asm b/Source/Apps/syscopy/syscopy.asm
similarity index 100%
rename from Source/Apps/syscopy.asm
rename to Source/Apps/syscopy/syscopy.asm
diff --git a/Source/Apps/sysgen/Build.cmd b/Source/Apps/sysgen/Build.cmd
new file mode 100644
index 00000000..9155303b
--- /dev/null
+++ b/Source/Apps/sysgen/Build.cmd
@@ -0,0 +1,13 @@
+@echo off
+setlocal
+
+set TOOLS=..\..\..\Tools
+set PATH=%TOOLS%\tasm32;%TOOLS%\zxcc;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+set CPMDIR80=%TOOLS%/cpm/
+
+:: tasm -t80 -g3 -fFF sysgen.asm sysgen.com sysgen.lst || exit /b
+
+zxcc Z80ASM -SYSGEN/F || exit /b
+
+copy /Y sysgen.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/sysgen/Clean.cmd b/Source/Apps/sysgen/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/sysgen/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/sysgen/Makefile b/Source/Apps/sysgen/Makefile
new file mode 100644
index 00000000..01e3f2d9
--- /dev/null
+++ b/Source/Apps/sysgen/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = sysgen.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/sysgen.z80 b/Source/Apps/sysgen/sysgen.z80
similarity index 100%
rename from Source/Apps/sysgen.z80
rename to Source/Apps/sysgen/sysgen.z80
diff --git a/Source/Apps/talk/Build.cmd b/Source/Apps/talk/Build.cmd
new file mode 100644
index 00000000..ac9c6e90
--- /dev/null
+++ b/Source/Apps/talk/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF talk.asm talk.com talk.lst || exit /b
+
+copy /Y talk.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/talk/Clean.cmd b/Source/Apps/talk/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/talk/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/talk/Makefile b/Source/Apps/talk/Makefile
new file mode 100644
index 00000000..67a1d261
--- /dev/null
+++ b/Source/Apps/talk/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = talk.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/talk.asm b/Source/Apps/talk/talk.asm
similarity index 100%
rename from Source/Apps/talk.asm
rename to Source/Apps/talk/talk.asm
diff --git a/Source/Apps/timer/Build.cmd b/Source/Apps/timer/Build.cmd
new file mode 100644
index 00000000..76fc1789
--- /dev/null
+++ b/Source/Apps/timer/Build.cmd
@@ -0,0 +1,10 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+set PATH=%TOOLS%\tasm32;%PATH%
+set TASMTABS=%TOOLS%\tasm32
+
+tasm -t80 -g3 -fFF timer.asm timer.com timer.lst || exit /b
+
+copy /Y timer.com ..\..\..\Binary\Apps\ || exit /b
diff --git a/Source/Apps/timer/Clean.cmd b/Source/Apps/timer/Clean.cmd
new file mode 100644
index 00000000..9ecb428f
--- /dev/null
+++ b/Source/Apps/timer/Clean.cmd
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
+if exist *.lst del *.lst
+if exist *.bin del *.bin
diff --git a/Source/Apps/timer/Makefile b/Source/Apps/timer/Makefile
new file mode 100644
index 00000000..055fa6be
--- /dev/null
+++ b/Source/Apps/timer/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = timer.com
+DEST = ../../../Binary/Apps
+TOOLS =../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/timer.asm b/Source/Apps/timer/timer.asm
similarity index 96%
rename from Source/Apps/timer.asm
rename to Source/Apps/timer/timer.asm
index d9c2f895..ae5d67f8 100644
--- a/Source/Apps/timer.asm
+++ b/Source/Apps/timer/timer.asm
@@ -40,7 +40,7 @@
 ; Includes division subroutines from: https://wikiti.brandonw.net/
 ;;_______________________________________________________________________________
 ;
-#include "../ver.inc"			; Used for building RomWBW
+#include "../../ver.inc"		; Used for building RomWBW
 ;#include "ver.inc"			; Used for testing purposes during code development
 ;
 ;===============================================================================
diff --git a/Source/Images/d_zpm3/u0/HELP.HLP b/Source/Images/d_zpm3/u0/HELP.HLP
deleted file mode 100644
index 428c767a..00000000
Binary files a/Source/Images/d_zpm3/u0/HELP.HLP and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/date.com b/Source/Images/d_zpm3/u15/date.com
deleted file mode 100644
index 67a84b2d..00000000
Binary files a/Source/Images/d_zpm3/u15/date.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/device.com b/Source/Images/d_zpm3/u15/device.com
deleted file mode 100644
index 78075a3f..00000000
Binary files a/Source/Images/d_zpm3/u15/device.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/dir.com b/Source/Images/d_zpm3/u15/dir.com
deleted file mode 100644
index 16ead13b..00000000
Binary files a/Source/Images/d_zpm3/u15/dir.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/dump.com b/Source/Images/d_zpm3/u15/dump.com
deleted file mode 100644
index 97c10c03..00000000
Binary files a/Source/Images/d_zpm3/u15/dump.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/ed.com b/Source/Images/d_zpm3/u15/ed.com
deleted file mode 100644
index 203eafd7..00000000
Binary files a/Source/Images/d_zpm3/u15/ed.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/erase.com b/Source/Images/d_zpm3/u15/erase.com
deleted file mode 100644
index cdc3ea60..00000000
Binary files a/Source/Images/d_zpm3/u15/erase.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/gencom.com b/Source/Images/d_zpm3/u15/gencom.com
deleted file mode 100644
index d0816425..00000000
Binary files a/Source/Images/d_zpm3/u15/gencom.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/get.com b/Source/Images/d_zpm3/u15/get.com
deleted file mode 100644
index 7f12456e..00000000
Binary files a/Source/Images/d_zpm3/u15/get.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/help.com b/Source/Images/d_zpm3/u15/help.com
deleted file mode 100644
index 3a4d4394..00000000
Binary files a/Source/Images/d_zpm3/u15/help.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/hexcom.com b/Source/Images/d_zpm3/u15/hexcom.com
deleted file mode 100644
index e8eb54b4..00000000
Binary files a/Source/Images/d_zpm3/u15/hexcom.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/initdir.com b/Source/Images/d_zpm3/u15/initdir.com
deleted file mode 100644
index 03cce335..00000000
Binary files a/Source/Images/d_zpm3/u15/initdir.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/patch.com b/Source/Images/d_zpm3/u15/patch.com
deleted file mode 100644
index 548b266e..00000000
Binary files a/Source/Images/d_zpm3/u15/patch.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/pip.com b/Source/Images/d_zpm3/u15/pip.com
deleted file mode 100644
index e1321a2a..00000000
Binary files a/Source/Images/d_zpm3/u15/pip.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/put.com b/Source/Images/d_zpm3/u15/put.com
deleted file mode 100644
index c9d35243..00000000
Binary files a/Source/Images/d_zpm3/u15/put.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/rename.com b/Source/Images/d_zpm3/u15/rename.com
deleted file mode 100644
index 8582175f..00000000
Binary files a/Source/Images/d_zpm3/u15/rename.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/save.com b/Source/Images/d_zpm3/u15/save.com
deleted file mode 100644
index 03ceb989..00000000
Binary files a/Source/Images/d_zpm3/u15/save.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/set.com b/Source/Images/d_zpm3/u15/set.com
deleted file mode 100644
index e4c374dc..00000000
Binary files a/Source/Images/d_zpm3/u15/set.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/setdef.com b/Source/Images/d_zpm3/u15/setdef.com
deleted file mode 100644
index 005ac7ad..00000000
Binary files a/Source/Images/d_zpm3/u15/setdef.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/show.com b/Source/Images/d_zpm3/u15/show.com
deleted file mode 100644
index 5f2458ec..00000000
Binary files a/Source/Images/d_zpm3/u15/show.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/submit.com b/Source/Images/d_zpm3/u15/submit.com
deleted file mode 100644
index e0473c7c..00000000
Binary files a/Source/Images/d_zpm3/u15/submit.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/type.com b/Source/Images/d_zpm3/u15/type.com
deleted file mode 100644
index 17e695f2..00000000
Binary files a/Source/Images/d_zpm3/u15/type.com and /dev/null differ
diff --git a/Source/Images/d_zpm3/u15/zsid.com b/Source/Images/d_zpm3/u15/zsid.com
deleted file mode 100644
index 686b3775..00000000
Binary files a/Source/Images/d_zpm3/u15/zsid.com and /dev/null differ
diff --git a/Source/Images/fd_zpm3.txt b/Source/Images/fd_zpm3.txt
index 9e8ddf5e..ef93df79 100644
--- a/Source/Images/fd_zpm3.txt
+++ b/Source/Images/fd_zpm3.txt
@@ -23,6 +23,11 @@ d_zpm3/ReadMe.txt 0:
 ../ZPM3/bnkbdos3.spr 0:
 ../ZPM3/resbdos3.spr 0:
 #
+# Include CP/M 3 files
+#
+d_cpm3/u0/*.COM 15:
+d_cpm3/u0/HELP.HLP 0:
+#
 # Add RomWBW utilities
 #
 #../../Binary/Apps/*.com 15:
@@ -48,7 +53,6 @@ d_zpm3/ReadMe.txt 0:
 #
 Common/All/*.* 15:
 Common/CPM3/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:
diff --git a/Source/Images/hd_zpm3.txt b/Source/Images/hd_zpm3.txt
index 975f6b01..c00131dc 100644
--- a/Source/Images/hd_zpm3.txt
+++ b/Source/Images/hd_zpm3.txt
@@ -23,6 +23,11 @@ d_zpm3/ReadMe.txt 0:
 ../ZPM3/bnkbdos3.spr 0:
 ../ZPM3/resbdos3.spr 0:
 #
+# Include CP/M 3 files
+#
+d_cpm3/u0/*.COM 15:
+d_cpm3/u0/HELP.HLP 0:
+#
 # Add RomWBW utilities
 #
 #../../Binary/Apps/*.com 15: