diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 5d83dc1..ac9d4ea 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -63,7 +63,6 @@ tidy_xml() {
   echo ${xml_file}
   mv ${xml_file} ${xml_file}.old
   cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | sed -e 's!&gt;!>!g' -e 's!&lt;!<!g' > ${xml_file}
-  rm ${xml_file}.old
 }
 
 
@@ -153,13 +152,13 @@ function create() {
   # ==========================================================================================================
   
   if [ "$JREUPDATE" = "1" ]; then
-    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe
-    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe
-    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JREUVERSION}"
-    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='BUILD']/@value" "${JREVERSION}"
+    rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/*/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x86/jre.exe
+    mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/x64/jre.exe
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JREUVERSION}"
+    patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml "/package/variable[@name='BUILD']/@value" "${JREVERSION}"
   fi
-  sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+  sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
   
   # ==========================================================================================================
   # Update Flash
@@ -331,17 +330,17 @@ function create() {
   # Disable Java Update check
   # ==========================================================================================================
   
-  echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
-  echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
-  echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
+  echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
+  echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
+  echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
   
-  echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
-  echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
-  echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
+  echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
+  echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
+  echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
   
-  echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
-  sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
-  tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
+  echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat
+  sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
+  tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml
   
   # ==========================================================================================================
   # Disable Flash Update Check