diff --git a/sql/DATA_DEFAULT.php b/sql/DATA_DEFAULT.php
new file mode 100644
index 0000000..582b3ad
--- /dev/null
+++ b/sql/DATA_DEFAULT.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * System - PHP Framework
+ *
+ * PHP Version 5.6
+ *
+ * @copyright   2016 Ulf Gebhardt (http://www.webcraft-media.de)
+ * @license     http://www.opensource.org/licenses/mit-license.php MIT
+ * @link        https://github.com/webcraftmedia/system
+ * @package     SYSTEM\SQL
+ */
+namespace SYSTEM\SQL;
+
+/**
+ * DATA_SYSTEM_TEXT Class provided by System to install the Page Defaults e.g meta tags to the Database(includes Tags)
+ */
+class DATA_DEFAULT extends \SYSTEM\DB\QI {
+    /**
+     * Get Classname of the QQ
+     * 
+     * @return string Returns classname
+     */
+    public static function get_class(){return \get_class();}
+    
+    /**
+     * Get paths of PostgreSQL compatible sql files
+     * 
+     * @return array Returns paths of PostgreSQL compatible sql files
+     */
+    public static function files_pgsql(){
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/default.sql'))->SERVERPATH());}
+        
+    /**
+     * Get paths of MYSQL compatible sql files
+     * 
+     * @return array Returns paths of MYSQL compatible sql files
+     */
+    public static function files_mysql(){
+        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/default.sql'))->SERVERPATH());}
+}
\ No newline at end of file
diff --git a/sql/qt/DATA_SYSTEM_API.php b/sql/DATA_SYSTEM_API.php
similarity index 63%
rename from sql/qt/DATA_SYSTEM_API.php
rename to sql/DATA_SYSTEM_API.php
index cbbc8a1..38c6dd3 100644
--- a/sql/qt/DATA_SYSTEM_API.php
+++ b/sql/DATA_SYSTEM_API.php
@@ -28,9 +28,9 @@ class DATA_SYSTEM_API extends \SYSTEM\DB\QI {
      * @return array Returns paths of PostgreSQL compatible sql files
      */
     public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/data/system_api.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/data/system_api_default.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/data/system_sai_api.sql'))->SERVERPATH());
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/system_api.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/data/system_api_default.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/data/system_sai_api.sql'))->SERVERPATH());
     }
     
     /**
@@ -39,8 +39,8 @@ class DATA_SYSTEM_API extends \SYSTEM\DB\QI {
      * @return array Returns paths of MYSQL compatible sql files
      */
     public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/system_api.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/data/system_api_default.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/data/system_sai_api.sql'))->SERVERPATH());
+        return array(   (new \SYSTEM\PSQL('/mysql/data/system_api.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/data/system_api_default.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/data/system_sai_api.sql'))->SERVERPATH());
     }    
 }
\ No newline at end of file
diff --git a/sql/qt/DATA_SYSTEM_CRON.php b/sql/DATA_SYSTEM_CRON.php
similarity index 83%
rename from sql/qt/DATA_SYSTEM_CRON.php
rename to sql/DATA_SYSTEM_CRON.php
index 387d46c..4633473 100644
--- a/sql/qt/DATA_SYSTEM_CRON.php
+++ b/sql/DATA_SYSTEM_CRON.php
@@ -28,7 +28,7 @@ class DATA_SYSTEM_CRON extends \SYSTEM\DB\QI {
      * @return array Returns paths of PostgreSQL compatible sql files
      */
     public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/data/system_cron.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/system_cron.sql'))->SERVERPATH());}
         
     /**
      * Get paths of MYSQL compatible sql files
@@ -36,5 +36,5 @@ class DATA_SYSTEM_CRON extends \SYSTEM\DB\QI {
      * @return array Returns paths of MYSQL compatible sql files
      */
     public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/system_cron.sql'))->SERVERPATH());}    
+        return array(   (new \SYSTEM\PSQL('/mysql/data/system_cron.sql'))->SERVERPATH());}    
 }
\ No newline at end of file
diff --git a/sql/qt/DATA_SYSTEM_PAGE.php b/sql/DATA_SYSTEM_PAGE.php
similarity index 83%
rename from sql/qt/DATA_SYSTEM_PAGE.php
rename to sql/DATA_SYSTEM_PAGE.php
index 6da4509..823835d 100644
--- a/sql/qt/DATA_SYSTEM_PAGE.php
+++ b/sql/DATA_SYSTEM_PAGE.php
@@ -28,7 +28,7 @@ class DATA_SYSTEM_PAGE extends \SYSTEM\DB\QI {
      * @return array Returns paths of PostgreSQL compatible sql files
      */
     public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/data/system_page.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/system_page.sql'))->SERVERPATH());}
     
     /**
      * Get paths of MYSQL compatible sql files
@@ -36,5 +36,5 @@ class DATA_SYSTEM_PAGE extends \SYSTEM\DB\QI {
      * @return array Returns paths of MYSQL compatible sql files
      */
     public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/system_page.sql'))->SERVERPATH());}    
+        return array(   (new \SYSTEM\PSQL('/mysql/data/system_page.sql'))->SERVERPATH());}    
 }
\ No newline at end of file
diff --git a/sql/qt/DATA_SYSTEM_RIGHTS.php b/sql/DATA_SYSTEM_RIGHTS.php
similarity index 83%
rename from sql/qt/DATA_SYSTEM_RIGHTS.php
rename to sql/DATA_SYSTEM_RIGHTS.php
index efe7dde..38bfca3 100644
--- a/sql/qt/DATA_SYSTEM_RIGHTS.php
+++ b/sql/DATA_SYSTEM_RIGHTS.php
@@ -28,7 +28,7 @@ class DATA_SYSTEM_RIGHTS extends \SYSTEM\DB\QI {
      * @return array Returns paths of PostgreSQL compatible sql files
      */
     public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/data/system_rights.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/system_rights.sql'))->SERVERPATH());}
         
     /**
      * Get paths of MYSQL compatible sql files
@@ -36,5 +36,5 @@ class DATA_SYSTEM_RIGHTS extends \SYSTEM\DB\QI {
      * @return array Returns paths of MYSQL compatible sql files
      */
     public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/system_rights.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/mysql/data/system_rights.sql'))->SERVERPATH());}
 }
\ No newline at end of file
diff --git a/sql/qt/DATA_SYSTEM_TEXT.php b/sql/DATA_SYSTEM_TEXT.php
similarity index 84%
rename from sql/qt/DATA_SYSTEM_TEXT.php
rename to sql/DATA_SYSTEM_TEXT.php
index dd66000..adf8d49 100644
--- a/sql/qt/DATA_SYSTEM_TEXT.php
+++ b/sql/DATA_SYSTEM_TEXT.php
@@ -28,7 +28,7 @@ class DATA_SYSTEM_TEXT extends \SYSTEM\DB\QI {
      * @return array Returns paths of PostgreSQL compatible sql files
      */
     public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/data/system_text.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/pgsql/data/system_text.sql'))->SERVERPATH());}
         
     /**
      * Get paths of MYSQL compatible sql files
@@ -36,5 +36,5 @@ class DATA_SYSTEM_TEXT extends \SYSTEM\DB\QI {
      * @return array Returns paths of MYSQL compatible sql files
      */
     public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/data/system_text.sql'))->SERVERPATH());}
+        return array(   (new \SYSTEM\PSQL('/mysql/data/system_text.sql'))->SERVERPATH());}
 }
