diff --git a/interface/sql/db_installer_sandbox/table_definitions.php b/interface/sql/db_installer_sandbox/defs.mail_spam.php
similarity index 64%
rename from interface/sql/db_installer_sandbox/table_definitions.php
rename to interface/sql/db_installer_sandbox/defs.mail_spam.php
index 2db6f3eee5ac758cd3e4375a34358722e7032f8a..d463a92f90a5da2f74f774f41afdbda7e2b82534 100644
--- a/interface/sql/db_installer_sandbox/table_definitions.php
+++ b/interface/sql/db_installer_sandbox/defs.mail_spam.php
@@ -152,39 +152,6 @@ recipient C(255) NOTNULL DEFAULT '',
 active enum('0','1') NOTNULL DEFAULT '1'
 ";
 
-$tables['reseller'] = "
-reseller_id bigint(20) NOTNULL AUTO PRIMARY,
-sys_userid I NOTNULL DEFAULT '0',
-sys_groupid I NOTNULL DEFAULT '0',
-sys_perm_user C(5) NOTNULL DEFAULT '',
-sys_perm_group C(5) NOTNULL DEFAULT '',
-sys_perm_other C(5) NOTNULL DEFAULT '',
-company C(255) NOTNULL DEFAULT '',
-title C(255) NOTNULL DEFAULT '',
-firstname C(255) NOTNULL DEFAULT '',
-surname C(255) NOTNULL DEFAULT '',
-street C(255) NOTNULL DEFAULT '',
-zip C(255) NOTNULL DEFAULT '',
-city C(255) NOTNULL DEFAULT '',
-country C(255) NOTNULL DEFAULT '',
-telephone C(255) NOTNULL DEFAULT '',
-mobile C(255) NOTNULL DEFAULT '',
-fax C(255) NOTNULL DEFAULT '',
-email C(255) NOTNULL DEFAULT '',
-internet C(255) NOTNULL DEFAULT '',
-icq C(255) NOTNULL DEFAULT '',
-notes text NOTNULL,
-limit_client I NOTNULL DEFAULT '-1',
-limit_domain I NOTNULL DEFAULT '-1',
-limit_subdomain I NOTNULL DEFAULT '-1',
-limit_mailbox I NOTNULL DEFAULT '-1',
-limit_mailalias I NOTNULL DEFAULT '-1',
-limit_webquota I NOTNULL DEFAULT '-1',
-limit_mailquota I NOTNULL DEFAULT '-1',
-limit_database I NOTNULL DEFAULT '-1',
-ip_address text NOTNULL
-";
-
 $tables['rr'] = "
 id int(10) unsigned NOTNULL AUTO PRIMARY,
 zone int(10) unsigned NOTNULL DEFAULT '0',
@@ -239,84 +206,6 @@ sys_perm_group C(5) NOTNULL DEFAULT '',
 sys_perm_other C(5) NOTNULL DEFAULT ''
 ";
 
-//*************************************************************************************
-// System Related
-//*************************************************************************************
-$tables['sys_datalog'] = "
-datalog_id bigint(20) NOTNULL AUTO PRIMARY,
-dbtable C(255) NOTNULL DEFAULT '',
-dbidx C(255) NOTNULL DEFAULT '',
-server_id I NOTNULL DEFAULT '0',
-action char(1) NOTNULL DEFAULT '',
-tstamp bigint(20) NOTNULL DEFAULT '0',
-user C(255) NOTNULL DEFAULT '',
-data text NOTNULL
-";
-
-$tables['sys_dbsync'] = "
-id bigint(20) NOTNULL AUTO PRIMARY,
-jobname C(255) NOTNULL DEFAULT '',
-sync_interval_minutes I NOTNULL DEFAULT '0',
-db_type C(255) NOTNULL DEFAULT '',
-db_host C(255) NOTNULL DEFAULT '',
-db_name C(255) NOTNULL DEFAULT '',
-db_username C(255) NOTNULL DEFAULT '',
-db_password C(255) NOTNULL DEFAULT '',
-db_tables C(255) NOTNULL DEFAULT 'admin,forms',
-empty_datalog I NOTNULL DEFAULT '0',
-sync_datalog_external I NOTNULL DEFAULT '0',
-active I NOTNULL DEFAULT '1',
-last_datalog_id bigint(20) NOTNULL DEFAULT '0'
-";
-
-
-$tables['sys_filesync'] = "
-id bigint(20) NOTNULL AUTO PRIMARY,
-jobname C(255) NOTNULL DEFAULT '',
-sync_interval_minutes I NOTNULL DEFAULT '0',
-ftp_host C(255) NOTNULL DEFAULT '',
-ftp_path C(255) NOTNULL DEFAULT '',
-ftp_username C(255) NOTNULL DEFAULT '',
-ftp_password C(255) NOTNULL DEFAULT '',
-local_path C(255) NOTNULL DEFAULT '',
-wput_options C(255) NOTNULL DEFAULT '--timestamping --reupload --dont-continue',
-active I NOTNULL DEFAULT '1'
-";
 
