diff --git a/PrepareStick.cmd b/PrepareStick.cmd
index d9dffba..4b73e8e 100644
--- a/PrepareStick.cmd
+++ b/PrepareStick.cmd
@@ -55,7 +55,7 @@ if EXIST tools (
   robocopy tools %USBDRIVE%\tools /COPY:DT /FFT /XO /256 /NJH /NJS /NDL /XF .gitignore
 )
 
-for %%P in (software scripts) do (
+for %%P in (software scripts source optional) do (
   if EXIST %%P (
     echo.
     echo copying folder %%P to drive %USBDRIVE%\tools ...
diff --git a/tools/optional/install-antivir.cmd b/optional/install-antivir.cmd
similarity index 94%
rename from tools/optional/install-antivir.cmd
rename to optional/install-antivir.cmd
index 0092325..37be12c 100644
--- a/tools/optional/install-antivir.cmd
+++ b/optional/install-antivir.cmd
@@ -16,3 +16,4 @@ echo removing F-Secure desktop link ...
 del /F "%PUBLIC%\Desktop\F-Secure Anti-Virus.lnk" 2>nul
 
 echo ####### %0 #######
+
diff --git a/tools/optional/install-spotify.cmd b/optional/install-spotify.cmd
similarity index 77%
rename from tools/optional/install-spotify.cmd
rename to optional/install-spotify.cmd
index c5adf30..d194ee9 100644
--- a/tools/optional/install-spotify.cmd
+++ b/optional/install-spotify.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set EXE=..\..\software\spotify-setup.exe
+set EXE=..\software\spotify-setup.exe
 
 if NOT EXIST %EXE% (
   echo ERROR: %EXE% not found!