diff --git a/lib/Froxlor/Api/ApiCommand.php b/lib/Froxlor/Api/ApiCommand.php
index 51bd3c47..84c5bf5a 100644
--- a/lib/Froxlor/Api/ApiCommand.php
+++ b/lib/Froxlor/Api/ApiCommand.php
@@ -50,7 +50,7 @@ abstract class ApiCommand extends ApiParameter
 	/**
 	 * mail interface
 	 *
-	 * @var \PHPMailer\PHPMailer\PHPMailer
+	 * @var \Froxlor\System\Mailer
 	 */
 	private $mail = null;
 
@@ -95,13 +95,11 @@ abstract class ApiCommand extends ApiParameter
 	 */
 	public function __construct($header = null, $params = null, $userinfo = null)
 	{
-		global $version, $dbversion, $branding;
-
 		parent::__construct($params);
 
-		$this->version = $version;
-		$this->dbversion = $dbversion;
-		$this->branding = $branding;
+		$this->version = \Froxlor\Froxlor::VERSION;
+		$this->dbversion = \Froxlor\Froxlor::DBVERSION;
+		$this->branding = \Froxlor\Froxlor::BRANDING;
 
 		if (! empty($header)) {
 			$this->readUserData($header);
@@ -120,7 +118,11 @@ abstract class ApiCommand extends ApiParameter
 		}
 
 		$this->initLang();
-		$this->initMail();
+
+		/**
+		 * Initialize the mailingsystem
+		 */
+		$this->mail = new \Froxlor\System\Mailer(true);
 
 		if ($this->debug) {
 			$this->logger()->logAction(LOG_ERROR, LOG_DEBUG, "[API] " . get_called_class() . ": " . json_encode($params, JSON_UNESCAPED_SLASHES));
@@ -180,42 +182,6 @@ abstract class ApiCommand extends ApiParameter
 		$this->lng = $lng;
 	}
 
-	/**
-	 * initialize mail interface so an API wide mail-object is available
-	 *
-	 * @throws \PHPMailer\PHPMailer\Exception
-	 */
-	private function initMail()
-	{
-		/**
-		 * Initialize the mailingsystem
-		 */
-		$this->mail = new \PHPMailer\PHPMailer\PHPMailer(true);
-		$this->mail->CharSet = "UTF-8";
-
-		if (\Froxlor\Settings::Get('system.mail_use_smtp')) {
-			$this->mail->isSMTP();
-			$this->mail->Host = \Froxlor\Settings::Get('system.mail_smtp_host');
-			$this->mail->SMTPAuth = \Froxlor\Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
-			$this->mail->Username = \Froxlor\Settings::Get('system.mail_smtp_user');
-			$this->mail->Password = \Froxlor\Settings::Get('system.mail_smtp_passwd');
-			if (\Froxlor\Settings::Get('system.mail_smtp_usetls')) {
-				$this->mail->SMTPSecure = 'tls';
-			} else {
-				$this->mail->SMTPAutoTLS = false;
-			}
-			$this->mail->Port = \Froxlor\Settings::Get('system.mail_smtp_port');
-		}
-
-		if (\PHPMailer\PHPMailer\PHPMailer::validateAddress(\Froxlor\Settings::Get('panel.adminmail')) !== false) {
-			// set return-to address and custom sender-name, see #76
-			$this->mail->setFrom(\Froxlor\Settings::Get('panel.adminmail'), \Froxlor\Settings::Get('panel.adminmail_defname'));
-			if (\Froxlor\Settings::Get('panel.adminmail_return') != '') {
-				$this->mail->addReplyTo(\Froxlor\Settings::Get('panel.adminmail_return'), \Froxlor\Settings::Get('panel.adminmail_defname'));
-			}
-		}
-	}
-
 	/**
 	 * returns an instance of the wanted ApiCommand (e.g.
 	 * Customers, Domains, etc);
@@ -279,7 +245,7 @@ abstract class ApiCommand extends ApiParameter
 	/**
 	 * return mailer instance
 	 *
-	 * @return \PHPMailer\PHPMailer\PHPMailer
+	 * @return \Froxlor\System\Mailer
 	 */
 	protected function mailer()
 	{
diff --git a/lib/Froxlor/Api/ApiParameter.php b/lib/Froxlor/Api/ApiParameter.php
index 27509c72..9424994e 100644
--- a/lib/Froxlor/Api/ApiParameter.php
+++ b/lib/Froxlor/Api/ApiParameter.php
@@ -1,6 +1,7 @@
 <?php
 namespace Froxlor\Api;
 
+
 /**
  * This file is part of the Froxlor project.
  * Copyright (c) 2010 the Froxlor Team (see authors).
diff --git a/lib/Froxlor/Api/Commands/Admins.php b/lib/Froxlor/Api/Commands/Admins.php
index 3dbfcd9f..576575b4 100644
--- a/lib/Froxlor/Api/Commands/Admins.php
+++ b/lib/Froxlor/Api/Commands/Admins.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/Certificates.php b/lib/Froxlor/Api/Commands/Certificates.php
index 404e5a99..d30824dc 100644
--- a/lib/Froxlor/Api/Commands/Certificates.php
+++ b/lib/Froxlor/Api/Commands/Certificates.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/Cronjobs.php b/lib/Froxlor/Api/Commands/Cronjobs.php
index 4fe82f61..db951590 100644
--- a/lib/Froxlor/Api/Commands/Cronjobs.php
+++ b/lib/Froxlor/Api/Commands/Cronjobs.php
@@ -1,7 +1,7 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
+use Froxlor\Database\Database;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/CustomerBackups.php b/lib/Froxlor/Api/Commands/CustomerBackups.php
index 0787bec8..98f972e3 100644
--- a/lib/Froxlor/Api/Commands/CustomerBackups.php
+++ b/lib/Froxlor/Api/Commands/CustomerBackups.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php
index 8893e385..c0344d0c 100644
--- a/lib/Froxlor/Api/Commands/Customers.php
+++ b/lib/Froxlor/Api/Commands/Customers.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/DirOptions.php b/lib/Froxlor/Api/Commands/DirOptions.php
index 2c304009..1df4c97b 100644
--- a/lib/Froxlor/Api/Commands/DirOptions.php
+++ b/lib/Froxlor/Api/Commands/DirOptions.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/DirProtections.php b/lib/Froxlor/Api/Commands/DirProtections.php
index aa17f4c8..c7975dcc 100644
--- a/lib/Froxlor/Api/Commands/DirProtections.php
+++ b/lib/Froxlor/Api/Commands/DirProtections.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/DomainZones.php b/lib/Froxlor/Api/Commands/DomainZones.php
index 138493a7..f6cebf61 100644
--- a/lib/Froxlor/Api/Commands/DomainZones.php
+++ b/lib/Froxlor/Api/Commands/DomainZones.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/EmailAccounts.php b/lib/Froxlor/Api/Commands/EmailAccounts.php
index 3bb3f9af..ce2e194d 100644
--- a/lib/Froxlor/Api/Commands/EmailAccounts.php
+++ b/lib/Froxlor/Api/Commands/EmailAccounts.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/Ftps.php b/lib/Froxlor/Api/Commands/Ftps.php
index a5e30dd8..3d57de17 100644
--- a/lib/Froxlor/Api/Commands/Ftps.php
+++ b/lib/Froxlor/Api/Commands/Ftps.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Api/Commands/Mysqls.php b/lib/Froxlor/Api/Commands/Mysqls.php
index d34440f4..d410d8df 100644
--- a/lib/Froxlor/Api/Commands/Mysqls.php
+++ b/lib/Froxlor/Api/Commands/Mysqls.php
@@ -1,8 +1,8 @@
 <?php
 namespace Froxlor\Api\Commands;
 
-use Froxlor\Database as Database;
-use Froxlor\Settings as Settings;
+use Froxlor\Database\Database;
+use Froxlor\Settings;
 
 /**
  * This file is part of the Froxlor project.
diff --git a/lib/Froxlor/Cron/Traffic/ReportsCron.php b/lib/Froxlor/Cron/Traffic/ReportsCron.php
index c6b72106..dbbc5ffc 100644
--- a/lib/Froxlor/Cron/Traffic/ReportsCron.php
+++ b/lib/Froxlor/Cron/Traffic/ReportsCron.php
@@ -31,45 +31,22 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 		/**
 		 * Initialize the mailingsystem
 		 */
-		$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
-		$mail->CharSet = "UTF-8";
-
-		if (Settings::Get('system.mail_use_smtp')) {
-			$mail->isSMTP();
-			$mail->Host = Settings::Get('system.mail_smtp_host');
-			$mail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
-			$mail->Username = Settings::Get('system.mail_smtp_user');
-			$mail->Password = Settings::Get('system.mail_smtp_passwd');
-			if (Settings::Get('system.mail_smtp_usetls')) {
-				$mail->SMTPSecure = 'tls';
-			} else {
-				$mail->SMTPAutoTLS = false;
-			}
-			$mail->Port = Settings::Get('system.mail_smtp_port');
-		}
-
-		if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
-			// set return-to address and custom sender-name, see #76
-			$mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
-			if (Settings::Get('panel.adminmail_return') != '') {
-				$mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
-			}
-		}
+		$mail = new \Froxlor\System\Mailer(true);
 
 		if ((int) Settings::Get('system.report_trafficmax') > 0) {
 			// Warn the customers at xx% traffic-usage
 			$result_stmt = Database::prepare("
-		SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`,
-		`c`.`company`, `c`.`traffic`, `c`.`email`, `c`.`def_language`,
-		`a`.`name` AS `adminname`, `a`.`email` AS `adminmail`,
-		(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
-		FROM `" . TABLE_PANEL_TRAFFIC . "` `t`
-		WHERE `t`.`customerid` = `c`.`customerid` AND `t`.`year` = :year AND `t`.`month` = :month
-		) as `traffic_used`
-		FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c`
-		LEFT JOIN `" . TABLE_PANEL_ADMINS . "` AS `a`
-		ON `a`.`adminid` = `c`.`adminid` WHERE `c`.`reportsent` <> '1'
-	");
+				SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`,
+				`c`.`company`, `c`.`traffic`, `c`.`email`, `c`.`def_language`,
+				`a`.`name` AS `adminname`, `a`.`email` AS `adminmail`,
+				(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
+				FROM `" . TABLE_PANEL_TRAFFIC . "` `t`
+				WHERE `t`.`customerid` = `c`.`customerid` AND `t`.`year` = :year AND `t`.`month` = :month
+				) as `traffic_used`
+				FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c`
+				LEFT JOIN `" . TABLE_PANEL_ADMINS . "` AS `a`
+				ON `a`.`adminid` = `c`.`adminid` WHERE `c`.`reportsent` <> '1'
+			");
 
 			$result_data = array(
 				'year' => date("Y", $yesterday),
@@ -89,8 +66,8 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 						'SALUTATION' => getCorrectUserSalutation($rep_userinfo),
 						'NAME' => $row['name'], // < keep this for compatibility
 						'TRAFFIC' => round(($row['traffic'] / 1024), 2), /* traffic is stored in KB, template uses MB */
-							'TRAFFICUSED' => round(($row['traffic_used'] / 1024), 2), /* traffic is stored in KB, template uses MB */
-							'USAGE_PERCENT' => round(($row['traffic_used'] * 100) / $row['traffic'], 2),
+						'TRAFFICUSED' => round(($row['traffic_used'] / 1024), 2), /* traffic is stored in KB, template uses MB */
+						'USAGE_PERCENT' => round(($row['traffic_used'] * 100) / $row['traffic'], 2),
 						'MAX_PERCENT' => Settings::Get('system.report_trafficmax')
 					);
 
@@ -118,11 +95,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 
 					// Get mail templates from database; the ones from 'admin' are fetched for fallback
 					$result2_stmt = Database::prepare("
-				SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid
-				AND `language` = :lang
-				AND `templategroup` = 'mails' AND `varname` = :varname
-			");
+						SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+						WHERE `adminid` = :adminid
+						AND `language` = :lang
+						AND `templategroup` = 'mails' AND `varname` = :varname
+					");
 					$result2_data = array(
 						'adminid' => $row['adminid'],
 						'lang' => $row['def_language'],
@@ -159,9 +136,9 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 
 					$mail->ClearAddresses();
 					$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `reportsent` = '1'
-				WHERE `customerid` = :customerid
-			");
+						UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `reportsent` = '1'
+						WHERE `customerid` = :customerid
+					");
 					Database::pexecute($upd_stmt, array(
 						'customerid' => $row['customerid']
 					));
@@ -170,13 +147,13 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 
 			// Warn the admins at xx% traffic-usage
 			$result_stmt = Database::prepare("
-		SELECT `a`.*,
-		(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
-		FROM `" . TABLE_PANEL_TRAFFIC_ADMINS . "` `t`
-		WHERE `t`.`adminid` = `a`.`adminid` AND `t`.`year` = :year AND `t`.`month` = :month
-		) as `traffic_used_total`
-		FROM `" . TABLE_PANEL_ADMINS . "` `a` WHERE `a`.`reportsent` = '0'
-	");
+				SELECT `a`.*,
+				(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
+				FROM `" . TABLE_PANEL_TRAFFIC_ADMINS . "` `t`
+				WHERE `t`.`adminid` = `a`.`adminid` AND `t`.`year` = :year AND `t`.`month` = :month
+				) as `traffic_used_total`
+				FROM `" . TABLE_PANEL_ADMINS . "` `a` WHERE `a`.`reportsent` = '0'
+			");
 
 			$result_data = array(
 				'year' => date("Y", $yesterday),
@@ -197,9 +174,9 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 					);
 
 					$lngfile_stmt = Database::prepare("
-				SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
-				WHERE `language` = :deflang
-			");
+						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+						WHERE `language` = :deflang
+					");
 					$lngfile = Database::pexecute_first($lngfile_stmt, array(
 						'deflang' => $row['def_language']
 					));
@@ -220,11 +197,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 
 					// Get mail templates from database; the ones from 'admin' are fetched for fallback
 					$result2_stmt = Database::prepare("
-				SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid
-				AND `language` = :lang
-				AND `templategroup` = 'mails' AND `varname` = :varname
-			");
+						SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+						WHERE `adminid` = :adminid
+						AND `language` = :lang
+						AND `templategroup` = 'mails' AND `varname` = :varname
+					");
 					$resul2_data = array(
 						'adminid' => $row['adminid'],
 						'lang' => $row['def_language'],
@@ -261,9 +238,9 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 
 					$mail->ClearAddresses();
 					$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "` SET `reportsent` = '1'
-				WHERE `adminid` = :adminid
-			");
+						UPDATE `" . TABLE_PANEL_ADMINS . "` SET `reportsent` = '1'
+						WHERE `adminid` = :adminid
+					");
 					Database::pexecute($upd_stmt, array(
 						'adminid' => $row['adminid']
 					));
@@ -277,13 +254,13 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 					$mail_body .= '---------------------------------------------------------------' . "\n";
 					$mail_body .= 'Loginname       Traffic used  (Percent) | Traffic available' . "\n";
 					$customers_stmt = Database::prepare("
-				SELECT `c`.*,
-				(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
-				FROM `" . TABLE_PANEL_TRAFFIC . "` `t`
-				WHERE `t`.`customerid` = `c`.`customerid` AND `t`.`year` = :year AND `t`.`month` = :month
-				) as `traffic_used_total`
-				FROM `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `c`.`adminid` = :adminid
-			");
+						SELECT `c`.*,
+						(SELECT SUM(`t`.`http` + `t`.`ftp_up` + `t`.`ftp_down` + `t`.`mail`)
+						FROM `" . TABLE_PANEL_TRAFFIC . "` `t`
+						WHERE `t`.`customerid` = `c`.`customerid` AND `t`.`year` = :year AND `t`.`month` = :month
+						) as `traffic_used_total`
+						FROM `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `c`.`adminid` = :adminid
+					");
 					$customers_data = array(
 						'year' => date("Y", $yesterday),
 						'month' => date("m", $yesterday),
@@ -350,7 +327,7 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 		} // trafficmax > 0
 
 		// include diskspace-usage report, #466
-		include dirname(__FILE__) . '/cron_usage.inc.diskspace.php';
+		self::usageDiskspace();
 
 		// Another month, reset the reportstatus
 		if (date('d') == '01') {
@@ -358,4 +335,207 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 			Database::query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `reportsent` = '0';");
 		}
 	}
+
+	private static function usageDiskspace()
+	{
+		if ((int) Settings::Get('system.report_webmax') > 0) {
+			/**
+			 * report about diskusage for customers
+			 */
+			$result_stmt = Database::query("
+				SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`,
+				`c`.`company`, `c`.`diskspace`, `c`.`diskspace_used`, `c`.`email`, `c`.`def_language`,
+				`a`.`name` AS `adminname`, `a`.`email` AS `adminmail`
+				FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c`
+			    LEFT JOIN `" . TABLE_PANEL_ADMINS . "` AS `a`
+			    ON `a`.`adminid` = `c`.`adminid`
+			    WHERE `c`.`diskspace` > '0' AND `c`.`reportsent` <> '2'
+			");
+
+			while ($row = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+				if (isset($row['diskspace']) && $row['diskspace_used'] != null && $row['diskspace_used'] > 0 && (($row['diskspace_used'] * 100) / $row['diskspace']) >= (int) Settings::Get('system.report_webmax')) {
+
+					$rep_userinfo = array(
+						'name' => $row['name'],
+						'firstname' => $row['firstname'],
+						'company' => $row['company']
+					);
+					$replace_arr = array(
+						'SALUTATION' => getCorrectUserSalutation($rep_userinfo),
+						'NAME' => $row['name'], // < keep this for compatibility
+						'DISKAVAILABLE' => round(($row['diskspace'] / 1024), 2), /* traffic is stored in KB, template uses MB */
+						'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */
+						'USAGE_PERCENT' => round(($row['diskspace_used'] * 100) / $row['diskspace'], 2),
+						'MAX_PERCENT' => Settings::Get('system.report_webmax')
+					);
+
+					$lngfile_stmt = Database::prepare("
+						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+						WHERE `language` = :deflang
+					");
+					$lngfile = Database::pexecute_first($lngfile_stmt, array(
+						'deflang' => $row['def_language']
+					));
+
+					if ($lngfile !== null) {
+						$langfile = $lngfile['file'];
+					} else {
+						$lngfile = Database::pexecute_first($lngfile_stmt, array(
+							'deflang' => Settings::Get('panel.standardlanguage')
+						));
+						$langfile = $lngfile['file'];
+					}
+
+					// include english language file (fallback)
+					include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/lng/english.lng.php');
+					// include admin/customer language file
+					include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/' . $langfile);
+
+					// Get mail templates from database; the ones from 'admin' are fetched for fallback
+					$result2_stmt = Database::prepare("
+						SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+						WHERE `adminid` = :adminid
+						AND `language` = :lang
+						AND `templategroup` = 'mails' AND `varname` = :varname
+					");
+					$result2_data = array(
+						'adminid' => $row['adminid'],
+						'lang' => $row['def_language'],
+						'varname' => 'diskmaxpercent_subject'
+					);
+					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
+
+					$result2_data['varname'] = 'diskmaxpercent_mailbody';
+					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
+
+					$_mailerror = false;
+					$mailerr_msg = "";
+					try {
+						$mail->SetFrom($row['adminmail'], $row['adminname']);
+						$mail->Subject = $mail_subject;
+						$mail->AltBody = $mail_body;
+						$mail->MsgHTML(nl2br($mail_body));
+						$mail->AddAddress($row['email'], $row['name']);
+						$mail->Send();
+					} catch (\PHPMailer\PHPMailer\Exception $e) {
+						$mailerr_msg = $e->errorMessage();
+						$_mailerror = true;
+					} catch (\Exception $e) {
+						$mailerr_msg = $e->getMessage();
+						$_mailerror = true;
+					}
+
+					if ($_mailerror) {
+						$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+						echo "Error sending mail: " . $mailerr_msg . "\n";
+					}
+
+					$mail->ClearAddresses();
+					$upd_stmt = Database::prepare("
+						UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `reportsent` = '2'
+						WHERE `customerid` = :customerid
+					");
+					Database::pexecute($upd_stmt, array(
+						'customerid' => $row['customerid']
+					));
+				}
+			}
+
+			/**
+			 * report about diskusage for admins/reseller
+			 */
+			$result_stmt = Database::query("
+				SELECT `a`.* FROM `" . TABLE_PANEL_ADMINS . "` `a` WHERE `a`.`reportsent` <> '2'
+			");
+
+			while ($row = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+				if (isset($row['diskspace']) && $row['diskspace_used'] != null && $row['diskspace_used'] > 0 && (($row['diskspace_used'] * 100) / $row['diskspace']) >= (int) Settings::Get('system.report_webmax')) {
+
+					$replace_arr = array(
+						'NAME' => $row['name'],
+						'DISKAVAILABLE' => ($row['diskspace'] / 1024), /* traffic is stored in KB, template uses MB */
+						'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */
+						'USAGE_PERCENT' => ($row['diskspace_used'] * 100) / $row['diskspace'],
+						'MAX_PERCENT' => Settings::Get('system.report_webmax')
+					);
+
+					$lngfile_stmt = Database::prepare("
+						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+						WHERE `language` = :deflang
+					");
+					$lngfile = Database::pexecute_first($lngfile_stmt, array(
+						'deflang' => $row['def_language']
+					));
+
+					if ($lngfile !== null) {
+						$langfile = $lngfile['file'];
+					} else {
+						$lngfile = Database::pexecute_first($lngfile_stmt, array(
+							'deflang' => Settings::Get('panel.standardlanguage')
+						));
+						$langfile = $lngfile['file'];
+					}
+
+					// include english language file (fallback)
+					include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/lng/english.lng.php');
+					// include admin/customer language file
+					include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/' . $langfile);
+
+					// Get mail templates from database; the ones from 'admin' are fetched for fallback
+					$result2_stmt = Database::prepare("
+						SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
+						WHERE `adminid` = :adminid
+						AND `language` = :lang
+						AND `templategroup` = 'mails' AND `varname` = :varname
+					");
+					$result2_data = array(
+						'adminid' => $row['adminid'],
+						'lang' => $row['def_language'],
+						'varname' => 'diskmaxpercent_subject'
+					);
+					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
+
+					$result2_data['varname'] = 'diskmaxpercent_mailbody';
+					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
+
+					$_mailerror = false;
+					$mailerr_msg = "";
+					try {
+						$mail->SetFrom($row['email'], $row['name']);
+						$mail->Subject = $mail_subject;
+						$mail->AltBody = $mail_body;
+						$mail->MsgHTML(nl2br($mail_body));
+						$mail->AddAddress($row['email'], $row['name']);
+						$mail->Send();
+					} catch (\PHPMailer\PHPMailer\Exception $e) {
+						$mailerr_msg = $e->errorMessage();
+						$_mailerror = true;
+					} catch (\Exception $e) {
+						$mailerr_msg = $e->getMessage();
+						$_mailerror = true;
+					}
+
+					if ($_mailerror) {
+						$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
+						echo "Error sending mail: " . $mailerr_msg . "\n";
+					}
+
+					$mail->ClearAddresses();
+					$upd_stmt = Database::prepare("
+						UPDATE `" . TABLE_PANEL_ADMINS . "` SET `reportsent` = '2'
+						WHERE `adminid` = :adminid
+					");
+					Database::pexecute($upd_stmt, array(
+						'adminid' => $row['adminid']
+					));
+				}
+			}
+		} // webmax > 0
+	}
 }
diff --git a/lib/Froxlor/Cron/Traffic/cron_usage.inc.diskspace.php b/lib/Froxlor/Cron/Traffic/cron_usage.inc.diskspace.php
deleted file mode 100644
index ef2adadd..00000000
--- a/lib/Froxlor/Cron/Traffic/cron_usage.inc.diskspace.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php
-
-if (! defined('MASTER_CRONJOB'))
-	die('You cannot access this file directly!');
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Froxlor team <team@froxlor.org> (2010-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *         
- */
-use Froxlor\Database;
-use Froxlor\Settings;
-
-if ((int) Settings::Get('system.report_webmax') > 0) {
-	/**
-	 * report about diskusage for customers
-	 */
-	$result_stmt = Database::query("
-		SELECT `c`.`customerid`, `c`.`adminid`, `c`.`name`, `c`.`firstname`,
-		`c`.`company`, `c`.`diskspace`, `c`.`diskspace_used`, `c`.`email`, `c`.`def_language`,
-		`a`.`name` AS `adminname`, `a`.`email` AS `adminmail`
-		FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c`
-	    LEFT JOIN `" . TABLE_PANEL_ADMINS . "` AS `a`
-	    ON `a`.`adminid` = `c`.`adminid`
-	    WHERE `c`.`diskspace` > '0' AND `c`.`reportsent` <> '2'
-	");
-
-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-		if (isset($row['diskspace']) && $row['diskspace_used'] != null && $row['diskspace_used'] > 0 && (($row['diskspace_used'] * 100) / $row['diskspace']) >= (int) Settings::Get('system.report_webmax')) {
-
-			$rep_userinfo = array(
-				'name' => $row['name'],
-				'firstname' => $row['firstname'],
-				'company' => $row['company']
-			);
-			$replace_arr = array(
-				'SALUTATION' => getCorrectUserSalutation($rep_userinfo),
-				'NAME' => $row['name'], // < keep this for compatibility
-				'DISKAVAILABLE' => round(($row['diskspace'] / 1024), 2), /* traffic is stored in KB, template uses MB */
-				'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */
-				'USAGE_PERCENT' => round(($row['diskspace_used'] * 100) / $row['diskspace'], 2),
-				'MAX_PERCENT' => Settings::Get('system.report_webmax')
-			);
-
-			$lngfile_stmt = Database::prepare("
-				SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
-				WHERE `language` = :deflang
-			");
-			$lngfile = Database::pexecute_first($lngfile_stmt, array(
-				'deflang' => $row['def_language']
-			));
-
-			if ($lngfile !== null) {
-				$langfile = $lngfile['file'];
-			} else {
-				$lngfile = Database::pexecute_first($lngfile_stmt, array(
-					'deflang' => Settings::Get('panel.standardlanguage')
-				));
-				$langfile = $lngfile['file'];
-			}
-
-			// include english language file (fallback)
-			include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/lng/english.lng.php');
-			// include admin/customer language file
-			include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/' . $langfile);
-
-			// Get mail templates from database; the ones from 'admin' are fetched for fallback
-			$result2_stmt = Database::prepare("
-				SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid
-				AND `language` = :lang
-				AND `templategroup` = 'mails' AND `varname` = :varname
-			");
-			$result2_data = array(
-				'adminid' => $row['adminid'],
-				'lang' => $row['def_language'],
-				'varname' => 'diskmaxpercent_subject'
-			);
-			$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-			$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
-
-			$result2_data['varname'] = 'diskmaxpercent_mailbody';
-			$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-			$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
-
-			$_mailerror = false;
-			try {
-				$mail->SetFrom($row['adminmail'], $row['adminname']);
-				$mail->Subject = $mail_subject;
-				$mail->AltBody = $mail_body;
-				$mail->MsgHTML(nl2br($mail_body));
-				$mail->AddAddress($row['email'], $row['name']);
-				$mail->Send();
-			} catch (\PHPMailer\PHPMailer\Exception $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
-
-			if ($_mailerror) {
-				$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				echo "Error sending mail: " . $mailerr_msg . "\n";
-			}
-
-			$mail->ClearAddresses();
-			$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `reportsent` = '2'
-				WHERE `customerid` = :customerid
-			");
-			Database::pexecute($upd_stmt, array(
-				'customerid' => $row['customerid']
-			));
-		}
-	}
-
-	/**
-	 * report about diskusage for admins/reseller
-	 */
-	$result_stmt = Database::query("
-		SELECT `a`.* FROM `" . TABLE_PANEL_ADMINS . "` `a` WHERE `a`.`reportsent` <> '2'
-	");
-
-	while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
-
-		if (isset($row['diskspace']) && $row['diskspace_used'] != null && $row['diskspace_used'] > 0 && (($row['diskspace_used'] * 100) / $row['diskspace']) >= (int) Settings::Get('system.report_webmax')) {
-
-			$replace_arr = array(
-				'NAME' => $row['name'],
-				'DISKAVAILABLE' => ($row['diskspace'] / 1024), /* traffic is stored in KB, template uses MB */
-				'DISKUSED' => round($row['diskspace_used'] / 1024, 2), /* traffic is stored in KB, template uses MB */
-				'USAGE_PERCENT' => ($row['diskspace_used'] * 100) / $row['diskspace'],
-				'MAX_PERCENT' => Settings::Get('system.report_webmax')
-			);
-
-			$lngfile_stmt = Database::prepare("
-				SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
-				WHERE `language` = :deflang
-			");
-			$lngfile = Database::pexecute_first($lngfile_stmt, array(
-				'deflang' => $row['def_language']
-			));
-
-			if ($lngfile !== null) {
-				$langfile = $lngfile['file'];
-			} else {
-				$lngfile = Database::pexecute_first($lngfile_stmt, array(
-					'deflang' => Settings::Get('panel.standardlanguage')
-				));
-				$langfile = $lngfile['file'];
-			}
-
-			// include english language file (fallback)
-			include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/lng/english.lng.php');
-			// include admin/customer language file
-			include_once \Froxlor\FileDir::makeCorrectFile(\Froxlor\Froxlor::getInstallDir() . '/' . $langfile);
-
-			// Get mail templates from database; the ones from 'admin' are fetched for fallback
-			$result2_stmt = Database::prepare("
-				SELECT `value` FROM `" . TABLE_PANEL_TEMPLATES . "`
-				WHERE `adminid` = :adminid
-				AND `language` = :lang
-				AND `templategroup` = 'mails' AND `varname` = :varname
-			");
-			$result2_data = array(
-				'adminid' => $row['adminid'],
-				'lang' => $row['def_language'],
-				'varname' => 'diskmaxpercent_subject'
-			);
-			$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-			$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
-
-			$result2_data['varname'] = 'diskmaxpercent_mailbody';
-			$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-			$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
-
-			$_mailerror = false;
-			try {
-				$mail->SetFrom($row['email'], $row['name']);
-				$mail->Subject = $mail_subject;
-				$mail->AltBody = $mail_body;
-				$mail->MsgHTML(nl2br($mail_body));
-				$mail->AddAddress($row['email'], $row['name']);
-				$mail->Send();
-			} catch (\PHPMailer\PHPMailer\Exception $e) {
-				$mailerr_msg = $e->errorMessage();
-				$_mailerror = true;
-			} catch (Exception $e) {
-				$mailerr_msg = $e->getMessage();
-				$_mailerror = true;
-			}
-
-			if ($_mailerror) {
-				$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				echo "Error sending mail: " . $mailerr_msg . "\n";
-			}
-
-			$mail->ClearAddresses();
-			$upd_stmt = Database::prepare("
-				UPDATE `" . TABLE_PANEL_ADMINS . "` SET `reportsent` = '2'
-				WHERE `adminid` = :adminid
-			");
-			Database::pexecute($upd_stmt, array(
-				'adminid' => $row['adminid']
-			));
-		}
-	}
-} // webmax > 0
diff --git a/lib/Froxlor/System/Cronjob.php b/lib/Froxlor/System/Cronjob.php
index d154530e..ce939cbb 100644
--- a/lib/Froxlor/System/Cronjob.php
+++ b/lib/Froxlor/System/Cronjob.php
@@ -320,31 +320,7 @@ class Cronjob
 	{
 		if (Settings::Get('system.send_cron_errors') == '1') {
 
-			$_mail = new \PHPMailer\PHPMailer\PHPMailer(true);
-			$_mail->CharSet = "UTF-8";
-
-			if (Settings::Get('system.mail_use_smtp')) {
-				$_mail->isSMTP();
-				$_mail->Host = Settings::Get('system.mail_smtp_host');
-				$_mail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
-				$_mail->Username = Settings::Get('system.mail_smtp_user');
-				$_mail->Password = Settings::Get('system.mail_smtp_passwd');
-				if (Settings::Get('system.mail_smtp_usetls')) {
-					$_mail->SMTPSecure = 'tls';
-				} else {
-					$_mail->SMTPAutoTLS = false;
-				}
-				$_mail->Port = Settings::Get('system.mail_smtp_port');
-			}
-
-			if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
-				// set return-to address and custom sender-name, see #76
-				$_mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
-				if (Settings::Get('panel.adminmail_return') != '') {
-					$_mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
-				}
-			}
-
+			$_mail = new Mailer(true);
 			$_mailerror = false;
 			$mailerr_msg = "";
 			try {
diff --git a/lib/Froxlor/System/Mailer.php b/lib/Froxlor/System/Mailer.php
new file mode 100644
index 00000000..e4e015bb
--- /dev/null
+++ b/lib/Froxlor/System/Mailer.php
@@ -0,0 +1,43 @@
+<?php
+namespace Froxlor\System;
+
+use Froxlor\Settings;
+
+class Mailer extends \PHPMailer\PHPMailer\PHPMailer
+{
+
+	/**
+	 * class construtor
+	 *
+	 * @param string $exceptions
+	 *        	whether to throw exceptions or not
+	 *        	
+	 */
+	public function __construct($exceptions = false)
+	{
+		parent::__construct($exceptions);
+		$this->CharSet = "UTF-8";
+
+		if (Settings::Get('system.mail_use_smtp')) {
+			$this->isSMTP();
+			$this->Host = Settings::Get('system.mail_smtp_host');
+			$this->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
+			$this->Username = Settings::Get('system.mail_smtp_user');
+			$this->Password = Settings::Get('system.mail_smtp_passwd');
+			if (Settings::Get('system.mail_smtp_usetls')) {
+				$this->SMTPSecure = 'tls';
+			} else {
+				$this->SMTPAutoTLS = false;
+			}
+			$this->Port = Settings::Get('system.mail_smtp_port');
+		}
+
+		if (self::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
+			// set return-to address and custom sender-name, see #76
+			$this->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
+			if (Settings::Get('panel.adminmail_return') != '') {
+				$this->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/lib/ajax.php b/lib/ajax.php
index 79c2bf64..8089d322 100644
--- a/lib/ajax.php
+++ b/lib/ajax.php
@@ -15,7 +15,7 @@
  * @package    AJAX
  *
  */
-require __DIR__ . '/vendor/autoload.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 // Load the user settings
 if (! file_exists('./userdata.inc.php')) {
@@ -23,8 +23,6 @@ if (! file_exists('./userdata.inc.php')) {
 }
 require './userdata.inc.php';
 require './tables.inc.php';
-require './functions/validate/function.validate_ip.php';
-require './functions/validate/function.validateDomain.php';
 
 if (isset($_POST['action'])) {
 	$action = $_POST['action'];
diff --git a/lib/init.php b/lib/init.php
index 7fba53ef..39549e69 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -476,27 +476,4 @@ if ($page == '') {
 /**
  * Initialize the mailingsystem
  */
-$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
-$mail->CharSet = "UTF-8";
-
-if (Settings::Get('system.mail_use_smtp')) {
-	$mail->isSMTP();
-	$mail->Host = Settings::Get('system.mail_smtp_host');
-	$mail->SMTPAuth = Settings::Get('system.mail_smtp_auth') == '1' ? true : false;
-	$mail->Username = Settings::Get('system.mail_smtp_user');
-	$mail->Password = Settings::Get('system.mail_smtp_passwd');
-	if (Settings::Get('system.mail_smtp_usetls')) {
-		$mail->SMTPSecure = 'tls';
-	} else {
-		$mail->SMTPAutoTLS = false;
-	}
-	$mail->Port = Settings::Get('system.mail_smtp_port');
-}
-
-if (\PHPMailer\PHPMailer\PHPMailer::ValidateAddress(Settings::Get('panel.adminmail')) !== false) {
-	// set return-to address and custom sender-name, see #76
-	$mail->SetFrom(Settings::Get('panel.adminmail'), Settings::Get('panel.adminmail_defname'));
-	if (Settings::Get('panel.adminmail_return') != '') {
-		$mail->AddReplyTo(Settings::Get('panel.adminmail_return'), Settings::Get('panel.adminmail_defname'));
-	}
-}
+$mail = new \Froxlor\System\Mailer(true);