diff --git a/CLIENT_DATA/Ricktendo_VC_package.xml b/CLIENT_DATA/Ricktendo_VC_package.xml
deleted file mode 100644
index 63c021b..0000000
--- a/CLIENT_DATA/Ricktendo_VC_package.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<package id="msvc" name="%NAME% Runtimes" group="Standard Programme" priority="1">
-    <variable name="NAME" value="Visual C++" />
-		
-	<install>
-		<cmd name="%NAME% 2005" path="2005\x86\vcredist.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x86" />
-			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia80.dll" value="5.0.50727.6229" arch="x64" />
-		</cmd>
-		<cmd name="%NAME% 2008" path="2008\x86\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x86" />
-			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia90.dll" value="5.0.30729.7523" arch="x64" />
-		</cmd>
-		<cmd name="%NAME% 2010" path="2010\x86\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%commonprogramfiles%\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x86" />
-			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\msdia100.dll" value="50.0.40219.1" arch="x64" />
-		</cmd>
-		<cmd name="%NAME% 2012 Minimum" path="2012\x86\vc_runtimeMinimum_x86.msi" param="/qb! REBOOT=ReallySuppress"> 
-			<check type="os"   condition=">" value="6.0.6002.0" />
-		    <check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
-			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
-		</cmd>
-		<cmd name="%NAME% 2012 Additional" path="2012\x86\vc_runtimeAdditional_x86.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="os"   condition=">" value="6.0.6002.0" />
-		    <check type="file" condition="<" path="%windir%\system32\atl110.dll" value="51.0.60610.1" arch="x86" />
-			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1" arch="x64" />
-		</cmd>
-		
-		
-		<cmd arch="x64" name="%NAME% 2005 x64" path="2005\x64\vcredist.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%programfiles(x86)%\Common Files\microsoft shared\VC\amd64\msdia80.dll" value="5.0.50727.6229"/>
-		</cmd>
-		<cmd arch="x64" name="%NAME% 2008 x64" path="2008\x64\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia90.dll" value="5.0.30729.7523"/>
-		</cmd>
-		<cmd arch="x64" name="%NAME% 2010 x64" path="2010\x64\vc_red.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="file" condition="<" path="%commonprogramfiles%\Microsoft Shared\VC\msdia100.dll" value="50.0.40219.1"/>
-		</cmd>
-		<cmd arch="x64" name="%NAME% 2012 Minimum x64" path="2012\x64\vc_runtimeMinimum_x64.msi" param="/qb! REBOOT=ReallySuppress"> 
-			<check type="os"   condition=">" value="6.0.6002.0" />
-			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
-		</cmd>
-		<cmd arch="x64" name="%NAME% 2012 Additional x64" path="2012\x64\vc_runtimeAdditional_x64.msi" param="/qb! REBOOT=ReallySuppress">
-			<check type="os"   condition=">" value="6.0.6002.0" />
-			<check type="file" condition="<" path="%windir%\syswow64\atl110.dll" value="51.0.60610.1"/>
-		</cmd>
-	</install>
-</package>
\ No newline at end of file
diff --git a/Geos_One_General_Runtimes_Installer_1.1.0.4.exe.sha1sum b/Geos_One_General_Runtimes_Installer_1.1.0.4.exe.sha1sum
deleted file mode 100644
index a915829..0000000
--- a/Geos_One_General_Runtimes_Installer_1.1.0.4.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-7d78bb3b679b52c022914c15a6aac29bb08be0cb  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/Geos_One_General_Runtimes_Installer_1.1.0.4.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 769d6b5..19acf1c 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -55,15 +55,9 @@ SILVERVERSION="5.1.20513.0"
 # Take Parts of Ricktendo Update
 # ==================================
 
-RICKTENDOMSVCUPDATE="0"
 RICKTENDOJSHARPUPDATE="1"
 RICKTENDOAIO="2013.8.22"
 
-MSVC2005VER="8.00.50727.6229"
-MSVC2008VER="9.00.30729.7523"
-MSVC2010VER="10.00.40219.01"
-MSVC2012VER="11.0.60610.1"
-
 # ==================================
 # Take Ricktendo .net Update
 # ==================================
@@ -76,7 +70,13 @@ RICKTENDONET="2013.8.15"
 # General Runtimes Verison
 # ==================================
 GENERALUPDATE="1"
-GENERALVERSION="1.1.0.4"
+GENERALVERSION="1.1.0.5-go1"
+
+# ==================================
+# MSVC Runtimes Verison
+# ==================================
+MSVCUPDATE="1"
+MSVCVERSION="2013.09.14-go1"
 
 
 # TYPE - defines, if the install files are public or restricteded. 
