diff --git a/application/Espo/Controllers/PopupNotification.php b/application/Espo/Controllers/PopupNotification.php
index 426a3ba454..b8c05ac466 100644
--- a/application/Espo/Controllers/PopupNotification.php
+++ b/application/Espo/Controllers/PopupNotification.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Controllers;
 
-use Espo\Services\PopupNotification as Service;
+use Espo\Tools\PopupNotification\Service as Service;
 
 use stdClass;
 
diff --git a/application/Espo/Controllers/TwoFactorEmail.php b/application/Espo/Controllers/TwoFactorEmail.php
index 05c088d03a..efe02816ee 100644
--- a/application/Espo/Controllers/TwoFactorEmail.php
+++ b/application/Espo/Controllers/TwoFactorEmail.php
@@ -34,7 +34,7 @@ use Espo\Core\Exceptions\BadRequest;
 
 use Espo\Core\Api\Request;
 
-use Espo\Services\TwoFactorEmail as Service;
+use Espo\Tools\UserSecurity\TwoFactorEmailService as Service;
 
 use Espo\Entities\User;
 
diff --git a/application/Espo/Controllers/TwoFactorSms.php b/application/Espo/Controllers/TwoFactorSms.php
index 82affaa734..0a4f7d0e3f 100644
--- a/application/Espo/Controllers/TwoFactorSms.php
+++ b/application/Espo/Controllers/TwoFactorSms.php
@@ -34,7 +34,7 @@ use Espo\Core\Exceptions\BadRequest;
 
 use Espo\Core\Api\Request;
 
-use Espo\Services\TwoFactorSms as Service;
+use Espo\Tools\UserSecurity\TwoFactorSmsService as Service;
 
 use Espo\Entities\User;
 
diff --git a/application/Espo/Services/PopupNotification.php b/application/Espo/Tools/PopupNotification/Service.php
similarity index 86%
rename from application/Espo/Services/PopupNotification.php
rename to application/Espo/Tools/PopupNotification/Service.php
index 885e06f679..f444990a69 100644
--- a/application/Espo/Services/PopupNotification.php
+++ b/application/Espo/Tools/PopupNotification/Service.php
@@ -27,33 +27,30 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Services;
+namespace Espo\Tools\PopupNotification;
 
-use Espo\Core\{
-    ServiceFactory,
-    Utils\Metadata,
-    Utils\Log,
-};
+use Espo\Core\ServiceFactory;
+use Espo\Core\Utils\Log;
+use Espo\Core\Utils\Metadata;
 
-use Espo\{
-    Entities\User,
-};
+use Espo\Entities\User;
 
 use stdClass;
 use Throwable;
 
-class PopupNotification
+class Service
 {
-    private $metadata;
+    private Metadata $metadata;
+    private ServiceFactory $serviceFactory;
+    private User $user;
+    private Log $log;
 
-    private $serviceFactory;
-
-    private $user;
-
-    private $log;
-
-    public function __construct(Metadata $metadata, ServiceFactory $serviceFactory, User $user, Log $log)
-    {
+    public function __construct(
+        Metadata $metadata,
+        ServiceFactory $serviceFactory,
+        User $user,
+        Log $log
+    ) {
         $this->metadata = $metadata;
         $this->serviceFactory = $serviceFactory;
         $this->user = $user;
diff --git a/application/Espo/Services/TwoFactorEmail.php b/application/Espo/Tools/UserSecurity/TwoFactorEmailService.php
similarity index 88%
rename from application/Espo/Services/TwoFactorEmail.php
rename to application/Espo/Tools/UserSecurity/TwoFactorEmailService.php
index b48f280fa1..077a9eb04c 100644
--- a/application/Espo/Services/TwoFactorEmail.php
+++ b/application/Espo/Tools/UserSecurity/TwoFactorEmailService.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Services;
+namespace Espo\Tools\UserSecurity;
 
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\NotFound;
@@ -39,18 +39,19 @@ use Espo\ORM\EntityManager;
 
 use Espo\Entities\User;
 
-class TwoFactorEmail
+class TwoFactorEmailService
 {
-    private $util;
+    private Util $util;
+    private User $user;
+    private EntityManager $entityManager;
+    private Config $config;
 
-    private $user;
-
-    private $entityManager;
-
-    private $config;
-
-    public function __construct(Util $util, User $user, EntityManager $entityManager, Config $config)
-    {
+    public function __construct(
+        Util $util,
+        User $user,
+        EntityManager $entityManager,
+        Config $config
+    ) {
         $this->util = $util;
         $this->user = $user;
         $this->entityManager = $entityManager;
diff --git a/application/Espo/Services/TwoFactorSms.php b/application/Espo/Tools/UserSecurity/TwoFactorSmsService.php
similarity index 92%
rename from application/Espo/Services/TwoFactorSms.php
rename to application/Espo/Tools/UserSecurity/TwoFactorSmsService.php
index f470416c32..c0fdc836a2 100644
--- a/application/Espo/Services/TwoFactorSms.php
+++ b/application/Espo/Tools/UserSecurity/TwoFactorSmsService.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Services;
+namespace Espo\Tools\UserSecurity;
 
 use Espo\Core\Exceptions\Forbidden;
 use Espo\Core\Exceptions\NotFound;
@@ -39,15 +39,19 @@ use Espo\ORM\EntityManager;
 
 use Espo\Entities\User;
 
-class TwoFactorSms
+class TwoFactorSmsService
 {
     private Util $util;
     private User $user;
     private EntityManager $entityManager;
     private Config $config;
 
-    public function __construct(Util $util, User $user, EntityManager $entityManager, Config $config)
-    {
+    public function __construct(
+        Util $util,
+        User $user,
+        EntityManager $entityManager,
+        Config $config
+    ) {
         $this->util = $util;
         $this->user = $user;
         $this->entityManager = $entityManager;