diff --git a/scripts/models-ext/DomainHandler.php b/model/DomainHandler.php
similarity index 100%
rename from scripts/models-ext/DomainHandler.php
rename to model/DomainHandler.php
diff --git a/scripts/common.php b/scripts/common.php
index 437370ba..6f646f4a 100644
--- a/scripts/common.php
+++ b/scripts/common.php
@@ -49,7 +49,7 @@ require_once("$incpath/languages/en.lang");
  * __autoload implementation, for use with spl_autoload_register().
  */
 function postfixadmin_autoload2($class) {
-    $PATH = CORE_INCLUDE_PATH.'/models-ext/' . $class . '.php';
+    $PATH = CORE_INCLUDE_PATH.'/../model/' . $class . '.php';
 
     if(is_file($PATH)) {
         require_once($PATH);
diff --git a/scripts/models-ext/AliasHandler.php b/scripts/models-ext/AliasHandler.php
deleted file mode 100644
index 534623f5..00000000
--- a/scripts/models-ext/AliasHandler.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-require('../model/AliasHandler.php');
diff --git a/scripts/models-ext/UserHandler.php b/scripts/models-ext/UserHandler.php
deleted file mode 100644
index 235cb3bf..00000000
--- a/scripts/models-ext/UserHandler.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-require('../model/UserHandler.php');