diff --git a/api.php b/api.php
index 0495874..1068d56 100644
--- a/api.php
+++ b/api.php
@@ -1,13 +1,12 @@
 <?php
-
 require_once '../system/autoload.inc.php';                                         //SYSTEM Classes
 require_once 'uVote/autoload.inc.php';                                           //Project Classes
-require_once '../system/log/register_exception_shortcut.php';                      //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-require_once '../system/log/register_errorhandler_jsonoutput.php';                 //print errors as json to caller
-require_once '../system/log/register_result_shortcut.php'; 
 
 require_once 'config.php';
 SYSTEM\system::start($uvote_config);
+\SYSTEM\system::include_ExceptionShortcut();
+\SYSTEM\system::include_ResultShortcut();
+\SYSTEM\system::register_errorhandler_dbwriter();
+\SYSTEM\system::register_errorhandler_jsonoutput();
 
-$api = new \SYSTEM\API\Api (new SYSTEM\verifyclass(), new ApiClass());
-echo $api->CALL(array_merge($_POST,$_GET));
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_uvote',array_merge($_POST,$_GET));
\ No newline at end of file
diff --git a/config.php b/config.php
index d44c1e5..2434313 100644
--- a/config.php
+++ b/config.php
@@ -10,5 +10,5 @@ $uvote_config = array(  array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,         'dsjgfasudzfsvad'),
                         array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,           'host_uVote'),
                         array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, '../system/'),
-                        array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,              \serialize(array('deDE', 'enUS', 'huHU'))),
+                        array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,              array('deDE', 'enUS', 'huHU')),
                         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 9fbaff6..5990967 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,12 @@
 <?php
-
 require_once '../system/autoload.inc.php';                                         //SYSTEM Classes
 require_once 'uVote/autoload.inc.php';                                           //Project Classes
-require_once '../system/log/register_exception_shortcut.php';                      //allow ERROR() instead of \SYSTEM\LOG\ERROR()
-require_once '../system/log/register_errorhandler_jsonoutput.php';                 //print errors as json to caller
-require_once '../system/log/register_result_shortcut.php'; 
        
 require_once 'config.php';
 SYSTEM\system::start($uvote_config);
+\SYSTEM\system::include_ExceptionShortcut();
+\SYSTEM\system::include_ResultShortcut();
+\SYSTEM\system::register_errorhandler_dbwriter();
+\SYSTEM\system::register_errorhandler_jsonoutput();
 
-$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\verifyclass(), new PageApi());
-echo $page->CALL(array_merge($_POST,$_GET))->html();
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html();
\ No newline at end of file
diff --git a/uVote/api/ApiClass.php b/uVote/api/api_uvote.php
similarity index 82%
rename from uVote/api/ApiClass.php
rename to uVote/api/api_uvote.php
index 5ba6588..40709df 100644
--- a/uVote/api/ApiClass.php
+++ b/uVote/api/api_uvote.php
@@ -1,6 +1,6 @@
 <?php
 
-class ApiClass extends \SYSTEM\API\apiloginclass {
+class api_uvote extends \SYSTEM\API\api_login {
     public static function call_vote_action_vote($poll_ID, $vote) {
         return votes::write_vote($poll_ID, $vote);}
     public static function call_vote_action_barsperusers($poll_ID){
diff --git a/uVote/api/autoload.inc.php b/uVote/api/autoload.inc.php
index a345682..3fced9b 100644
--- a/uVote/api/autoload.inc.php
+++ b/uVote/api/autoload.inc.php
@@ -1,7 +1,3 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/votes','');
-
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes','');
\ No newline at end of file
diff --git a/uVote/dbd/autoload.inc.php b/uVote/dbd/autoload.inc.php
index d87380a..91ed195 100644
--- a/uVote/dbd/autoload.inc.php
+++ b/uVote/dbd/autoload.inc.php
@@ -1,9 +1,6 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
-$autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
\ No newline at end of file
diff --git a/uVote/page/PageApi.php b/uVote/page/page_uvote.php
similarity index 96%
rename from uVote/page/PageApi.php
rename to uVote/page/page_uvote.php
index f64529e..1f73dc6 100644
--- a/uVote/page/PageApi.php
+++ b/uVote/page/page_uvote.php
@@ -1,6 +1,6 @@
 <?php
 
-class PageApi extends \SYSTEM\PAGE\PageClass {
+class page_uvote extends \SYSTEM\API\api_default {
 
     public static function default_page(){
         return new default_page();}
diff --git a/uVote/page/register_page_classes.php b/uVote/page/register_page_classes.php
index 751c739..d5fe93b 100644
--- a/uVote/page/register_page_classes.php
+++ b/uVote/page/register_page_classes.php
@@ -1,9 +1,6 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
-$autoload->registerFolder(dirname(__FILE__).'/default_page','');
-$autoload->registerFolder(dirname(__FILE__).'/default_myvote','');
-$autoload->registerFolder(dirname(__FILE__).'/default_register','');
-$autoload->registerFolder(dirname(__FILE__).'/default_openinfo','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_myvote','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_openinfo','');
diff --git a/uVote/path/register_path_classes.php b/uVote/path/register_path_classes.php
index 36d9a01..d94a324 100644
--- a/uVote/path/register_path_classes.php
+++ b/uVote/path/register_path_classes.php
@@ -1,5 +1,2 @@
 <?php
-
-$autoload = SYSTEM\autoload::getInstance();
-
-$autoload->registerFolder(dirname(__FILE__),'');
\ No newline at end of file
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file