changed path to Modules dir. Now is application/Espo/Modules

.gitignore

@@ -4,8 +4,8 @@ application/config.php
 /test.php
 /test2.php
 application/Espo/Resources/metadata/scopes/CustomTest.json
-application/Modules/Crm/Resources/metadata/scopes/CustomTest.json
+application/Espo/Modules/Crm/Resources/metadata/scopes/CustomTest.json
 application/Espo/Resources/layouts/CustomTest/*
-application/Modules/Crm/Resources/layouts/CustomTest/*
+application/Espo/Modules/Crm/Resources/layouts/CustomTest/*
 application/Espo/Resources/metadata/customTest/*
-application/Modules/Crm/Resources/metadata/customTest/*
+application/Espo/Modules/Crm/Resources/metadata/customTest/*

application/Espo/Core/Container.php

@@ -33,7 +33,7 @@ class Container
     		$this->$loadMethod();
     	} else {
             //external loader class \Espo\Core\Loaders\<className> or \Custom\Espo\Core\Loaders\<className> with load() method
-			$className = '\Custom\Espo\Core\Loaders\\'.ucfirst($name);
+			$className = '\Espo\Custom\Core\Loaders\\'.ucfirst($name);
             if (!class_exists($className)) {
             	$className = '\Espo\Core\Loaders\\'.ucfirst($name);
             }

application/Espo/Core/Utils/Layout.php

@@ -123,7 +123,7 @@ class Layout
     	$moduleName= $this->getMetadata()->getScopeModuleName($entityName);
 
     	$path= $this->getLayoutConfig()->corePath;
-		if (!empty($moduleName)) {
+		if ($moduleName !== false) {
 			$path= str_replace('{*}', $moduleName, $this->getLayoutConfig()->customPath);
 		}
         $path= Util::concatPath($path, $entityName);

application/Espo/Core/Utils/Metadata.php

@@ -150,7 +150,7 @@ class Metadata
 		$fullPath= $this->getMetaConfig()->corePath;
 		$moduleName= $this->getScopeModuleName($scope);
 
-		if (!empty($moduleName)) {
+		if ($moduleName !== false) {
         	$fullPath= str_replace('{*}', $moduleName, $this->getMetaConfig()->customPath);
 		}
 		$fullPath= Util::concatPath($fullPath, $type);
@@ -320,7 +320,7 @@ class Metadata
     	$moduleName = $this->getScopeModuleName($scopeName);
 
     	$path = $this->getConfig()->get('espoPath');
-		if (!empty($moduleName)) {
+		if ($moduleName !== false) {
 			$path = str_replace('{*}', $moduleName, $this->getConfig()->get('espoModulePath'));
 		}
 

application/Espo/Core/defaults/systemConfig.php

@@ -3,23 +3,23 @@
 return array (
   'configPath' => 'application/config.php',
 
-  'customDir' => 'application/Custom',
+  'customDir' => 'application/Espo/Custom',
   'cachePath' => 'data/cache',
   'defaultsPath' => 'application/Espo/Core/defaults',
   'unsetFileName' => 'unset.json',
 
   'espoPath' => 'Espo',
-  'espoModulePath' => 'Modules/{*}',
+  'espoModulePath' => 'Espo/Modules/{*}',
-  'espoCustomPath' => 'Custom',
+  'espoCustomPath' => 'Espo/Custom',
 
-  'controllerPath' => 'Controllers', //path for controllers in module
+  'controllerPath' => 'Controllers', //path for controllers in a module
 
   'metadataConfig' =>
   array (
     'name' => 'metadata',
     'cachePath' => 'data/cache/application',
     'corePath' => 'application/Espo/Resources/metadata',
-    'customPath' => 'application/Modules/{*}/Resources/metadata',
+    'customPath' => 'application/Espo/Modules/{*}/Resources/metadata',
     'doctrineCache' => 'data/cache/doctrine/metadata',
   ),
 
@@ -27,7 +27,7 @@ return array (
   array (
     'name' => 'layouts',
     'corePath' => 'application/Espo/Resources/layouts',
-    'customPath' => 'application/Modules/{*}/Resources/layouts',
+    'customPath' => 'application/Espo/Modules/{*}/Resources/layouts',
   ),
 
   'languageConfig' =>
@@ -35,7 +35,7 @@ return array (
     'name' => '{lang}',
     'cachePath' => 'data/cache/application/Language',
     'corePath' => 'application/Espo/Language',
-    'customPath' => 'application/Modules/{*}/Language',
+    'customPath' => 'application/Espo/Modules/{*}/Language',
   ),
 
   'defaultPermissions' =>