diff --git a/mojotrollz/api/autoload.inc b/mojotrollz/api/autoload.inc
new file mode 100644
index 0000000..f3da379
--- /dev/null
+++ b/mojotrollz/api/autoload.inc
@@ -0,0 +1,9 @@
+<?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/server','');
+require_once dirname(__FILE__).'/realm/autoload.inc';
+require_once dirname(__FILE__).'/world/autoload.inc';
+require_once dirname(__FILE__).'/database/autoload.inc';
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char','');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client','');
\ No newline at end of file
diff --git a/mojotrollz/api/autoload.inc.php b/mojotrollz/api/autoload.inc.php
deleted file mode 100644
index b7500e5..0000000
--- a/mojotrollz/api/autoload.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/server','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/realm','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/world','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/database','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/char/qq','DBD');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/client','');
-
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature','');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature/qq','DBD');
\ No newline at end of file
diff --git a/mojotrollz/api/database/autoload.inc b/mojotrollz/api/database/autoload.inc
new file mode 100644
index 0000000..de59206
--- /dev/null
+++ b/mojotrollz/api/database/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php b/mojotrollz/api/database/log/WOW_STATS_PLAYER_ONLINE.php
similarity index 100%
rename from mojotrollz/log/WOW_STATS_PLAYER_ONLINE.php
rename to mojotrollz/api/database/log/WOW_STATS_PLAYER_ONLINE.php
diff --git a/mojotrollz/api/population_statistics/population_statistics.php b/mojotrollz/api/database/population_statistics.php
similarity index 100%
rename from mojotrollz/api/population_statistics/population_statistics.php
rename to mojotrollz/api/database/population_statistics.php
diff --git a/mojotrollz/api/realm/autoload.inc b/mojotrollz/api/realm/autoload.inc
new file mode 100644
index 0000000..de59206
--- /dev/null
+++ b/mojotrollz/api/realm/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_REALM_OFFLINE.php b/mojotrollz/api/realm/log/WOW_STATS_REALM_OFFLINE.php
similarity index 100%
rename from mojotrollz/log/WOW_STATS_REALM_OFFLINE.php
rename to mojotrollz/api/realm/log/WOW_STATS_REALM_OFFLINE.php
diff --git a/mojotrollz/log/WOW_STATS_REALM_ONLINE.php b/mojotrollz/api/realm/log/WOW_STATS_REALM_ONLINE.php
similarity index 100%
rename from mojotrollz/log/WOW_STATS_REALM_ONLINE.php
rename to mojotrollz/api/realm/log/WOW_STATS_REALM_ONLINE.php
diff --git a/mojotrollz/api/world/autoload.inc b/mojotrollz/api/world/autoload.inc
new file mode 100644
index 0000000..de59206
--- /dev/null
+++ b/mojotrollz/api/world/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/log');
\ No newline at end of file
diff --git a/mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php b/mojotrollz/api/world/log/WOW_STATS_WORLD_OFFLINE.php
similarity index 100%
rename from mojotrollz/log/WOW_STATS_WORLD_OFFLINE.php
rename to mojotrollz/api/world/log/WOW_STATS_WORLD_OFFLINE.php
diff --git a/mojotrollz/log/WOW_STATS_WORLD_ONLINE.php b/mojotrollz/api/world/log/WOW_STATS_WORLD_ONLINE.php
similarity index 100%
rename from mojotrollz/log/WOW_STATS_WORLD_ONLINE.php
rename to mojotrollz/api/world/log/WOW_STATS_WORLD_ONLINE.php
diff --git a/mojotrollz/autoload.inc.php b/mojotrollz/autoload.inc.php
index 82d87c0..1ea87be 100644
--- a/mojotrollz/autoload.inc.php
+++ b/mojotrollz/autoload.inc.php
@@ -2,7 +2,6 @@
 require_once dirname(__FILE__).'/path/register_path_classes.php';
 require_once dirname(__FILE__).'/page/autoload.inc';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
-require_once dirname(__FILE__).'/api/autoload.inc.php';
+require_once dirname(__FILE__).'/api/autoload.inc';
 require_once dirname(__FILE__).'/docu/autoload.inc.php';
-require_once dirname(__FILE__).'/files/autoload.inc.php';
-require_once dirname(__FILE__).'/log/autoload.inc.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/files/autoload.inc.php';
\ No newline at end of file
diff --git a/mojotrollz/log/autoload.inc.php b/mojotrollz/log/autoload.inc.php
deleted file mode 100644
index d94a324..0000000
--- a/mojotrollz/log/autoload.inc.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file