diff --git a/.gitignore b/.gitignore
index 00a93664c..fdacfd89a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@ bin64/
 lib/
 lib64/
 pocomsg.h
+**/UpgradeLog*.XML
 
 # Eclipse generated files #
 ###########################
diff --git a/ProGen/progen.bat b/ProGen/progen.bat
new file mode 100644
index 000000000..d3b02c65c
--- /dev/null
+++ b/ProGen/progen.bat
@@ -0,0 +1,45 @@
+ProGen\bin\static_md\progen.exe CppUnit\CppUnit.progen
+ProGen\bin\static_md\progen.exe Foundation\Foundation.progen
+ProGen\bin\static_md\progen.exe Encodings\Encodings.progen
+ProGen\bin\static_md\progen.exe XML\XML.progen
+ProGen\bin\static_md\progen.exe JSON\JSON.progen
+ProGen\bin\static_md\progen.exe Util\Util.progen
+ProGen\bin\static_md\progen.exe Net\Net.progen
+ProGen\bin\static_md\progen.exe Crypto\Crypto.progen
+ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\NetSSL_OpenSSL.progen
+ProGen\bin\static_md\progen.exe NetSSL_Win\NetSSL_Win.progen
+ProGen\bin\static_md\progen.exe Data\Data.progen
+ProGen\bin\static_md\progen.exe Data\SQLite\SQLite.progen
+ProGen\bin\static_md\progen.exe Data\ODBC\ODBC.progen
+ProGen\bin\static_md\progen.exe Data\MySQL\MySQL.progen
+ProGen\bin\static_md\progen.exe Data\PostgreSQL\PostgreSQL.progen
+ProGen\bin\static_md\progen.exe Zip\Zip.progen
+ProGen\bin\static_md\progen.exe PageCompiler\PageCompiler.progen
+ProGen\bin\static_md\progen.exe PageCompiler\File2Page\File2Page.progen
+ProGen\bin\static_md\progen.exe PDF\PDF.progen
+ProGen\bin\static_md\progen.exe CppParser\CppParser.progen
+ProGen\bin\static_md\progen.exe MongoDB\MongoDB.progen
+ProGen\bin\static_md\progen.exe Redis\Redis.progen
+ProGen\bin\static_md\progen.exe ProGen\ProGen.progen
+
+
+ProGen\bin\static_md\progen.exe Foundation\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Encodings\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe XML\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe JSON\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Util\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Net\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Crypto\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe NetSSL_Win\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Data\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Data\SQLite\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Data\ODBC\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Data\MySQL\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Data\PostgreSQL\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Zip\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe PageCompiler\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe PDF\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe CppParser\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe MongoDB\testsuite\TestSuite.progen
+ProGen\bin\static_md\progen.exe Redis\testsuite\TestSuite.progen
diff --git a/ProGen/rebuildall32.bat b/ProGen/rebuildall32.bat
new file mode 100644
index 000000000..e59a4fa02
--- /dev/null
+++ b/ProGen/rebuildall32.bat
@@ -0,0 +1,8 @@
+setlocal EnableDelayedExpansion EnableExtensions        
+rd /q /s ..\lib ..\bin     & call ..\buildwin  90 rebuild all both Win32 samples tests devenv  > log\90.x32.log 2>&1
+rd /q /s ..\lib ..\bin     & call ..\buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1
+rd /q /s ..\lib ..\bin     & call ..\buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1
+rd /q /s ..\lib ..\bin     & call ..\buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1
+rd /q /s ..\lib ..\bin     & call ..\buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1
+rd /q /s ..\lib ..\bin     & call ..\buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1
+endlocal
diff --git a/ProGen/rebuildall64.bat b/ProGen/rebuildall64.bat
new file mode 100644
index 000000000..fe7aa1a83
--- /dev/null
+++ b/ProGen/rebuildall64.bat
@@ -0,0 +1,8 @@
+setlocal EnableExtensions EnableDelayedExpansion
+rd /q /s ..\lib64 ..\bin64 & call buildwin  90 ..\rebuild all bot..\h x64   samples tests devenv  > log\9..\0.x64.log 2>&1
+rd /q /s ..\lib64 ..\bin64 & call buildwin 100 ..\rebuild all bot..\h x64   samples tests msbuild > log\10..\0.x64.log 2>&1
+rd /q /s ..\lib64 ..\bin64 & call buildwin 110 ..\rebuild all bot..\h x64   samples tests msbuild > log\11..\0.x64.log 2>&1
+rd /q /s ..\lib64 ..\bin64 & call buildwin 120 ..\rebuild all bot..\h x64   samples tests msbuild > log\12..\0.x64.log 2>&1
+rd /q /s ..\lib64 ..\bin64 & call buildwin 140 ..\rebuild all bot..\h x64   samples tests msbuild > log\14..\0.x64.log 2>&1
+rd /q /s ..\lib64 ..\bin64 & call buildwin 150 ..\rebuild all bot..\h x64   samples tests msbuild > log\15..\0.x64.log 2>&1
+endlocal
diff --git a/progen.bat b/progen.bat
deleted file mode 100644
index c26f21721..000000000
--- a/progen.bat
+++ /dev/null
@@ -1,39 +0,0 @@
-ProGen\bin\progen.exe CppUnit\CppUnit.progen
-ProGen\bin\progen.exe Foundation\Foundation.progen
-ProGen\bin\progen.exe Encodings\Encodings.progen
-ProGen\bin\progen.exe XML\XML.progen
-ProGen\bin\progen.exe JSON\JSON.progen
-ProGen\bin\progen.exe Util\Util.progen
-ProGen\bin\progen.exe Net\Net.progen
-ProGen\bin\progen.exe NetSSL_OpenSSL\NetSSL_OpenSSL.progen
-ProGen\bin\progen.exe NetSSL_Win\NetSSL_Win.progen
-ProGen\bin\progen.exe Data\Data.progen
-ProGen\bin\progen.exe Data\SQLite\SQLite.progen
-ProGen\bin\progen.exe Data\ODBC\ODBC.progen
-ProGen\bin\progen.exe Data\MySQL\MySQL.progen
-ProGen\bin\progen.exe Data\PostgreSQL\PostgreSQL.progen
-ProGen\bin\progen.exe Zip\Zip.progen
-ProGen\bin\progen.exe PDF\PDF.progen
-ProGen\bin\progen.exe CppParser\CppParser.progen
-ProGen\bin\progen.exe MongoDB\MongoDB.progen
-ProGen\bin\progen.exe Redis\Redis.progen
-
-ProGen\bin\progen.exe CppUnit\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Foundation\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Encodings\testsuite\TestSuite.progen
-ProGen\bin\progen.exe XML\testsuite\TestSuite.progen
-ProGen\bin\progen.exe JSON\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Util\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Net\testsuite\TestSuite.progen
-ProGen\bin\progen.exe NetSSL_OpenSSL\testsuite\TestSuite.progen
-ProGen\bin\progen.exe NetSSL_Win\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Data\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Data\SQLite\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Data\ODBC\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Data\MySQL\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Data\PostgreSQL\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Zip\testsuite\TestSuite.progen
-ProGen\bin\progen.exe PDF\testsuite\TestSuite.progen
-ProGen\bin\progen.exe CppParser\testsuite\TestSuite.progen
-ProGen\bin\progen.exe MongoDB\testsuite\TestSuite.progen
-ProGen\bin\progen.exe Redis\testsuite\TestSuite.progen
diff --git a/rebuildall32.bat b/rebuildall32.bat
deleted file mode 100644
index 6f438b037..000000000
--- a/rebuildall32.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-setlocal EnableDelayedExpansion EnableExtensions        
-rem rd /q /s lib bin     & buildwin  90 rebuild all both Win32 samples tests devenv  > log\90.x32.log 2>&1
-rem rd /q /s lib bin     & buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1
-rd /q /s lib bin     & buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1
-rd /q /s lib bin     & buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1
-rd /q /s lib bin     & buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1
-rd /q /s lib bin     & buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1
-endlocal
diff --git a/rebuildall64.bat b/rebuildall64.bat
deleted file mode 100644
index 9082863ca..000000000
--- a/rebuildall64.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-setlocal EnableExtensions EnableDelayedExpansion
-rem rd /q /s lib64 bin64 & buildwin  90 rebuild all both x64   samples tests devenv  > log\90.x64.log 2>&1
-rd /q /s lib64 bin64 & buildwin 100 rebuild all both x64   samples tests msbuild > log\100.x64.log 2>&1
-rd /q /s lib64 bin64 & buildwin 110 rebuild all both x64   samples tests msbuild > log\110.x64.log 2>&1
-rd /q /s lib64 bin64 & buildwin 120 rebuild all both x64   samples tests msbuild > log\120.x64.log 2>&1
-rd /q /s lib64 bin64 & buildwin 140 rebuild all both x64   samples tests msbuild > log\140.x64.log 2>&1
-rd /q /s lib64 bin64 & buildwin 150 rebuild all both x64   samples tests msbuild > log\150.x64.log 2>&1
-endlocal