diff --git a/application/Espo/Utils/Controllers/Layout.php b/application/Espo/Controllers/Layout.php
old mode 100755
new mode 100644
similarity index 91%
rename from application/Espo/Utils/Controllers/Layout.php
rename to application/Espo/Controllers/Layout.php
index 23e712c70b..cfd62ef44e
--- a/application/Espo/Utils/Controllers/Layout.php
+++ b/application/Espo/Controllers/Layout.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Espo\Utils\Controllers;
+namespace Espo\Controllers;
 
 use Espo\Utils as Utils;
 
-class Layout extends Controller
+class Layout extends Utils\Controllers\Controller
 {
 
     public function read($params, $data)
diff --git a/application/Espo/Utils/Controllers/Metadata.php b/application/Espo/Controllers/Metadata.php
old mode 100755
new mode 100644
similarity index 89%
rename from application/Espo/Utils/Controllers/Metadata.php
rename to application/Espo/Controllers/Metadata.php
index a1636387d1..9e357de33a
--- a/application/Espo/Utils/Controllers/Metadata.php
+++ b/application/Espo/Controllers/Metadata.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Espo\Utils\Controllers;
+namespace Espo\Controllers;
 
 use Espo\Utils as Utils;
 
-class Metadata extends Controller
+class Metadata extends Utils\Controllers\Controller
 {
 
     public function read($params, $data)
diff --git a/application/Espo/Utils/Controllers/Settings.php b/application/Espo/Controllers/Settings.php
similarity index 91%
rename from application/Espo/Utils/Controllers/Settings.php
rename to application/Espo/Controllers/Settings.php
index 327a2d1231..6056ccb3ec 100644
--- a/application/Espo/Utils/Controllers/Settings.php
+++ b/application/Espo/Controllers/Settings.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Espo\Utils\Controllers;
+namespace Espo\Controllers;
 
 use Espo\Utils as Utils;
 
-class Settings extends Controller
+class Settings extends Utils\Controllers\Controller
 {
 
     public function read($params, $data)
diff --git a/application/Espo/Utils/Controllers/Manager.php b/application/Espo/Utils/Controllers/Manager.php
index 4136e4c2f5..3b91256122 100755
--- a/application/Espo/Utils/Controllers/Manager.php
+++ b/application/Espo/Utils/Controllers/Manager.php
@@ -27,8 +27,9 @@ class Manager
 	{
 		$baseUtils = new Utils\BaseUtils();
 
-		$espoPath = $baseUtils->getObject('Configurator')->get('espoPath');
-		$controllerPath= $baseUtils->concatPath($espoPath, 'Utils/Controllers');
+		$config = $baseUtils->getObject('Configurator');
+		$espoPath = $config->get('espoPath');
+		$controllerPath= $baseUtils->concatPath($espoPath, $config->get('controllerPath'));
 
 		$crud = $baseUtils->getObject('Configurator')->get('crud');
 		$baseAction = $crud->$controllerParams['HttpMethod'];
@@ -51,20 +52,20 @@ class Manager
 
 		//define default values
 		$classInfo = new \stdClass();
-		$classInfo->name = $this->getClassName($controllerPath, 'Controller');
+		$classInfo->name = $this->getClassName($baseUtils->concatPath($espoPath, 'Utils/Controllers'), 'Controller');
 		$classInfo->path = $this->getClassPath($classInfo->name);
 		$classInfo->method = $this->getDefinedMethod($classInfo->name, $controller->baseAction, $controller->action);
 
 
-		//Espo\Utils\Controlles\Layout  and  Custom\Espo\Utils\Controlles\Layout
+		//Espo\Controlles\Layout  and  Custom\Espo\Controlles\Layout
 		$controllerClass = $this->getClassName($controllerPath, $controller->name);
 		$classInfo = $this->setClassInfo($controllerClass, $classInfo, $controller);
-		//END: Espo\Utils\Controlles\Layout and Custom\Espo\Utils\Controlles\Layout
+		//END: Espo\Controlles\Layout and Custom\Utils\Controlles\Layout
 
 
 		if (!empty($controller->scope)) {
 			//path in Modules dir
-			$controllerDir = $baseUtils->concatPath( $baseUtils->getScopePath($controller->scope), $baseUtils->getObject('Configurator')->get('controllerPath') );
+			$controllerDir = $baseUtils->concatPath( $baseUtils->getScopePath($controller->scope), $config->get('controllerPath') );
 
 			//ex. Modules\Crm\Controllers\Layout  and  Cusom\Modules\Crm\Controllers\Layout
 			$controllerClass = $this->getClassName($controllerDir, $controller->name);