-$tables['sys_group'] = "
-groupid I NOTNULL AUTO PRIMARY,
-name C(255) NOTNULL DEFAULT '',
-description text NOTNULL
-";
-
-$tables['sys_user'] = "
-userid I NOTNULL AUTO PRIMARY,
-sys_userid I NOTNULL DEFAULT '0',
-sys_groupid I NOTNULL DEFAULT '0',
-sys_perm_user C(5) NOTNULL DEFAULT '',
-sys_perm_group C(5) NOTNULL DEFAULT '',
-sys_perm_other C(5) NOTNULL DEFAULT '',
-username C(100) NOTNULL DEFAULT '',
-passwort C(100) NOTNULL DEFAULT '',
-modules C(255) NOTNULL DEFAULT '',
-startmodule C(255) NOTNULL DEFAULT '',
-app_theme C(100) NOTNULL DEFAULT 'DEFAULT',
-typ C(20) NOTNULL DEFAULT 'user',
-active tinyint(4) NOTNULL DEFAULT '1',
-name C(100) NOTNULL DEFAULT '',
-vorname C(100) NOTNULL DEFAULT '',
-unternehmen C(100) NOTNULL DEFAULT '',
-strasse C(100) NOTNULL DEFAULT '',
-ort C(100) NOTNULL DEFAULT '',
-plz C(10) NOTNULL DEFAULT '',
-land C(50) NOTNULL DEFAULT '',
-email C(100) NOTNULL DEFAULT '',
-url C(255) NOTNULL DEFAULT '',
-telefon C(100) NOTNULL DEFAULT '',
-fax C(100) NOTNULL DEFAULT '',
-language C(10) NOTNULL DEFAULT 'de',
-groups C(255) NOTNULL DEFAULT '',
-DEFAULT_group I NOTNULL DEFAULT '0'
-";
 
 ?>
