From 407f5fa53a83b57c95ccab84ba536e6315b1070a Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 6 Sep 2020 15:53:38 +0300
Subject: [PATCH] classes folder

---
 .../{Core => Classes}/AppParams/TemplateEntityTypeList.php    | 2 +-
 application/Espo/{Core => Classes}/Cleanup/Reminders.php      | 2 +-
 application/Espo/{Core => Classes}/Cleanup/WebhookQueue.php   | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/ArrayIntType.php   | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/ArrayType.php      | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/BaseType.php       | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/ChecklistType.php  | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/CurrencyType.php   | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/DateType.php       | 2 +-
 .../FieldValidators/DatetimeOptionalType.php                  | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/DatetimeType.php   | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/EmailType.php      | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/EnumType.php       | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/FileType.php       | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/FloatType.php      | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/ImageType.php      | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/IntType.php        | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/JsonArrayType.php  | 2 +-
 .../{Core => Classes}/FieldValidators/LinkMultipleType.php    | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/LinkParentType.php | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/LinkType.php       | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/MultiEnumType.php  | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/PersonNameType.php | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/PhoneType.php      | 2 +-
 .../Espo/{Core => Classes}/FieldValidators/VarcharType.php    | 2 +-
 .../Espo/{Core => Classes}/TemplateHelpers/GoogleMaps.php     | 2 +-
 application/Espo/Core/Utils/FieldValidatorManager.php         | 4 ++--
 application/Espo/Resources/metadata/app/appParams.json        | 2 +-
 application/Espo/Resources/metadata/app/cleanup.json          | 4 ++--
 application/Espo/Resources/metadata/app/templateHelpers.json  | 2 +-
 application/Espo/Resources/metadata/fields/barcode.json       | 2 +-
 31 files changed, 33 insertions(+), 33 deletions(-)
 rename application/Espo/{Core => Classes}/AppParams/TemplateEntityTypeList.php (98%)
 rename application/Espo/{Core => Classes}/Cleanup/Reminders.php (98%)
 rename application/Espo/{Core => Classes}/Cleanup/WebhookQueue.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/ArrayIntType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/ArrayType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/BaseType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/ChecklistType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/CurrencyType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/DateType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/DatetimeOptionalType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/DatetimeType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/EmailType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/EnumType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/FileType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/FloatType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/ImageType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/IntType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/JsonArrayType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/LinkMultipleType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/LinkParentType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/LinkType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/MultiEnumType.php (97%)
 rename application/Espo/{Core => Classes}/FieldValidators/PersonNameType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/PhoneType.php (98%)
 rename application/Espo/{Core => Classes}/FieldValidators/VarcharType.php (98%)
 rename application/Espo/{Core => Classes}/TemplateHelpers/GoogleMaps.php (99%)

