diff --git a/st/4TH.PRG b/AtariST/4TH.PRG
similarity index 100%
rename from st/4TH.PRG
rename to AtariST/4TH.PRG
diff --git a/st/4THCORE.PRG b/AtariST/4THCORE.PRG
similarity index 100%
rename from st/4THCORE.PRG
rename to AtariST/4THCORE.PRG
diff --git a/st/ALLOCATE.FB b/AtariST/ALLOCATE.FB
similarity index 100%
rename from st/ALLOCATE.FB
rename to AtariST/ALLOCATE.FB
diff --git a/st/ASSEMBLE.FB b/AtariST/ASSEMBLE.FB
similarity index 100%
rename from st/ASSEMBLE.FB
rename to AtariST/ASSEMBLE.FB
diff --git a/st/C.FB b/AtariST/C.FB
similarity index 100%
rename from st/C.FB
rename to AtariST/C.FB
diff --git a/st/COPY.DEM/COPY.PRG b/AtariST/COPY.DEM/COPY.PRG
similarity index 100%
rename from st/COPY.DEM/COPY.PRG
rename to AtariST/COPY.DEM/COPY.PRG
diff --git a/st/COPY.DEM/COPY.RSC b/AtariST/COPY.DEM/COPY.RSC
similarity index 100%
rename from st/COPY.DEM/COPY.RSC
rename to AtariST/COPY.DEM/COPY.RSC
diff --git a/st/CROSTARG.FB b/AtariST/CROSTARG.FB
similarity index 100%
rename from st/CROSTARG.FB
rename to AtariST/CROSTARG.FB
diff --git a/st/DEMO.FB b/AtariST/DEMO.FB
similarity index 100%
rename from st/DEMO.FB
rename to AtariST/DEMO.FB
diff --git a/st/DISASS.FB b/AtariST/DISASS.FB
similarity index 100%
rename from st/DISASS.FB
rename to AtariST/DISASS.FB
diff --git a/st/DRAGON1.FB b/AtariST/DRAGON1.FB
similarity index 100%
rename from st/DRAGON1.FB
rename to AtariST/DRAGON1.FB
diff --git a/st/EDIICON.FB b/AtariST/EDIICON.FB
similarity index 100%
rename from st/EDIICON.FB
rename to AtariST/EDIICON.FB
diff --git a/st/EDIICON.RSC b/AtariST/EDIICON.RSC
similarity index 100%
rename from st/EDIICON.RSC
rename to AtariST/EDIICON.RSC
diff --git a/st/EDITOR.FB b/AtariST/EDITOR.FB
similarity index 100%
rename from st/EDITOR.FB
rename to AtariST/EDITOR.FB
diff --git a/st/EDWINDOW.FB b/AtariST/EDWINDOW.FB
similarity index 100%
rename from st/EDWINDOW.FB
rename to AtariST/EDWINDOW.FB
diff --git a/st/ERRORBOX.FB b/AtariST/ERRORBOX.FB
similarity index 100%
rename from st/ERRORBOX.FB
rename to AtariST/ERRORBOX.FB
diff --git a/st/FILEINT.FB b/AtariST/FILEINT.FB
similarity index 100%
rename from st/FILEINT.FB
rename to AtariST/FILEINT.FB
diff --git a/st/FORTH83.FB b/AtariST/FORTH83.FB
similarity index 100%
rename from st/FORTH83.FB
rename to AtariST/FORTH83.FB
diff --git a/st/FORTHKER.PRG b/AtariST/FORTHKER.PRG
similarity index 100%
rename from st/FORTHKER.PRG
rename to AtariST/FORTHKER.PRG
diff --git a/st/GEM/AES.FB b/AtariST/GEM/AES.FB
similarity index 100%
rename from st/GEM/AES.FB
rename to AtariST/GEM/AES.FB
diff --git a/st/GEM/BASICS.FB b/AtariST/GEM/BASICS.FB
similarity index 100%
rename from st/GEM/BASICS.FB
rename to AtariST/GEM/BASICS.FB
diff --git a/st/GEM/GEMDEFS.FB b/AtariST/GEM/GEMDEFS.FB
similarity index 100%
rename from st/GEM/GEMDEFS.FB
rename to AtariST/GEM/GEMDEFS.FB
diff --git a/st/GEM/SUPERGEM.FB b/AtariST/GEM/SUPERGEM.FB
similarity index 100%
rename from st/GEM/SUPERGEM.FB
rename to AtariST/GEM/SUPERGEM.FB
diff --git a/st/GEM/VDI.FB b/AtariST/GEM/VDI.FB
similarity index 100%
rename from st/GEM/VDI.FB
rename to AtariST/GEM/VDI.FB
diff --git a/st/INDEX.FB b/AtariST/INDEX.FB
similarity index 100%
rename from st/INDEX.FB
rename to AtariST/INDEX.FB
diff --git a/st/LINE_A.FB b/AtariST/LINE_A.FB
similarity index 100%
rename from st/LINE_A.FB
rename to AtariST/LINE_A.FB
diff --git a/st/MISC.FB b/AtariST/MISC.FB
similarity index 100%
rename from st/MISC.FB
rename to AtariST/MISC.FB
diff --git a/st/PATCH.FB b/AtariST/PATCH.FB
similarity index 100%
rename from st/PATCH.FB
rename to AtariST/PATCH.FB
diff --git a/st/PRINTER.FB b/AtariST/PRINTER.FB
similarity index 100%
rename from st/PRINTER.FB
rename to AtariST/PRINTER.FB
diff --git a/st/RAMDISK.FB b/AtariST/RAMDISK.FB
similarity index 100%
rename from st/RAMDISK.FB
rename to AtariST/RAMDISK.FB
diff --git a/st/RELOCATE.FB b/AtariST/RELOCATE.FB
similarity index 100%
rename from st/RELOCATE.FB
rename to AtariST/RELOCATE.FB
diff --git a/st/RFEDIT.FB b/AtariST/RFEDIT.FB
similarity index 100%
rename from st/RFEDIT.FB
rename to AtariST/RFEDIT.FB
diff --git a/st/STARTUP.FB b/AtariST/STARTUP.FB
similarity index 100%
rename from st/STARTUP.FB
rename to AtariST/STARTUP.FB
diff --git a/st/STRINGS.FB b/AtariST/STRINGS.FB
similarity index 100%
rename from st/STRINGS.FB
rename to AtariST/STRINGS.FB
diff --git a/st/TARGET.FB b/AtariST/TARGET.FB
similarity index 100%
rename from st/TARGET.FB
rename to AtariST/TARGET.FB
diff --git a/st/TASKER.FB b/AtariST/TASKER.FB
similarity index 100%
rename from st/TASKER.FB
rename to AtariST/TASKER.FB
diff --git a/st/TOOLS.FB b/AtariST/TOOLS.FB
similarity index 100%
rename from st/TOOLS.FB
rename to AtariST/TOOLS.FB
diff --git a/st/TUTORIAL.FB b/AtariST/TUTORIAL.FB
similarity index 100%
rename from st/TUTORIAL.FB
rename to AtariST/TUTORIAL.FB
diff --git a/st/UNDO.FB b/AtariST/UNDO.FB
similarity index 100%
rename from st/UNDO.FB
rename to AtariST/UNDO.FB
diff --git a/tools/gensourcefiles.sh b/tools/gensourcefiles.sh
index b0a5ad8..a1fe575 100755
--- a/tools/gensourcefiles.sh
+++ b/tools/gensourcefiles.sh
@@ -4,7 +4,31 @@ mkdir -p $d/../sources/msdos
 for i in $d/../msdos/*.{fb,vid,sys}; do
   b=$(basename $i)
   /bin/echo -n "write $d/../sources/msdos/$b.src ..."
-  $d/dumpblock.sh "$i" > $d/../sources/msdos/$b.src 
+  $d/dumpblock.sh "$i" > $d/../sources/msdos/$b.src
+  echo " Done."
+done
+
+mkdir -p $d/../sources/cpm
+for i in $d/../cpm/*.FB; do
+  b=$(basename $i)
+  /bin/echo -n "write $d/../sources/cpm/$b.src ..."
+  $d/dumpblock.sh "$i" > $d/../sources/cpm/$b.src
+  echo " Done."
+done
+
+mkdir -p $d/../sources/AtariST
+for i in $d/../AtariST/*.FB; do
+  b=$(basename $i)
+  /bin/echo -n "write $d/../sources/AtariST/$b.src ..."
+  $d/dumpblock.sh "$i" > $d/../sources/AtariST/$b.src
+  echo " Done."
+done
+
+mkdir -p $d/../sources/AtariST/GEM
+for i in $d/../AtariST/GEM/*.FB; do
+  b=$(basename $i)
+  /bin/echo -n "write $d/../sources/AtariST/GEM/$b.src ..."
+  $d/dumpblock.sh "$i" > $d/../sources/AtariST/GEM/$b.src
   echo " Done."
 done