@@ -206,10 +206,18 @@ DL_ARCH[22]="X86"
 DL_WINST_NAME[22]=RicktendoNet45Lang
 
 # General Runtimes
-DL_FILE[23]="Geos_One_General_Runtimes_Installer_${GENERALVERSION}.exe"
-DL_SOURCE[23]="http://ftp.disconnected-by-peer.at/AIO/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.exe"
+DL_FILE[23]="geos_one-general-runtimes_${GENERALVERSION}.7z"
+DL_SOURCE[23]="http://ftp.disconnected-by-peer.at/AIO/integration/general-runtimes_${GENERALVERSION}.7z"
 DL_ARCH[23]="X86"
-DL_WINST_NAME[23]=InstallGeneralMsi
+DL_EXTRACT_FORMAT[23]="7zip"
+DL_EXTRACT_TO[23]="Basic"
+
+# General Runtimes
+DL_FILE[24]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
+DL_SOURCE[24]="http://ftp.disconnected-by-peer.at/AIO/integration/microsoft-msvc_${MSVCVERSION}.7z"
+DL_ARCH[24]="X86"
+DL_EXTRACT_FORMAT[24]="7zip"
+DL_EXTRACT_TO[24]="MSVC"
 
 ##################
 ### Uninstallers
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 7071a55..4642a89 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -119,10 +119,8 @@ function create() {
 # ==========================================================================================================
 
     if [ "$GENERALUPDATE" = "1" ]; then
-	rm $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/*.exe
-	mv -v $INST_DIR/CLIENT_DATA/X86/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/Geos_One_General_Runtimes_Installer.exe
-	sed "s!General_Runtimes_Installer.exe!Geos_One_General_Runtimes_Installer.exe!" -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml
-	sed "s!.\..\..\..!${GENERALVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml
+	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes
+	mv -v $INST_DIR/CLIENT_DATA/X86/Basic $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/
     fi
 
 # ==========================================================================================================
@@ -191,21 +189,9 @@ function create() {
     fi
 
 # ==========================================================================================================
-# Update MSCV & J Sharp and add F Sharp
+# Update J Sharp and add F Sharp
 # ==========================================================================================================
 
-    if [ "$RICKTENDOMSVCUPDATE" = "1" ]; then
-	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/*
-	mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/20* $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/
-	mv -v $INST_DIR/CLIENT_DATA/Ricktendo_VC_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
-	sed "/msdia80.dll/ s!.\..\......\.....!${MSVC2005VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
-	sed "/msdia90.dll/ s!.\..\......\.....!${MSVC2008VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
-	sed "/msdia100.dll/ s!..\..\......\..!${MSVC2010VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
-	sed "/atl110.dll/ s!..\..\......\..!${MSVC2012VER}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/MSVC/package.xml
-    else
-	rm $INST_DIR/CLIENT_DATA/Ricktendo_VC_package.xml
-    fi
-
     if [ "$RICKTENDOJSHARPUPDATE" = "1" ]; then
 	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist
 	mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/vjsharp $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/
@@ -241,6 +227,16 @@ function create() {
 	rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
     fi
 
+# ==========================================================================================================
+# Update MSVC
+# ==========================================================================================================
+
+    if [ "$MSVCUPDATE" = "1" ]; then
+	rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
+	mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
+    fi
+
+
 # ==========================================================================================================
 # move the uninstallers in place (directory layout like the sereby package)
 # ==========================================================================================================
diff --git a/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum b/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum
new file mode 100644
index 0000000..77040fb
--- /dev/null
+++ b/geos_one-general-runtimes_1.1.0.5-go1.7z.sha1sum
@@ -0,0 +1 @@
+bda89a613f1769c8d915ae409173419100de15c5  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.3/X86/geos_one-general-runtimes_1.1.0.5-go1.7z
diff --git a/geos_one-microsoft-msvc_2013.09.14-go1.7z.sha1sum b/geos_one-microsoft-msvc_2013.09.14-go1.7z.sha1sum
new file mode 100644
index 0000000..c87a0ee
--- /dev/null
+++ b/geos_one-microsoft-msvc_2013.09.14-go1.7z.sha1sum
@@ -0,0 +1 @@
+80f3079f89e92676dc8c3b5d972230748f224d60  /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.3/X86/geos_one-microsoft-msvc_2013.09.14-go1.7z