\ No newline at end of file
diff --git a/sql/SCHEMA_SYSTEM.php b/sql/SCHEMA_SYSTEM.php
new file mode 100644
index 0000000..88cd2b8
--- /dev/null
+++ b/sql/SCHEMA_SYSTEM.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * System - PHP Framework
+ *
+ * PHP Version 5.6
+ *
+ * @copyright   2016 Ulf Gebhardt (http://www.webcraft-media.de)
+ * @license     http://www.opensource.org/licenses/mit-license.php MIT
+ * @link        https://github.com/webcraftmedia/system
+ * @package     SYSTEM\SQL
+ */
+namespace SYSTEM\SQL;
+
+/**
+ * SCHEMA_SYSTEM Class provided by System to install the Database Schema for system
+ */
+class SCHEMA_SYSTEM extends \SYSTEM\DB\QI {
+    /**
+     * Get Classname of the QQ
+     * 
+     * @return string Returns classname
+     */
+    public static function get_class(){return \get_class();}
+    
+    /**
+     * Get paths of PostgreSQL compatible sql files
+     * 
+     * @return array Returns paths of PostgreSQL compatible sql files
+     */
+    public static function files_pgsql(){
+        return array(   (new \SYSTEM\PSQL('/pgsql/schema/system_api.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_cache.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_cron.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_log.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_page.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_rights.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_text.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_text_tag.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_todo.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_todo_assign.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_user.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/pgsql/schema/system_user_to_rights.sql'))->SERVERPATH());
+    }
+    
+    /**
+     * Get paths of MYSQL compatible sql files
+     * 
+     * @return array Returns paths of MYSQL compatible sql files
+     */
+    public static function files_mysql(){
+        return array(   (new \SYSTEM\PSQL('/mysql/schema/system_api.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_cache.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_cron.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_log.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_page.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_rights.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_text.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_text_tag.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_todo.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_todo_assign.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_token.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_user.sql'))->SERVERPATH(),
+                        (new \SYSTEM\PSQL('/mysql/schema/system_user_to_rights.sql'))->SERVERPATH());
+    }    
+}
\ No newline at end of file
diff --git a/sql/autoload.inc b/sql/autoload.inc
index 23a1550..175fbcc 100644
--- a/sql/autoload.inc
+++ b/sql/autoload.inc
@@ -1,7 +1,6 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SQL');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl','SYSTEM\SQL');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qt','SYSTEM\SQL');
 
 \SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\SCHEMA_SYSTEM');
 
@@ -9,4 +8,5 @@
 \SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_SYSTEM_CRON');
 \SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_SYSTEM_PAGE');
 \SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_SYSTEM_RIGHTS');
