diff --git a/.gitignore b/.gitignore
index 896c71bb7d..d7b19abe8d 100644
--- a/.gitignore
+++ b/.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/*
\ No newline at end of file
+application/Espo/Modules/Crm/Resources/metadata/customTest/*
\ No newline at end of file
diff --git a/application/Espo/Core/Container.php b/application/Espo/Core/Container.php
index ebc2c5bc6d..f9b014ea38 100644
--- a/application/Espo/Core/Container.php
+++ b/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);
             }
diff --git a/application/Espo/Core/Utils/Layout.php b/application/Espo/Core/Utils/Layout.php
index 87f6257b23..80846d6a85 100644
--- a/application/Espo/Core/Utils/Layout.php
+++ b/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);
diff --git a/application/Espo/Core/Utils/Metadata.php b/application/Espo/Core/Utils/Metadata.php
index 70627c9ba7..8acd612011 100644
--- a/application/Espo/Core/Utils/Metadata.php
+++ b/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'));
 		}
 
diff --git a/application/Espo/Core/defaults/systemConfig.php b/application/Espo/Core/defaults/systemConfig.php
index f8065b7304..11c4b57e79 100644
--- a/application/Espo/Core/defaults/systemConfig.php
+++ b/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/{*}',
-  'espoCustomPath' => 'Custom',
+  'espoModulePath' => 'Espo/Modules/{*}',
+  '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' =>
diff --git a/application/Modules/Crm/Resources/layouts/Account/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Account/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Account/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Account/filters.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/filters.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/filters.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/list.json b/application/Espo/Modules/Crm/Resources/layouts/Account/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Account/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Account/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Account/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Account/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Account/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Account/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Call/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Call/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/list.json b/application/Espo/Modules/Crm/Resources/layouts/Call/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Call/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Call/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Call/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Call/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Call/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Call/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Case/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Case/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Case/filters.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/filters.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/filters.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/list.json b/application/Espo/Modules/Crm/Resources/layouts/Case/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Case/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Case/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Case/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Case/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Case/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/filters.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/filters.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/list.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Contact/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Contact/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Contact/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Email/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Email/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Email/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Email/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Email/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Email/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Email/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Email/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/EmailTemplate/detail.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/EmailTemplate/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/InboundEmail/detail.json b/application/Espo/Modules/Crm/Resources/layouts/InboundEmail/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/InboundEmail/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/InboundEmail/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/InboundEmail/list.json b/application/Espo/Modules/Crm/Resources/layouts/InboundEmail/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/InboundEmail/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/InboundEmail/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/filters.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/filters.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/list.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/listDashlet.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/listDashlet.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/listDashlet.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/listDashlet.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Lead/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Lead/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Lead/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/list.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Meeting/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Meeting/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Meeting/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Meeting/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/list.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Opportunity/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Opportunity/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Opportunity/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/filters.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/filters.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/filters.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/filters.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/list.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Prospect/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Prospect/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Prospect/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Prospect/relationships.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/detail.json b/application/Espo/Modules/Crm/Resources/layouts/Task/detail.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/detail.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/detail.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/detailSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Task/detailSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/detailSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/detailSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json b/application/Espo/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/filtersAdvanced.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/list.json b/application/Espo/Modules/Crm/Resources/layouts/Task/list.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/list.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/list.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/listSelect.json b/application/Espo/Modules/Crm/Resources/layouts/Task/listSelect.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/listSelect.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/listSelect.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/listSmall.json b/application/Espo/Modules/Crm/Resources/layouts/Task/listSmall.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/listSmall.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/listSmall.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/massUpdate.json b/application/Espo/Modules/Crm/Resources/layouts/Task/massUpdate.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/massUpdate.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/massUpdate.json
diff --git a/application/Modules/Crm/Resources/layouts/Task/relationships.json b/application/Espo/Modules/Crm/Resources/layouts/Task/relationships.json
similarity index 100%
rename from application/Modules/Crm/Resources/layouts/Task/relationships.json
rename to application/Espo/Modules/Crm/Resources/layouts/Task/relationships.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/Calendar.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calendar.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/Calendar.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/Calendar.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/Cases.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/Cases.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/Leads.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/Leads.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/Opportunities.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByLeadSource.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/OpportunitiesByStage.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesByMonth.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/SalesPipeline.json
diff --git a/application/Modules/Crm/Resources/metadata/dashlets/Tasks.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/dashlets/Tasks.json
rename to application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
diff --git a/application/Modules/Crm/Resources/metadata/defs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/defs/Contact.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/defs/Contact.json
rename to application/Espo/Modules/Crm/Resources/metadata/defs/Contact.json
diff --git a/application/Modules/Crm/Resources/metadata/defs/Product.json b/application/Espo/Modules/Crm/Resources/metadata/defs/Product.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/defs/Product.json
rename to application/Espo/Modules/Crm/Resources/metadata/defs/Product.json
diff --git a/application/Modules/Crm/Resources/metadata/defs/unset.json b/application/Espo/Modules/Crm/Resources/metadata/defs/unset.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/defs/unset.json
rename to application/Espo/Modules/Crm/Resources/metadata/defs/unset.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Account.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Call.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Case.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Case.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Contact.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Email.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Email.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Email.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Email.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/InboundEmail.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Lead.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Prospect.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
diff --git a/application/Modules/Crm/Resources/metadata/entityDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/entityDefs/Task.json
rename to application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Account.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Account.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Account.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Account.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Calendar.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Calendar.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Calendar.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Calendar.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Call.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Call.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Call.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Call.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Case.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Case.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Case.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Case.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Contact.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Contact.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Contact.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Email.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Email.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Email.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Email.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/InboundEmail.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/InboundEmail.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/InboundEmail.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/InboundEmail.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Lead.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Lead.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Lead.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Meeting.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Meeting.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Meeting.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Opportunity.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Opportunity.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Opportunity.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Prospect.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Prospect.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Prospect.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Prospect.json
diff --git a/application/Modules/Crm/Resources/metadata/scopes/Task.json b/application/Espo/Modules/Crm/Resources/metadata/scopes/Task.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/scopes/Task.json
rename to application/Espo/Modules/Crm/Resources/metadata/scopes/Task.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Account.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Account.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Call.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Call.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Call.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Case.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Case.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Case.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Contact.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Contact.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/InboundEmail.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Lead.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Lead.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Meeting.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Meeting.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Meeting.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Opportunity.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Prospect.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Prospect.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Prospect.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Prospect.json
diff --git a/application/Modules/Crm/Resources/metadata/viewDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/viewDefs/Task.json
similarity index 100%
rename from application/Modules/Crm/Resources/metadata/viewDefs/Task.json
rename to application/Espo/Modules/Crm/Resources/metadata/viewDefs/Task.json
diff --git a/tests/Api/MetadataTest.php b/tests/Api/MetadataTest.php
index f9e87d958a..b299c0202c 100644
--- a/tests/Api/MetadataTest.php
+++ b/tests/Api/MetadataTest.php
@@ -33,7 +33,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( ));
 	}
 
-	function testPut()
+	/*function testPut()
 	{
 		$this->fixture->setType('PUT');
 
@@ -42,7 +42,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($this->fixture->isSuccess( $data ));
 
 		//check if file exists
-		$this->assertTrue(file_exists('application/Modules/Crm/Resources/metadata/customTest/Account.json'));
+		$this->assertTrue(file_exists('application/Espo/Modules/Crm/Resources/metadata/customTest/Account.json'));
 
 
 		$this->fixture->setUrl('/metadata/custom-test/custom-test');
@@ -51,7 +51,7 @@ class MetadataTest extends \PHPUnit_Framework_TestCase
 
 		//check if file exists
 		$this->assertTrue(file_exists('application/Espo/Resources/metadata/customTest/CustomTest.json'));
-	}
+	}*/
 
 
 }