diff --git a/api.php b/api.php
index da83817..527a7e1 100644
--- a/api.php
+++ b/api.php
@@ -10,7 +10,4 @@ SYSTEM\system::include_ResultShortcut();
 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
 
-$api = new \SYSTEM\API\Api (new SYSTEM\verifyclass(), new ApiClass());
-echo $api->CALL(array_merge($_POST,$_GET));
-
-//echo \SYSTEM\API\Api::run('\SYSTEM\verify', 'api_danube',array_merge($_POST,$_GET),group,strict=false);
\ No newline at end of file
+echo \SYSTEM\API\Api::run('\SYSTEM\API\verify', 'api_danube',array_merge($_POST,$_GET));
\ No newline at end of file
diff --git a/danube/api/ApiClass.php b/danube/api/api_danube.php
similarity index 72%
rename from danube/api/ApiClass.php
rename to danube/api/api_danube.php
index 0219c23..814a8b9 100644
--- a/danube/api/ApiClass.php
+++ b/danube/api/api_danube.php
@@ -1,6 +1,6 @@
 <?php
 
-class ApiClass extends \SYSTEM\API\apiloginclass {
+class api_danube extends \SYSTEM\API\api_login {
     
     public static function call_img($id){
         return picfolder::get(\SYSTEM\SERVERPATH(new PPAGE,'pics'),$id);
diff --git a/danube/page/PageApi.php b/danube/page/page_danube.php
similarity index 96%
rename from danube/page/PageApi.php
rename to danube/page/page_danube.php
index 04dce73..18b5705 100644
--- a/danube/page/PageApi.php
+++ b/danube/page/page_danube.php
@@ -1,6 +1,6 @@
 <?php
 
-class PageApi extends \SYSTEM\PAGE\PageClass {
+class page_danube extends \SYSTEM\API\api_default {
 
     public static function default_page(){
         return new default_page();}
diff --git a/index.php b/index.php
index 0c07e95..8bbec38 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,8 @@ SYSTEM\system::include_ResultShortcut();
 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
 
-$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\verifyclass(), new PageApi());
-echo $page->CALL(array_merge($_POST,$_GET))->html();
+//$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\API\verify(), new PageApi());
+//echo $page->CALL(array_merge($_POST,$_GET))->html();
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_danube', array_merge($_POST,$_GET),1,false,true)->html();
 
 new INFO('Page was called sucessfully.');
\ No newline at end of file