diff --git a/application/Espo/Core/CronManager.php b/application/Espo/Core/CronManager.php
index 1aec1d6498..ec7ed65b0e 100644
--- a/application/Espo/Core/CronManager.php
+++ b/application/Espo/Core/CronManager.php
@@ -358,7 +358,7 @@ class CronManager
         $obj->run($data, $job->get('targetId'), $job->get('targetType'));
     }
 
-    protected function runService(JonEntity $job)
+    protected function runService(JobEntity $job)
     {
         $serviceName = $job->get('serviceName');
 
diff --git a/application/Espo/Jobs/Job.php b/application/Espo/Core/Jobs/Job.php
similarity index 98%
rename from application/Espo/Jobs/Job.php
rename to application/Espo/Core/Jobs/Job.php
index a13ed3ad97..4a7ddc5644 100644
--- a/application/Espo/Jobs/Job.php
+++ b/application/Espo/Core/Jobs/Job.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
+namespace Espo\Core\Jobs;
 
 interface Job
 {
diff --git a/application/Espo/Jobs/JobTargeted.php b/application/Espo/Core/Jobs/JobTargeted.php
similarity index 98%
rename from application/Espo/Jobs/JobTargeted.php
rename to application/Espo/Core/Jobs/JobTargeted.php
index 113083470f..9a51ff8d09 100644
--- a/application/Espo/Jobs/JobTargeted.php
+++ b/application/Espo/Core/Jobs/JobTargeted.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Jobs;
+namespace Espo\Core\Jobs;
 
 use Espo\Entities\ScheduledJob;
 
diff --git a/application/Espo/Jobs/ProcessJobQueueE0.php b/application/Espo/Jobs/ProcessJobQueueE0.php
index 62d6625ed2..65e016aed3 100644
--- a/application/Espo/Jobs/ProcessJobQueueE0.php
+++ b/application/Espo/Jobs/ProcessJobQueueE0.php
@@ -32,6 +32,7 @@ namespace Espo\Jobs;
 use Espo\Core\{
     CronManager,
     Utils\Config,
+    Jobs\Job,
 };
 
 class ProcessJobQueueE0 implements Job
diff --git a/application/Espo/Jobs/ProcessJobQueueQ0.php b/application/Espo/Jobs/ProcessJobQueueQ0.php
index 65a9bd4cb4..1eaad252e7 100644
--- a/application/Espo/Jobs/ProcessJobQueueQ0.php
+++ b/application/Espo/Jobs/ProcessJobQueueQ0.php
@@ -32,6 +32,7 @@ namespace Espo\Jobs;
 use Espo\Core\{
     CronManager,
     Utils\Config,
+    Jobs\Job,
 };
 
 class ProcessJobQueueQ0 implements Job
diff --git a/application/Espo/Jobs/ProcessJobQueueQ1.php b/application/Espo/Jobs/ProcessJobQueueQ1.php
index 87f44ce569..56fa1dddeb 100644
--- a/application/Espo/Jobs/ProcessJobQueueQ1.php
+++ b/application/Espo/Jobs/ProcessJobQueueQ1.php
@@ -32,6 +32,7 @@ namespace Espo\Jobs;
 use Espo\Core\{
     CronManager,
     Utils\Config,
+    Jobs\Job,
 };
 
 class ProcessJobQueueQ1 implements Job
diff --git a/application/Espo/Jobs/ProcessWebhookQueue.php b/application/Espo/Jobs/ProcessWebhookQueue.php
index 15ad028d36..f8aac35a34 100644
--- a/application/Espo/Jobs/ProcessWebhookQueue.php
+++ b/application/Espo/Jobs/ProcessWebhookQueue.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Jobs;
 
-use \Espo\Core\Exceptions;
+use Espo\Core\Exceptions;
 
 class ProcessWebhookQueue extends \Espo\Core\Jobs\Base
 {
diff --git a/application/Espo/Jobs/SendEmailNotifications.php b/application/Espo/Jobs/SendEmailNotifications.php
index 27c5ac3a32..b58f19c6ad 100644
--- a/application/Espo/Jobs/SendEmailNotifications.php
+++ b/application/Espo/Jobs/SendEmailNotifications.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Jobs;
 
-use \Espo\Core\Exceptions;
+use Espo\Core\Exceptions;
 
 class SendEmailNotifications extends \Espo\Core\Jobs\Base
 {
diff --git a/application/Espo/Modules/Crm/Jobs/CheckEmailAccounts.php b/application/Espo/Modules/Crm/Jobs/CheckEmailAccounts.php
index 1821b7d305..e8d38db2a5 100644
--- a/application/Espo/Modules/Crm/Jobs/CheckEmailAccounts.php
+++ b/application/Espo/Modules/Crm/Jobs/CheckEmailAccounts.php
@@ -35,10 +35,9 @@ use Espo\Core\{
     CronManager,
     ServiceFactory,
     ORM\EntityManager,
+    Jobs\JobTargeted,
 };
 
-use Espo\Jobs\JobTargeted;
-
 use Espo\Entities\ScheduledJob;
 
 class CheckEmailAccounts implements JobTargeted
diff --git a/application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php b/application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php
index e03725d6c7..1da72f6b8b 100644
--- a/application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php
+++ b/application/Espo/Modules/Crm/Jobs/CheckInboundEmails.php
@@ -35,10 +35,9 @@ use Espo\Core\{
     CronManager,
     ServiceFactory,
     ORM\EntityManager,
+    Jobs\JobTargeted,
 };
 
-use Espo\Jobs\JobTargeted;
-
 use Espo\Entities\ScheduledJob;
 
 class CheckInboundEmails implements JobTargeted