diff --git a/builder-product.cfg b/builder-product.cfg
index 482888f..10f978c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -14,91 +14,38 @@ ADVICE=""
 # Valid value: restrict | public
 TYPE="public"
 
-# EXTRACTWITH - defines the used programm for decompression
-# Valid values: 7zip | unzip
-# Default value: 7zip
-# This Value is only usefull in combinnation with Variable INSTALL[INDEX]
-EXTRACTWITH="7zip"
-
-# Begin Not Implemented ---
-# DOWNLOADWITH - defines the used programm for download
-# Valid values: wget | plowdown
-# Default value: wget
-# DOWNLOADWITH="wget"
-# End Not Implemented ---
-
-
-#################
-# File object array
-################
-#
-# To build the opsi-packet, some files are needed. The files are defined by a file object.
-# A file object contains different attributes. All attributes (FILE, SOURCE, ..) are binded together
-# using a file index.
-#
-#   - Filename
-#     Filename used inside the builder and opsi package
-#     This parameter is mandatory.
-#        FILE[index]="cool-stuff.exe"
-# 
-#   - Source URL
-#     The source URL to download the file from. Multiple URLs are separted by a ";"
-#     The $DIST_PRIVATE_REPOS variable will be added as the first URL automatically
-#     Therefore, you download the non-public programs to your local/privagte repository.
-#     You can use variable like $PN or $Version inside the URLs
-#     This parameter is mandatory
-#       SOURCE[index]="http://cool-stuff.de/download/cool-stuff_1.001.exe;http://mirro5.cool-stuff.at/$PN_$VERSION.exe"
-#
-#   - Architecture
-#     Definition of the architecture to separate different files. This will be used in 
-#     the file structure inside the opsi-package. Also, you can use it in your repos-URL's 
-#     or filenames (OPSI_REPOS_FILE_PATTERN, OPSI_REPOS_PRODUCT_DIR) to structure the repos. 
-#     If it's a file for all architecture, the variable have not to be set. 
-#     This parameter is optional, default value: <not set>, 
-#     Valid values: <not set>, "X86", "X86_64"
-#       ARCH[index]="X86"
-#
-#   - WINST Variabels:
-#     You can access the file (included in the opsi-package) using WINST script language. 
-#     The target "package" will replace all occurence of the string "@@BUILDER_VARIABLES@@" 
-#     by pairs of "DefVar/Set"-commands, if the WINST attribute is set. Default value: <not set>
-#     This parameter is ptional, default value: <not set>, 
-#       WINST[index]=itWESS
-#
-#################
-# Optional Array Elements
-################
-#
-#   - INSTALL Variabels:
-#     If you specify the INSTALL Array Element Builder expects that the specified FILE is a
-#     compressed archive and extract it.
-#       INSTALL[index]="libreoffice34.msi"
-#
-#   - EXTRACTTO Variabels:
-#     This Variable only works in combination with INSTALL and forces the extraction
-#     to be done into the specified directory.
-#     This will result in the files to be extracted to ARCH/EXTRACTTO.
-#     This feature is mostly needed if a package includes more setup programms that are nemed the
-#     same. This way you place the setups into diffent dirs
-#       EXTRACTTO[index]="office"
-#
-   
-FILE[0]="1713.png"
-SOURCE[0]="http://pics.computerbase.de/1/1713.png"
-WINST[0]=IconFile
-
-FILE[1]="AiO-Runtimes-x86-v1.7.1.7z"
-SOURCE[1]="http://ftp.computerbase.de/dl-758/weJMhoTGCTbFI5mzRnMlAg/1327825564/AiO-Runtimes-x86-v1.7.1.7z"
-ARCH[1]="X86"
-WINST[1]=Install32Exe
-INSTALL[1]="svcpack\aio-runtimes.exe"
-
-FILE[2]="AiO-Runtimes-x64-v1.3.3.7z"
-SOURCE[2]="http://ftp.computerbase.de/dl-758/bEO61bckV1TVTjJaCZApLg/1327825611/AiO-Runtimes-x64-v1.3.3.7z"
-ARCH[2]="X86_64"
-WINST[2]=Install64Exe
-INSTALL[2]="aio-runtimes.exe"
-
 # File array index for the image showing while installing the program
-ICON_FILE_INDEX=0
+ICON_DL_INDEX=0
+   
+##################
+### Download files
+##################
+
+## 0: Image
+DL_FILE[0]="1713.png"
+DL_SOURCE[0]="http://pics.computerbase.de/1/1713.png"
+
+## 1: 32 Bit Runtimes
+DL_FILE[1]="AiO-Runtimes-x86-v1.7.1.7z"
+DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/50559/?download;http://ftp.computerbase.de/dl-758/weJMhoTGCTbFI5mzRnMlAg/1327825564/AiO-Runtimes-x86-v1.7.1.7z"
+DL_ARCH[1]="X86"
+DL_EXTRACT_FORMAT[1]="7zip"
+
+## 2: 64 Bit
+DL_FILE[2]="AiO-Runtimes-x64-v1.3.3.7z"
+DL_SOURCE[2]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/50558/?download;http://ftp.computerbase.de/dl-758/bEO61bckV1TVTjJaCZApLg/1327825611/AiO-Runtimes-x64-v1.3.3.7z"
+DL_ARCH[2]="X86_64"
+DL_EXTRACT_FORMAT[2]="7zip"
+
+##################
+### Variables
+##################
+
+WINST_VARIABLE[0]=Install64Exe
+WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\aio-runtimes.exe"
+
+WINST_VARIABLE[1]=Install32Exe
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\svcpack\\aio-runtimes.exe"
+
+
 
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 639eff1..0cd6490 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -52,7 +52,7 @@ function publish() {
 
 function commit() {
     echo "Commit"
-    # builder_commit
+    builder_commit
 }
 function cleanup() {
     echo "Cleanup: output_dir: $output_dir"