diff --git a/mojotrollz/sai/autoload.inc b/mojotrollz/sai/autoload.inc
index 6562278..c04970a 100644
--- a/mojotrollz/sai/autoload.inc
+++ b/mojotrollz/sai/autoload.inc
@@ -1,8 +1,6 @@
 <?php
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'','');
-
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_server_handling','');
-\SYSTEM\SAI\sai::register('saimod_mojotrollz_server_handling');
+require_once dirname(__FILE__).'/saimod_mojotrollz_server_handling/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_creature/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_item/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_quest/autoload.inc';
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_server_handling/autoload.inc
new file mode 100644
index 0000000..68ce1ff
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/autoload.inc
@@ -0,0 +1,4 @@
+<?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','DBD');
+\SYSTEM\SAI\sai::register('saimod_mojotrollz_server_handling');
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.js b/mojotrollz/sai/saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.js
rename to mojotrollz/sai/saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
index 4a49851..425c5bf 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
+++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php
@@ -4,12 +4,12 @@ class saimod_mojotrollz_server_handling extends \SYSTEM\SAI\SaiModule {
         $vars = array();
         $vars['status_realm'] = self::sai_mod_saimod_mojotrollz_server_handling_action_realmstatus();
         $vars['status_world'] = self::sai_mod_saimod_mojotrollz_server_handling_action_worldstatus();
-        return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/main.tpl', $vars);}            
+        return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/tpl/main.tpl', $vars);}            
     public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_mojotrollz_server_handling">Server</a></li><li class="divider"></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
     public static function sai_mod_saimod_mojotrollz_server_handling_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
-            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.js')
+            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js')
     ));}
     public static function sai_mod_saimod_mojotrollz_server_handling_flag_css(){}
     
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/sql/server_handling.sql b/mojotrollz/sai/saimod_mojotrollz_server_handling/server_handling.sql
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_server_handling/sql/server_handling.sql
rename to mojotrollz/sai/saimod_mojotrollz_server_handling/server_handling.sql
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/main.tpl b/mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_server_handling/main.tpl
rename to mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl