diff --git a/CLIENT_DATA/delsub.ins b/CLIENT_DATA/delsub3264.ins
similarity index 75%
rename from CLIENT_DATA/delsub.ins
rename to CLIENT_DATA/delsub3264.ins
index 9e23e1a..c3f7f1d 100644
--- a/CLIENT_DATA/delsub.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -4,15 +4,25 @@
 ; credits: http://www.opsi.org/credits/
 
 
-Set $MsiId32$ = '{537056B7-32A4-4408-9B54-0341963C7C9C}'
 Set $UninstallProgram32$ = $InstallDir32$ + "\uninstall.exe"
+Set $UninstallProgram64$ = $InstallDir64$ + "\uninstall.exe"
+Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
+Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
+
 
-Set $MsiId64$ = '{F24FF688-7138-4CCF-A83F-71E9FB01170E}'
-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($IniFile32$)
+    		Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
+    		if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "")
+            		comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version"
+            		Winbatch_uninstall_msi_old_32
+            		sub_check_exitcode
+    		endif
+	endif
+
 	if FileExists($UninstallProgram32$)
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_32
@@ -34,6 +44,14 @@ 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($IniFile64$)
+    		Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
+    		if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "")
+            		comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version"
+            		Winbatch_uninstall_msi_old_64
+            		sub_check_exitcode
+    		endif
+	endif
 	if FileExists($UninstallProgram64$)
 		comment "Uninstall program found, starting uninstall"
 		Winbatch_uninstall_64
@@ -62,9 +80,12 @@ LinkFolder_uninstall
 ; "$UninstallProgram32$" /S
 ;
 ; === Inno Setup ========================================================================================
-; "$UninstallProgram32$" /silent /norestart
+; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES
 
 
+[Winbatch_uninstall_msi_old_32]
+msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress
+
 [Winbatch_uninstall_msi_32]
 msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 
@@ -80,9 +101,12 @@ msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
 ; "$UninstallProgram64$" /S
 ;
 ; === Inno Setup ========================================================================================
-; "$UninstallProgram64$" /silent /norestart
+; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES
 
 
+[Winbatch_uninstall_msi_old_64]
+msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
+
 [Winbatch_uninstall_msi_64]
 msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
 
diff --git a/CLIENT_DATA/opsi-realtimesoft.ultramon.ini b/CLIENT_DATA/opsi-realtimesoft.ultramon.ini
new file mode 100644
index 0000000..c13f86f
--- /dev/null
+++ b/CLIENT_DATA/opsi-realtimesoft.ultramon.ini
@@ -0,0 +1,10 @@
+[X86]
+MsiId32={537056B7-32A4-4408-9B54-0341963C7C9C}
+
+[X86_64]
+MsiId64={F24FF688-7138-4CCF-A83F-71E9FB01170E}
+
+[COMMON]
+PN=realtimesoft.ultramon
+VERSION=3.1.0
+
diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup3264.ins
similarity index 70%
rename from CLIENT_DATA/setup.ins
rename to CLIENT_DATA/setup3264.ins
index 53b597e..c08e420 100644
--- a/CLIENT_DATA/setup.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -6,10 +6,15 @@
 [Actions]
 requiredWinstVersion >= "4.10.8.6"
 
-DefVar $MsiId32$
+; DefVar $MsiId32$
+DefVar $MsiIdOld32$
 DefVar $UninstallProgram32$
-DefVar $MsiId64$
+DefVar $IniFile32$
+; DefVar $MsiId64$
+DefVar $MsiIdOld64$
 DefVar $UninstallProgram64$
+DefVar $IniFile64$
+DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
@@ -24,21 +29,33 @@ DefVar $INST_architecture$
 
 Set $INST_SystemType$ = GetSystemType
 set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
+Set $OrgName$ = GetProductProperty ("orgname","OrgName")
 
 
 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                             -
 ; ----------------------------------------------------------------
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $ProductId$       = "ultramon"
-Set $MinimumSpace$    = "40 MB"
+Set $ProductId$       = "realtimesoft.ultramon"
+Set $MinimumSpace$    = "10 MB"
 ; the path were we find the product after the installation
 Set $InstallDir32$      = "%ProgramFiles32Dir%\UltraMon"
 Set $InstallDir64$      = "%ProgramFiles64Dir%\UltraMon"
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 Set $LicenseRequired$ = "true"
 Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
