Index: scripts/jenkins/prepare-installer-package.bat
===================================================================
diff -u -N -r4ed6512d73cd1b444f83afdefe9a986b6ca9de90 -re3ca590faeb93bd54ca09d12929181c08c2dc180
--- scripts/jenkins/prepare-installer-package.bat	(.../prepare-installer-package.bat)	(revision 4ed6512d73cd1b444f83afdefe9a986b6ca9de90)
+++ scripts/jenkins/prepare-installer-package.bat	(.../prepare-installer-package.bat)	(revision e3ca590faeb93bd54ca09d12929181c08c2dc180)
@@ -1,8 +1,8 @@
 @echo off
 
-SET OutDir=%WORKSPACE%\Output
-mkdir "%OutDir%"
-
 call "%WORKSPACE%\scripts\jenkins\_get-version.bat" || exit /b 1
 
+SET OutDir=%WORKSPACE%\Output\%CHTextVersion%
+mkdir "%OutDir%"
+
 "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" "%WORKSPACE%\scripts\setup.iss" /o"%OutDir%"
Index: scripts/jenkins/prepare-portable-package.bat
===================================================================
diff -u -N -r4ed6512d73cd1b444f83afdefe9a986b6ca9de90 -re3ca590faeb93bd54ca09d12929181c08c2dc180
--- scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision 4ed6512d73cd1b444f83afdefe9a986b6ca9de90)
+++ scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision e3ca590faeb93bd54ca09d12929181c08c2dc180)
@@ -1,17 +1,16 @@
 @echo off
 
 rem Script prepares the portable CH package after build
+call "%WORKSPACE%\scripts\jenkins\_get-version.bat" || exit /b 1
 
 SET TmpDir=%WORKSPACE%\temp\chzip-%BUILD_NUMBER%
-SET OutDir=%WORKSPACE%\Output
+SET OutDir=%WORKSPACE%\Output\%CHTextVersion%
 
 SET VSInstallDirX86=C:\Program Files (x86)\Microsoft Visual Studio 12.0
 
 mkdir "%TmpDir%"
 mkdir "%OutDir%"
 
-call "%WORKSPACE%\scripts\jenkins\_get-version.bat" || exit /b 1
-
 xcopy "%WORKSPACE%\bin\release\ch.exe" "%TmpDir%\32bit\" || exit /B 1
 xcopy "%WORKSPACE%\License.txt" "%TmpDir%\32bit\" || exit /B 1
 xcopy "%WORKSPACE%\bin\release\chext.dll" "%TmpDir%\32bit\" || exit /B 1
Index: scripts/jenkins/prepare-source-package.bat
===================================================================
diff -u -N -r4ed6512d73cd1b444f83afdefe9a986b6ca9de90 -re3ca590faeb93bd54ca09d12929181c08c2dc180
--- scripts/jenkins/prepare-source-package.bat	(.../prepare-source-package.bat)	(revision 4ed6512d73cd1b444f83afdefe9a986b6ca9de90)
+++ scripts/jenkins/prepare-source-package.bat	(.../prepare-source-package.bat)	(revision e3ca590faeb93bd54ca09d12929181c08c2dc180)
@@ -1,8 +1,8 @@
 @echo off
 
-SET OutDir=%WORKSPACE%\Output
-mkdir "%OutDir%"
-
 call "%WORKSPACE%\scripts\jenkins\_get-version.bat" || exit /b 1
 
-"C:\Program Files\7-Zip\7z.exe" a "%WORKSPACE%\Output\chsrc-%CHTextVersion%.zip" -tzip -x!".git" -x!"temp" -x!"Output" "%WORKSPACE%\*"
+SET OutDir=%WORKSPACE%\Output\%CHTextVersion%
+mkdir "%OutDir%"
+
+"C:\Program Files\7-Zip\7z.exe" a "%OutDir%\chsrc-%CHTextVersion%.zip" -tzip -x!".git" -x!"temp" -x!"Output" "%WORKSPACE%\*"
Index: scripts/jenkins/prepare-symbols-package.bat
===================================================================
diff -u -N -r4ed6512d73cd1b444f83afdefe9a986b6ca9de90 -re3ca590faeb93bd54ca09d12929181c08c2dc180
--- scripts/jenkins/prepare-symbols-package.bat	(.../prepare-symbols-package.bat)	(revision 4ed6512d73cd1b444f83afdefe9a986b6ca9de90)
+++ scripts/jenkins/prepare-symbols-package.bat	(.../prepare-symbols-package.bat)	(revision e3ca590faeb93bd54ca09d12929181c08c2dc180)
@@ -1,8 +1,8 @@
 @echo off
 
-SET OutDir=%WORKSPACE%\Output
-mkdir "%OutDir%"
-
 call "%WORKSPACE%\scripts\jenkins\_get-version.bat" || exit /b 1
 
-"C:\Program Files\7-Zip\7z.exe" a "%WORKSPACE%\Output\chsymbols-%CHTextVersion%.zip" -tzip "%WORKSPACE%\bin\release\*.pdb"
+SET OutDir=%WORKSPACE%\Output\%CHTextVersion%
+mkdir "%OutDir%"
+
+"C:\Program Files\7-Zip\7z.exe" a "%OutDir%\chsymbols-%CHTextVersion%.zip" -tzip "%WORKSPACE%\bin\release\*.pdb"