diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 42b25f7cdc8845746e5b2173a6ae8d926191cc83..621fe653e3fb41fcb249274b26749ad473db240a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -40,126 +40,6 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- --------------------------------------------------------
 -- --------------------------------------------------------
 
--- 
--- Table structure for table  `billing_invoice`
--- 
-
-CREATE TABLE `billing_invoice` (
-  `billing_invoice_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `invoice_number` varchar(32) NOT NULL default '',
-  `invoice_date` date default NULL,
-  `xml` longtext NOT NULL,
-  `total_fee_net` decimal(10,4) NOT NULL default '0.00',
-  `total_fee_gross` decimal(10,4) NOT NULL default '0.00',
-  `currency_code` char(3) default 'EUR',
-  PRIMARY KEY  (`billing_invoice_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `billing_product`
--- 
-
-CREATE TABLE `billing_product` (
-  `billing_product_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `parent_id` int(11) unsigned NOT NULL default '0',
-  `product_name` varchar(64) default NULL,
-  `product_details` varchar(256) default NULL,
-  `template_id` int(11) unsigned NOT NULL default '0',
-  `service_class_id` int(11) unsigned NOT NULL default '0',
-  `billing_tax_id` int(11) unsigned NOT NULL default '0',
-  `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
-  `interval_fee_gross` decimal(10,4) NOT NULL default '0.00',
-  `interval_length` tinyint(3) NOT NULL default '0',
-  `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
-  `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
-  `clearing_period` tinyint(3) unsigned default '1',
-  `currency_code` char(3) default 'EUR',
-  PRIMARY KEY  (`billing_product_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `billing_service`
--- 
-
-CREATE TABLE `billing_service` (
-  `billing_service_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `product_id` int(11) unsigned default NULL,
-  `product_pid` int(11) unsigned default NULL,
-  `product_name` varchar(64) default NULL,
-  `product_details` varchar(256) default NULL,
-  `service_class_id` int(11) unsigned default '0',
-  `service_template_id` int(11) unsigned default NULL,
-  `service_id` int(11) unsigned default NULL,
-  `billing_tax_id` int(11) unsigned NOT NULL default '1',
-  `quantity` smallint(5) unsigned NOT NULL default '1',
-  `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
-  `interval_fee_gross` decimal(10,4) default '0.00',
-  `interval_fee_is_individual` tinyint(1) default '0',
-  `interval_length` int(11) NOT NULL default '1',
-  `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
-  `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
-  `clearing_period` tinyint(3) unsigned default '1',
-  `currency_code` char(3) default 'EUR',
-  `is_active` tinyint(1) NOT NULL default '0',
-  `service_start_at` date default NULL,
-  `service_end_at` date default NULL,
-  `invoiced_upto` date default NULL,
-  PRIMARY KEY  (`billing_service_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `billing_service_class`
--- 
-
-CREATE TABLE `billing_service_class` (
-  `billing_service_class_id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(64) NOT NULL default '',
-  `sort_order` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`billing_service_class_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `billing_tax`
--- 
-
-CREATE TABLE `billing_tax` (
-  `billing_tax_id` int(11) unsigned NOT NULL auto_increment,
-  `name` varchar(64) NOT NULL default '',
-  `tax_rate` decimal(10,4) default NULL,
-  `is_default` tinyint(1) NOT NULL default '0',
-  `valid_from` date default NULL,
-  `valid_till` date default NULL,
-  PRIMARY KEY  (`billing_tax_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table  `client`
 -- 
@@ -226,38 +106,6 @@ CREATE TABLE `client` (
 
 -- --------------------------------------------------------
 
--- 
--- Table structure for table  `client_address_book`
--- 
-
-CREATE TABLE `client_address_book` (
-  `client_address_book_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `entry_role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
-  `entry_company` varchar(64) default NULL,
-  `entry_gender` enum('m','f') default NULL,
-  `entry_title` varchar(16) default NULL,
-  `entry_firstname` varchar(32) NOT NULL,
-  `entry_lastname` varchar(32) NOT NULL,
-  `entry_address1` varchar(64) default NULL,
-  `entry_address2` varchar(64) default NULL,
-  `entry_postcode` varchar(32) NOT NULL,
-  `entry_city` varchar(64) NOT NULL,
-  `entry_state` varchar(32) default NULL,
-  `entry_country` char(2) default NULL,
-  `entry_phone` varchar(32) default NULL,
-  `entry_fax` varchar(32) default NULL,
-  `entry_mobile` varchar(32) default NULL,
-  `entry_email` varchar(256) default NULL,
-  PRIMARY KEY  (`client_address_book_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table  `client_template`
 -- 
@@ -375,94 +223,6 @@ CREATE TABLE `dns_template` (
 
 -- --------------------------------------------------------
 
--- 
--- Table structure for table  `domain`
--- 
-
-CREATE TABLE `domain` (
-  `domain_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `domain_provider_id` int(11) unsigned NOT NULL default '0',
-  `provider_domain_id` int(11) unsigned default NULL,
-  `domain` varchar(255) NOT NULL default '',
-  `tld` varchar(32) NOT NULL default '',
-  `handle_desc` varchar(32) default NULL,
-  `handle_admin_c` varchar(32) default NULL,
-  `handle_tech_c` varchar(32) default NULL,
-  `handle_zone_c` varchar(32) default NULL,
-  `added_at` timestamp NULL default NULL,
-  `connected_at` date default NULL,
-  `disconnected_at` date default NULL,
-  `status` varchar(64) NOT NULL default '0',
-  PRIMARY KEY  (`domain_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `domain_handle`
--- 
-
-CREATE TABLE `domain_handle` (
-  `domain_handle_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `domain_registrar` varchar(64) default NULL,
-  `handle` varchar(32) default NULL,
-  PRIMARY KEY  (`domain_handle_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `domain_provider`
--- 
-
-CREATE TABLE `domain_provider` (
-  `domain_provider_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `provider` varchar(255) default NULL,
-  `is_extern` tinyint(1) NOT NULL default '0',
-  `domainrobot_interface` varchar(16) default '',
-  PRIMARY KEY  (`domain_provider_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
--- 
--- Table structure for table  `domain_tld`
--- 
-
-CREATE TABLE `domain_tld` (
-  `domain_tld_id` int(11) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) unsigned NOT NULL default '0',
-  `sys_groupid` int(11) unsigned NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,
-  `sys_perm_all` varchar(5) default NULL,
-  `tld` varchar(32) default NULL,
-  `domain_provider_id` int(11) unsigned NOT NULL default '0',
-  `domain_registrar` varchar(64) default NULL,
-  PRIMARY KEY  (`domain_tld_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table  `firewall`
 -- 
@@ -1330,23 +1090,6 @@ CREATE TABLE `country` (
 -- --------------------------------------------------------
 -- --------------------------------------------------------
 
--- 
--- Dumping data for table `billing_service_class`
--- 
-
-INSERT INTO `billing_service_class` VALUES (1,'other',9999);
-INSERT INTO `billing_service_class` VALUES (2,'hosting',10);
-INSERT INTO `billing_service_class` VALUES (3,'domains',20);
-INSERT INTO `billing_service_class` VALUES (4,'traffic',30);
-INSERT INTO `billing_service_class` VALUES (5,'diskspace',40);
-
--- 
--- Dumping data for table `billing_tax_class`
--- 
-
-INSERT INTO `billing_tax` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
-INSERT INTO `billing_tax` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
-
 -- 
 -- Dumping data for table `dns_template`
 -- 
diff --git a/interface/web/domain/domain_del.php b/install/sql/pre_update.sql
similarity index 58%
rename from interface/web/domain/domain_del.php
rename to install/sql/pre_update.sql
index 2d62320389b383179deb41c9b2a5773f4efa0b4e..31e890dbc658efe9198416f5b9c649d0c733f26b 100644
--- a/interface/web/domain/domain_del.php
+++ b/install/sql/pre_update.sql
@@ -1,66 +1,46 @@
-<?php
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/domain.list.php";
-$tform_def_file = "form/domain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-	function onBeforeDelete() {
-		global $app; $conf;
-		
-		if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
-		
-		// Delete all records that belog to this domain.
-		$app->db->query("DELETE FROM domain WHERE domain_id = $domain_id");
-	}
-}
-
-$page = new page_action;
-$page->onDelete();
-
-?>
\ No newline at end of file
+/*
+Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+-- 
+-- These SQL commands will be executed before the ISPConfig update is performed.
+--
+
+SET FOREIGN_KEY_CHECKS = 0;
+
+DROP TABLE IF EXISTS `billing_invoice`;
+DROP TABLE IF EXISTS `billing_product`;
+DROP TABLE IF EXISTS `billing_service`;
+DROP TABLE IF EXISTS `billing_service_class`;
+DROP TABLE IF EXISTS `billing_tax`;
+DROP TABLE IF EXISTS `client_address_book`;
+DROP TABLE IF EXISTS `domain`;
+DROP TABLE IF EXISTS `domain_handle`;
+DROP TABLE IF EXISTS `domain_provider`;
+DROP TABLE IF EXISTS `domain_tld`;
+
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/install/update.php b/install/update.php
index 0c3a2073f108ca995b7f49a47b45b2cb37bae23a..d72b8f998e25f58926a43bef4e032da23a2f60fe 100644
--- a/install/update.php
+++ b/install/update.php
@@ -119,6 +119,15 @@ if( empty($conf["mysql"]["admin_password"]) ) {
 	$conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
 }
 
+//** load the pre update sql script do perform modifications on the database before the database is dumped
+if(is_file(ISPC_INSTALL_ROOT."/install/sql/pre_update.sql")) {
+	if($conf['mysql']['admin_password'] == '') {
+		caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+	} else {
+		caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['mysql']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/pre_update.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+	}
+}
+
 //** export the current database data
 if( !empty($conf["mysql"]["admin_password"]) ) {
 
diff --git a/interface/web/domain/README_DEVELOPER.txt b/interface/web/domain/README_DEVELOPER.txt
deleted file mode 100644
index 9bdddf3e70a5ec7c9fd2dfb6470de74121674a2a..0000000000000000000000000000000000000000
--- a/interface/web/domain/README_DEVELOPER.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-since i don't have the time to develope this module at the moment i want to explain how the database is constructed, so that someone else is able to contiue on this module.
-
-First of all: Why do we need this module?
------------------------------------------
-At the moment it is possible for a customer to register every domain, even subdomains belonging to other customers!
-With the "domain"-module it is possible to assign domains to customers and to implement domain-robot-tools.
-
-The next step would be to implement selector boxes to other modules like "dns", "mail", etc. where the customer can only select domains which belong to him.
-
-THE TABLES:
------------
-
-domain
-______
-
-- domain_provider_id: reference to table domain_provider; over which provider was the domain ordered!
-- provider_domain_id: reference-id from the domain-provider
-- ...
-- added_at: record creation date
-- connected_at: date at which the domain was connected - important for billing!
-- disconnected_at: empty by default. Date when the domain was canceled.
-- status: status-info from the registrar
-
-
-domain_handle
--------------
-most registrars work with handles. In this table we assign handles from different registrars (DENIC, etc.) to the ispc-clients
-
-
-domain_provider
----------------
-the domainprovider is the one where the domains are ordere at (Hetzner, 1und1, HostEurope, etc.)
-
-- provider: name of the Provider
-- is_extern: BOOL; Only True if the client has ordered the domain somewhere else on his own and want's to use the domain on the ISPC-Server. - IMPORTANT FOR DOMAIN-BILLING!
-- domainrobot_interface: for future development - describes the Providers domainrobot-interface: could be NULL, EMAIL, SOAP, XML, etc.
-
-domain_tld
-----------
-all available TopLevelDomains
-
-- tld: The TopLevelDomain (without dot: e.g.: "de" NOT ".de")
-- domain_provider: reference to table domain_provider; which provider is responsible for registration
-- domain_registrar: who is the domain registrar (DENIC, EURID, etc.); same name as in domain_handle - IMPORTANT for Table domain_handle: e.g.: When the domain test.de is ordered only DENIC-Handles from the Customer are displayed and valid!
-
-
-
-cheers
-
-if you have any question you can contact me over the forum.
-http://www.howtoforge.com/forums/member.php?u=50859
-
-2009-04-11
\ No newline at end of file
diff --git a/interface/web/domain/domain_edit.php b/interface/web/domain/domain_edit.php
deleted file mode 100644
index 978910c9e3eebd909d9e04cb1bb7b191e727af24..0000000000000000000000000000000000000000
--- a/interface/web/domain/domain_edit.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/domain.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-	function onShowNew() {
-		global $app, $conf;
-		
-		if($_SESSION["s"]["user"]["typ"] != 'admin') {
-  		$app->error($app->tform->wordbook["onlyforadmin_txt"]);
-		}
-		
-		parent::onShowNew();
-	}
-	
-	function onShowEnd() {
-		global $app, $conf;
-
-		if($_SESSION["s"]["user"]["typ"] != 'admin') {
-  		$app->error($app->tform->wordbook["onlyforadmin_txt"]);
-		}
-
-		// Fill the client select field
-		$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0";
-		$clients = $app->db->queryAllRecords($sql);
-		$client_select = "<option value='0'></option>";
-		if(is_array($clients)) {
-			foreach( $clients as $client) {
-				$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
-				$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
-			}
-		}
-		$app->tpl->setVar("client_group_id",$client_select);
-		
-		parent::onShowEnd();
-	}
-	
-	function onSubmit() {
-		global $app, $conf;
-		
-		parent::onSubmit();
-	}
-	
-	function onAfterInsert() {
-		global $app, $conf;
-		
-	}
-	
-	function onBeforeUpdate () {
-		global $app, $conf;
-	
-	}
-	
-	function onAfterUpdate() {
-		global $app, $conf;
-		
-	}
-	
-	function onAfterDelete() {
-		global $app, $conf;
-		
-	}
-	
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/domain_list.php b/interface/web/domain/domain_list.php
deleted file mode 100644
index fd82881c2313973380e26b3625394536e96b0e34..0000000000000000000000000000000000000000
--- a/interface/web/domain/domain_list.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/domain.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->SQLOrderBy = 'ORDER BY domain';
-$app->listform_actions->onLoad();
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/form/domain.tform.php b/interface/web/domain/form/domain.tform.php
deleted file mode 100644
index 8a52221b53d4295ac6854d55b0688ac2bce08d39..0000000000000000000000000000000000000000
--- a/interface/web/domain/form/domain.tform.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/*
-	Form Definition
-
-	Tabledefinition
-
-	Datatypes:
-	- INTEGER (Forces the input to Int)
-	- DOUBLE
-	- CURRENCY (Formats the values to currency notation)
-	- VARCHAR (no format check, maxlength: 255)
-	- TEXT (no format check)
-	- DATE (Dateformat, automatic conversion to timestamps)
-
-	Formtype:
-	- TEXT (Textfield)
-	- TEXTAREA (Textarea)
-	- PASSWORD (Password textfield, input is not shown when edited)
-	- SELECT (Select option field)
-	- RADIO
-	- CHECKBOX
-	- CHECKBOXARRAY
-	- FILE
-
-	VALUE:
-	- Wert oder Array
-
-	Hint:
-	The ID field of the database table is not part of the datafield definition.
-	The ID field must be always auto incement (int or bigint).
-
-
-*/
-
-$form["title"] 			= "Domain";
-$form["description"] 	= "";
-$form["name"] 			= "domain";
-$form["action"]			= "domain_edit.php";
-$form["db_table"]		= "domain";
-$form["db_table_idx"]	= "domain_id";
-$form["db_history"]		= "yes";
-$form["tab_default"]	= "domain";
-$form["list_default"]	= "domain_list.php";
-$form["auth"]			= 'yes'; // yes / no
-
-$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-// Clients may not change the website basic settings if they are not resellers
-if($app->auth->has_clients($_SESSION['s']['user']['userid']) || $app->auth->is_admin()) {
-	$domain_edit_readonly = false;
-} else {
-	$domain_edit_readonly = true;
-}
-
-
-$form["tabs"]['domain'] = array (
-	'title' 	=> "Domain",
-	'width' 	=> 100,
-	'template' 	=> "templates/domain_edit.htm",
-	'readonly'	=> $domain_edit_readonly,
-	'fields' 	=> array (
-	##################################
-	# Begin Datatable fields
-	##################################
-		'domain' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'TEXT',
-			'validators'	=> array ( 	0 => array (	'type'	=> 'NOTEMPTY',
-														'errmsg'=> 'domain_error_empty'),
-										1 => array (	'type'	=> 'UNIQUE',
-														'errmsg'=> 'domain_error_unique'),
-										2 => array (	'type'	=> 'REGEX',
-														'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z]{2,10}$/',
-														'errmsg'=> 'domain_error_regex'),
-									),
-			'default'	=> '',
-			'value'		=> '',
-			'width'		=> '30',
-			'maxlength'	=> '255'
-		),
-		'tld' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT tld FROM domain_tld ORDER BY tld",
-										'keyfield'=> 'tld',
-										'valuefield'=> 'tld'
-									 ),
-			'value'		=> ''
-		),
-		'domain_provider_id' => array (
-			'datatype'	=> 'INTEGER',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT domain_provider_id, provider FROM domain_provider ORDER BY domain_provider_id",
-										'keyfield'=> 'domain_provider_id',
-										'valuefield'=> 'provider'
-									 ),
-			'value'		=> ''
-		),
-		'handle_desc' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT handle FROM domain_handle ORDER BY handle",
-										'keyfield'=> 'handle',
-										'valuefield'=> 'handle'
-									 ),
-			'value'		=> ''
-		),
-		'handle_admin_c' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT handle FROM domain_handle ORDER BY handle",
-										'keyfield'=> 'handle',
-										'valuefield'=> 'handle'
-									 ),
-			'value'		=> ''
-		),
-		'handle_tech_c' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT handle FROM domain_handle ORDER BY handle",
-										'keyfield'=> 'handle',
-										'valuefield'=> 'handle'
-									 ),
-			'value'		=> ''
-		),
-		'handle_zone_c' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> '',
-			'datasource'	=> array ( 	'type'	=> 'SQL',
-										'querystring' => "SELECT handle FROM domain_handle ORDER BY handle",
-										'keyfield'=> 'handle',
-										'valuefield'=> 'handle'
-									 ),
-			'value'		=> ''
-		),
-		'status' => array (
-			'datatype'	=> 'VARCHAR',
-			'formtype'	=> 'SELECT',
-			'default'	=> 'y',
-			'value'		=> array('connect' => 'connect', 'failed' => 'failed', 'free' => 'free', 'invalid' => 'invalid')
-		),
-
-	##################################
-	# ENDE Datatable fields
-	##################################
-	)
-);
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/handle_list.php b/interface/web/domain/handle_list.php
deleted file mode 100644
index c0da52e95a98109df403de3688d5ea51d84d218b..0000000000000000000000000000000000000000
--- a/interface/web/domain/handle_list.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/handle.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->SQLOrderBy = 'ORDER BY handle';
-$app->listform_actions->onLoad();
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/lib/admin.conf.php b/interface/web/domain/lib/admin.conf.php
deleted file mode 100644
index a45d4403455c5c46f438046f088398e241cbc3d9..0000000000000000000000000000000000000000
--- a/interface/web/domain/lib/admin.conf.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
\ No newline at end of file
diff --git a/interface/web/domain/lib/lang/en.lng b/interface/web/domain/lib/lang/en.lng
deleted file mode 100644
index b71c88b0c045f686a119ce0efeed11f925c22833..0000000000000000000000000000000000000000
--- a/interface/web/domain/lib/lang/en.lng
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$wb['Domain'] = 'Domain';
-?>
\ No newline at end of file
diff --git a/interface/web/domain/lib/lang/en_domain.lng b/interface/web/domain/lib/lang/en_domain.lng
deleted file mode 100644
index 1943e15efacaf7438481ed10da9132ec64de443a..0000000000000000000000000000000000000000
--- a/interface/web/domain/lib/lang/en_domain.lng
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$wb["client_group_id_txt"] = 'Registered for';
-$wb["domain_txt"] = 'Domain';
-$wb["domain_hint_txt"] = 'Format: domain.tld';
-$wb["tld_txt"] = 'TLD';
-$wb["domain_provider_id_txt"] = 'Domain-Provider';
-$wb["provider_domain_id_txt"] = 'Reg-ID';
-$wb["handle_desc_txt"] = 'Desc-C';
-$wb["handle_admin_c_txt"] = 'Admin-C';
-$wb["handle_tech_c_txt"] = 'Tech-C';
-$wb["handle_zone_c_txt"] = 'Zone-C';
-$wb["added_at_txt"] = 'Added at';
-$wb["connected_at_txt"] = 'Connected at';
-$wb["disconnected_at_txt"] = 'Disconnected at';
-$wb["status_txt"] = 'Status';
-$wb["date_hint_txt"] = 'Date Format: YYYY-MM-DD';
-?>
diff --git a/interface/web/domain/lib/lang/en_domain_list.lng b/interface/web/domain/lib/lang/en_domain_list.lng
deleted file mode 100644
index 80a1de08f9f223989b9802664ded3bec3617bae0..0000000000000000000000000000000000000000
--- a/interface/web/domain/lib/lang/en_domain_list.lng
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$wb["list_head_txt"] = 'Domains';
-$wb["domain_id_txt"] = 'ID';
-$wb["domain_txt"] = 'Domain';
-$wb["tld_txt"] = 'TLD';
-$wb["connected_at_txt"] = 'Connected';
-$wb["disconnected_at_txt"] = 'Disconnected';
-$wb["status_txt"] = 'Status';
-$wb["add_new_record_txt"] = 'Add new domain';
-?>
\ No newline at end of file
diff --git a/interface/web/domain/lib/module.conf.php b/interface/web/domain/lib/module.conf.php
deleted file mode 100644
index 603fdf567aa6340aa0e862a8b608969cdf50184f..0000000000000000000000000000000000000000
--- a/interface/web/domain/lib/module.conf.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-$module["name"] 		= "domain";
-$module["title"] 		= "Domain";
-$module["template"] 	= "module.tpl.htm";
-$module["startpage"] 	= "domain/domain_list.php";
-$module["tab_width"]    = '';
-
-/*
-	Websites menu
-*/
-
-$items[] = array( 'title' 	=> "Domain",
-				  'target' 	=> 'content',
-				  'link'	=> 'domain/domain_list.php');
-
-
-$items[] = array( 'title' 	=> "TLD",
-				  'target' 	=> 'content',
-				  'link'	=> 'domain/tld_list.php');
-
-
-$items[] = array( 'title' 	=> "Handle",
-				  'target' 	=> 'content',
-				  'link'	=> 'domain/handle_list.php');
-
-$items[] = array( 'title' 	=> "Domain-Provider",
-				  'target' 	=> 'content',
-				  'link'	=> 'domain/provider_list.php');
-
-$module["nav"][] = array(	'title'	=> 'Domain',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-// clean up
-unset($items);
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/list/domain.list.php b/interface/web/domain/list/domain.list.php
deleted file mode 100644
index da9d613a828e8b517824a2b43ff633f00e1e6efd..0000000000000000000000000000000000000000
--- a/interface/web/domain/list/domain.list.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
-	Datatypes:
-	- INTEGER
-	- DOUBLE
-	- CURRENCY
-	- VARCHAR
-	- TEXT
-	- DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] 				= "domain";
-
-// Database table
-$liste["table"] 			= "domain";
-
-// Index index field of the database table
-$liste["table_idx"]			= "domain_id";
-
-// Search Field Prefix
-$liste["search_prefix"] 	= "search_";
-
-// Records per page
-$liste["records_per_page"] 	= 30;
-
-// Script File of the list
-$liste["file"]				= "domain_list.php";
-
-// Script file of the edit form
-$liste["edit_file"]			= "domain_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"]		= "domain_del.php";
-
-// Paging Template
-$liste["paging_tpl"]		= "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"]				= "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-$liste["item"][] = array(	'field'		=> "domain",
-							'datatype'	=> "VARCHAR",
-							'formtype'	=> "TEXT",
-							'op'		=> "like",
-							'prefix'	=> "%",
-							'suffix'	=> "%",
-							'width'		=> "",
-							'value'		=> "");
-
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/list/handle.list.php b/interface/web/domain/list/handle.list.php
deleted file mode 100644
index 5bbd9a1a3df2b78fdab4aaf56c8f551b1f652593..0000000000000000000000000000000000000000
--- a/interface/web/domain/list/handle.list.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
-	Datatypes:
-	- INTEGER
-	- DOUBLE
-	- CURRENCY
-	- VARCHAR
-	- TEXT
-	- DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] 				= "domain_handle";
-
-// Database table
-$liste["table"] 			= "domain_handle";
-
-// Index index field of the database table
-$liste["table_idx"]			= "domain_handle_id";
-
-// Search Field Prefix
-$liste["search_prefix"] 	= "search_";
-
-// Records per page
-$liste["records_per_page"] 	= 30;
-
-// Script File of the list
-$liste["file"]				= "handle_list.php";
-
-// Script file of the edit form
-$liste["edit_file"]			= "handle_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"]		= "handle_del.php";
-
-// Paging Template
-$liste["paging_tpl"]		= "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"]				= "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/list/provider.list.php b/interface/web/domain/list/provider.list.php
deleted file mode 100644
index bc1e93fa3c15a943164811d81ffb76f0529aaa3b..0000000000000000000000000000000000000000
--- a/interface/web/domain/list/provider.list.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
-	Datatypes:
-	- INTEGER
-	- DOUBLE
-	- CURRENCY
-	- VARCHAR
-	- TEXT
-	- DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] 				= "domain_provider";
-
-// Database table
-$liste["table"] 			= "domain_provider";
-
-// Index index field of the database table
-$liste["table_idx"]			= "domain_provider_id";
-
-// Search Field Prefix
-$liste["search_prefix"] 	= "search_";
-
-// Records per page
-$liste["records_per_page"] 	= 30;
-
-// Script File of the list
-$liste["file"]				= "provider_list.php";
-
-// Script file of the edit form
-$liste["edit_file"]			= "provider_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"]		= "provider_del.php";
-
-// Paging Template
-$liste["paging_tpl"]		= "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"]				= "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/list/tld.list.php b/interface/web/domain/list/tld.list.php
deleted file mode 100644
index c19e24d63bb4b31a0f1805af41b12e223f2fd8c2..0000000000000000000000000000000000000000
--- a/interface/web/domain/list/tld.list.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
-	Datatypes:
-	- INTEGER
-	- DOUBLE
-	- CURRENCY
-	- VARCHAR
-	- TEXT
-	- DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] 				= "domain_tld";
-
-// Database table
-$liste["table"] 			= "domain_tld";
-
-// Index index field of the database table
-$liste["table_idx"]			= "domain_tld_id";
-
-// Search Field Prefix
-$liste["search_prefix"] 	= "search_";
-
-// Records per page
-$liste["records_per_page"] 	= 30;
-
-// Script File of the list
-$liste["file"]				= "tld_list.php";
-
-// Script file of the edit form
-$liste["edit_file"]			= "tld_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"]		= "tld_del.php";
-
-// Paging Template
-$liste["paging_tpl"]		= "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"]				= "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/provider_list.php b/interface/web/domain/provider_list.php
deleted file mode 100644
index a14aa00f2dd23c9af75b2a3dbd668f81782490a6..0000000000000000000000000000000000000000
--- a/interface/web/domain/provider_list.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/provider.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->SQLOrderBy = 'ORDER BY provider_id';
-$app->listform_actions->onLoad();
-
-?>
\ No newline at end of file
diff --git a/interface/web/domain/templates/domain_edit.htm b/interface/web/domain/templates/domain_edit.htm
deleted file mode 100644
index 596d73a0ed00d6750e8e642ade3fb29e6701d6b4..0000000000000000000000000000000000000000
--- a/interface/web/domain/templates/domain_edit.htm
+++ /dev/null
@@ -1,94 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_domain">
-
-  <div class="pnl_formsarea">
-    <fieldset class="inlineLabels">
-      <tmpl_if name="is_admin">
-      <div class="ctrlHolder">
-      	<label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
-        <select name="client_group_id" id="client_group_id" class="selectInput">
-					{tmpl_var name='client_group_id'}
-				</select>
-      </div>
-      </tmpl_if>
-
-      <div class="ctrlHolder">
-      	<label for="domain">{tmpl_var name='domain_txt'}</label>
-        <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
-        <p class="formHint">{tmpl_var name='domain_hint_txt'}</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="tld">{tmpl_var name='tld_txt'}</label>
-        <select name="tld" id="tld" class="selectInput formLengthHalf">
-					{tmpl_var name='tld'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="domain_provider_id">{tmpl_var name='domain_provider_id_txt'}</label>
-        <select name="domain_provider_id" id="domain_provider_id" class="selectInput">
-					{tmpl_var name='domain_provider_id'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="provider_domain_id">{tmpl_var name='provider_domain_id_txt'}</label>
-        <input name="provider_domain_id" id="provider_domain_id" value="{tmpl_var name='provider_domain_id'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
-			</div>
-      <div class="ctrlHolder">
-      	<label for="handle_desc">{tmpl_var name='handle_desc_txt'}</label>
-        <select name="handle_desc" id="handle_desc" class="selectInput">
-					{tmpl_var name='handle_desc'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="handle_admin_c">{tmpl_var name='handle_admin_c_txt'}</label>
-        <select name="handle_admin_c" id="handle_admin_c" class="selectInput">
-					{tmpl_var name='handle_admin_c'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="handle_tech_c">{tmpl_var name='handle_tech_c_txt'}</label>
-        <select name="handle_tech_c" id="handle_tech_c" class="selectInput">
-					{tmpl_var name='handle_tech_c'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="handle_zone_c">{tmpl_var name='handle_zone_c_txt'}</label>
-        <select name="handle_zone_c" id="handle_zone_c" class="selectInput">
-					{tmpl_var name='handle_zone_c'}
-				</select>
-      </div>
-      <div class="ctrlHolder">
-      	<label for="added_at">{tmpl_var name='added_at_txt'}</label>
-        <input name="added_at" id="added_at" value="{tmpl_var name='added_at'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
-        <p class="formHint">{tmpl_var name='date_hint_txt'}</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="connected_at">{tmpl_var name='connected_at_txt'}</label>
-        <input name="connected_at" id="connected_at" value="{tmpl_var name='connected_at'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
-        <p class="formHint">{tmpl_var name='date_hint_txt'}</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="disconnected_at">{tmpl_var name='disconnected_at_txt'}</label>
-        <input name="disconnected_at" id="disconnected_at" value="{tmpl_var name='disconnected_at'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
-        <p class="formHint">{tmpl_var name='date_hint_txt'}</p>
-			</div>
-      <div class="ctrlHolder">
-      	<label for="status">{tmpl_var name='status_txt'}</label>
-        <select name="status" id="status" class="selectInput formLengthHalf">
-					{tmpl_var name='status'}
-				</select>
-      </div>
-
-    </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','domain/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('domain/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
-  </div>
-  
-</div>
diff --git a/interface/web/domain/templates/domain_handle_list.htm b/interface/web/domain/templates/domain_handle_list.htm
deleted file mode 100644
index b7222ecc7fdf0a4a51d63bfe22572bff1da36169..0000000000000000000000000000000000000000
--- a/interface/web/domain/templates/domain_handle_list.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_handle">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/handle_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_handle_id" scope="col"><tmpl_var name="handle_id_txt"></th>
-            <th class="tbl_col_domain_registrar" scope="col"><tmpl_var name="domain_registrar_txt"></th>
-            <th class="tbl_col_handle" scope="col"><tmpl_var name="handle_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_handle_id"></td>
-            <td class="tbl_col_domain_registrar"></td>
-            <td class="tbl_col_handle"></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_handle_id"><a href="#" onClick="loadContent('domain/handle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="handle_id"}</a></td>
-            <td class="tbl_col_domain_registrar">{tmpl_var name="domain_registrar"}</td>
-            <td class="tbl_col_handle"><a href="#" onClick="loadContent('domain/handle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="handle"}</a></td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('domain/handle_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
diff --git a/interface/web/domain/templates/domain_list.htm b/interface/web/domain/templates/domain_list.htm
deleted file mode 100644
index 01e3dbe58ec1e05dd227c3aac65395ec2dbb7cf3..0000000000000000000000000000000000000000
--- a/interface/web/domain/templates/domain_list.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_domain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_tld" scope="col"><tmpl_var name="tld_txt"></th>
-            <th class="tbl_col_connected_at" scope="col"><tmpl_var name="connected_at_txt"></th>
-            <th class="tbl_col_disconnected_at" scope="col"><tmpl_var name="disconnected_at_txt"></th>
-            <th class="tbl_col_status" scope="col"><tmpl_var name="status_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_domain_id"></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_tld"><input type="text" name="search_tld" value="{tmpl_var name='search_tld'}" /></td>
-            <td class="tbl_col_connected_at"></td>
-            <td class="tbl_col_disconnected_at"></td>
-            <td class="tbl_col_status"></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_tld"><a href="#" onClick="loadContent('domain/tld_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tld"}</a></td>
-            <td class="tbl_col_connected_at">{tmpl_var name="connected_at"}</td>
-            <td class="tbl_col_disconnected_at">{tmpl_var name="disconnected_at"}</td>
-            <td class="tbl_col_status">{tmpl_var name="status"}</td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
diff --git a/interface/web/domain/templates/domain_provider_list.htm b/interface/web/domain/templates/domain_provider_list.htm
deleted file mode 100644
index 01e3dbe58ec1e05dd227c3aac65395ec2dbb7cf3..0000000000000000000000000000000000000000
--- a/interface/web/domain/templates/domain_provider_list.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_domain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_tld" scope="col"><tmpl_var name="tld_txt"></th>
-            <th class="tbl_col_connected_at" scope="col"><tmpl_var name="connected_at_txt"></th>
-            <th class="tbl_col_disconnected_at" scope="col"><tmpl_var name="disconnected_at_txt"></th>
-            <th class="tbl_col_status" scope="col"><tmpl_var name="status_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_domain_id"></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_tld"><input type="text" name="search_tld" value="{tmpl_var name='search_tld'}" /></td>
-            <td class="tbl_col_connected_at"></td>
-            <td class="tbl_col_disconnected_at"></td>
-            <td class="tbl_col_status"></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_tld"><a href="#" onClick="loadContent('domain/tld_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tld"}</a></td>
-            <td class="tbl_col_connected_at">{tmpl_var name="connected_at"}</td>
-            <td class="tbl_col_disconnected_at">{tmpl_var name="disconnected_at"}</td>
-            <td class="tbl_col_status">{tmpl_var name="status"}</td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
diff --git a/interface/web/domain/templates/domain_tld_list.htm b/interface/web/domain/templates/domain_tld_list.htm
deleted file mode 100644
index 01e3dbe58ec1e05dd227c3aac65395ec2dbb7cf3..0000000000000000000000000000000000000000
--- a/interface/web/domain/templates/domain_tld_list.htm
+++ /dev/null
@@ -1,65 +0,0 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="panel panel_list_domain">
-
-  <div class="pnl_toolsarea">
-    <fieldset><legend>Tools</legend>
-      <div class="buttons">
-        <button class="iconstxt icoAdd" type="button" onClick="loadContent('domain/domain_edit.php');">
-          <span>{tmpl_var name="add_new_record_txt"}</span>
-        </button>
-      </div>
-    </fieldset>
-  </div>
-
-  <div class="pnl_listarea">
-    <fieldset><legend><tmpl_var name="list_head_txt"></legend>
-      <table class="list">
-        <thead>
-          <tr>
-            <th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_tld" scope="col"><tmpl_var name="tld_txt"></th>
-            <th class="tbl_col_connected_at" scope="col"><tmpl_var name="connected_at_txt"></th>
-            <th class="tbl_col_disconnected_at" scope="col"><tmpl_var name="disconnected_at_txt"></th>
-            <th class="tbl_col_status" scope="col"><tmpl_var name="status_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
-          </tr>
-          <tr>
-            <td class="tbl_col_domain_id"></td>
-            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
-            <td class="tbl_col_tld"><input type="text" name="search_tld" value="{tmpl_var name='search_tld'}" /></td>
-            <td class="tbl_col_connected_at"></td>
-            <td class="tbl_col_disconnected_at"></td>
-            <td class="tbl_col_status"></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','sites/web_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
-          </tr>
-        </thead>
-        <tbody>
-          <tmpl_loop name="records">
-          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-            <td class="tbl_col_domain_id"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain_id"}</a></td>
-            <td class="tbl_col_domain"><a href="#" onClick="loadContent('domain/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
-            <td class="tbl_col_tld"><a href="#" onClick="loadContent('domain/tld_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tld"}</a></td>
-            <td class="tbl_col_connected_at">{tmpl_var name="connected_at"}</td>
-            <td class="tbl_col_disconnected_at">{tmpl_var name="disconnected_at"}</td>
-            <td class="tbl_col_status">{tmpl_var name="status"}</td>
-            <td class="tbl_col_buttons">
-              <div class="buttons icons16">    
-                <a class="icons16 icoDelete" href="javascript: del_record('domain/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
-              </div>
-            </td>
-          </tr>
-          </tmpl_loop>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </fieldset>
-  </div>
-
-</div>
diff --git a/interface/web/domain/tld_list.php b/interface/web/domain/tld_list.php
deleted file mode 100644
index ae25c70d614d1b83a024f62122ba330cecc11c6c..0000000000000000000000000000000000000000
--- a/interface/web/domain/tld_list.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/tld.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('domain');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->SQLOrderBy = 'ORDER BY tld';
-$app->listform_actions->onLoad();
-
-?>
\ No newline at end of file