Index: branches/main/admin/interface/version.php
===================================================================
--- branches/main/admin/interface/version.php	(revision 9)
+++ branches/main/admin/interface/version.php	(revision 10)
@@ -48,6 +48,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) { define('VERSION', '2.10.1-dev'); }
-if(!defined('REVISION')) { define('REVISION', '9'); }
+if(!defined('REVISION')) { define('REVISION', '10'); }
 if(!defined('SP')) { define('SP', ''); }
 
Index: branches/main/framework/CoreAutoloader.php
===================================================================
--- branches/main/framework/CoreAutoloader.php	(revision 9)
+++ branches/main/framework/CoreAutoloader.php	(revision 10)
@@ -31,7 +31,7 @@
  * @description  xxx
  */
 //declare(strict_types = 1);
-declare(encoding = 'UTF-8');
+//declare(encoding = 'UTF-8');
 
 namespace bin;
 
@@ -87,12 +87,17 @@
 /**
  * register this autoloader
  */
-    public static function doRegister()
+    public static function doRegister(array $aAdditionalTranslations = null)
     {
+        if (!is_null($aAdditionalTranslations)) {
+            foreach ($aAdditionalTranslations as $sKey=>$sValue) {
+                self::$aTransNs[$sKey] = $sValue;
+            }
+        }
         self::$sInstallPath = \rtrim(\str_replace('\\', '/', \dirname(__DIR__)), '/').'/';
         foreach (self::$aTransNs as $sPattern => $sReplacement) {
-            self::$aPatterns[]     = '@^'.$sPattern.'@su';
-            self::$aReplacements[] = $sReplacement;
+            self::$aPatterns[]     = '@^('.$sPattern.'/)@su';
+            self::$aReplacements[] = $sReplacement.'/';
         }
         \spl_autoload_register([__CLASS__, 'autoLoad']);
     }
Index: branches/main/framework/initialize.php
===================================================================
--- branches/main/framework/initialize.php	(revision 9)
+++ branches/main/framework/initialize.php	(revision 10)
@@ -316,7 +316,7 @@
     if (!class_exists('\bin\CoreAutoloader')) {
         include __DIR__.'/CoreAutoloader.php';
     }
-    \bin\CoreAutoloader::doRegister();
+    \bin\CoreAutoloader::doRegister(['acp' => ADMIN_DIRECTORY]);
 
 if (class_exists('database')) {
     // sanitize $_SERVER['HTTP_REFERER']