diff --git a/api/autoload.inc.php b/api/autoload.inc.php
new file mode 100644
index 0000000..9c5b8af
--- /dev/null
+++ b/api/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\API');
\ No newline at end of file
diff --git a/autoload.inc.php b/autoload.inc.php
index dc05dbd..3cf27a1 100644
--- a/autoload.inc.php
+++ b/autoload.inc.php
@@ -1,38 +1,23 @@
 <?php
-//include autoloadclass
+//include autoload class
 require_once dirname(__FILE__).'/system/path.php';
 require_once dirname(__FILE__).'/system/autoload.php';
 
 //Register autoload
 \SYSTEM\autoload::register_autoload();
 
-//Register system classes
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/system','SYSTEM');
-
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log/result','SYSTEM\LOG');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log','SYSTEM\LOG');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log/exceptions','SYSTEM\LOG');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log/error_handler','SYSTEM\LOG');
-
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/api','SYSTEM\API');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/page','SYSTEM\PAGE');
-
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/dbd/tbl/','SYSTEM\DBD');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/dbd/qq/','SYSTEM\DBD');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db','SYSTEM\DB');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/dbinfo','SYSTEM\DB');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/connection','SYSTEM\DB');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/result','SYSTEM\DB');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/qq','SYSTEM\DB');
-
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/security','SYSTEM\SECURITY');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/config','SYSTEM\CONFIG');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/cache','SYSTEM\CACHE');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/sai','SYSTEM\SAI');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/docu','SYSTEM\DOCU');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/files','SYSTEM\FILES');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/cron','SYSTEM\CRON');
-
-require_once dirname(__FILE__).'/lib/autoload.inc.php';
-require_once dirname(__FILE__).'/docu/register_sys_docu.php';
-require_once dirname(__FILE__).'/sai/autoload.inc.php';
\ No newline at end of file
+//Autoload submodules
+require_once dirname(__FILE__).'/system/autoload.inc.php';
+require_once dirname(__FILE__).'/log/autoload.inc.php';
+require_once dirname(__FILE__).'/api/autoload.inc.php';
+require_once dirname(__FILE__).'/page/autoload.inc.php';
+require_once dirname(__FILE__).'/dbd/autoload.inc.php';
+require_once dirname(__FILE__).'/db/autoload.inc.php';
+require_once dirname(__FILE__).'/security/autoload.inc.php';
+require_once dirname(__FILE__).'/config/autoload.inc.php';
+require_once dirname(__FILE__).'/cache/autoload.inc.php';
+require_once dirname(__FILE__).'/docu/autoload.inc.php';
+require_once dirname(__FILE__).'/files/autoload.inc.php';
+require_once dirname(__FILE__).'/cron/autoload.inc.php';
+require_once dirname(__FILE__).'/sai/autoload.inc.php';
+require_once dirname(__FILE__).'/lib/autoload.inc.php';
\ No newline at end of file
diff --git a/cache/autoload.inc.php b/cache/autoload.inc.php
new file mode 100644
index 0000000..7990f0f
--- /dev/null
+++ b/cache/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CACHE');
\ No newline at end of file
diff --git a/config/autoload.inc.php b/config/autoload.inc.php
new file mode 100644
index 0000000..b4ee554
--- /dev/null
+++ b/config/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CONFIG');
\ No newline at end of file
diff --git a/cron/autoload.inc.php b/cron/autoload.inc.php
new file mode 100644
index 0000000..c48ab76
--- /dev/null
+++ b/cron/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CRON');
\ No newline at end of file
diff --git a/cron/cronjobtest.php b/cron/cronjobtest.php
deleted file mode 100644
index b3c541d..0000000
--- a/cron/cronjobtest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace SYSTEM\CRON;
-
-class cronjobtest extends cronjob {
-    public static function run(){
-        new \SYSTEM\LOG\WARNING("Unimplemented!");
-        return \SYSTEM\CRON\cronstatus::CRON_STATUS_SUCCESFULLY;
-    }
-}
\ No newline at end of file
diff --git a/cron/crontime.php b/cron/crontime.php
index c176d87..6a58616 100644
--- a/cron/crontime.php
+++ b/cron/crontime.php
@@ -46,7 +46,7 @@ class crontime {
         return mktime($last_hour, $last_min, 0, $last_month, $last_day, $last_year);
     }
     public static function check($base_time,$last_run,$min,$hour,$day,$day_week,$month){
-        return crontime::next($last_run, $min, $hour, $day, $day_week, $month) < $base_time ? true : false;}
+        return self::next($last_run, $min, $hour, $day, $day_week, $month) < $base_time ? true : false;}
     public static function next_now($min,$hour,$day,$day_week,$month){
         self::next(time(),$min,$hour,$day,$day_week,$month);}
     public static function last_now($min,$hour,$day,$day_week,$month){
diff --git a/db/autoload.inc.php b/db/autoload.inc.php
new file mode 100644
index 0000000..2bca5de
--- /dev/null
+++ b/db/autoload.inc.php
@@ -0,0 +1,6 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\DB');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/dbinfo','SYSTEM\DB');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/connection','SYSTEM\DB');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/result','SYSTEM\DB');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DB');
\ No newline at end of file
diff --git a/dbd/autoload.inc.php b/dbd/autoload.inc.php
new file mode 100644
index 0000000..3cfa7e3
--- /dev/null
+++ b/dbd/autoload.inc.php
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl','SYSTEM\DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/docu/autoload.inc.php b/docu/autoload.inc.php
new file mode 100644
index 0000000..d4353fb
--- /dev/null
+++ b/docu/autoload.inc.php
@@ -0,0 +1,4 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\DOCU');
+
+require_once dirname(__FILE__).'/register_sys_docu.php';
\ No newline at end of file
diff --git a/files/autoload.inc.php b/files/autoload.inc.php
new file mode 100644
index 0000000..ca73016
--- /dev/null
+++ b/files/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\FILES');
\ No newline at end of file
diff --git a/log/autoload.inc.php b/log/autoload.inc.php
new file mode 100644
index 0000000..2236094
--- /dev/null
+++ b/log/autoload.inc.php
@@ -0,0 +1,5 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'','SYSTEM\LOG');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/result','SYSTEM\LOG');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/exceptions','SYSTEM\LOG');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/error_handler','SYSTEM\LOG');
\ No newline at end of file
diff --git a/page/autoload.inc.php b/page/autoload.inc.php
new file mode 100644
index 0000000..33a05ec
--- /dev/null
+++ b/page/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\PAGE');
\ No newline at end of file
diff --git a/sai/autoload.inc.php b/sai/autoload.inc.php
index e82a68f..49c066a 100644
--- a/sai/autoload.inc.php
+++ b/sai/autoload.inc.php
@@ -1,7 +1,5 @@
 <?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/sai','SYSTEM\SAI');