@@ -51,9 +68,9 @@ else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
 	
-	if FileExists("%ScriptPath%\delsub.ins")
+	if FileExists("%ScriptPath%\delsub3264.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub.ins"
+		Sub "%ScriptPath%\delsub3264.ins"
 	endif
 	
 	if $LicenseRequired$ = "true"
@@ -92,27 +109,21 @@ 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 USERNAME="%PCName%" PIDKEY=$LicenseKey$
+msiexec /i "$Install32Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress USERNAME="$OrgName$" PIDKEY=$LicenseKey$
 
 [Files_install_32]
+copy "$IniCfgFile$" "$InstallDir32$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; 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 USERNAME="%PCName%" PIDKEY=$LicenseKey$
+msiexec /i "$Install64Msi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress USERNAME="$OrgName$" PIDKEY=$LicenseKey$
 
 [Files_install_64]
+copy "$IniCfgFile$" "$InstallDir64$"
+
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
@@ -160,43 +171,37 @@ msiexec /i "%ScriptPath%\AMD64FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /
 ; end_link
 
 [Sub_get_licensekey]
-if opsiLicenseManagementEnabled
-	comment "License management is enabled and will be used"
+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
+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
-		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
deleted file mode 100644
index a011397..0000000
--- a/CLIENT_DATA/uninstall.ins
+++ /dev/null
@@ -1,75 +0,0 @@
-; Copyright (c) uib gmbh (www.uib.de)
-; This sourcecode is owned by uib gmbh
-; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
-
-[Actions]
-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$
-
-Set $INST_SystemType$ = GetSystemType
-set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
-
-
-Set $LogDir$ = "%SystemDrive%\tmp"
-
-; ----------------------------------------------------------------
-; - Please edit the following values                             -
-; ----------------------------------------------------------------
-Set $ProductId$       = "ultramon"
-Set $InstallDir32$      = "%ProgramFiles32Dir%\UltraMon"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\UltraMon"
-Set $LicenseRequired$ = "true"
-Set $LicensePool$     = "p_" + $ProductId$
-; ----------------------------------------------------------------
-
-
-comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
-
-Message "Uninstalling " + $ProductId$ + " ..."
-
-if FileExists("%ScriptPath%\delsub.ins")
-	comment "Start uninstall sub section"
-	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/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins
new file mode 100644
index 0000000..c3266b6
--- /dev/null
+++ b/CLIENT_DATA/uninstall3264.ins
@@ -0,0 +1,84 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/credits/
+
+[Actions]
+requiredWinstVersion >= "4.10.8.6"
+
+; DefVar $MsiId32$
+DefVar $MsiIdOld32$
+DefVar $UninstallProgram32$
+DefVar $IniFile32$
+; DefVar $MsiId64$
+DefVar $MsiIdOld64$
+DefVar $UninstallProgram64$
+DefVar $IniFile64$
+DefVar $IniCfgFile$
+DefVar $LogDir$
+DefVar $ExitCode$
+DefVar $ProductId$
+DefVar $InstallDir32$
+DefVar $InstallDir64$
+DefVar $LicenseRequired$
+DefVar $LicensePool$
+DefVar $INST_SystemType$
+DefVar $INST_architecture$
+
+Set $INST_SystemType$ = GetSystemType
+set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
+
+
+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$       = "realtimesoft.ultramon"
+Set $InstallDir32$    = "%ProgramFiles32Dir%\UltraMon"
+Set $InstallDir64$    = "%ProgramFiles64Dir%\UltraMon"
+Set $LicenseRequired$ = "true"
+Set $LicensePool$     = "p_" + $ProductId$
+; ----------------------------------------------------------------
+
+
+comment "Show product picture"
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+
+Message "Uninstalling " + $ProductId$ + " ..."
+
+if FileExists("%ScriptPath%\delsub3264.ins")
+	comment "Start uninstall sub section"
+	Sub "%ScriptPath%\delsub3264.ins"
+endif
+
+if $LicenseRequired$ = "true"
+	comment "Licensing required, free license used"
+	Sub_free_license
+endif
+
+[Sub_free_license]
+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$)
+
+
diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt
index e69de29..bc69317 100644
--- a/OPSI/changelog.txt
+++ b/OPSI/changelog.txt
@@ -0,0 +1,2 @@
+Don't add cahngelog entries here!
+It get autogenerated by the opsi-builder.sh
\ No newline at end of file
diff --git a/OPSI/control b/OPSI/control
index f9199ad..ad2590e 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -5,16 +5,16 @@ incremental: False
 
 [Product]
 type: localboot
