diff --git a/451604026_a750b0de57.jpg.sha1sum b/451604026_a750b0de57.jpg.sha1sum
new file mode 100644
index 0000000..beeb6c4
--- /dev/null
+++ b/451604026_a750b0de57.jpg.sha1sum
@@ -0,0 +1 @@
+8d5fbc83d0e90f52e4de890b231d487df58c64f6  /home/mario/.opsi-dist-cache/ghostscript-9.0.0//451604026_a750b0de57.jpg
diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub.ins
index b2ddb12..13fc675 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub.ins
@@ -5,20 +5,12 @@
 
 
 Set $MsiId32$ = '{E630D30A-79EE-407A-8F51-9D57D1F45230}'
-Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
 
 Set $MsiId64$ = '{2E415339-7210-4A3B-84EA-E50FE7565F0D}'
-Set $UninstallProgram32$ = $InstallDir64$ + "\uninstall.exe"
 
 if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
 	Message "Uninstalling " + $ProductId$ + " 32 Bit..."
 
-	if FileExists($UninstallProgram32$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
-		sub_check_exitcode
-	endif
-
 	if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
 		comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
 		Winbatch_uninstall_msi_32
@@ -34,12 +26,6 @@ endif
 if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
 	Message "Uninstalling " + $ProductId$ + " 64 Bit..."
 
-	if FileExists($UninstallProgram64$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
-		sub_check_exitcode
-	endif
-
 	if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
 		comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
 		Winbatch_uninstall_msi_64
@@ -55,16 +41,6 @@ endif
 comment "Delete program shortcuts"
 LinkFolder_uninstall
 
-[Winbatch_uninstall_32]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; "$UninstallProgram32$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram32$" /silent /norestart
-
-
 [Winbatch_uninstall_msi_32]
 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 
@@ -73,16 +49,6 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ;
 ; delete -sf "$InstallDir32$\"
 
-[Winbatch_uninstall_64]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; "$UninstallProgram64$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram64$" /silent /norestart
-
-
 [Winbatch_uninstall_msi_64]
 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins
index 5d74873..0ff641e 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup.ins
@@ -7,18 +7,13 @@
 requiredWinstVersion >= "4.10.8.6"
 
 DefVar $MsiId32$
-DefVar $UninstallProgram32$
 DefVar $MsiId64$
-DefVar $UninstallProgram64$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
 DefVar $InstallDir32$
 DefVar $InstallDir64$
 DefVar $ExitCode$
-DefVar $LicenseRequired$
-DefVar $LicenseKey$
-DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
 
@@ -28,6 +23,16 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
 
 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                             -
 ; ----------------------------------------------------------------
@@ -39,8 +44,6 @@ Set $MinimumSpace$    = "20 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\gs"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\gs"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -56,11 +59,6 @@ else
 		Sub "%ScriptPath%\delsub.ins"
 	endif
 	
-	if $LicenseRequired$ = "true"
-		comment "Licensing required, reserve license and get license key"
-		Sub_get_licensekey
-	endif
-	
 	comment "installing"
 
 	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
@@ -92,12 +90,7 @@ else
 endif
 
 [Winbatch_install_32]
-; Choose one of the following examples as basis for your installation
-; You can use $LicenseKey$ var to pass a license key to the installer
-;
-; === MSI package =======================================================================================
-; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 
 [Files_install_32]
 ; Example of recursively copying some files into the installation directory:
@@ -105,12 +98,7 @@ msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
 
 [Winbatch_install_64]
-; Choose one of the following examples as basis for your installation
-; You can use $LicenseKey$ var to pass a license key to the installer
-;
-; === MSI package =======================================================================================
-; You may use the parameter PIDKEY=$Licensekey$
-msiexec /i "%ScriptPath%\AMD64FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
+msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress
 
 [Files_install_64]
 ; Example of recursively copying some files into the installation directory:
@@ -159,44 +147,6 @@ msiexec /i "%ScriptPath%\AMD64FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /
 ; 	icon_index: 2
 ; end_link
 
-[Sub_get_licensekey]
-if opsiLicenseManagementEnabled
-	comment "License management is enabled and will be used"
-
-	comment "Trying to get a license key"
-	Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
-	; If there is an assignment of exactly one licensepool to the product the following call is possible:
-	; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
-	;
-	; If there is an assignment of a license pool to a windows software id, it is possible to use:
-	; DefVar $WindowsSoftwareId$
-	; $WindowsSoftwareId$ = "..."
-	; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
-	
-	DefVar $ServiceErrorClass$
-	set $ServiceErrorClass$ = getLastServiceErrorClass
-	comment "Error class: " + $ServiceErrorClass$
-	
-	if $ServiceErrorClass$ = "None"
-		comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
-	else
-		if $ServiceErrorClass$ = "LicenseConfigurationError"
-			LogError "Fatal: license configuration must be corrected"
-			LogError getLastServiceErrorMessage
-			isFatalError
-		else 
-			if $ServiceErrorClass$ = "LicenseMissingError"
-				LogError "Fatal: required license is not supplied"
-				isFatalError
-			endif
-		endif
-	endif
-else
-	LogError "Fatal: license required, but license management not enabled"
-	isFatalError
-endif
-
-
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
 set $ExitCode$ = getLastExitCode
diff --git a/CLIENT_DATA/uninstall.ins b/CLIENT_DATA/uninstall.ins
index 994fa1d..78d676b 100644
--- a/CLIENT_DATA/uninstall.ins
+++ b/CLIENT_DATA/uninstall.ins
@@ -7,16 +7,12 @@
 requiredWinstVersion >= "4.10.8.6"
 
 DefVar $MsiId32$
-DefVar $UninstallProgram32$
 DefVar $MsiId64$
-DefVar $UninstallProgram64$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
 DefVar $InstallDir32$
 DefVar $InstallDir64$
-DefVar $LicenseRequired$
-DefVar $LicensePool$
 DefVar $INST_SystemType$
 DefVar $INST_architecture$
 
@@ -26,14 +22,22 @@ set $INST_architecture$ = GetProductProperty("install_architecture","system spec
 
 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                             -
 ; ----------------------------------------------------------------
 Set $ProductId$       = "ghostscript"
 Set $InstallDir32$      = "%ProgramFiles32Dir%\gs"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\gs"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
 
@@ -47,29 +51,3 @@ if FileExists("%ScriptPath%\delsub.ins")
 	Sub "%ScriptPath%\delsub.ins"
 endif
 
-if $LicenseRequired$ = "true"
-	comment "Licensing required, free license used"
-	Sub_free_license
-endif
-
-[Sub_free_license]
-if opsiLicenseManagementEnabled
-	comment "License management is enabled and will be used"
-
-	comment "Trying to free license used for the product"
-	DefVar $result$
-	Set $result$ = FreeLicense($LicensePool$)
-	; If there is an assignment of a license pool to the product, it is possible to use
-	; Set $result$ = FreeLicense("", $ProductId$)
-	;
-	; If there is an assignment of a license pool to a windows software id, it is possible to use
-	; DefVar $WindowsSoftwareId$
-	; $WindowsSoftwareId$ = "..."
-	; set $result$ = FreeLicense("", "", $WindowsSoftwareId$)
-else
-	LogError "Error: licensing required, but license management not enabled"
-	isFatalError
-endif
-
-
-
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 7b06451..0000000
--- a/build.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-PN="ghostscript"
-VERSION="9.00"
-RELEASE="1"
-PRIORITY="0"
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://scottlinux.com/wp-content/uploads/2011/04/ghostscript.png"
-X86="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x86.msi"
-AMD64="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x64.msi"
-ICONFILE=${ICON##*/}
-X86FILE=${X86##*/}
-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
-#				convert -colorspace rgb /usr/portage/distfiles/$ICONFILE -resize x160 -gravity center -crop 160x160+0+0 +repage $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 -P /usr/portage/distfiles/ $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" -i $OUT/$PN/OPSI/control
-sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.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..49e29be
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,30 @@
+############################
+# Setup product information 
+############################
+VENDOR="pdfprinter.at"
+PN="ghostscript"
+VERSION="9.0.0"
+RELEASE="1"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restricted | public
+TYPE="public"
+
+DL_FILE[0]="451604026_a750b0de57.jpg"
+DL_SOURCE[0]="http://download.chip.eu/ii/451604026_a750b0de57.jpg"
+
+DL_FILE[1]="gs900x86.msi"
+DL_SOURCE[1]="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x86.msi"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]=Install32Msi
+
+DL_FILE[2]="gs900x64.msi"
+DL_SOURCE[2]="ftp://download.may.co.at/Repository/msoftware/MAYComp/Current/RO/gs900x64.msi"
+DL_ARCH[2]="X86_64"
+DL_WINST_NAME[2]=Install64Msi
+
+# 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/ghostscript.png.sha1sum b/ghostscript.png.sha1sum
deleted file mode 100644
index be104f6..0000000
--- a/ghostscript.png.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-d309fa88b28d002a5b0e4dc21ee95bce291302c0  /usr/portage/distfiles/ghostscript.png