-
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/page','SYSTEM\SAI');
-
-require_once dirname(__FILE__).'/modules/autoload_modules.php';
-require_once dirname(__FILE__).'/modules/register_modules.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/modules/autoload_modules.php';
\ No newline at end of file
diff --git a/sai/modules/autoload_modules.php b/sai/modules/autoload_modules.php
index 428b21c..276af6c 100644
--- a/sai/modules/autoload_modules.php
+++ b/sai/modules/autoload_modules.php
@@ -12,4 +12,6 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_cache','SYSTEM\SA
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_docu','SYSTEM\SAI');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_todo','SYSTEM\SAI');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_files','SYSTEM\SAI');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_cron','SYSTEM\SAI');
\ No newline at end of file
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_sys_cron','SYSTEM\SAI');
+
+require_once dirname(__FILE__).'/register_modules.php';
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php
index 3601d32..3ad87d1 100644
--- a/sai/modules/saimod_sys_api/saimod_sys_api.php
+++ b/sai/modules/saimod_sys_api/saimod_sys_api.php
@@ -58,6 +58,8 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
     public static function sai_mod__system_sai_saimod_sys_api_action_addcall($ID,$group,$type,$parentID,$parentValue,$name,$verify){
         if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){
             throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");}
+        if($parentValue == ''){ $parentValue = NULL;}
+        if($verify      == ''){ $verify = NULL;}
         \SYSTEM\DBD\SYS_SAIMOD_API_ADD::QI(array($ID,$group,$type,$parentID,$parentValue,$name,$verify));
         return \SYSTEM\LOG\JsonResult::ok();
     }
diff --git a/security/autoload.inc.php b/security/autoload.inc.php
new file mode 100644
index 0000000..4814d67
--- /dev/null
+++ b/security/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SECURITY');
\ No newline at end of file
diff --git a/system/autoload.inc.php b/system/autoload.inc.php
new file mode 100644
index 0000000..9c6ec92
--- /dev/null
+++ b/system/autoload.inc.php
@@ -0,0 +1,2 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM');
\ No newline at end of file