diff --git a/api/autoload.inc b/api/autoload.inc
index 9c5b8af..cf0349d 100644
--- a/api/autoload.inc
+++ b/api/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\API');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\API');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_API_TREE.php b/api/qq/SYS_API_TREE.php
similarity index 100%
rename from dbd/qq/SYS_API_TREE.php
rename to api/qq/SYS_API_TREE.php
diff --git a/cache/autoload.inc b/cache/autoload.inc
index 7990f0f..cdf0ba9 100644
--- a/cache/autoload.inc
+++ b/cache/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CACHE');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CACHE');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_CACHE_CHECK.php b/cache/qq/SYS_CACHE_CHECK.php
similarity index 100%
rename from dbd/qq/SYS_CACHE_CHECK.php
rename to cache/qq/SYS_CACHE_CHECK.php
diff --git a/dbd/qq/SYS_CACHE_DELETE.php b/cache/qq/SYS_CACHE_DELETE.php
similarity index 100%
rename from dbd/qq/SYS_CACHE_DELETE.php
rename to cache/qq/SYS_CACHE_DELETE.php
diff --git a/dbd/qq/SYS_CACHE_DELETE_ALL.php b/cache/qq/SYS_CACHE_DELETE_ALL.php
similarity index 100%
rename from dbd/qq/SYS_CACHE_DELETE_ALL.php
rename to cache/qq/SYS_CACHE_DELETE_ALL.php
diff --git a/dbd/qq/SYS_CACHE_PUT.php b/cache/qq/SYS_CACHE_PUT.php
similarity index 100%
rename from dbd/qq/SYS_CACHE_PUT.php
rename to cache/qq/SYS_CACHE_PUT.php
diff --git a/cron/autoload.inc b/cron/autoload.inc
index c48ab76..19cb42c 100644
--- a/cron/autoload.inc
+++ b/cron/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CRON');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\CRON');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_GET.php b/cron/qq/SYS_CRON_GET.php
similarity index 100%
rename from dbd/qq/SYS_CRON_GET.php
rename to cron/qq/SYS_CRON_GET.php
diff --git a/dbd/qq/SYS_CRON_LAST_VISIT.php b/cron/qq/SYS_CRON_LAST_VISIT.php
similarity index 100%
rename from dbd/qq/SYS_CRON_LAST_VISIT.php
rename to cron/qq/SYS_CRON_LAST_VISIT.php
diff --git a/dbd/qq/SYS_CRON_LIST.php b/cron/qq/SYS_CRON_LIST.php
similarity index 100%
rename from dbd/qq/SYS_CRON_LIST.php
rename to cron/qq/SYS_CRON_LIST.php
diff --git a/dbd/qq/SYS_CRON_UPD.php b/cron/qq/SYS_CRON_UPD.php
similarity index 100%
rename from dbd/qq/SYS_CRON_UPD.php
rename to cron/qq/SYS_CRON_UPD.php
diff --git a/dbd/tbl/UserLoginsTable.php b/dbd/tbl/UserLoginsTable.php
deleted file mode 100644
index 690a1e3..0000000
--- a/dbd/tbl/UserLoginsTable.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace SYSTEM\DBD;
-
-class UserLoginsTable {
-
-    const NAME = 'system.user_logins';
-
-    const FIELD_ID = 'id';
-    const FIELD_USERID = 'userID';    
-    const FIELD_IP = 'IP';
-    const FIELD_SUCC = 'succ';
-    const FIELD_TIMESTAMP = 'timestamp';
-}
\ No newline at end of file
diff --git a/dbd/tbl/UserRightsTable.php b/dbd/tbl/system_user_to_rights.php
similarity index 86%
rename from dbd/tbl/UserRightsTable.php
rename to dbd/tbl/system_user_to_rights.php
index b39277c..a1536a1 100644
--- a/dbd/tbl/UserRightsTable.php
+++ b/dbd/tbl/system_user_to_rights.php
@@ -2,7 +2,7 @@
 
 namespace SYSTEM\DBD;
 
