diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b4b0f99
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/nbproject/private
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8220a5c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/system"]
+	path = lib/system
+	url = git@mojotrollz.eu:system.git
diff --git a/api.php b/api.php
index 7190142..b543c0f 100644
--- a/api.php
+++ b/api.php
@@ -1,13 +1,13 @@
 <?php
-require_once 'system/autoload.inc';                                      //SYSTEM Classes
-\SYSTEM\system::register_errorhandler_dbwriter();
-\SYSTEM\system::register_errorhandler_jsonoutput();
-require_once 'redestoff/autoload.inc.php';                                       //Project Classes
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'redestoff/autoload.inc';                                           //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';
-\SYSTEM\system::start($redestoff_config);
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 \SYSTEM\system::include_ExceptionShortcut();
 \SYSTEM\system::include_ResultShortcut();
+\SYSTEM\system::register_errorhandler_dbwriter();
+\SYSTEM\system::register_errorhandler_jsonoutput();
 
 echo \SYSTEM\API\api::run('\SYSTEM\API\verify','\SYSTEM\API\api_system',array_merge($_POST,$_GET));
 new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/config.php b/config.php
deleted file mode 100644
index 3ddce10..0000000
--- a/config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$redestoff_config = array(  array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,     E_ALL | E_STRICT),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,       'http://www.redestoffmusik.de/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,      '/home/web/webdir/Redestoffmusik/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,            SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,            '127.0.0.1'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT,            ''),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER,            'mojotrolls_mysql'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,        'dajsabeaisvd345'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,          'host_redestoff'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG,         '/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL,        'http://www.redestoffmusik.de/sai.php?'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE,          'redestoff - Admin Area'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT,      '<a href="http://www.redestoffmusik.de/" target="_blank">redestoff</a>, &copy; WebCraft Media 2013'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,              array('deDE', 'enUS')),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,       'deDE'));   
\ No newline at end of file
diff --git a/index.php b/index.php
index a538474..2696f46 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,13 @@
 <?php
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'redestoff/autoload.inc';                                           //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'system/autoload.inc';                                         //SYSTEM Classes
-require_once 'redestoff/autoload.inc.php';                                           //Project Classes
-       
-require_once 'config.php';
-\SYSTEM\system::start($redestoff_config);
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 \SYSTEM\system::include_ExceptionShortcut();
 \SYSTEM\system::include_ResultShortcut();
 \SYSTEM\system::register_errorhandler_dbwriter();
 \SYSTEM\system::register_errorhandler_jsonoutput();
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_redestoff',array_merge($_POST,$_GET),1,false,true)->html();
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_redestoff', array_merge($_POST,$_GET), 1, false, true);
+new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
diff --git a/lib/system b/lib/system
new file mode 160000
index 0000000..90ce83b
--- /dev/null
+++ b/lib/system
@@ -0,0 +1 @@
+Subproject commit 90ce83ba36c6081b1395b555575260cb13358693
diff --git a/redestoff/autoload.inc.php b/redestoff/autoload.inc
similarity index 66%
rename from redestoff/autoload.inc.php
rename to redestoff/autoload.inc
index a8278a2..6cc5b6d 100644
--- a/redestoff/autoload.inc.php
+++ b/redestoff/autoload.inc
@@ -1,5 +1,5 @@
 <?php
 
 require_once dirname(__FILE__).'/path/register_path_classes.php';
-require_once dirname(__FILE__).'/page/register_page_classes.php';
+require_once dirname(__FILE__).'/page/autoload.inc';
 require_once dirname(__FILE__).'/files/register_files.php';
\ No newline at end of file
diff --git a/redestoff/files/alben/Flexibel_im_Niveau.zip b/redestoff/files/alben/Flexibel_im_Niveau.zip
new file mode 100644
index 0000000..0c540c6
Binary files /dev/null and b/redestoff/files/alben/Flexibel_im_Niveau.zip differ
diff --git a/redestoff/files/alben/Redestoff_EP.zip b/redestoff/files/alben/Redestoff_EP.zip
new file mode 100644
index 0000000..af7239c
Binary files /dev/null and b/redestoff/files/alben/Redestoff_EP.zip differ
diff --git a/redestoff/files/alben/Scheiß_auf_die_Idioten.zip b/redestoff/files/alben/Scheiß_auf_die_Idioten.zip
new file mode 100644
index 0000000..cf6b3f8
Binary files /dev/null and b/redestoff/files/alben/Scheiß_auf_die_Idioten.zip differ
diff --git a/redestoff/files/alben/X-Mas_Sound.zip b/redestoff/files/alben/X-Mas_Sound.zip
new file mode 100644
index 0000000..0a7a340
Binary files /dev/null and b/redestoff/files/alben/X-Mas_Sound.zip differ
diff --git a/redestoff/page/register_page_classes.php b/redestoff/page/autoload.inc
similarity index 100%
rename from redestoff/page/register_page_classes.php
rename to redestoff/page/autoload.inc
diff --git a/redestoff/page/default_impressum/default_impressum.php b/redestoff/page/default_impressum/default_impressum.php
index 7450cb6..3810ade 100644
--- a/redestoff/page/default_impressum/default_impressum.php
+++ b/redestoff/page/default_impressum/default_impressum.php
@@ -4,7 +4,7 @@ class default_impressum extends SYSTEM\PAGE\Page {
     
     
     public function html() {
-        $vars["redestoff_impressum"] = \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_REDSTOFF_TEXT);
+        $vars["redestoff_impressum"] = \SYSTEM\PAGE\text::get('impressum');
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/impressum.tpl'), $vars);
     }
 }
