diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index e2fda11..69086af 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -143,82 +143,62 @@ function create() {
   # VC 2012
   ###################################################
   
+  mkdir -p $INST_DIR/x86/2012/
+  mkdir -p $INST_DIR/x64/2012/
+  cp $INST_DIR/Temp/x86/2012/vcredist2012_x86.exe $INST_DIR/x86/2012/
+  cp $INST_DIR/Temp/x64/2012/vcredist2012_x64.exe $INST_DIR/x64/2012/
+
   extract_file cab-sfx $INST_DIR/Temp/x86/2012/vcredist2012_x86.exe $INST_DIR/Temp/x86/2012/
   extract_file cab-sfx $INST_DIR/Temp/x64/2012/vcredist2012_x64.exe $INST_DIR/Temp/x64/2012/
   
-  extract_file msi-a $INST_DIR/Temp/x86/2012/packages/vcRuntimeMinimum_x86/vc_runtimeMinimum_x86.msi $INST_DIR/x86/2012
-  extract_file msi-a $INST_DIR/Temp/x86/2012/packages/vcRuntimeAdditional_x86/vc_runtimeAdditional_x86.msi $INST_DIR/x86/2012
-  extract_file msi-a $INST_DIR/Temp/x64/2012/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/x64/2012
-  extract_file msi-a $INST_DIR/Temp/x64/2012/packages/vcRuntimeAdditional_amd64/vc_runtimeAdditional_x64.msi $INST_DIR/x64/2012
+  extract_file msi-a $INST_DIR/Temp/x86/2012/packages/vcRuntimeMinimum_x86/vc_runtimeMinimum_x86.msi $INST_DIR/Temp/x86/2012
+  extract_file msi-a $INST_DIR/Temp/x64/2012/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/Temp/x64/2012
   
-  get_file_ver vc2012ver_atl_x86 $INST_DIR/x86/2012/Win/System/atl110.dll
-  get_file_ver vc2012ver_atl_x64 $INST_DIR/x64/2012/Win/System64/atl110.dll
-  get_file_ver vc2012ver_mfc_x86 $INST_DIR/x86/2012/Win/System/mfc110.dll
-  get_file_ver vc2012ver_mfc_x64 $INST_DIR/x64/2012/Win/System64/mfc110.dll
-  echo "msvc 2012 Minimal x86 $vc2010ver_atl_x86"
-  echo "msvc 2012 Minimal x64 $vc2010ver_atl_x64"
-  echo "msvc 2012 Additional x86 $vc2010ver_mfc_x86"
-  echo "msvc 2012 Additional x64 $vc2010ver_mfc_x64"
+  get_file_ver vc2012ver_atl_x86 $INST_DIR/Temp/x86/2012/Win/System/atl110.dll
+  get_file_ver vc2012ver_atl_x64 $INST_DIR/Temp/x64/2012/Win/System64/atl110.dll
+  echo "msvc 2012 x86 $vc2010ver_atl_x86"
+  echo "msvc 2012 x64 $vc2010ver_atl_x64"
   
-  echo "<cmd name=\"%NAME% 2012 Minimum\" path=\"x86\2012\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2012\" path=\"x86\2012\vcredist2012_x86.exe\" param=\"/q /norestart\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd name=\"%NAME% 2012 Additional\" path=\"x86\2012\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
-  echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
-  echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Minimum x64\" path=\"x64\2012\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 x64\" path=\"x64\2012\vcredist2012_x64.exe\" param=\"/q /norestart\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\atl110.dll\" value=\"$vc2012ver_atl_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2012 Additional x64\" path=\"x64\2012\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
-  echo "<check type=\"os\" condition=\">\" value=\"6.0.6002.0\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc110.dll\" value=\"$vc2012ver_mfc_x64\"/>" >> $INST_DIR/package.old
-  echo "</cmd>" >> $INST_DIR/package.old
   
   
   ###################################################
   # VC 2013
   ###################################################
   
+  mkdir -p $INST_DIR/x86/2013/
+  mkdir -p $INST_DIR/x64/2013/
+  cp $INST_DIR/Temp/x86/2013/vcredist2013_x86.exe $INST_DIR/x86/2013/
+  cp $INST_DIR/Temp/x64/2013/vcredist2013_x64.exe $INST_DIR/x64/2013/
+
   extract_file cab-sfx $INST_DIR/Temp/x86/2013/vcredist2013_x86.exe $INST_DIR/Temp/x86/2013/
   extract_file cab-sfx $INST_DIR/Temp/x64/2013/vcredist2013_x64.exe $INST_DIR/Temp/x64/2013/
   
-  extract_file msi-a $INST_DIR/Temp/x86/2013/packages/vcRuntimeMinimum_x86/vc_runtimeMinimum_x86.msi $INST_DIR/x86/2013
-  extract_file msi-a $INST_DIR/Temp/x86/2013/packages/vcRuntimeAdditional_x86/vc_runtimeAdditional_x86.msi $INST_DIR/x86/2013
-  extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/x64/2013
-  extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeAdditional_amd64/vc_runtimeAdditional_x64.msi $INST_DIR/x64/2013
+  extract_file msi-a $INST_DIR/Temp/x86/2013/packages/vcRuntimeMinimum_x86/vc_runtimeMinimum_x86.msi $INST_DIR/Temp/x86/2013
+  extract_file msi-a $INST_DIR/Temp/x64/2013/packages/vcRuntimeMinimum_amd64/vc_runtimeMinimum_x64.msi $INST_DIR/Temp/x64/2013
   
-  get_file_ver vc2013ver_msvcp_x86 $INST_DIR/x86/2013/System/msvcp120.dll
-  get_file_ver vc2013ver_msvcp_x64 $INST_DIR/x64/2013/System64/msvcp120.dll
-  get_file_ver vc2013ver_mfc_x86 $INST_DIR/x86/2013/System/mfc120.dll
-  get_file_ver vc2013ver_mfc_x64 $INST_DIR/x64/2013/System64/mfc120.dll
-  echo "msvc 2013 Minimal x86 $vc2013ver_msvcp_x86"
-  echo "msvc 2013 Minimal x64 $vc2013ver_msvcp_x64"
-  echo "msvc 2013 Additional x86 $vc2013ver_mfc_x86"
-  echo "msvc 2013 Additional x64 $vc2013ver_mfc_x64"
+  get_file_ver vc2013ver_msvcp_x86 $INST_DIR/Temp/x86/2013/System/msvcp120.dll
+  get_file_ver vc2013ver_msvcp_x64 $INST_DIR/Temp/x64/2013/System64/msvcp120.dll
+  echo "msvc 2013 x86 $vc2013ver_msvcp_x86"
+  echo "msvc 2013 x64 $vc2013ver_msvcp_x64"
   
-  echo "<cmd name=\"%NAME% 2013 Minimum\" path=\"x86\2013\vc_runtimeMinimum_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
+  echo "<cmd name=\"%NAME% 2013\" path=\"x86\2013\vcredist2013_x86.exe\" param=\"/q /norestart\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd name=\"%NAME% 2013 Additional\" path=\"x86\2013\vc_runtimeAdditional_x86.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
-  echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\system32\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x86\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x86\" arch=\"x64\" />" >> $INST_DIR/package.old
-  echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Minimum x64\" path=\"x64\2013\vc_runtimeMinimum_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
+  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 x64\" path=\"x64\2013\vcredist2013_x64.exe\" param=\"/q /norestart\">" >> $INST_DIR/package.old
   echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
   echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\msvcp120.dll\" value=\"$vc2013ver_msvcp_x64\"/>" >> $INST_DIR/package.old
   echo "</cmd>" >> $INST_DIR/package.old
-  echo "<cmd arch=\"x64\" name=\"%NAME% 2013 Additional x64\" path=\"x64\2013\vc_runtimeAdditional_x64.msi\" param=\"/q /norestart MSIFASTINSTALL=7 NOVSUI=1\">" >> $INST_DIR/package.old
-  echo "<check type=\"os\" condition=\">\" value=\"6.1.7600.0\" />" >> $INST_DIR/package.old
-  echo "<check type=\"file\" condition=\"<\" path=\"%windir%\syswow64\mfc120.dll\" value=\"$vc2013ver_mfc_x64\"/>" >> $INST_DIR/package.old
-  echo "</cmd>" >> $INST_DIR/package.old
   
   
   ###################################################