-\SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_SYSTEM_TEXT');
\ No newline at end of file
+\SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_SYSTEM_TEXT');
+\SYSTEM\SQL\setup::register('\SYSTEM\\SQL\\DATA_DEFAULT');
\ No newline at end of file
diff --git a/sql/qt/mysql/convert_locale_string_2_text.sql b/sql/mysql/convert_locale_string_2_text.sql
similarity index 100%
rename from sql/qt/mysql/convert_locale_string_2_text.sql
rename to sql/mysql/convert_locale_string_2_text.sql
diff --git a/sql/mysql/data/default.sql b/sql/mysql/data/default.sql
new file mode 100644
index 0000000..5a45296
--- /dev/null
+++ b/sql/mysql/data/default.sql
@@ -0,0 +1,7 @@
+INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('meta_start_author', 'deDE', 'Author', 1, 1, '2017-06-08 21:23:49', '2017-06-08 21:23:49');
+INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('meta_start_description', 'deDE', 'Description', 1, 1, '2017-06-08 21:24:43', '2017-06-08 21:24:43');
+INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('meta_start_keywords', 'deDE', 'Keywords', 1, 1, '2017-06-08 21:25:22', '2017-06-08 21:25:22');
+
+INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_keywords', 'meta');
+INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_author', 'meta');
+INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('meta_start_description', 'meta');
\ No newline at end of file
diff --git a/sql/qt/mysql/data/system_api.sql b/sql/mysql/data/system_api.sql
similarity index 100%
rename from sql/qt/mysql/data/system_api.sql
rename to sql/mysql/data/system_api.sql
diff --git a/sql/qt/mysql/data/system_api_default.sql b/sql/mysql/data/system_api_default.sql
similarity index 100%
rename from sql/qt/mysql/data/system_api_default.sql
rename to sql/mysql/data/system_api_default.sql
diff --git a/sql/qt/mysql/data/system_cron.sql b/sql/mysql/data/system_cron.sql
similarity index 100%
rename from sql/qt/mysql/data/system_cron.sql
rename to sql/mysql/data/system_cron.sql
diff --git a/sql/qt/mysql/data/system_page.sql b/sql/mysql/data/system_page.sql
similarity index 100%
rename from sql/qt/mysql/data/system_page.sql
rename to sql/mysql/data/system_page.sql
diff --git a/sql/qt/mysql/data/system_rights.sql b/sql/mysql/data/system_rights.sql
similarity index 100%
rename from sql/qt/mysql/data/system_rights.sql
rename to sql/mysql/data/system_rights.sql
diff --git a/sql/qt/mysql/data/system_sai_api.sql b/sql/mysql/data/system_sai_api.sql
similarity index 100%
rename from sql/qt/mysql/data/system_sai_api.sql
rename to sql/mysql/data/system_sai_api.sql
diff --git a/sql/qt/mysql/data/system_text.sql b/sql/mysql/data/system_text.sql
similarity index 100%
rename from sql/qt/mysql/data/system_text.sql
rename to sql/mysql/data/system_text.sql
diff --git a/sql/qt/mysql/schema/system_api.sql b/sql/mysql/schema/system_api.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_api.sql
rename to sql/mysql/schema/system_api.sql
diff --git a/sql/qt/mysql/schema/system_cache.sql b/sql/mysql/schema/system_cache.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_cache.sql
rename to sql/mysql/schema/system_cache.sql
diff --git a/sql/qt/mysql/schema/system_cron.sql b/sql/mysql/schema/system_cron.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_cron.sql
rename to sql/mysql/schema/system_cron.sql
diff --git a/sql/qt/mysql/schema/system_log.sql b/sql/mysql/schema/system_log.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_log.sql
rename to sql/mysql/schema/system_log.sql
diff --git a/sql/qt/mysql/schema/system_page.sql b/sql/mysql/schema/system_page.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_page.sql
rename to sql/mysql/schema/system_page.sql
diff --git a/sql/qt/mysql/schema/system_rights.sql b/sql/mysql/schema/system_rights.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_rights.sql
rename to sql/mysql/schema/system_rights.sql
diff --git a/sql/qt/mysql/schema/system_text.sql b/sql/mysql/schema/system_text.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_text.sql
rename to sql/mysql/schema/system_text.sql
diff --git a/sql/qt/mysql/schema/system_text_tag.sql b/sql/mysql/schema/system_text_tag.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_text_tag.sql
rename to sql/mysql/schema/system_text_tag.sql
diff --git a/sql/qt/mysql/schema/system_todo.sql b/sql/mysql/schema/system_todo.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_todo.sql
rename to sql/mysql/schema/system_todo.sql
diff --git a/sql/qt/mysql/schema/system_todo_assign.sql b/sql/mysql/schema/system_todo_assign.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_todo_assign.sql
rename to sql/mysql/schema/system_todo_assign.sql
diff --git a/sql/qt/mysql/schema/system_token.sql b/sql/mysql/schema/system_token.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_token.sql
rename to sql/mysql/schema/system_token.sql
diff --git a/sql/qt/mysql/schema/system_user.sql b/sql/mysql/schema/system_user.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_user.sql
rename to sql/mysql/schema/system_user.sql
diff --git a/sql/qt/mysql/schema/system_user_to_rights.sql b/sql/mysql/schema/system_user_to_rights.sql
similarity index 100%
rename from sql/qt/mysql/schema/system_user_to_rights.sql
rename to sql/mysql/schema/system_user_to_rights.sql
diff --git a/sql/qt/pgsql/convert_locale_string_2_text.sql b/sql/pgsql/convert_locale_string_2_text.sql
similarity index 100%
rename from sql/qt/pgsql/convert_locale_string_2_text.sql
rename to sql/pgsql/convert_locale_string_2_text.sql
diff --git a/sql/qt/pgsql/data/basic_locale_string.sql b/sql/pgsql/data/basic_locale_string.sql
similarity index 100%
rename from sql/qt/pgsql/data/basic_locale_string.sql
rename to sql/pgsql/data/basic_locale_string.sql
diff --git a/sql/qt/pgsql/data/sai_error_locale_string.sql b/sql/pgsql/data/sai_error_locale_string.sql
similarity index 100%
rename from sql/qt/pgsql/data/sai_error_locale_string.sql
rename to sql/pgsql/data/sai_error_locale_string.sql
diff --git a/sql/qt/pgsql/data/sai_locale_string.sql b/sql/pgsql/data/sai_locale_string.sql
similarity index 100%
rename from sql/qt/pgsql/data/sai_locale_string.sql
rename to sql/pgsql/data/sai_locale_string.sql
diff --git a/sql/qt/pgsql/data/system_api.sql b/sql/pgsql/data/system_api.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_api.sql
rename to sql/pgsql/data/system_api.sql
diff --git a/sql/qt/pgsql/data/system_api_default.sql b/sql/pgsql/data/system_api_default.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_api_default.sql
rename to sql/pgsql/data/system_api_default.sql
diff --git a/sql/qt/pgsql/data/system_cron.sql b/sql/pgsql/data/system_cron.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_cron.sql
rename to sql/pgsql/data/system_cron.sql
diff --git a/sql/qt/pgsql/data/system_page.sql b/sql/pgsql/data/system_page.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_page.sql
rename to sql/pgsql/data/system_page.sql
diff --git a/sql/qt/pgsql/data/system_rights.sql b/sql/pgsql/data/system_rights.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_rights.sql
rename to sql/pgsql/data/system_rights.sql
diff --git a/sql/qt/pgsql/data/system_sai_api.sql b/sql/pgsql/data/system_sai_api.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_sai_api.sql
rename to sql/pgsql/data/system_sai_api.sql
diff --git a/sql/qt/pgsql/data/system_text.sql b/sql/pgsql/data/system_text.sql
similarity index 100%
rename from sql/qt/pgsql/data/system_text.sql
rename to sql/pgsql/data/system_text.sql
diff --git a/sql/qt/pgsql/extension_pgcrypto.sql b/sql/pgsql/extension_pgcrypto.sql
similarity index 100%
rename from sql/qt/pgsql/extension_pgcrypto.sql
rename to sql/pgsql/extension_pgcrypto.sql
diff --git a/sql/qt/pgsql/schema/schema.sql b/sql/pgsql/schema/schema.sql
similarity index 100%
rename from sql/qt/pgsql/schema/schema.sql
rename to sql/pgsql/schema/schema.sql
diff --git a/sql/qt/pgsql/schema/system_api.sql b/sql/pgsql/schema/system_api.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_api.sql
rename to sql/pgsql/schema/system_api.sql
diff --git a/sql/qt/pgsql/schema/system_cache.sql b/sql/pgsql/schema/system_cache.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_cache.sql
rename to sql/pgsql/schema/system_cache.sql
diff --git a/sql/qt/pgsql/schema/system_cron.sql b/sql/pgsql/schema/system_cron.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_cron.sql
rename to sql/pgsql/schema/system_cron.sql
diff --git a/sql/qt/pgsql/schema/system_locale_string.sql b/sql/pgsql/schema/system_locale_string.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_locale_string.sql
rename to sql/pgsql/schema/system_locale_string.sql
diff --git a/sql/qt/pgsql/schema/system_log.sql b/sql/pgsql/schema/system_log.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_log.sql
rename to sql/pgsql/schema/system_log.sql
diff --git a/sql/qt/pgsql/schema/system_page.sql b/sql/pgsql/schema/system_page.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_page.sql
rename to sql/pgsql/schema/system_page.sql
diff --git a/sql/qt/pgsql/schema/system_rights.sql b/sql/pgsql/schema/system_rights.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_rights.sql
rename to sql/pgsql/schema/system_rights.sql
diff --git a/sql/qt/pgsql/schema/system_text.sql b/sql/pgsql/schema/system_text.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_text.sql
rename to sql/pgsql/schema/system_text.sql
diff --git a/sql/qt/pgsql/schema/system_text_tag.sql b/sql/pgsql/schema/system_text_tag.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_text_tag.sql
rename to sql/pgsql/schema/system_text_tag.sql
diff --git a/sql/qt/pgsql/schema/system_todo.sql b/sql/pgsql/schema/system_todo.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_todo.sql
rename to sql/pgsql/schema/system_todo.sql
diff --git a/sql/qt/pgsql/schema/system_todo_assign.sql b/sql/pgsql/schema/system_todo_assign.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_todo_assign.sql
rename to sql/pgsql/schema/system_todo_assign.sql
diff --git a/sql/qt/pgsql/schema/system_user.sql b/sql/pgsql/schema/system_user.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_user.sql
rename to sql/pgsql/schema/system_user.sql
diff --git a/sql/qt/pgsql/schema/system_user_to_rights.sql b/sql/pgsql/schema/system_user_to_rights.sql
similarity index 100%
rename from sql/qt/pgsql/schema/system_user_to_rights.sql
rename to sql/pgsql/schema/system_user_to_rights.sql
diff --git a/sql/qt/pgsql/util_copy_api_table_by_group.sql b/sql/pgsql/util_copy_api_table_by_group.sql
similarity index 100%
rename from sql/qt/pgsql/util_copy_api_table_by_group.sql
rename to sql/pgsql/util_copy_api_table_by_group.sql
diff --git a/sql/qt/SCHEMA_SYSTEM.php b/sql/qt/SCHEMA_SYSTEM.php
deleted file mode 100644
index f15762c..0000000
--- a/sql/qt/SCHEMA_SYSTEM.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * System - PHP Framework
- *
- * PHP Version 5.6
- *
- * @copyright   2016 Ulf Gebhardt (http://www.webcraft-media.de)
- * @license     http://www.opensource.org/licenses/mit-license.php MIT
- * @link        https://github.com/webcraftmedia/system
- * @package     SYSTEM\SQL
- */
-namespace SYSTEM\SQL;
-
-/**
- * SCHEMA_SYSTEM Class provided by System to install the Database Schema for system
- */
-class SCHEMA_SYSTEM extends \SYSTEM\DB\QI {
-    /**
-     * Get Classname of the QQ
-     * 
-     * @return string Returns classname
-     */
-    public static function get_class(){return \get_class();}
-    
-    /**
-     * Get paths of PostgreSQL compatible sql files
-     * 
-     * @return array Returns paths of PostgreSQL compatible sql files
-     */
-    public static function files_pgsql(){
-        return array(   (new \SYSTEM\PSQL('/qt/pgsql/schema/system_api.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_cache.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_cron.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_log.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_page.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_rights.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_text.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_text_tag.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_todo.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_todo_assign.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_user.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/pgsql/schema/system_user_to_rights.sql'))->SERVERPATH());
-    }
-    
-    /**
-     * Get paths of MYSQL compatible sql files
-     * 
-     * @return array Returns paths of MYSQL compatible sql files
-     */
-    public static function files_mysql(){
-        return array(   (new \SYSTEM\PSQL('/qt/mysql/schema/system_api.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_cache.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_cron.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_log.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_page.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_rights.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_text.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_text_tag.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_todo.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_todo_assign.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_token.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_user.sql'))->SERVERPATH(),
-                        (new \SYSTEM\PSQL('/qt/mysql/schema/system_user_to_rights.sql'))->SERVERPATH());
-    }    
-}
\ No newline at end of file