\ No newline at end of file
diff --git a/redestoff/page/default_page/default_page.js b/redestoff/page/default_page/default_page.js
index cd27214..04edef4 100644
--- a/redestoff/page/default_page/default_page.js
+++ b/redestoff/page/default_page/default_page.js
@@ -1,11 +1,5 @@
 $(document).ready(function() {
-    console.log("fu");
     $("#impressum_link").click(function(){
-        console.log("bla");
-        $("#midframe").load("./?action=load&id=redestoff_impressum");
-    });
-    $("#test").click(function(){
-        console.log("bla");
-        $("#midframe").load("./?action=load&id=redestoff_impressum");
+        $("#midframe").load("./?page=impressum");
     });
 });
diff --git a/redestoff/page/default_page/default_page.php b/redestoff/page/default_page/default_page.php
index 78e7751..86c05c9 100644
--- a/redestoff/page/default_page/default_page.php
+++ b/redestoff/page/default_page/default_page.php
@@ -3,12 +3,15 @@
 class default_page extends SYSTEM\PAGE\Page {
     
     private function js(){        
-        return  '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
+        return  '<script type="text/javascript" language="JavaScript" src="http://code.jquery.com/jquery.js"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
                 
     }
-    public function html(){
+    public function html($_escaped_fragment_ = NULL){
         $vars = array();
-        $vars['js'] = $this->js(); 
+        $vars['js'] = '';
+        if(!$_escaped_fragment_){
+            $vars['js'] = $this->js();}
         $vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
         $vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/redestoff.tpl'), $vars);
diff --git a/redestoff/page/default_page/redestoff.tpl b/redestoff/page/default_page/redestoff.tpl
index f3a6f45..4d997f7 100644
--- a/redestoff/page/default_page/redestoff.tpl
+++ b/redestoff/page/default_page/redestoff.tpl
@@ -88,7 +88,7 @@
                 <div class="hero-unit" style="background-color: black; margin-top: 0px; margin-left: 20px; padding:7px; width:150px; background: url(${IMG_PATH}affen_top.jpg);">                
                     <img src="${IMG_PATH}REP_Cover.jpg" width="200" height="150"  />
 <!--                    <iframe width="200" height="150" src="http://www.youtube.com/embed/kpavxOgpNkY?rel=0" frameborder="0" ></iframe>-->                    
-                    <div style="padding-top: 5px;"><a class="btn" style="font-size: 9px;" href="/.api.php?call=files&cat=alben&id=Redestoff_EP.zip">DOWNLOAD &raquo;</a>
+                    <div style="padding-top: 5px;"><a class="btn" style="font-size: 9px;" href="./api.php?call=files&cat=alben&id=Redestoff_EP.zip">DOWNLOAD &raquo;</a>
                          <img src="${IMG_PATH}LOGO2011!!!.png" width="30" height="30" style="margin-left: 23px;"  />
                     </div>
                 </div>
@@ -109,7 +109,6 @@
             </div>
             </div>
 
-        <script src="http://code.jquery.com/jquery.js"></script>
         <script src="${BT_PATH}js/bootstrap.min.js"></script>
     </body>
 </html>
diff --git a/redestoff/page/page_redestoff.php b/redestoff/page/page_redestoff.php
index dba4d88..5e8e3cf 100644
--- a/redestoff/page/page_redestoff.php
+++ b/redestoff/page/page_redestoff.php
@@ -2,7 +2,10 @@
 
 class page_redestoff extends \SYSTEM\API\api_default {
 
-    public static function default_page(){
-        return new default_page();
-    }   
+    public static function default_page($_escaped_fragment_ = NULL){
+        return (new default_page())->html($_escaped_fragment_);
+    }
+    
+    public static function page_impressum(){
+        return (new default_impressum())->html();}
 }
\ No newline at end of file
diff --git a/sai.php b/sai.php
index 4a34eb8..68c8c7d 100644
--- a/sai.php
+++ b/sai.php
@@ -1,9 +1,9 @@
 <?php
-require_once 'system/autoload.inc';                                         //SYSTEM Classes
-require_once 'redestoff/autoload.inc.php';                                        //Project Classes
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'redestoff/autoload.inc';                                           //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';                                                      //Server config
-SYSTEM\system::start($redestoff_config);                                          //Start System time + config
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 SYSTEM\system::include_ExceptionShortcut();                                     //allow ERROR() instead of \SYSTEM\LOG\ERROR()
 SYSTEM\system::include_ResultShortcut();                                        //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
 SYSTEM\system::register_errorhandler_dbwriter();                                //write errors to database (must be first errorhandler to register)
diff --git a/system b/system
deleted file mode 160000
index 18a6cd5..0000000
--- a/system
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d