\ No newline at end of file
diff --git a/interface/sql/db_installer_sandbox/defs.resellers_clients.php b/interface/sql/db_installer_sandbox/defs.resellers_clients.php
new file mode 100644
index 0000000000000000000000000000000000000000..80dae847a77630e8860a1183e02ab2fd0682d142
--- /dev/null
+++ b/interface/sql/db_installer_sandbox/defs.resellers_clients.php
@@ -0,0 +1,42 @@
+<?php
+
+
+//*************************************************************************************
+// Resellers, clients etc
+//*************************************************************************************
+
+$tables['reseller'] = "
+reseller_id bigint(20) NOTNULL AUTO PRIMARY,
+sys_userid I NOTNULL DEFAULT '0',
+sys_groupid I NOTNULL DEFAULT '0',
+sys_perm_user C(5) NOTNULL DEFAULT '',
+sys_perm_group C(5) NOTNULL DEFAULT '',
+sys_perm_other C(5) NOTNULL DEFAULT '',
+company C(255) NOTNULL DEFAULT '',
+title C(255) NOTNULL DEFAULT '',
+firstname C(255) NOTNULL DEFAULT '',
+surname C(255) NOTNULL DEFAULT '',
+street C(255) NOTNULL DEFAULT '',
+zip C(255) NOTNULL DEFAULT '',
+city C(255) NOTNULL DEFAULT '',
+country C(255) NOTNULL DEFAULT '',
+telephone C(255) NOTNULL DEFAULT '',
+mobile C(255) NOTNULL DEFAULT '',
+fax C(255) NOTNULL DEFAULT '',
+email C(255) NOTNULL DEFAULT '',
+internet C(255) NOTNULL DEFAULT '',
+icq C(255) NOTNULL DEFAULT '',
+notes text NOTNULL,
+limit_client I NOTNULL DEFAULT '-1',
+limit_domain I NOTNULL DEFAULT '-1',
+limit_subdomain I NOTNULL DEFAULT '-1',
+limit_mailbox I NOTNULL DEFAULT '-1',
+limit_mailalias I NOTNULL DEFAULT '-1',
+limit_webquota I NOTNULL DEFAULT '-1',
+limit_mailquota I NOTNULL DEFAULT '-1',
+limit_database I NOTNULL DEFAULT '-1',
+ip_address text NOTNULL
+";
+
+
+?>
\ No newline at end of file
diff --git a/interface/sql/db_installer_sandbox/defs.system.php b/interface/sql/db_installer_sandbox/defs.system.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1e940695aae0235f5666f18fe3374d7b00ec08a
--- /dev/null
+++ b/interface/sql/db_installer_sandbox/defs.system.php
@@ -0,0 +1,86 @@
+<?php
+
+//*************************************************************************************
+// System Related
+//*************************************************************************************
+
+$tables['sys_datalog'] = "
+datalog_id bigint(20) NOTNULL AUTO PRIMARY,
+dbtable C(255) NOTNULL DEFAULT '',
+dbidx C(255) NOTNULL DEFAULT '',
+server_id I NOTNULL DEFAULT '0',
+action char(1) NOTNULL DEFAULT '',
+tstamp bigint(20) NOTNULL DEFAULT '0',
+user C(255) NOTNULL DEFAULT '',
+data text NOTNULL
+";
+
+$tables['sys_dbsync'] = "
+id bigint(20) NOTNULL AUTO PRIMARY,
+jobname C(255) NOTNULL DEFAULT '',
+sync_interval_minutes I NOTNULL DEFAULT '0',
+db_type C(255) NOTNULL DEFAULT '',
+db_host C(255) NOTNULL DEFAULT '',
+db_name C(255) NOTNULL DEFAULT '',
+db_username C(255) NOTNULL DEFAULT '',
+db_password C(255) NOTNULL DEFAULT '',
+db_tables C(255) NOTNULL DEFAULT 'admin,forms',
+empty_datalog I NOTNULL DEFAULT '0',
+sync_datalog_external I NOTNULL DEFAULT '0',
+active I NOTNULL DEFAULT '1',
+last_datalog_id bigint(20) NOTNULL DEFAULT '0'
+";
+
+
+$tables['sys_filesync'] = "
+id bigint(20) NOTNULL AUTO PRIMARY,
+jobname C(255) NOTNULL DEFAULT '',
+sync_interval_minutes I NOTNULL DEFAULT '0',
+ftp_host C(255) NOTNULL DEFAULT '',
+ftp_path C(255) NOTNULL DEFAULT '',
+ftp_username C(255) NOTNULL DEFAULT '',
+ftp_password C(255) NOTNULL DEFAULT '',
+local_path C(255) NOTNULL DEFAULT '',
+wput_options C(255) NOTNULL DEFAULT '--timestamping --reupload --dont-continue',
+active I NOTNULL DEFAULT '1'
+";
+
+$tables['sys_group'] = "
+groupid I NOTNULL AUTO PRIMARY,
+name C(255) NOTNULL DEFAULT '',
+description text NOTNULL,
+client_id int(11) NOT NULL default '0'
+";
+
+$tables['sys_user'] = "
+userid I NOTNULL AUTO PRIMARY,
+sys_userid I NOTNULL DEFAULT '0',
+sys_groupid I NOTNULL DEFAULT '0',
+sys_perm_user C(5) NOTNULL DEFAULT '',
+sys_perm_group C(5) NOTNULL DEFAULT '',
+sys_perm_other C(5) NOTNULL DEFAULT '',
+username C(100) NOTNULL DEFAULT '',
+passwort C(100) NOTNULL DEFAULT '',
+modules C(255) NOTNULL DEFAULT '',
+startmodule C(255) NOTNULL DEFAULT '',
+app_theme C(100) NOTNULL DEFAULT 'default',
+typ C(20) NOTNULL DEFAULT 'user',
+active tinyint(4) NOTNULL DEFAULT '1',
+name C(100) NOTNULL DEFAULT '',
+vorname C(100) NOTNULL DEFAULT '',
+unternehmen C(100) NOTNULL DEFAULT '',
+strasse C(100) NOTNULL DEFAULT '',
+ort C(100) NOTNULL DEFAULT '',
+plz C(10) NOTNULL DEFAULT '',
+land C(50) NOTNULL DEFAULT '',
+email C(100) NOTNULL DEFAULT '',
+url C(255) NOTNULL DEFAULT '',
+telefon C(100) NOTNULL DEFAULT '',
+fax C(100) NOTNULL DEFAULT '',
+language C(10) NOTNULL DEFAULT 'de',
+groups C(255) NOTNULL DEFAULT '',
+default_group I NOTNULL DEFAULT '0',
+client_id I INDEX
+";
+
+?>
\ No newline at end of file