diff --git a/autoload.inc b/autoload.inc
index 7e3de83..48e9498 100644
--- a/autoload.inc
+++ b/autoload.inc
@@ -1,4 +1,4 @@
 <?php
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','DBD');
+require_once dirname(__FILE__).'/sql/autoload.inc';
 \SYSTEM\SAI\sai::register('saimod_webcraft_gallery');
\ No newline at end of file
diff --git a/saimod_webcraft_gallery.php b/saimod_webcraft_gallery.php
index 1452645..dae12d8 100644
--- a/saimod_webcraft_gallery.php
+++ b/saimod_webcraft_gallery.php
@@ -1,7 +1,7 @@
 <?php
 class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     public static function getGalleryBootstrap($id){
-        $gallery = \DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($id));
+        $gallery = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($id));
         $gallery_items = '';
         $first = true;
         while($img = $gallery->next()){
@@ -13,7 +13,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function getGalleryGalleria($id){
-        $gallery = \DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($id));
+        $gallery = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($id));
         $result = '';
         while($img = $gallery->next()){
             $result .= '<img class="carousel-img" src="./api.php?call=files&cat='.$img['file_cat'].'&id='.$img['file_id'].'" alt="">';}
@@ -22,15 +22,15 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function sai_mod_saimod_webcraft_gallery_action_addgalleryitem($gallery, $position, $heading, $description, $file_cat, $file_id){
-        if(!\DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD::QI(array($gallery, $position, $heading, $description, $file_cat, $file_id))){
+        if(!\SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD::QI(array($gallery, $position, $heading, $description, $file_cat, $file_id))){
             throw new SYSTEM\LOG\ERROR("Problem with adding Galleryitem!");}
         return \SYSTEM\LOG\JsonResult::ok();}    
     public static function sai_mod_saimod_webcraft_gallery_action_delgalleryitem($id){
-        if(!\DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE::QI(array($id))){
+        if(!\SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE::QI(array($id))){
             throw new SYSTEM\LOG\ERROR("Problem with deleting Galleryitem!");}
         return \SYSTEM\LOG\JsonResult::ok();}
     public static function sai_mod_saimod_webcraft_gallery_action_chggalleryitem($id, $gallery, $position, $heading, $description, $file_cat, $file_id){
-        if(!\DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG::QI(array($gallery, $position, $heading, $description, $file_cat, $file_id, $id))){
+        if(!\SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG::QI(array($gallery, $position, $heading, $description, $file_cat, $file_id, $id))){
             throw new SYSTEM\LOG\ERROR("Problem with changing Galleryitem!");}
         return \SYSTEM\LOG\JsonResult::ok();}
     
@@ -60,13 +60,13 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function sai_mod_saimod_webcraft_gallery_action_showgalleryitem($gallery,$id){
-        $vars = \DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID::Q1(array($gallery,$id));
+        $vars = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID::Q1(array($gallery,$id));
         $vars = array_merge($vars, array('file_cat_options' => self::select_options_cat($vars['file_cat']), 'file_id_options' => self::sai_mod_saimod_webcraft_gallery_action_select_options_id($vars['file_cat'],$vars['file_id'])));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_show.tpl'),$vars);
     }
     
     public static function sai_mod_saimod_webcraft_gallery(){
-        $galleries = DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERIES::QQ();
+        $galleries = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERIES::QQ();
         $vars = array('tabopts' => '', 'firsttab' => '');
         $first = true;
         while($gallery = $galleries->next()){
@@ -79,7 +79,7 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     }
     
     public static function sai_mod_saimod_webcraft_gallery_action_tab($name){
-        $gallery = DBD\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($name));
+        $gallery = \SQL\SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID::QQ(array($name));
         $content = '';
         while($entry = $gallery->next()){
             $content .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(), 'saimod_webcraft_gallery/tpl/saimod_webcraft_gallery_tabentry.tpl'), $entry);}
@@ -93,6 +93,5 @@ class saimod_webcraft_gallery extends \SYSTEM\SAI\SaiModule {
     public static function js(){
         return array(  \SYSTEM\WEBPATH(new PSAI(),'saimod_webcraft_gallery/js/saimod_webcraft_gallery.js'));}
     public static function css(){
-        return array();}
-    
-}
+        return array();}   
+}
\ No newline at end of file
diff --git a/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php b/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php
new file mode 100644
index 0000000..4348b39
--- /dev/null
+++ b/sql/DATA_SAIMOD_WEBCRAFT_GALLERY.php
@@ -0,0 +1,10 @@
+<?php
+namespace SQL;
+class DATA_SAIMOD_WEBCRAFT_GALLERY extends \SYSTEM\DB\QI {
+    public static function get_class(){return \get_class();}
+    public static function files_mysql(){
+        return array(   \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/schema_webcraft_gallery.sql'),
+                        \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery.sql'),
+                        \SYSTEM\SERVERPATH(new \PSAI(),'/saimod_webcraft_gallery/sql/mysql/saimod_webcraft_gallery_page.sql'));
+    }    
+}
\ No newline at end of file
diff --git a/sql/autoload.inc b/sql/autoload.inc
new file mode 100644
index 0000000..a2c0c2b
--- /dev/null
+++ b/sql/autoload.inc
@@ -0,0 +1,4 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SQL');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SQL');
+\SYSTEM\SQL\setup::register('SQL\\DATA_SAIMOD_WEBCRAFT_GALLERY');
\ No newline at end of file
diff --git a/sql/mysql/schema_webcraft_gallery.sql b/sql/mysql/schema_webcraft_gallery.sql
new file mode 100644
index 0000000..e9a569a
--- /dev/null
+++ b/sql/mysql/schema_webcraft_gallery.sql
@@ -0,0 +1,14 @@
+CREATE TABLE `webcraft_gallery` (
+	`ID` INT(10) NOT NULL AUTO_INCREMENT,
+	`gallery` INT(10) NOT NULL,
+	`position` INT(10) NOT NULL DEFAULT '0',
+	`heading` CHAR(255) NOT NULL,
+	`description` TEXT NOT NULL,
+	`file_cat` CHAR(50) NOT NULL,
+	`file_id` CHAR(50) NOT NULL,
+	PRIMARY KEY (`ID`)
+)
+COLLATE='utf8_general_ci'
+ENGINE=InnoDB
+AUTO_INCREMENT=1
+;
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERIES.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERIES.php
index f34ccde..8d47033 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERIES.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERIES.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERIES extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'SELECT DISTINCT gallery FROM webcraft_gallery;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT DISTINCT gallery FROM webcraft_gallery;';
+    }    
+}
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID.php
index d3f93c3..37c2152 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERY_ID extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'SELECT * FROM webcraft_gallery WHERE gallery = ? ORDER BY position ASC;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT * FROM webcraft_gallery WHERE gallery = ? ORDER BY position ASC;';
+    }    
+}
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD.php
index 0f27434..f37434e 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ADD extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'INSERT INTO webcraft_gallery (gallery, position, heading, description, file_cat, file_id) VALUES (?,?,?,?,?,?);'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'INSERT INTO webcraft_gallery (gallery, position, heading, description, file_cat, file_id) VALUES (?,?,?,?,?,?);';
+    }    
+}
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG.php
index 737d946..2b190f8 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_CHG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'UPDATE webcraft_gallery SET gallery = ?, position = ?, heading = ?, description = ?, file_cat = ?, file_id= ? WHERE ID = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'UPDATE webcraft_gallery SET gallery = ?, position = ?, heading = ?, description = ?, file_cat = ?, file_id= ? WHERE ID = ?;';
+    }    
+}
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE.php
index 4cd4265..0c8e42f 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_DELETE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'DELETE FROM webcraft_gallery WHERE ID = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'DELETE FROM webcraft_gallery WHERE ID = ?;';
+    }    
+}
\ No newline at end of file
diff --git a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID.php b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID.php
index 57f4794..5f7bd74 100644
--- a/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID.php
+++ b/sql/qq/SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID.php
@@ -1,11 +1,8 @@
 <?php
-namespace DBD;
-
+namespace SQL;
 class SAIMOD_WEBCRAFT_GALLERY_GALLERY_ITEM_ID extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg
-'',
-//mys
-'SELECT * FROM webcraft_gallery WHERE gallery = ? and ID = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'SELECT * FROM webcraft_gallery WHERE gallery = ? and ID = ?;';
+    }    
+}
\ No newline at end of file