diff --git a/application/Espo/Core/AppParams/TemplateEntityTypeList.php b/application/Espo/Classes/AppParams/TemplateEntityTypeList.php
similarity index 98%
rename from application/Espo/Core/AppParams/TemplateEntityTypeList.php
rename to application/Espo/Classes/AppParams/TemplateEntityTypeList.php
index 7334574761..e314d8af74 100644
--- a/application/Espo/Core/AppParams/TemplateEntityTypeList.php
+++ b/application/Espo/Classes/AppParams/TemplateEntityTypeList.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\AppParams;
+namespace Espo\Classes\AppParams;
 
 use Espo\Core\{
     Acl,
diff --git a/application/Espo/Core/Cleanup/Reminders.php b/application/Espo/Classes/Cleanup/Reminders.php
similarity index 98%
rename from application/Espo/Core/Cleanup/Reminders.php
rename to application/Espo/Classes/Cleanup/Reminders.php
index 7d290afb3a..3f344f5bf2 100644
--- a/application/Espo/Core/Cleanup/Reminders.php
+++ b/application/Espo/Classes/Cleanup/Reminders.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Cleanup;
+namespace Espo\Classes\Cleanup;
 
 use Espo\Core\{
     Utils\Config,
diff --git a/application/Espo/Core/Cleanup/WebhookQueue.php b/application/Espo/Classes/Cleanup/WebhookQueue.php
similarity index 98%
rename from application/Espo/Core/Cleanup/WebhookQueue.php
rename to application/Espo/Classes/Cleanup/WebhookQueue.php
index 0c08452615..0dcecf05c0 100644
--- a/application/Espo/Core/Cleanup/WebhookQueue.php
+++ b/application/Espo/Classes/Cleanup/WebhookQueue.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Cleanup;
+namespace Espo\Classes\Cleanup;
 
 use Espo\Core\{
     Utils\Config,
diff --git a/application/Espo/Core/FieldValidators/ArrayIntType.php b/application/Espo/Classes/FieldValidators/ArrayIntType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/ArrayIntType.php
rename to application/Espo/Classes/FieldValidators/ArrayIntType.php
index d43d457126..5cdf978e74 100644
--- a/application/Espo/Core/FieldValidators/ArrayIntType.php
+++ b/application/Espo/Classes/FieldValidators/ArrayIntType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ArrayIntType extends ArrayType
 {
diff --git a/application/Espo/Core/FieldValidators/ArrayType.php b/application/Espo/Classes/FieldValidators/ArrayType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/ArrayType.php
rename to application/Espo/Classes/FieldValidators/ArrayType.php
index de938c0cc5..2aa50e2896 100644
--- a/application/Espo/Core/FieldValidators/ArrayType.php
+++ b/application/Espo/Classes/FieldValidators/ArrayType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/BaseType.php b/application/Espo/Classes/FieldValidators/BaseType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/BaseType.php
rename to application/Espo/Classes/FieldValidators/BaseType.php
index c1d2e8f9b6..13a4dc9987 100644
--- a/application/Espo/Core/FieldValidators/BaseType.php
+++ b/application/Espo/Classes/FieldValidators/BaseType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/ChecklistType.php b/application/Espo/Classes/FieldValidators/ChecklistType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/ChecklistType.php
rename to application/Espo/Classes/FieldValidators/ChecklistType.php
index 2b3bd780bf..b913bbc7a0 100644
--- a/application/Espo/Core/FieldValidators/ChecklistType.php
+++ b/application/Espo/Classes/FieldValidators/ChecklistType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ChecklistType extends ArrayType
 {
diff --git a/application/Espo/Core/FieldValidators/CurrencyType.php b/application/Espo/Classes/FieldValidators/CurrencyType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/CurrencyType.php
rename to application/Espo/Classes/FieldValidators/CurrencyType.php
index 5d0adc8211..1f62018c97 100644
--- a/application/Espo/Core/FieldValidators/CurrencyType.php
+++ b/application/Espo/Classes/FieldValidators/CurrencyType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/DateType.php b/application/Espo/Classes/FieldValidators/DateType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/DateType.php
rename to application/Espo/Classes/FieldValidators/DateType.php
index 9c730778e5..b321a8727c 100644
--- a/application/Espo/Core/FieldValidators/DateType.php
+++ b/application/Espo/Classes/FieldValidators/DateType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/DatetimeOptionalType.php b/application/Espo/Classes/FieldValidators/DatetimeOptionalType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/DatetimeOptionalType.php
rename to application/Espo/Classes/FieldValidators/DatetimeOptionalType.php
index e6e5e75d62..0c81364936 100644
--- a/application/Espo/Core/FieldValidators/DatetimeOptionalType.php
+++ b/application/Espo/Classes/FieldValidators/DatetimeOptionalType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/DatetimeType.php b/application/Espo/Classes/FieldValidators/DatetimeType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/DatetimeType.php
rename to application/Espo/Classes/FieldValidators/DatetimeType.php
index 27abf2cf28..abeef668f0 100644
--- a/application/Espo/Core/FieldValidators/DatetimeType.php
+++ b/application/Espo/Classes/FieldValidators/DatetimeType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class DatetimeType extends DateType
 {
diff --git a/application/Espo/Core/FieldValidators/EmailType.php b/application/Espo/Classes/FieldValidators/EmailType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/EmailType.php
rename to application/Espo/Classes/FieldValidators/EmailType.php
index 8f3212988d..a05902acad 100644
--- a/application/Espo/Core/FieldValidators/EmailType.php
+++ b/application/Espo/Classes/FieldValidators/EmailType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/EnumType.php b/application/Espo/Classes/FieldValidators/EnumType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/EnumType.php
rename to application/Espo/Classes/FieldValidators/EnumType.php
index 9975f7d327..9db1497e9d 100644
--- a/application/Espo/Core/FieldValidators/EnumType.php
+++ b/application/Espo/Classes/FieldValidators/EnumType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/FileType.php b/application/Espo/Classes/FieldValidators/FileType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/FileType.php
rename to application/Espo/Classes/FieldValidators/FileType.php
index 7fdedee4d4..a96d97e362 100644
--- a/application/Espo/Core/FieldValidators/FileType.php
+++ b/application/Espo/Classes/FieldValidators/FileType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FileType extends LinkType
 {
diff --git a/application/Espo/Core/FieldValidators/FloatType.php b/application/Espo/Classes/FieldValidators/FloatType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/FloatType.php
rename to application/Espo/Classes/FieldValidators/FloatType.php
index 94024ff23f..fd76cdedf9 100644
--- a/application/Espo/Core/FieldValidators/FloatType.php
+++ b/application/Espo/Classes/FieldValidators/FloatType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class FloatType extends IntType
 {
diff --git a/application/Espo/Core/FieldValidators/ImageType.php b/application/Espo/Classes/FieldValidators/ImageType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/ImageType.php
rename to application/Espo/Classes/FieldValidators/ImageType.php
index 30578d853b..836ef41c10 100644
--- a/application/Espo/Core/FieldValidators/ImageType.php
+++ b/application/Espo/Classes/FieldValidators/ImageType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class ImageType extends FileType
 {
diff --git a/application/Espo/Core/FieldValidators/IntType.php b/application/Espo/Classes/FieldValidators/IntType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/IntType.php
rename to application/Espo/Classes/FieldValidators/IntType.php
index 05f960e583..4015f9be9b 100644
--- a/application/Espo/Core/FieldValidators/IntType.php
+++ b/application/Espo/Classes/FieldValidators/IntType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/JsonArrayType.php b/application/Espo/Classes/FieldValidators/JsonArrayType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/JsonArrayType.php
rename to application/Espo/Classes/FieldValidators/JsonArrayType.php
index 0373b01156..bd647e3433 100644
--- a/application/Espo/Core/FieldValidators/JsonArrayType.php
+++ b/application/Espo/Classes/FieldValidators/JsonArrayType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/LinkMultipleType.php b/application/Espo/Classes/FieldValidators/LinkMultipleType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/LinkMultipleType.php
rename to application/Espo/Classes/FieldValidators/LinkMultipleType.php
index 053275e439..c2a3db2730 100644
--- a/application/Espo/Core/FieldValidators/LinkMultipleType.php
+++ b/application/Espo/Classes/FieldValidators/LinkMultipleType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/LinkParentType.php b/application/Espo/Classes/FieldValidators/LinkParentType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/LinkParentType.php
rename to application/Espo/Classes/FieldValidators/LinkParentType.php
index daa0a3a603..b89dc7e70c 100644
--- a/application/Espo/Core/FieldValidators/LinkParentType.php
+++ b/application/Espo/Classes/FieldValidators/LinkParentType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/LinkType.php b/application/Espo/Classes/FieldValidators/LinkType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/LinkType.php
rename to application/Espo/Classes/FieldValidators/LinkType.php
index b3dc600ed1..654706760c 100644
--- a/application/Espo/Core/FieldValidators/LinkType.php
+++ b/application/Espo/Classes/FieldValidators/LinkType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/MultiEnumType.php b/application/Espo/Classes/FieldValidators/MultiEnumType.php
similarity index 97%
rename from application/Espo/Core/FieldValidators/MultiEnumType.php
rename to application/Espo/Classes/FieldValidators/MultiEnumType.php
index 47620b03fd..3e7fbef790 100644
--- a/application/Espo/Core/FieldValidators/MultiEnumType.php
+++ b/application/Espo/Classes/FieldValidators/MultiEnumType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 class MultiEnumType extends ArrayType
 {
diff --git a/application/Espo/Core/FieldValidators/PersonNameType.php b/application/Espo/Classes/FieldValidators/PersonNameType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/PersonNameType.php
rename to application/Espo/Classes/FieldValidators/PersonNameType.php
index 265ca8a3d0..d7425a7983 100644
--- a/application/Espo/Core/FieldValidators/PersonNameType.php
+++ b/application/Espo/Classes/FieldValidators/PersonNameType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/PhoneType.php b/application/Espo/Classes/FieldValidators/PhoneType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/PhoneType.php
rename to application/Espo/Classes/FieldValidators/PhoneType.php
index bce06bac57..a7179d3db8 100644
--- a/application/Espo/Core/FieldValidators/PhoneType.php
+++ b/application/Espo/Classes/FieldValidators/PhoneType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/FieldValidators/VarcharType.php b/application/Espo/Classes/FieldValidators/VarcharType.php
similarity index 98%
rename from application/Espo/Core/FieldValidators/VarcharType.php
rename to application/Espo/Classes/FieldValidators/VarcharType.php
index 69e8a41f81..fca4e01378 100644
--- a/application/Espo/Core/FieldValidators/VarcharType.php
+++ b/application/Espo/Classes/FieldValidators/VarcharType.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldValidators;
+namespace Espo\Classes\FieldValidators;
 
 use Espo\ORM\Entity;
 
diff --git a/application/Espo/Core/TemplateHelpers/GoogleMaps.php b/application/Espo/Classes/TemplateHelpers/GoogleMaps.php
similarity index 99%
rename from application/Espo/Core/TemplateHelpers/GoogleMaps.php
rename to application/Espo/Classes/TemplateHelpers/GoogleMaps.php
index 6c05279c3c..b0b35b7005 100644
--- a/application/Espo/Core/TemplateHelpers/GoogleMaps.php
+++ b/application/Espo/Classes/TemplateHelpers/GoogleMaps.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\TemplateHelpers;
+namespace Espo\Classes\TemplateHelpers;
 
 class GoogleMaps
 {
diff --git a/application/Espo/Core/Utils/FieldValidatorManager.php b/application/Espo/Core/Utils/FieldValidatorManager.php
index 1fdf2e29f1..72d14357f1 100644
--- a/application/Espo/Core/Utils/FieldValidatorManager.php
+++ b/application/Espo/Core/Utils/FieldValidatorManager.php
@@ -74,9 +74,9 @@ class FieldValidatorManager
         $className = $this->metadata->get(['fields', $fieldType, 'validatorClassName']);
 
         if (!$className) {
-            $className = '\\Espo\\Core\\FieldValidators\\' . ucfirst($fieldType) . 'Type';
+            $className = 'Espo\\Classes\\FieldValidators\\' . ucfirst($fieldType) . 'Type';
             if (!class_exists($className)) {
-                $className = '\\Espo\\Core\\FieldValidators\\BaseType';
+                $className = 'Espo\\Classes\\FieldValidators\\BaseType';
             }
         }
 
diff --git a/application/Espo/Resources/metadata/app/appParams.json b/application/Espo/Resources/metadata/app/appParams.json
index bac90a4ef3..292e5dc442 100644
--- a/application/Espo/Resources/metadata/app/appParams.json
+++ b/application/Espo/Resources/metadata/app/appParams.json
@@ -1,5 +1,5 @@
 {
     "templateEntityTypeList": {
-        "className": "\\Espo\\Core\\AppParams\\TemplateEntityTypeList"
+        "className": "Espo\\Classes\\AppParams\\TemplateEntityTypeList"
     }
 }
\ No newline at end of file
diff --git a/application/Espo/Resources/metadata/app/cleanup.json b/application/Espo/Resources/metadata/app/cleanup.json
index 87157551a8..09db587b02 100644
--- a/application/Espo/Resources/metadata/app/cleanup.json
+++ b/application/Espo/Resources/metadata/app/cleanup.json
@@ -1,10 +1,10 @@
 {
     "reminders": {
-        "className": "\\Espo\\Core\\Cleanup\\Reminders",
+        "className": "Espo\\Classes\\Cleanup\\Reminders",
         "order": 10
     },
     "webhookQueue": {
-        "className": "\\Espo\\Core\\Cleanup\\WebhookQueue",
+        "className": "Espo\\Classes\\Cleanup\\WebhookQueue",
         "order": 11
     }
 }
diff --git a/application/Espo/Resources/metadata/app/templateHelpers.json b/application/Espo/Resources/metadata/app/templateHelpers.json
index 348cb7f25c..ed41cddcfd 100644
--- a/application/Espo/Resources/metadata/app/templateHelpers.json
+++ b/application/Espo/Resources/metadata/app/templateHelpers.json
@@ -1,3 +1,3 @@
 {
-    "googleMapsImage": "\\Espo\\Core\\TemplateHelpers\\GoogleMaps::image"
+    "googleMapsImage": "Espo\\Classes\\TemplateHelpers\\GoogleMaps::image"
 }
diff --git a/application/Espo/Resources/metadata/fields/barcode.json b/application/Espo/Resources/metadata/fields/barcode.json
index d9600f9f24..9ddb359681 100644
--- a/application/Espo/Resources/metadata/fields/barcode.json
+++ b/application/Espo/Resources/metadata/fields/barcode.json
@@ -47,5 +47,5 @@
       "type":"varchar",
       "len": 255
    },
-   "validatorClassName": "Espo\\Core\\FieldValidators\\VarcharType"
+   "validatorClassName": "Espo\\Classes\\FieldValidators\\VarcharType"
 }