-id: ultramon
-name: UltraMon
-description: UltraMon is a utility for multi-monitor systems, designed to increase productivity and unlock the full potential of multiple monitors.
+id: realtimesoft.ultramon
+name:realtimesoft.ultramon
+description: Get the most out of multiple monitors with UltraMon
 advice: ADVICE
 version: VERSION
 priority: PRIORITY
 licenseRequired: False
 productClasses: 
-setupScript: setup.ins
-uninstallScript: uninstall.ins
+setupScript: setup3264.ins
+uninstallScript: uninstall3264.ins
 updateScript: 
 alwaysScript: 
 onceScript: 
@@ -30,3 +30,17 @@ description: which architecture (32/64 bit) has to be installed
 values: ["32 only", "64 only", "both", "system specific"]
 default: ["system specific"]
 
+[ProductDependency]
+action: setup
+requiredProduct: aio
+requiredStatus: installed
+requirementType: before
+
+[ProductProperty]
+type: unicode
+name: orgname
+multivalue: False
+editable: True
+description: The name the software is registered to
+values: [""]
+default: ["OrgName"]
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 1ba09fa..0000000
--- a/build.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-PN="ultramon"
-VERSION="3.1.0"
-RELEASE="2"
-PRIORITY="0"
-ADVICE=""
-TYPE="public"
-# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
-ICON="http://www.realtimesoft.com/ultramon/ultramon_logo.jpg"
-X86="http://www.realtimesoft.com/files/UltraMon_3.1.0_de_x32.msi"
-AMD64="http://www.realtimesoft.com/files/UltraMon_3.1.0_de_x64.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" -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
-
-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..8751516
--- /dev/null
+++ b/builder-product.cfg
@@ -0,0 +1,36 @@
+############################
+# Setup product information 
+############################
+VENDOR="realtimesoft.com"
+PN="realtimesoft.ultramon"
+VERSION="3.1.0"
+RELEASE="3"
+PRIORITY="0"
+ADVICE=""
+
+# TYPE - defines, if the install files are public or restricted. 
+# Valid value: restricted | public
+TYPE="public"
+
+  
+DL_FILE[0]="win-ultramon.jpg"
+DL_SOURCE[0]="http://cache.gawkerassets.com/assets/images/lifehacker/2011/04/win-ultramon.jpg"
+
+DL_FILE[1]="UltraMon_3.1.0_de_x32.msi"
+DL_SOURCE[1]="http://realtimesoft.com/files/UltraMon_3.1.0_de_x32.msi"
+DL_ARCH[1]="X86"
+DL_WINST_NAME[1]=Install32Msi
+
+DL_FILE[2]="UltraMon_3.1.0_de_x64.msi"
+DL_SOURCE[2]="http://realtimesoft.com/files/UltraMon_3.1.0_de_x64.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
+
+WINST_NAME[0]="MsiId32"
+WINST_VALUE[0]="{537056B7-32A4-4408-9B54-0341963C7C9C}"
+
+WINST_NAME[1]="MsiId64"
+WINST_VALUE[1]="{F24FF688-7138-4CCF-A83F-71E9FB01170E}"
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/ultramon_logo.jpg.sha1sum b/ultramon_logo.jpg.sha1sum
deleted file mode 100644
index 4c47c1d..0000000
--- a/ultramon_logo.jpg.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-a343e4b3bceb379c877a0d19a431af1aa4294340  /usr/portage/distfiles/ultramon_logo.jpg
diff --git a/win-ultramon.jpg.sha1sum b/win-ultramon.jpg.sha1sum
new file mode 100644
index 0000000..e3c415a
--- /dev/null
+++ b/win-ultramon.jpg.sha1sum
@@ -0,0 +1 @@
+ac16b69369845a77e0e0f95f2fa1a1539ca1d332  /home/mario/.opsi-dist-cache/realtimesoft.ultramon-3.1.0//win-ultramon.jpg