-class UserRightsTable {
+class system_user_to_rights {
 
     const NAME_PG = 'system.user_to_rights';
     const NAME_MYS = 'system_user_to_rights';
diff --git a/log/autoload.inc b/log/autoload.inc
index 688190a..ae6269a 100644
--- a/log/autoload.inc
+++ b/log/autoload.inc
@@ -3,3 +3,4 @@
 \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');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
diff --git a/dbd/qq/SYS_LOG_DEL.php b/log/qq/SYS_LOG_DEL.php
similarity index 100%
rename from dbd/qq/SYS_LOG_DEL.php
rename to log/qq/SYS_LOG_DEL.php
diff --git a/dbd/qq/SYS_LOG_INSERT.php b/log/qq/SYS_LOG_INSERT.php
similarity index 100%
rename from dbd/qq/SYS_LOG_INSERT.php
rename to log/qq/SYS_LOG_INSERT.php
diff --git a/dbd/qq/SYS_LOG_MONTH.php b/log/qq/SYS_LOG_MONTH.php
similarity index 100%
rename from dbd/qq/SYS_LOG_MONTH.php
rename to log/qq/SYS_LOG_MONTH.php
diff --git a/dbd/qq/SYS_LOG_OLDEST.php b/log/qq/SYS_LOG_OLDEST.php
similarity index 100%
rename from dbd/qq/SYS_LOG_OLDEST.php
rename to log/qq/SYS_LOG_OLDEST.php
diff --git a/page/autoload.inc b/page/autoload.inc
index 33a05ec..f714c14 100644
--- a/page/autoload.inc
+++ b/page/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\PAGE');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\PAGE');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_PAGE_GROUP.php b/page/qq/SYS_PAGE_GROUP.php
similarity index 100%
rename from dbd/qq/SYS_PAGE_GROUP.php
rename to page/qq/SYS_PAGE_GROUP.php
diff --git a/dbd/qq/SYS_TEXT_DELETE.php b/page/qq/SYS_TEXT_DELETE.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_DELETE.php
rename to page/qq/SYS_TEXT_DELETE.php
diff --git a/dbd/qq/SYS_TEXT_DELETE_TAGS.php b/page/qq/SYS_TEXT_DELETE_TAGS.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_DELETE_TAGS.php
rename to page/qq/SYS_TEXT_DELETE_TAGS.php
diff --git a/dbd/qq/SYS_TEXT_GET_ID.php b/page/qq/SYS_TEXT_GET_ID.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_ID.php
rename to page/qq/SYS_TEXT_GET_ID.php
diff --git a/dbd/qq/SYS_TEXT_GET_ID_ADV.php b/page/qq/SYS_TEXT_GET_ID_ADV.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_ID_ADV.php
rename to page/qq/SYS_TEXT_GET_ID_ADV.php
diff --git a/dbd/qq/SYS_TEXT_GET_ID_COUNT.php b/page/qq/SYS_TEXT_GET_ID_COUNT.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_ID_COUNT.php
rename to page/qq/SYS_TEXT_GET_ID_COUNT.php
diff --git a/dbd/qq/SYS_TEXT_GET_ID_TAGS.php b/page/qq/SYS_TEXT_GET_ID_TAGS.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_ID_TAGS.php
rename to page/qq/SYS_TEXT_GET_ID_TAGS.php
diff --git a/dbd/qq/SYS_TEXT_GET_TAG.php b/page/qq/SYS_TEXT_GET_TAG.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_TAG.php
rename to page/qq/SYS_TEXT_GET_TAG.php
diff --git a/dbd/qq/SYS_TEXT_GET_TAG_ADV.php b/page/qq/SYS_TEXT_GET_TAG_ADV.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_GET_TAG_ADV.php
rename to page/qq/SYS_TEXT_GET_TAG_ADV.php
diff --git a/dbd/qq/SYS_TEXT_RENAME.php b/page/qq/SYS_TEXT_RENAME.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_RENAME.php
rename to page/qq/SYS_TEXT_RENAME.php
diff --git a/dbd/qq/SYS_TEXT_RENAME_TAGS.php b/page/qq/SYS_TEXT_RENAME_TAGS.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_RENAME_TAGS.php
rename to page/qq/SYS_TEXT_RENAME_TAGS.php
diff --git a/dbd/qq/SYS_TEXT_SAVE.php b/page/qq/SYS_TEXT_SAVE.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_SAVE.php
rename to page/qq/SYS_TEXT_SAVE.php
diff --git a/dbd/qq/SYS_TEXT_SAVE_TAG.php b/page/qq/SYS_TEXT_SAVE_TAG.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_SAVE_TAG.php
rename to page/qq/SYS_TEXT_SAVE_TAG.php
diff --git a/dbd/qq/SYS_TEXT_SEARCH_TAG.php b/page/qq/SYS_TEXT_SEARCH_TAG.php
similarity index 100%
rename from dbd/qq/SYS_TEXT_SEARCH_TAG.php
rename to page/qq/SYS_TEXT_SEARCH_TAG.php
diff --git a/security/autoload.inc b/security/autoload.inc
index 4814d67..19117c3 100644
--- a/security/autoload.inc
+++ b/security/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SECURITY');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SECURITY');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_AVAILABLE.php b/security/qq/SYS_SECURITY_AVAILABLE.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_AVAILABLE.php
rename to security/qq/SYS_SECURITY_AVAILABLE.php
diff --git a/dbd/qq/SYS_SECURITY_CHECK.php b/security/qq/SYS_SECURITY_CHECK.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_CHECK.php
rename to security/qq/SYS_SECURITY_CHECK.php
diff --git a/dbd/qq/SYS_SECURITY_CREATE.php b/security/qq/SYS_SECURITY_CREATE.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_CREATE.php
rename to security/qq/SYS_SECURITY_CREATE.php
diff --git a/dbd/qq/SYS_SECURITY_LOGIN_MD5.php b/security/qq/SYS_SECURITY_LOGIN_MD5.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_LOGIN_MD5.php
rename to security/qq/SYS_SECURITY_LOGIN_MD5.php
diff --git a/dbd/qq/SYS_SECURITY_LOGIN_SHA1.php b/security/qq/SYS_SECURITY_LOGIN_SHA1.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_LOGIN_SHA1.php
rename to security/qq/SYS_SECURITY_LOGIN_SHA1.php
diff --git a/dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php b/security/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php
rename to security/qq/SYS_SECURITY_UPDATE_LASTACTIVE.php
diff --git a/dbd/qq/SYS_SECURITY_UPDATE_PW.php b/security/qq/SYS_SECURITY_UPDATE_PW.php
similarity index 100%
rename from dbd/qq/SYS_SECURITY_UPDATE_PW.php
rename to security/qq/SYS_SECURITY_UPDATE_PW.php
diff --git a/system/autoload.inc b/system/autoload.inc
index 9c6ec92..9d4ff44 100644
--- a/system/autoload.inc
+++ b/system/autoload.inc
@@ -1,2 +1,3 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\DBD');
\ No newline at end of file
diff --git a/dbd/qq/SYS_LOCALE_SET_LOCALE.php b/system/qq/SYS_LOCALE_SET_LOCALE.php
similarity index 100%
rename from dbd/qq/SYS_LOCALE_SET_LOCALE.php
rename to system/qq/SYS_LOCALE_SET_LOCALE.php