diff --git a/application/Espo/Core/Utils/Config.php b/application/Espo/Core/Utils/Config.php
index 238edcd42e..f4b4d1708d 100644
--- a/application/Espo/Core/Utils/Config.php
+++ b/application/Espo/Core/Utils/Config.php
@@ -38,9 +38,9 @@ use Espo\Core\Utils\File\Manager as FileManager;
  */
 class Config
 {
-    private $defaultConfigPath = 'application/Espo/Core/defaults/config.php';
+    private $defaultConfigPath = 'application/Espo/Resources/defaults/config.php';
 
-    private $systemConfigPath = 'application/Espo/Core/defaults/systemConfig.php';
+    private $systemConfigPath = 'application/Espo/Resources/defaults/systemConfig.php';
 
     protected $configPath = 'data/config.php';
 
diff --git a/application/Espo/Core/Utils/Layout.php b/application/Espo/Core/Utils/Layout.php
index 1865180f8a..9ed5ef2623 100644
--- a/application/Espo/Core/Utils/Layout.php
+++ b/application/Espo/Core/Utils/Layout.php
@@ -43,7 +43,7 @@ class Layout
 
     protected $changedData = [];
 
-    protected $defaultsPath = 'application/Espo/Core/defaults';
+    protected $defaultPath = 'application/Espo/Resources/defaults/layouts';
 
     protected $paths = [
         'corePath' => 'application/Espo/Resources/layouts',
@@ -106,8 +106,7 @@ class Layout
                 return Json::encode($data);
             }
 
-            $defaultPath = $this->defaultsPath;
-            $filePath = Util::concatPath(Util::concatPath($defaultPath, 'layouts'), $name . '.json' );
+            $filePath = Util::concatPath($this->defaultPath, $name . '.json' );
 
             if (!file_exists($filePath)) return null;
         }
diff --git a/application/Espo/Core/defaults/config.php b/application/Espo/Resources/defaults/config.php
similarity index 100%
rename from application/Espo/Core/defaults/config.php
rename to application/Espo/Resources/defaults/config.php
diff --git a/application/Espo/Core/defaults/layouts/bottomPanelsDetail.json b/application/Espo/Resources/defaults/layouts/bottomPanelsDetail.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/bottomPanelsDetail.json
rename to application/Espo/Resources/defaults/layouts/bottomPanelsDetail.json
diff --git a/application/Espo/Core/defaults/layouts/bottomPanelsDetailSmall.json b/application/Espo/Resources/defaults/layouts/bottomPanelsDetailSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/bottomPanelsDetailSmall.json
rename to application/Espo/Resources/defaults/layouts/bottomPanelsDetailSmall.json
diff --git a/application/Espo/Core/defaults/layouts/bottomPanelsEdit.json b/application/Espo/Resources/defaults/layouts/bottomPanelsEdit.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/bottomPanelsEdit.json
rename to application/Espo/Resources/defaults/layouts/bottomPanelsEdit.json
diff --git a/application/Espo/Core/defaults/layouts/bottomPanelsEditSmall.json b/application/Espo/Resources/defaults/layouts/bottomPanelsEditSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/bottomPanelsEditSmall.json
rename to application/Espo/Resources/defaults/layouts/bottomPanelsEditSmall.json
diff --git a/application/Espo/Core/defaults/layouts/detail.json b/application/Espo/Resources/defaults/layouts/detail.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/detail.json
rename to application/Espo/Resources/defaults/layouts/detail.json
diff --git a/application/Espo/Core/defaults/layouts/detailSmall.json b/application/Espo/Resources/defaults/layouts/detailSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/detailSmall.json
rename to application/Espo/Resources/defaults/layouts/detailSmall.json
diff --git a/application/Espo/Core/defaults/layouts/filters.json b/application/Espo/Resources/defaults/layouts/filters.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/filters.json
rename to application/Espo/Resources/defaults/layouts/filters.json
diff --git a/application/Espo/Core/defaults/layouts/kanban.json b/application/Espo/Resources/defaults/layouts/kanban.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/kanban.json
rename to application/Espo/Resources/defaults/layouts/kanban.json
diff --git a/application/Espo/Core/defaults/layouts/list.json b/application/Espo/Resources/defaults/layouts/list.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/list.json
rename to application/Espo/Resources/defaults/layouts/list.json
diff --git a/application/Espo/Core/defaults/layouts/listDashlet.json b/application/Espo/Resources/defaults/layouts/listDashlet.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/listDashlet.json
rename to application/Espo/Resources/defaults/layouts/listDashlet.json
diff --git a/application/Espo/Core/defaults/layouts/listSmall.json b/application/Espo/Resources/defaults/layouts/listSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/listSmall.json
rename to application/Espo/Resources/defaults/layouts/listSmall.json
diff --git a/application/Espo/Core/defaults/layouts/massUpdate.json b/application/Espo/Resources/defaults/layouts/massUpdate.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/massUpdate.json
rename to application/Espo/Resources/defaults/layouts/massUpdate.json
diff --git a/application/Espo/Core/defaults/layouts/relationships.json b/application/Espo/Resources/defaults/layouts/relationships.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/relationships.json
rename to application/Espo/Resources/defaults/layouts/relationships.json
diff --git a/application/Espo/Core/defaults/layouts/sidePanelsDetail.json b/application/Espo/Resources/defaults/layouts/sidePanelsDetail.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/sidePanelsDetail.json
rename to application/Espo/Resources/defaults/layouts/sidePanelsDetail.json
diff --git a/application/Espo/Core/defaults/layouts/sidePanelsDetailSmall.json b/application/Espo/Resources/defaults/layouts/sidePanelsDetailSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/sidePanelsDetailSmall.json
rename to application/Espo/Resources/defaults/layouts/sidePanelsDetailSmall.json
diff --git a/application/Espo/Core/defaults/layouts/sidePanelsEdit.json b/application/Espo/Resources/defaults/layouts/sidePanelsEdit.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/sidePanelsEdit.json
rename to application/Espo/Resources/defaults/layouts/sidePanelsEdit.json
diff --git a/application/Espo/Core/defaults/layouts/sidePanelsEditSmall.json b/application/Espo/Resources/defaults/layouts/sidePanelsEditSmall.json
similarity index 100%
rename from application/Espo/Core/defaults/layouts/sidePanelsEditSmall.json
rename to application/Espo/Resources/defaults/layouts/sidePanelsEditSmall.json
diff --git a/application/Espo/Core/defaults/systemConfig.php b/application/Espo/Resources/defaults/systemConfig.php
similarity index 100%
rename from application/Espo/Core/defaults/systemConfig.php
rename to application/Espo/Resources/defaults/systemConfig.php
diff --git a/install/index.php b/install/index.php
index 566b6ba19b..219c02c732 100644
--- a/install/index.php
+++ b/install/index.php
@@ -74,7 +74,7 @@ $config = include('core/config.php');
 require_once 'core/SystemHelper.php';
 $systemHelper = new SystemHelper();
 
-$systemConfig = include('application/Espo/Core/defaults/systemConfig.php');
+$systemConfig = include('application/Espo/Resources/defaults/systemConfig.php');
 if (isset($systemConfig['requiredPhpVersion']) && version_compare(PHP_VERSION, $systemConfig['requiredPhpVersion'], '<')) {
     die(str_replace("{minVersion}", $systemConfig['requiredPhpVersion'], $sanitizedLangs['messages']['phpVersion']) . ".\n");
 }