diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php
index 4900ee9..be7c47a 100644
--- a/mojotrollz/page/default_beta/default_beta.php
+++ b/mojotrollz/page/default_beta/default_beta.php
@@ -6,9 +6,9 @@ class default_beta implements \SYSTEM\PAGE\Page {
         return \SYSTEM\PAGE\text::tag('meta_beta');}
     public function html(){
         $vars = array();
-        $vars['realm_online']   = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_realm_status() == 1 ? 'online' : 'offline';
-        $vars['world_online']   = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_world_status() == 1 ? 'online' : 'offline';
-        $vars['test_online']    = \SAI\saimod_mojotrollz_server_handling::sai_mod__SAI_saimod_mojotrollz_server_handling_action_run_tbc_world_test_status() == 1 ? 'online' : 'offline';
+        $vars['realm_online']   = \SAI\saimod_mojotrollz_servers::sai_mod__SAI_saimod_mojotrollz_servers_action_run_tbc_realm_status() == 1 ? 'online' : 'offline';
+        $vars['world_online']   = \SAI\saimod_mojotrollz_servers::sai_mod__SAI_saimod_mojotrollz_servers_action_run_tbc_world_status() == 1 ? 'online' : 'offline';
+        $vars['test_online']    = \SAI\saimod_mojotrollz_servers::sai_mod__SAI_saimod_mojotrollz_servers_action_run_tbc_world_test_status() == 1 ? 'online' : 'offline';
         if(\SYSTEM\SECURITY\security::isLoggedIn()){
             $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email;
             $vars['username'] = \SYSTEM\SECURITY\security::getUser()->username;
diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVERS.php b/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVERS.php
new file mode 100644
index 0000000..38bd75a
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVERS.php
@@ -0,0 +1,9 @@
+<?php
+namespace SQL;
+class DATA_SAIMOD_MOJOTROLLZ_SERVERS extends \SYSTEM\DB\QI {
+    public static function get_class(){return \get_class();}
+    public static function files_mysql(){
+        return array(   (new \PSAI('/saimod_mojotrollz_servers/sql/mysql/system_page.sql'))->SERVERPATH(),
+                        (new \PSAI('/saimod_mojotrollz_servers/sql/mysql/system_api.sql'))->SERVERPATH());
+    }    
+}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVER_HANDLING.php b/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVER_HANDLING.php
deleted file mode 100644
index 1231f55..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_servers/sql/DATA_SAIMOD_MOJOTROLLZ_SERVER_HANDLING.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace SQL;
-class DATA_SAIMOD_MOJOTROLLZ_SERVER_HANDLING extends \SYSTEM\DB\QI {
-    public static function get_class(){return \get_class();}
-    public static function files_mysql(){
-        return array(   (new \PSAI('/saimod_mojotrollz_server_handling/sql/mysql/system_page.sql'))->SERVERPATH(),
-                        (new \PSAI('/saimod_mojotrollz_server_handling/sql/mysql/system_api.sql'))->SERVERPATH());
-    }    
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/sql/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_servers/sql/autoload.inc
index e81a064..6bccacb 100644
--- a/mojotrollz/sai/saimod_mojotrollz_servers/sql/autoload.inc
+++ b/mojotrollz/sai/saimod_mojotrollz_servers/sql/autoload.inc
@@ -1,4 +1,4 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SQL');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SQL');
-\SYSTEM\SQL\setup::register('SQL\\DATA_SAIMOD_MOJOTROLLZ_SERVER_HANDLING');
\ No newline at end of file
+\SYSTEM\SQL\setup::register('SQL\\DATA_SAIMOD_MOJOTROLLZ_SERVERS');
\ No newline at end of file