diff --git a/iso/extract-iso.cmd b/01_ExtractIso.cmd
similarity index 100%
rename from iso/extract-iso.cmd
rename to 01_ExtractIso.cmd
diff --git a/02_MakeAll.cmd b/02_MakeAll.cmd
new file mode 100644
index 0000000..c03a3c2
--- /dev/null
+++ b/02_MakeAll.cmd
@@ -0,0 +1,49 @@
+@echo off
+
+rem check for wim script directory ...
+if NOT EXIST wim (
+  echo ERROR: script directory [ wim ] NOT FOUND!
+  echo ABORT.
+  exit /b
+) else (
+  cd wim
+)
+
+clear
+echo ===================================
+echo START of image creation process ... 
+echo ===================================
+date /t
+time /t
+echo.
+
+rem start scripts
+for %%S in (
+
+  mount-boot.cmd
+  finish-boot.cmd
+
+  export-image.cmd
+  mount-image.cmd
+  remove-apps.cmd
+  remove-packages.cmd
+  finish-image.cmd
+
+) do (
+
+  echo ########## calling [ %%S ] ##########
+  call %%S
+  echo.
+
+)
+
+rem go back ...
+cd ..
+
+echo.
+date /t
+time /t
+echo =====
+echo END
+echo =====
+
diff --git a/FormatStick.cmd b/03_FormatStick.cmd
similarity index 100%
rename from FormatStick.cmd
rename to 03_FormatStick.cmd
diff --git a/CreateStick.cmd b/04_CreateStick.cmd
similarity index 100%
rename from CreateStick.cmd
rename to 04_CreateStick.cmd
diff --git a/PrepareStick.cmd b/05_PrepareStick.cmd
similarity index 85%
rename from PrepareStick.cmd
rename to 05_PrepareStick.cmd
index ad137db..b9c87ae 100644
--- a/PrepareStick.cmd
+++ b/05_PrepareStick.cmd
@@ -34,12 +34,12 @@ set answer=
   set /p answer="BIOS or UEFI setup (B/U)? "
   if /i "%answer:~,1%" EQU "B" (
     echo selected: BIOS
-    copy /Y autounattend_BIOS.xml %USBDRIVE%\autounattend.xml
+    copy /Y boot\autounattend_BIOS.xml %USBDRIVE%\autounattend.xml
     GOTO CONT
   )
   if /i "%answer:~,1%" EQU "U" (
     echo selected: UEFI
-    copy /Y autounattend_UEFI.xml %USBDRIVE%\autounattend.xml
+    copy /Y boot\autounattend_UEFI.xml %USBDRIVE%\autounattend.xml
     GOTO CONT
   )
   echo Please type B for BIOS or U for UEFI setup.
@@ -49,7 +49,7 @@ set answer=
 if EXIST %SOURCES%\%IMAGE% (
 
   echo.
-  echo copying [ %IMAGE ] to drive %USBDRIVE% ...
+  echo copying [ %IMAGE% ] to drive %USBDRIVE% ...
   robocopy %SOURCES% %USBDRIVE%\sources %IMAGE% /J /NJH
 
   rem move image in place ...
@@ -88,7 +88,7 @@ for %%P in (software scripts source optional personal) do (
 
 echo.
 echo copying custom setup script to %USBDRIVE% ...
-copy /Y CustomSetup.cmd %USBDRIVE%\
+copy /Y boot\CustomSetup.cmd %USBDRIVE%\
 echo READY.
 echo.
 
diff --git a/MakeIso.cmd b/06_MakeIso.cmd
similarity index 100%
rename from MakeIso.cmd
rename to 06_MakeIso.cmd
diff --git a/CustomSetup.cmd b/boot/CustomSetup.cmd
similarity index 100%
rename from CustomSetup.cmd
rename to boot/CustomSetup.cmd
diff --git a/autounattend_BIOS.xml b/boot/autounattend_BIOS.xml
similarity index 100%
rename from autounattend_BIOS.xml
rename to boot/autounattend_BIOS.xml
diff --git a/autounattend_UEFI.xml b/boot/autounattend_UEFI.xml
similarity index 100%
rename from autounattend_UEFI.xml
rename to boot/autounattend_UEFI.xml
diff --git a/iso/PUT_ISO_FILE_HERE.txt b/iso/PUT_ISO_FILES_HERE.txt
similarity index 100%
rename from iso/PUT_ISO_FILE_HERE.txt
rename to iso/PUT_ISO_FILES_HERE.txt
diff --git a/wim/make-all.cmd b/wim/make-all.cmd
deleted file mode 100644
index 76f684b..0000000
--- a/wim/make-all.cmd
+++ /dev/null
@@ -1,36 +0,0 @@
-@echo off
-clear
-
-echo =====
-echo START
-echo =====
-date /t
-time /t
-echo.
-
-for %%S in (
-
-  mount-boot.cmd
-  finish-boot.cmd
-
-  export-image.cmd
-  mount-image.cmd
-  remove-apps.cmd
-  remove-packages.cmd
-  finish-image.cmd
-
-) do (
-
-  echo ########## calling [ %%S ] ##########
-  call %%S
-  echo.
-
-)
-
-echo.
-date /t
-time /t
-echo =====
-echo END
-echo =====
-