diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 74c4bca..fdf67f9 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -19,6 +19,16 @@ DefVar $LicensePool$
 
 Set $LogDir$ = "%SystemDrive%\tmp"
 
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+;   from builder-product.cfg :  all variables definded by attribute WINST[index]
+;   from builder-product.cfg :  VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE   
+;   from opsi-builder.cfg    :  CREATOR_TAG CREATOR_NAME CREATOR_EMAIL           
+;   auto generated winst-variables
+;         $IconFile$: path to product picture
+;
+@@BUILDER_VARIABLES@@
+
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
@@ -82,7 +92,7 @@ endif
 ; You can use $LicenseKey$ var to pass a license key to the installer
 ;
 ; === Nullsoft Scriptable Install System ================================================================
-"%ScriptPath%\X86FILE" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+"$InstallExe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 
 [Files_install]
 ; Example of recursively copying some files into the installation directory:
diff --git a/CamStudio-Setup-2.6b.rev294.exe.sha1sum b/CamStudio-Setup-2.6b.rev294.exe.sha1sum
new file mode 100644
index 0000000..4d674e4
--- /dev/null
+++ b/CamStudio-Setup-2.6b.rev294.exe.sha1sum
@@ -0,0 +1 @@
+33c76ab548bebdd7f6ea456273f05ae41e9eb368  /home/mario/.opsi-dist-cache/camstudio-2.6b.rev294/X86/CamStudio-Setup-2.6b.rev294.exe
diff --git a/CamStudio.png.sha1sum b/CamStudio.png.sha1sum
new file mode 100644
index 0000000..74ee162
--- /dev/null
+++ b/CamStudio.png.sha1sum
@@ -0,0 +1 @@
+a1b21101d670162335d65316d5743494bc7b255a  /home/mario/.opsi-dist-cache/camstudio-2.6b.rev294//CamStudio.png
diff --git a/CamStudio_Setup.exe.sha1sum b/CamStudio_Setup.exe.sha1sum
deleted file mode 100644
index 8da3042..0000000
--- a/CamStudio_Setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-33c76ab548bebdd7f6ea456273f05ae41e9eb368  /usr/portage/distfiles/CamStudio_Setup.exe
diff --git a/CamStuido_Setup.exe.sha1sum b/CamStuido_Setup.exe.sha1sum
deleted file mode 100644
index 0c52789..0000000
--- a/CamStuido_Setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-33c76ab548bebdd7f6ea456273f05ae41e9eb368  /usr/portage/distfiles/CamStuido_Setup.exe
diff --git a/Testing.txt b/Testing.txt
new file mode 100644
index 0000000..d6b5e6c
--- /dev/null
+++ b/Testing.txt
@@ -0,0 +1,28 @@
+*** Qualitiymanagement/Testing procedure
+
+- Product:
+        - Name: productname
+        - Version: xxx
+        - Release: yyyy
+
+- Environment
+        - OS: Native windows XP-32Bit installation
+	- Preinstalled packages: None (also no aio)
+	- Files used while testing:
+                File1: http://domain.de/file.ext
+
+- Testing process:
+        OPSI-action:
+                - Installation (without dependencies like AIO/Firefox): ??
+        Result:   
+                - File extensions related to program: ??
+                - Start menu entry: ??
+                - Starting/using program: viewer works, File1 is shown correctly: ??
+
+        OPSI-action:
+                - Uninstall
+        Result:
+                - File extensions related to program: unrelated: ??
+                - Start menu entry: none: ??
+
+
diff --git a/build.sh b/build.sh
deleted file mode 100644
index 05ae799..0000000
--- a/build.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-PN="camstudio"
-VERSION="2.6b"
-RELEASE="1"
-PRIORITY="0"
-ADVICE=""
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://www.clipart-fr.com/en/data/icons/set_03/icones_01546.png"
-X86="http://sourceforge.net/projects/camstudio/files/stable/CamStudio_Setup_v2.6b_r294_%28build_24Oct2010%29.exe"
-#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi"
-ICONFILE=${ICON##*/}
-#X86FILE=${X86##*/}
-X86FILE="CamStudio_Setup.exe"
-#AMD64FILE=${AMD64##*/}
-
-	if [ -e /var/tmp/opsi/upload/$TYPE/${PN}_${VERSION}-${RELEASE}.opsi ]
-	then
-		echo "package ${PN}_${VERSION}-${RELEASE}.opsi already generated"
-		exit 1
-	fi
-
-OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; }
-mkdir $OUT/$PN
-cp -Rv OPSI CLIENT_DATA $OUT/$PN
-unix2dos $OUT/$PN/CLIENT_DATA/*
-
-	if [ -e /usr/portage/distfiles/$ICONFILE ]
-	then
-		if [ -e $ICONFILE.sha1sum ]
-		then
-			SHA1SUM=`cat $ICONFILE.sha1sum`
-			CHECKSUM=`sha1sum /usr/portage/distfiles/$ICONFILE`
-			if [ "$CHECKSUM" = "$SHA1SUM" ]
-			then
-				convert -colorspace rgb /usr/portage/distfiles/$ICONFILE -transparent white -background transparent -resize 160x160\> \
-					-size 160x160 xc:transparent +swap -gravity center -composite $OUT/$PN/CLIENT_DATA/$PN.png
-			else
-				echo "The checksums do not match."
-				exit 1
-			fi
-		else
-			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$ICONFILE > $ICONFILE.sha1sum"
-			exit 1
-		fi
-	else
-		echo "Downloading file"
-		wget -P /usr/portage/distfiles/ $ICON
-		exit 1
-	fi
-
-	if [ -e /usr/portage/distfiles/$X86FILE ]
-	then
-		if [ -e $X86FILE.sha1sum ]
-		then
-			SHA1SUM=`cat $X86FILE.sha1sum`
-			CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE`
-			if [ "$CHECKSUM" = "$SHA1SUM" ]
-			then
-				cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA
-			else
-				echo "The checksums do not match."
-				exit 1
-			fi
-		else
-			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE > $X86FILE.sha1sum"
-			exit 1
-		fi
-	else
-		echo "Downloading file"
-		wget -O /usr/portage/distfiles/$X86FILE $X86
-		exit 1
-	fi
-
-#	if [ -e /usr/portage/distfiles/$AMD64FILE ]
-#	then
-#		if [ -e $AMD64FILE.sha1sum ]
-#		then
-#			SHA1SUM=`cat $AMD64FILE.sha1sum`
-#			CHECKSUM=`sha1sum /usr/portage/distfiles/$AMD64FILE`
-#			if [ "$CHECKSUM" = "$SHA1SUM" ]
-#			then
-#				cp /usr/portage/distfiles/$AMD64FILE $OUT/$PN/CLIENT_DATA
-#			else
-#				echo "The checksums do not match." 
-#				exit 1
-#			fi
-#		else
-#			echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$AMD64FILE > $AMD64FILE.sha1sum"
-#			exit 1
-#		fi
-#	else
-#		echo "Downloading file"
-#		wget -P /usr/portage/distfiles/ $AMD64
-#		exit 1
-#	fi
-
-sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!$RELEASE!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" -i $OUT/$PN/OPSI/control
-#sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.ins
-sed -e "s!X86FILE!$X86FILE!g" -i $OUT/$PN/CLIENT_DATA/setup32.ins
-
-if test -d ".git"; then
-    git log --date-order --date=short | \
-    sed -e '/^commit.*$/d' | \
-    awk '/^Author/ {sub(/\\$/,""); getline t; print $0 t; next}; 1' | \
-    sed -e 's/^Author: //g' | \
-    sed -e 's/>Date:   \([0-9]*-[0-9]*-[0-9]*\)/>\t\1/g' | \
-    sed -e 's/^\(.*\) \(\)\t\(.*\)/\3    \1    \2/g' > $OUT/$PN/OPSI/changelog.txt
-else
-    echo "No git repository present."
-    exit 1
-fi
-
-pushd $OUT
-opsi-makeproductfile -v $OUT/$PN
-popd
-
-mkdir -p /var/tmp/opsi/upload/$TYPE/
-cp -afv $OUT/*.opsi /var/tmp/opsi/upload/$TYPE/
-
-#rm -rf $OUT
-
diff --git a/builder-product.cfg b/builder-product.cfg
new file mode 100644
index 0000000..e667cfa
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,26 @@
+############################
+# Setup product information 
+############################
+VENDOR="camstudio.org"
+PN="camstudio"
+VERSION="2.6b.rev294"
+RELEASE="1"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restricted | public
+TYPE="public"
+
+  
+DL_FILE[0]="CamStudio.png"
+DL_SOURCE[0]="http://www.cours.fse.ulaval.ca/ten-22182/opensource/images/CamStudio.png"
+
+DL_FILE[1]="CamStudio-Setup-${VERSION}.exe"
+DL_SOURCE[1]="http://sourceforge.net/projects/camstudio/files/stable/CamStudio_Setup_v2.6b_r294_%28build_24Oct2010%29.exe"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]=InstallExe
+
+# File array index for the image showing while installing the program
+ICON_DL_INDEX=0
+
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
new file mode 100644
index 0000000..9a3d4a8
--- /dev/null
+++ b/builder-targets-cb.sh
@@ -0,0 +1,25 @@
+##############################################################################
+# This optional file "builder-targets-cb.sh" will be called by builder.sh 
+# 
+# The targets will be called from thde opsi-builder using the following
+# order: config, prepare, retrieve, create, package, publish, commit, cleanup 
+# You can overwrite the target functions in builder-targets-cb.sh
+# 
+# You can define callback functions. The functions are called from
+# opsi-builder within processing a target
+#   cb_package_makeproductfile
+#
+# You can use every variable defined in any configuration file or by
+# the defined builder script itself. Also, calling the predefined
+# targets builder_<targetname> is possible.
+#
+# Abstract:
+#  target order: config, prepare, retrieve, create, package, publish, commit, cleanup
+#  callbacks: <none>
+#
+##############################################################################
+
+function cleanup() {
+    echo "Cleanup"
+    builder_cleanup
+}
diff --git a/icones_01546.png.sha1sum b/icones_01546.png.sha1sum
deleted file mode 100644
index 3bb70ec..0000000
--- a/icones_01546.png.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-ec8d4707bec7ce9b44351d81c7a83ae319aed714  /usr/portage/distfiles/icones_01546.png