diff --git a/builder/build-default.cfg b/builder/build-default.cfg
new file mode 100644
index 0000000..83f805f
--- /dev/null
+++ b/builder/build-default.cfg
@@ -0,0 +1,41 @@
+###################################################
+# build-default.cfg
+# Default values for OPSI builder system
+####################################################
+
+##################################
+# Global variables
+#################################
+TMP_DIR=/tmp
+
+##################################
+# OPSI repository settings
+#################################
+# Basedirectory storing OPSI-packages after building
+OPSI_REPOS_BASE_DIR=$HOME/.opsi-repository
+
+# Directory- and filename pattern
+OPSI_REPOS_PRODUCT_DIR=${OPSI_REPOS_BASE_DIR}/${STATUS}/${VENDOR}/${PN}/${VERSION}-${RELEASE}
+
+# OPSI-package filepattern
+OPSI_REPOS_FILE_PATTERN=${PN}_${VERSION}-${RELEASE}.opsi
+
+# Force alway upload  to opsi repos
+# OPSI_REPOS_FORCE_UPLOAD=1
+
+
+###############################
+# Distribution / Vendor settings
+###############################
+
+# Directory downloading/cacheing the artifacts like MSI package or icons from the vendor webside
+DIST_CACHE_DIR=$HOME/.opsi-dist-cache/${PN}-${VERSION}-${RELEASE}
+
+# private dist repository. You can use all variables from release.cfg insde the URL
+# this optinal URL will be the FIRST url to check for downloading vendor stuff.
+# To copy a local file, the repos should start with file://
+DIST_PRIVATE_REPOS=file://$HOME/opsi-dist.private/$VENDOR/$PN/$VERSION
+
+# Force always downloading dist files
+# DIST_FORCE_DOWNLOAD=1
+
diff --git a/build.cfg b/product.cfg
similarity index 70%
rename from build.cfg
rename to product.cfg
index bbd6b02..a90c95f 100644
--- a/build.cfg
+++ b/product.cfg
@@ -1,3 +1,20 @@
+############################
+# Setup product information 
+############################
+VENDOR="itwatch.de"
+PN="itwatch"
+VERSION="4.10.19"
+RELEASE="1"
+PRIORITY="0"
+ADVICE=""
+
+# Status integration, testing, release
+STATUS="review"
+
+#################
+# Setup url for downloading the binaries
+################
+
 # all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python)
 # You can setup many URL's separated by ";"
 
diff --git a/release.cfg b/release.cfg
deleted file mode 100644
index d22d369..0000000
--- a/release.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-VENDOR="itwatch.de"
-PN="itwatch"
-VERSION="4.10.19"
-RELEASE="1"
-PRIORITY="0"
-ADVICE=""
-
-# Status integration, testing, release
-STATUS="review"