diff --git a/api.php b/api.php
index 8279c28..26313a2 100644
--- a/api.php
+++ b/api.php
@@ -1,14 +1,13 @@
 <?php
-require_once '../system/autoload.inc.php';                                      //SYSTEM Classes
-\SYSTEM\system::register_errorhandler_dbwriter();                               //write errors to database (must be first errorhandler to register)
-\SYSTEM\system::register_errorhandler_jsonoutput();                             //print errors as json to caller
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'danube/autoload.inc';                                             //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'danube/autoload.inc.php';                                         //Project Classes
-       
-require_once 'config.php';
-\SYSTEM\system::start($danube_config);                                          //Start System time + config
-\SYSTEM\system::include_ExceptionShortcut();                                    //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-\SYSTEM\system::include_ResultShortcut();                                       //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
+\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', 'api_danube',\array_merge($_POST,$_GET));
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_danube',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 04b2887..0000000
--- a/config.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$danube_config = array(     array(config_ids::SYS_CONFIG_ERRORREPORTING,      E_ALL | E_STRICT),
-                            array(config_ids::SYS_CONFIG_PATH_BASEURL,        'http://www.mojotrollz.eu/web/danube/'),
-                            array(config_ids::SYS_CONFIG_PATH_BASEPATH,       '/home/web/webdir/danube/'),
-                            array(config_ids::SYS_CONFIG_DEFAULT_RESULT,      \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT_JSON),
-                            array(config_ids::SYS_CONFIG_DB_TYPE,             SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
-                            array(config_ids::SYS_CONFIG_DB_HOST,             '127.0.0.1'),
-                            array(config_ids::SYS_CONFIG_DB_PORT,             ''),
-                            array(config_ids::SYS_CONFIG_DB_USER,             'mojotrolls_mysql'),
-                            array(config_ids::SYS_CONFIG_DB_PASSWORD,         'dajsabeaisvd345'),
-                            array(config_ids::SYS_CONFIG_DB_DBNAME,           'host_danube'),
-                            array(config_ids::SYS_SAI_CONFIG_NAVIMG,         '/web/danube/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(config_ids::SYS_SAI_CONFIG_BASEURL,        'http://mojotrollz.eu/web/danube/sai.php?'),
-                            array(config_ids::SYS_SAI_CONFIG_TITLE,          'danube - Admin Area'),
-                            array(config_ids::SYS_SAI_CONFIG_COPYRIGHT,      '<a href="http://www.mojotrollz.eu/web/danube/" target="_blank">danube</a>, &copy; WebCraft Media 2013'),
-                            array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'lib/system/'),
-                            array(config_ids::SYS_CONFIG_LANGS,              array('deDE', 'enUS', 'huHU')),
-                            array(config_ids::SYS_CONFIG_DEFAULT_LANG,       'deDE'),
-                            array(config_ids::WEBCRAFT_BILLING_TOKEN,        'DANUBEdhasda3afdsjadfa3'));   
\ No newline at end of file
diff --git a/index.php b/index.php
index f1739f9..6e7c83b 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,13 @@
 <?php
-require_once '../system/autoload.inc.php';                                      //SYSTEM Classes
-SYSTEM\system::register_errorhandler_dbwriter();                                //write errors to database (must be first errorhandler to register)
-SYSTEM\system::register_errorhandler_jsonoutput();                              //print errors as json to caller
-require_once 'danube/autoload.inc.php';                                         //Project Classes
-       
-require_once 'config.php';
-SYSTEM\system::start($danube_config);                                           //Start System time + config
-SYSTEM\system::include_ExceptionShortcut();                                     //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-SYSTEM\system::include_ResultShortcut();                                        //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'danube/autoload.inc';                                             //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-header('Access-Control-Allow-Origin: *');
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_danube', array_merge($_POST,$_GET),1,false,true)->html();
-new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
+\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_danube',array_merge($_POST,$_GET), 1, true, true);
+new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/sai.php b/sai.php
index ec5485f..faef1c8 100644
--- a/sai.php
+++ b/sai.php
@@ -1,18 +1,13 @@
 <?php
-require_once '../system/autoload.inc.php';                                      //SYSTEM Classes
-SYSTEM\system::register_errorhandler_dbwriter();                                //write errors to database (must be first errorhandler to register)
-SYSTEM\system::register_errorhandler_jsonoutput();                              //print errors as json to caller
-require_once 'danube/autoload.inc.php';                                         //Project Classes
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'danube/autoload.inc';                                             //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';                                                      //Server config
-SYSTEM\system::start($danube_config);                                           //Start System time + config
-SYSTEM\system::include_ExceptionShortcut();                                     //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-SYSTEM\system::include_ResultShortcut();                                        //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
+\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)
+\SYSTEM\system::register_errorhandler_jsonoutput();                             //print errors as json to caller
 
-require_once '../system/sai/autoload.inc.php';
-require_once 'danube/sai/autoload.inc.php';
-require_once 'danube/sai/register_modules.php';
-
-header('Access-Control-Allow-Origin: *');
 $sai = new SYSTEM\SAI\saigui();
 echo $sai->html();
\ No newline at end of file