diff --git a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
index 16335c38..d57ceb2a 100644
--- a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
+++ b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
@@ -32,11 +32,11 @@ use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Import\Services\ImportStrategy;
 use SP\Domain\Plugin\Ports\PluginManagerService;
+use SP\Domain\Providers\Browser\BrowserAuthService;
 use SP\Infrastructure\File\FileException;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
-use SP\Providers\Auth\Browser\BrowserAuthService;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
index b4d18ee0..60b286f4 100644
--- a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
+++ b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 use SP\Domain\Core\Exceptions\ValidationException;
 use SP\Domain\Http\RequestInterface;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
 
 use function SP\__u;
 
diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php
index 43b67ed9..c858b16b 100644
--- a/app/modules/web/Controllers/ConfigMail/CheckController.php
+++ b/app/modules/web/Controllers/ConfigMail/CheckController.php
@@ -37,11 +37,11 @@ use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
 use SP\Domain\Notification\Ports\MailService;
+use SP\Domain\Providers\Mail\MailParams;
 use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
-use SP\Providers\Mail\MailParams;
 
 /**
  * Class CheckController
diff --git a/app/modules/web/Controllers/ConfigManager/IndexController.php b/app/modules/web/Controllers/ConfigManager/IndexController.php
index 53503635..c1395499 100644
--- a/app/modules/web/Controllers/ConfigManager/IndexController.php
+++ b/app/modules/web/Controllers/ConfigManager/IndexController.php
@@ -47,6 +47,11 @@ use SP\Domain\Core\File\MimeTypesService;
 use SP\Domain\Crypt\Services\TemporaryMasterPass;
 use SP\Domain\Export\Services\BackupFileHelper;
 use SP\Domain\Export\Services\XmlExport;
+use SP\Domain\Providers\Ldap\LdapMsAds;
+use SP\Domain\Providers\Ldap\LdapStd;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Log\LogInterface;
+use SP\Domain\Providers\Mail\MailHandler;
 use SP\Domain\Task\Services\Task;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserProfileService;
@@ -61,11 +66,6 @@ use SP\Mvc\Controller\WebControllerHelper;
 use SP\Mvc\View\Components\DataTab;
 use SP\Mvc\View\Components\SelectItemAdapter;
 use SP\Plugin\PluginManager;
-use SP\Providers\Auth\Ldap\LdapMsAds;
-use SP\Providers\Auth\Ldap\LdapStd;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
-use SP\Providers\Log\LogInterface;
-use SP\Providers\Mail\MailHandler;
 use SP\Util\Util;
 
 /**
diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php
index d6baaee4..e077f8f5 100644
--- a/app/modules/web/Controllers/ControllerBase.php
+++ b/app/modules/web/Controllers/ControllerBase.php
@@ -43,13 +43,13 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\PhpExtensionCheckerService;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Browser\BrowserAuthService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Modules\Web\Controllers\Traits\WebControllerTrait;
 use SP\Mvc\Controller\WebControllerHelper;
 use SP\Mvc\View\TemplateInterface;
-use SP\Providers\Auth\Browser\BrowserAuthService;
 
 use function SP\__;
 use function SP\logger;
diff --git a/lib/SP/Core/Definitions/CoreDefinitions.php b/lib/SP/Core/Definitions/CoreDefinitions.php
index 7161d867..ecdfb8e3 100644
--- a/lib/SP/Core/Definitions/CoreDefinitions.php
+++ b/lib/SP/Core/Definitions/CoreDefinitions.php
@@ -75,7 +75,27 @@ use SP\Domain\Install\Adapters\InstallDataFactory;
 use SP\Domain\Install\Services\DatabaseSetupInterface;
 use SP\Domain\Install\Services\MysqlSetupBuilder;
 use SP\Domain\Notification\Services\Mail;
-use SP\Domain\Providers\MailerInterface;
+use SP\Domain\Providers\Acl\AclHandler;
+use SP\Domain\Providers\Auth\AuthProvider;
+use SP\Domain\Providers\Auth\AuthProviderService;
+use SP\Domain\Providers\Auth\AuthType;
+use SP\Domain\Providers\Browser\BrowserAuth;
+use SP\Domain\Providers\Browser\BrowserAuthService;
+use SP\Domain\Providers\Database\DatabaseAuth;
+use SP\Domain\Providers\Database\DatabaseAuthService;
+use SP\Domain\Providers\Ldap\LdapActions;
+use SP\Domain\Providers\Ldap\LdapAuth;
+use SP\Domain\Providers\Ldap\LdapBase;
+use SP\Domain\Providers\Ldap\LdapConnection;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Log\DatabaseLogHandler;
+use SP\Domain\Providers\Log\FileLogHandler;
+use SP\Domain\Providers\Log\RemoteSyslogHandler;
+use SP\Domain\Providers\Log\SyslogHandler;
+use SP\Domain\Providers\Mail\MailHandler;
+use SP\Domain\Providers\Mail\PhpMailerWrapper;
+use SP\Domain\Providers\Notification\NotificationHandler;
+use SP\Domain\Providers\Ports\MailerInterface;
 use SP\Domain\Storage\Ports\FileCacheService;
 use SP\Html\Minify;
 use SP\Http\Client;
@@ -89,26 +109,6 @@ use SP\Infrastructure\File\FileHandler;
 use SP\Infrastructure\File\XmlFileStorage;
 use SP\Mvc\View\Template;
 use SP\Mvc\View\TemplateInterface;
-use SP\Providers\Acl\AclHandler;
-use SP\Providers\Auth\AuthProvider;
-use SP\Providers\Auth\AuthProviderService;
-use SP\Providers\Auth\AuthType;
-use SP\Providers\Auth\Browser\BrowserAuth;
-use SP\Providers\Auth\Browser\BrowserAuthService;
-use SP\Providers\Auth\Database\DatabaseAuth;
-use SP\Providers\Auth\Database\DatabaseAuthService;
-use SP\Providers\Auth\Ldap\LdapActions;
-use SP\Providers\Auth\Ldap\LdapAuth;
-use SP\Providers\Auth\Ldap\LdapBase;
-use SP\Providers\Auth\Ldap\LdapConnection;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Log\DatabaseLogHandler;
-use SP\Providers\Log\FileLogHandler;
-use SP\Providers\Log\RemoteSyslogHandler;
-use SP\Providers\Log\SyslogHandler;
-use SP\Providers\Mail\MailHandler;
-use SP\Providers\Mail\PhpMailerWrapper;
-use SP\Providers\Notification\NotificationHandler;
 
 use function DI\autowire;
 use function DI\create;
diff --git a/lib/SP/Core/Events/Event.php b/lib/SP/Core/Events/Event.php
index edccd08b..8391da8f 100644
--- a/lib/SP/Core/Events/Event.php
+++ b/lib/SP/Core/Events/Event.php
@@ -25,32 +25,31 @@
 namespace SP\Core\Events;
 
 use SP\Domain\Core\Exceptions\InvalidClassException;
-use SP\Domain\Core\Exceptions\SPException;
 
 /**
  * Class Event
  */
-class Event
+readonly class Event
 {
     public function __construct(
-        private readonly object        $source,
-        private readonly ?EventMessage $eventMessage = null
+        private object        $source,
+        private ?EventMessage $eventMessage = null
     ) {
     }
 
     /**
+     * @template T of object
+     *
+     * @param class-string<T>|null $type
+     * @return T&object
      * @throws InvalidClassException
      */
     public function getSource(?string $type = null): object
     {
-        if ($type !== null
-            && ($source = get_class($this->source)) !== $type
-            && !is_subclass_of($this->source, $type)
-        ) {
-            throw new InvalidClassException(
+        if ($type !== null && !is_a($this->source, $type)) {
+            throw InvalidClassException::error(
                 'Source type mismatch',
-                SPException::ERROR,
-                sprintf('Source: %s - Expected: %s', $source, $type)
+                sprintf('Source: %s - Expected: %s', get_class($this->source), $type)
             );
         }
 
diff --git a/lib/SP/Core/ProvidersHelper.php b/lib/SP/Core/ProvidersHelper.php
index b4826bd9..59fb7e44 100644
--- a/lib/SP/Core/ProvidersHelper.php
+++ b/lib/SP/Core/ProvidersHelper.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -24,14 +24,13 @@
 
 namespace SP\Core;
 
-use SP\Providers\Acl\AclHandler;
-use SP\Providers\Log\DatabaseLogHandler;
-use SP\Providers\Log\FileLogHandler;
-use SP\Providers\Log\RemoteSyslogHandler;
-use SP\Providers\Log\SyslogHandler;
-use SP\Providers\Mail\MailHandler;
-use SP\Providers\Notification\NotificationHandler;
-use SP\Providers\ProviderInterface;
+use SP\Domain\Providers\Acl\AclHandler;
+use SP\Domain\Providers\Log\DatabaseLogHandler;
+use SP\Domain\Providers\Log\FileLogHandler;
+use SP\Domain\Providers\Log\RemoteSyslogHandler;
+use SP\Domain\Providers\Log\SyslogHandler;
+use SP\Domain\Providers\Mail\MailHandler;
+use SP\Domain\Providers\Notification\NotificationHandler;
 
 /**
  * The Provider helper class will have oll the providers availabe in the application
@@ -52,57 +51,36 @@ final readonly class ProvidersHelper
 
     public function getFileLogHandler(): FileLogHandler
     {
-        self::ensureIsInitialized($this->fileLogHandler);
-
         return $this->fileLogHandler;
     }
 
-    private static function ensureIsInitialized(?ProviderInterface $provider = null): void
-    {
-        if ($provider !== null && !$provider->isInitialized()) {
-            $provider->initialize();
-        }
-    }
-
     public function getDatabaseLogHandler(): DatabaseLogHandler
     {
-        self::ensureIsInitialized($this->databaseLogHandler);
-
         return $this->databaseLogHandler;
     }
 
     public function getMailHandler(): MailHandler
     {
-        self::ensureIsInitialized($this->mailHandler);
-
         return $this->mailHandler;
     }
 
     public function getSyslogHandler(): SyslogHandler
     {
-        self::ensureIsInitialized($this->syslogHandler);
-
         return $this->syslogHandler;
     }
 
     public function getRemoteSyslogHandler(): RemoteSyslogHandler
     {
-        self::ensureIsInitialized($this->remoteSyslogHandler);
-
         return $this->remoteSyslogHandler;
     }
 
     public function getAclHandler(): AclHandler
     {
-        self::ensureIsInitialized($this->aclHandler);
-
         return $this->aclHandler;
     }
 
     public function getNotificationHandler(): NotificationHandler
     {
-        self::ensureIsInitialized($this->notificationHandler);
-
         return $this->notificationHandler;
     }
 }
diff --git a/lib/SP/Domain/Auth/Ports/LdapActionsService.php b/lib/SP/Domain/Auth/Ports/LdapActionsService.php
index 8bd3fb13..03f386dc 100644
--- a/lib/SP/Domain/Auth/Ports/LdapActionsService.php
+++ b/lib/SP/Domain/Auth/Ports/LdapActionsService.php
@@ -24,15 +24,15 @@
 
 namespace SP\Domain\Auth\Ports;
 
-use SP\Providers\Auth\Ldap\AttributeCollection;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\AttributeCollection;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
 
 /**
  * Class LdapActions
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 interface LdapActionsService
 {
diff --git a/lib/SP/Domain/Auth/Ports/LdapAuthService.php b/lib/SP/Domain/Auth/Ports/LdapAuthService.php
index c3005173..de647c41 100644
--- a/lib/SP/Domain/Auth/Ports/LdapAuthService.php
+++ b/lib/SP/Domain/Auth/Ports/LdapAuthService.php
@@ -24,8 +24,8 @@
 
 namespace SP\Domain\Auth\Ports;
 
-use SP\Providers\Auth\AuthService;
-use SP\Providers\Auth\Ldap\LdapAuthData;
+use SP\Domain\Providers\Auth\AuthService;
+use SP\Domain\Providers\Ldap\LdapAuthData;
 
 /**
  * Class LdapBase
diff --git a/lib/SP/Domain/Auth/Ports/LdapCheckService.php b/lib/SP/Domain/Auth/Ports/LdapCheckService.php
index 98296ed0..86c86c29 100644
--- a/lib/SP/Domain/Auth/Ports/LdapCheckService.php
+++ b/lib/SP/Domain/Auth/Ports/LdapCheckService.php
@@ -26,7 +26,7 @@ namespace SP\Domain\Auth\Ports;
 
 
 use SP\Domain\Auth\Dtos\LdapCheckResults;
-use SP\Providers\Auth\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapException;
 
 /**
  * Class LdapCheckService
diff --git a/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php b/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
index 5ed4acc9..f4da3a3a 100644
--- a/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
+++ b/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -24,8 +24,8 @@
 
 namespace SP\Domain\Auth\Ports;
 
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
 
 /**
  * Interface LdapInterface
diff --git a/lib/SP/Domain/Auth/Ports/LdapService.php b/lib/SP/Domain/Auth/Ports/LdapService.php
index 689d26e5..625d7fd7 100644
--- a/lib/SP/Domain/Auth/Ports/LdapService.php
+++ b/lib/SP/Domain/Auth/Ports/LdapService.php
@@ -25,12 +25,12 @@
 namespace SP\Domain\Auth\Ports;
 
 
-use SP\Providers\Auth\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapException;
 
 /**
  * Interface LdapInterface
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 interface LdapService
 {
diff --git a/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php b/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
index 8b949fc5..cf16b1e8 100644
--- a/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
+++ b/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
@@ -26,9 +26,9 @@ namespace SP\Domain\Auth\Ports;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Services\AuthException;
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
 
 /**
  * Class LoginDatabase
diff --git a/lib/SP/Domain/Auth/Ports/LoginService.php b/lib/SP/Domain/Auth/Ports/LoginService.php
index 399e5e1b..eec111d4 100644
--- a/lib/SP/Domain/Auth/Ports/LoginService.php
+++ b/lib/SP/Domain/Auth/Ports/LoginService.php
@@ -26,7 +26,7 @@ namespace SP\Domain\Auth\Ports;
 
 use SP\Domain\Auth\Dtos\LoginResponseDto;
 use SP\Domain\Auth\Services\AuthException;
-use SP\Providers\Auth\AuthResult;
+use SP\Domain\Providers\Auth\AuthResult;
 
 /**
  * Interface LoginService
diff --git a/lib/SP/Domain/Auth/Services/LdapCheck.php b/lib/SP/Domain/Auth/Services/LdapCheck.php
index 706a0df8..fefed4e7 100644
--- a/lib/SP/Domain/Auth/Services/LdapCheck.php
+++ b/lib/SP/Domain/Auth/Services/LdapCheck.php
@@ -31,9 +31,9 @@ use SP\Domain\Auth\Ports\LdapCheckService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
 use SP\Domain\Auth\Ports\LdapService;
 use SP\Domain\Common\Services\Service;
-use SP\Providers\Auth\Ldap\LdapBase;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapBase;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
 
 /**
  * Class LdapCheck
diff --git a/lib/SP/Domain/Auth/Services/Login.php b/lib/SP/Domain/Auth/Services/Login.php
index 99fdf4e5..28ddfddc 100644
--- a/lib/SP/Domain/Auth/Services/Login.php
+++ b/lib/SP/Domain/Auth/Services/Login.php
@@ -39,14 +39,14 @@ use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\LanguageInterface;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Auth\AuthProviderService;
+use SP\Domain\Providers\Auth\AuthResult;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Providers\Auth\AuthProviderService;
-use SP\Providers\Auth\AuthResult;
 
 use function SP\__u;
 
@@ -75,7 +75,6 @@ final class Login extends LoginBase implements LoginService
         parent::__construct($application, $trackService, $request);
 
         $this->userLoginDto = new UserLoginDto();
-        $this->authProviderService->initialize();
     }
 
     /**
diff --git a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
index ea919d4b..8aeb75d3 100644
--- a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
+++ b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
@@ -36,15 +36,15 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Auth\AuthType;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Providers\Ldap\LdapCodeEnum;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserLoginRequest;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\DuplicatedItemException;
-use SP\Providers\Auth\AuthType;
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
-use SP\Providers\Auth\Ldap\LdapCodeEnum;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/Common/Services/Service.php b/lib/SP/Domain/Common/Services/Service.php
index aaa5ec25..0735888f 100644
--- a/lib/SP/Domain/Common/Services/Service.php
+++ b/lib/SP/Domain/Common/Services/Service.php
@@ -82,7 +82,6 @@ abstract class Service
 
     /**
      * @throws ServiceException
-     * @throws CryptException
      */
     final protected function setMasterKeyInContext(string $masterPass): void
     {
@@ -92,7 +91,7 @@ abstract class Service
             } else {
                 $this->context->setTrasientKey('_masterpass', $masterPass);
             }
-        } catch (ContextException|CryptoException $e) {
+        } catch (ContextException|CryptException $e) {
             logger($e->getMessage());
 
             throw new ServiceException(__u('Error while setting master password in context'));
diff --git a/lib/SP/Domain/Config/Services/UpgradeConfig.php b/lib/SP/Domain/Config/Services/UpgradeConfig.php
index ba34b13c..a17a677f 100644
--- a/lib/SP/Domain/Config/Services/UpgradeConfig.php
+++ b/lib/SP/Domain/Config/Services/UpgradeConfig.php
@@ -26,7 +26,7 @@ namespace SP\Domain\Config\Services;
 
 use SP\Core\Application;
 use SP\Domain\Config\Ports\UpgradeConfigService;
-use SP\Domain\Providers\FileLogHandlerProvider;
+use SP\Domain\Providers\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Services\UpgradeBase;
 
 /**
diff --git a/lib/SP/Domain/Import/Ports/LdapImportService.php b/lib/SP/Domain/Import/Ports/LdapImportService.php
index 15ab8970..5192a11b 100644
--- a/lib/SP/Domain/Import/Ports/LdapImportService.php
+++ b/lib/SP/Domain/Import/Ports/LdapImportService.php
@@ -26,8 +26,8 @@ namespace SP\Domain\Import\Ports;
 
 use SP\Domain\Import\Dtos\LdapImportParamsDto;
 use SP\Domain\Import\Dtos\LdapImportResultsDto;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
 
 /**
  * Class UserLdapService
diff --git a/lib/SP/Domain/Import/Services/LdapImport.php b/lib/SP/Domain/Import/Services/LdapImport.php
index 60627457..6535fc2a 100644
--- a/lib/SP/Domain/Import/Services/LdapImport.php
+++ b/lib/SP/Domain/Import/Services/LdapImport.php
@@ -35,14 +35,14 @@ use SP\Domain\Common\Services\Service;
 use SP\Domain\Import\Dtos\LdapImportParamsDto;
 use SP\Domain\Import\Dtos\LdapImportResultsDto;
 use SP\Domain\Import\Ports\LdapImportService;
+use SP\Domain\Providers\Ldap\LdapBase;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
 use SP\Domain\User\Models\User;
 use SP\Domain\User\Models\UserGroup;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserService;
-use SP\Providers\Auth\Ldap\LdapBase;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/Notification/Ports/MailService.php b/lib/SP/Domain/Notification/Ports/MailService.php
index c793349f..96994448 100644
--- a/lib/SP/Domain/Notification/Ports/MailService.php
+++ b/lib/SP/Domain/Notification/Ports/MailService.php
@@ -28,7 +28,7 @@ use PHPMailer\PHPMailer\Exception;
 use SP\Core\Messages\MailMessage;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Providers\Mail\MailParams;
+use SP\Domain\Providers\Mail\MailParams;
 
 /**
  * Class MailService
diff --git a/lib/SP/Domain/Notification/Services/Mail.php b/lib/SP/Domain/Notification/Services/Mail.php
index 765270f8..aa82e2bc 100644
--- a/lib/SP/Domain/Notification/Services/Mail.php
+++ b/lib/SP/Domain/Notification/Services/Mail.php
@@ -35,9 +35,9 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Notification\Ports\MailService;
-use SP\Domain\Providers\MailerInterface;
+use SP\Domain\Providers\Mail\MailParams;
+use SP\Domain\Providers\Ports\MailerInterface;
 use SP\Html\Html;
-use SP\Providers\Mail\MailParams;
 
 use function SP\__u;
 use function SP\processException;
diff --git a/lib/SP/Providers/Acl/AclHandler.php b/lib/SP/Domain/Providers/Acl/AclHandler.php
similarity index 95%
rename from lib/SP/Providers/Acl/AclHandler.php
rename to lib/SP/Domain/Providers/Acl/AclHandler.php
index df7cb8b1..86a76b03 100644
--- a/lib/SP/Providers/Acl/AclHandler.php
+++ b/lib/SP/Domain/Providers/Acl/AclHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Acl;
+namespace SP\Domain\Providers\Acl;
 
 use Exception;
 use SP\Core\Application;
@@ -31,10 +31,10 @@ use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Core\Exceptions\FileNotFoundException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Provider;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserProfileService;
-use SP\Providers\EventsTrait;
-use SP\Providers\Provider;
 use SP\Util\FileSystemUtil;
 
 use function SP\__u;
@@ -43,8 +43,6 @@ use function SP\processException;
 
 /**
  * Class AclHandler
- *
- * @package SP\Providers\Acl
  */
 final class AclHandler extends Provider implements EventReceiver
 {
@@ -58,7 +56,7 @@ final class AclHandler extends Provider implements EventReceiver
         'delete.user.selection',
     ];
 
-    private string $events;
+    private readonly string $events;
 
     public function __construct(
         Application                         $application,
@@ -66,6 +64,16 @@ final class AclHandler extends Provider implements EventReceiver
         private readonly UserGroupService   $userGroupService
     ) {
         parent::__construct($application);
+
+        $this->setup();
+    }
+
+    /**
+     * @return void
+     */
+    private function setup(): void
+    {
+        $this->events = $this->parseEventsToRegex(self::EVENTS);
     }
 
     /**
@@ -190,10 +198,4 @@ final class AclHandler extends Provider implements EventReceiver
             processException($e);
         }
     }
-
-    public function initialize(): void
-    {
-        $this->events = $this->parseEventsToRegex(self::EVENTS);
-        $this->initialized = true;
-    }
 }
diff --git a/lib/SP/Providers/Auth/AuthDataBase.php b/lib/SP/Domain/Providers/Auth/AuthDataBase.php
similarity index 98%
rename from lib/SP/Providers/Auth/AuthDataBase.php
rename to lib/SP/Domain/Providers/Auth/AuthDataBase.php
index 0e3ea6ef..8dbeab35 100644
--- a/lib/SP/Providers/Auth/AuthDataBase.php
+++ b/lib/SP/Domain/Providers/Auth/AuthDataBase.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
 use SP\Domain\User\Dtos\UserDataDto;
 
diff --git a/lib/SP/Providers/Auth/AuthProvider.php b/lib/SP/Domain/Providers/Auth/AuthProvider.php
similarity index 94%
rename from lib/SP/Providers/Auth/AuthProvider.php
rename to lib/SP/Domain/Providers/Auth/AuthProvider.php
index c3e6c59f..6fa9b3dd 100644
--- a/lib/SP/Providers/Auth/AuthProvider.php
+++ b/lib/SP/Domain/Providers/Auth/AuthProvider.php
@@ -22,13 +22,13 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
 use SP\Core\Application;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Services\AuthException;
+use SP\Domain\Providers\Provider;
 use SP\Domain\User\Dtos\UserDataDto;
-use SP\Providers\Provider;
 use SplObjectStorage;
 
 use function SP\__u;
@@ -54,14 +54,6 @@ final class AuthProvider extends Provider implements AuthProviderService
         $this->auths = new SplObjectStorage();
     }
 
-    /**
-     * Auth initializer
-     *
-     */
-    public function initialize(): void
-    {
-    }
-
     /**
      * Register authentication methods
      *
diff --git a/lib/SP/Providers/Auth/AuthProviderService.php b/lib/SP/Domain/Providers/Auth/AuthProviderService.php
similarity index 97%
rename from lib/SP/Providers/Auth/AuthProviderService.php
rename to lib/SP/Domain/Providers/Auth/AuthProviderService.php
index edd87f86..96e2a36c 100644
--- a/lib/SP/Providers/Auth/AuthProviderService.php
+++ b/lib/SP/Domain/Providers/Auth/AuthProviderService.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\User\Dtos\UserDataDto;
diff --git a/lib/SP/Providers/Auth/AuthResult.php b/lib/SP/Domain/Providers/Auth/AuthResult.php
similarity index 87%
rename from lib/SP/Providers/Auth/AuthResult.php
rename to lib/SP/Domain/Providers/Auth/AuthResult.php
index 116c41b6..0aeb5f6b 100644
--- a/lib/SP/Providers/Auth/AuthResult.php
+++ b/lib/SP/Domain/Providers/Auth/AuthResult.php
@@ -22,11 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
 
 /**
  * Class AuthResult
diff --git a/lib/SP/Providers/Auth/AuthService.php b/lib/SP/Domain/Providers/Auth/AuthService.php
similarity index 97%
rename from lib/SP/Providers/Auth/AuthService.php
rename to lib/SP/Domain/Providers/Auth/AuthService.php
index c009b86d..bf9f46ea 100644
--- a/lib/SP/Providers/Auth/AuthService.php
+++ b/lib/SP/Domain/Providers/Auth/AuthService.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 
diff --git a/lib/SP/Providers/Auth/AuthType.php b/lib/SP/Domain/Providers/Auth/AuthType.php
similarity index 96%
rename from lib/SP/Providers/Auth/AuthType.php
rename to lib/SP/Domain/Providers/Auth/AuthType.php
index 1067a6dd..7b51017d 100644
--- a/lib/SP/Providers/Auth/AuthType.php
+++ b/lib/SP/Domain/Providers/Auth/AuthType.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth;
+namespace SP\Domain\Providers\Auth;
 
 /**
  * Class AuthType
diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuth.php b/lib/SP/Domain/Providers/Browser/BrowserAuth.php
similarity index 98%
rename from lib/SP/Providers/Auth/Browser/BrowserAuth.php
rename to lib/SP/Domain/Providers/Browser/BrowserAuth.php
index 67a9d316..75a3d8ce 100644
--- a/lib/SP/Providers/Auth/Browser/BrowserAuth.php
+++ b/lib/SP/Domain/Providers/Browser/BrowserAuth.php
@@ -22,12 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Browser;
+namespace SP\Domain\Providers\Browser;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Http\RequestInterface;
-use SP\Providers\Auth\AuthService;
+use SP\Domain\Providers\Auth\AuthService;
 
 /**
  * Class Browser
diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php b/lib/SP/Domain/Providers/Browser/BrowserAuthData.php
similarity index 81%
rename from lib/SP/Providers/Auth/Browser/BrowserAuthData.php
rename to lib/SP/Domain/Providers/Browser/BrowserAuthData.php
index 571cc755..0d4f0a67 100644
--- a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php
+++ b/lib/SP/Domain/Providers/Browser/BrowserAuthData.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,16 +22,16 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Browser;
+namespace SP\Domain\Providers\Browser;
 
-use SP\Providers\Auth\AuthDataBase;
+use SP\Domain\Providers\Auth\AuthDataBase;
 
 /**
  * Class BrowserAuthData
  *
- * @package SP\Providers\Auth\Browser
+ * @package SP\Domain\Providers\Browser
  */
 final class BrowserAuthData extends AuthDataBase
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuthService.php b/lib/SP/Domain/Providers/Browser/BrowserAuthService.php
similarity index 94%
rename from lib/SP/Providers/Auth/Browser/BrowserAuthService.php
rename to lib/SP/Domain/Providers/Browser/BrowserAuthService.php
index 3f210d73..b46400d8 100644
--- a/lib/SP/Providers/Auth/Browser/BrowserAuthService.php
+++ b/lib/SP/Domain/Providers/Browser/BrowserAuthService.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Browser;
+namespace SP\Domain\Providers\Browser;
 
-use SP\Providers\Auth\AuthService;
+use SP\Domain\Providers\Auth\AuthService;
 
 /**
  * Class Browser
diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuth.php b/lib/SP/Domain/Providers/Database/DatabaseAuth.php
similarity index 98%
rename from lib/SP/Providers/Auth/Database/DatabaseAuth.php
rename to lib/SP/Domain/Providers/Database/DatabaseAuth.php
index d3ba3d61..4809d78c 100644
--- a/lib/SP/Providers/Auth/Database/DatabaseAuth.php
+++ b/lib/SP/Domain/Providers/Database/DatabaseAuth.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Database;
+namespace SP\Domain\Providers\Database;
 
 use Exception;
 use SP\Core\Crypt\Hash;
diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php b/lib/SP/Domain/Providers/Database/DatabaseAuthData.php
similarity index 85%
rename from lib/SP/Providers/Auth/Database/DatabaseAuthData.php
rename to lib/SP/Domain/Providers/Database/DatabaseAuthData.php
index d88c22e8..451b0c2d 100644
--- a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php
+++ b/lib/SP/Domain/Providers/Database/DatabaseAuthData.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Database;
+namespace SP\Domain\Providers\Database;
 
-use SP\Providers\Auth\AuthDataBase;
+use SP\Domain\Providers\Auth\AuthDataBase;
 
 /**
  * Class DatabaseAuthData
@@ -34,4 +34,4 @@ use SP\Providers\Auth\AuthDataBase;
 final class DatabaseAuthData extends AuthDataBase
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuthService.php b/lib/SP/Domain/Providers/Database/DatabaseAuthService.php
similarity index 93%
rename from lib/SP/Providers/Auth/Database/DatabaseAuthService.php
rename to lib/SP/Domain/Providers/Database/DatabaseAuthService.php
index b2ca5b83..4c2577cb 100644
--- a/lib/SP/Providers/Auth/Database/DatabaseAuthService.php
+++ b/lib/SP/Domain/Providers/Database/DatabaseAuthService.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Database;
+namespace SP\Domain\Providers\Database;
 
-use SP\Providers\Auth\AuthService;
+use SP\Domain\Providers\Auth\AuthService;
 
 /**
  * Class Database
diff --git a/lib/SP/Providers/EventsTrait.php b/lib/SP/Domain/Providers/EventsTrait.php
similarity index 89%
rename from lib/SP/Providers/EventsTrait.php
rename to lib/SP/Domain/Providers/EventsTrait.php
index f41cbc01..5ae985c6 100644
--- a/lib/SP/Providers/EventsTrait.php
+++ b/lib/SP/Domain/Providers/EventsTrait.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,12 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers;
+namespace SP\Domain\Providers;
 
 /**
  * Trait EventsTrait
- *
- * @package SP\Providers
  */
 trait EventsTrait
 {
@@ -40,4 +38,4 @@ trait EventsTrait
     {
         return implode('|', array_map('preg_quote', $events));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Auth/Ldap/AttributeCollection.php b/lib/SP/Domain/Providers/Ldap/AttributeCollection.php
similarity index 86%
rename from lib/SP/Providers/Auth/Ldap/AttributeCollection.php
rename to lib/SP/Domain/Providers/Ldap/AttributeCollection.php
index cbf55d0d..b281071f 100644
--- a/lib/SP/Providers/Auth/Ldap/AttributeCollection.php
+++ b/lib/SP/Domain/Providers/Ldap/AttributeCollection.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,16 +22,16 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Core\DataCollection;
 
 /**
  * Class AttributeCollection
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class AttributeCollection extends DataCollection
 {
 
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Auth/Ldap/LdapActions.php b/lib/SP/Domain/Providers/Ldap/LdapActions.php
similarity index 99%
rename from lib/SP/Providers/Auth/Ldap/LdapActions.php
rename to lib/SP/Domain/Providers/Ldap/LdapActions.php
index 0d122e4b..bc19de85 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapActions.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapActions.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use Laminas\Ldap\Collection;
 use Laminas\Ldap\Exception\LdapException as LaminasLdapException;
@@ -37,7 +37,7 @@ use function SP\__u;
 /**
  * Class LdapActions
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class LdapActions implements LdapActionsService
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapAuth.php b/lib/SP/Domain/Providers/Ldap/LdapAuth.php
similarity index 99%
rename from lib/SP/Providers/Auth/Ldap/LdapAuth.php
rename to lib/SP/Domain/Providers/Ldap/LdapAuth.php
index 05a37d98..e8dd73f6 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapAuth.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapAuth.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventDispatcher;
diff --git a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php b/lib/SP/Domain/Providers/Ldap/LdapAuthData.php
similarity index 89%
rename from lib/SP/Providers/Auth/Ldap/LdapAuthData.php
rename to lib/SP/Domain/Providers/Ldap/LdapAuthData.php
index 0d29ba4b..3129b29c 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapAuthData.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
-use SP\Providers\Auth\AuthDataBase;
+use SP\Domain\Providers\Auth\AuthDataBase;
 
 /**
  * Class LdapUserData
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class LdapAuthData extends AuthDataBase
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapBase.php b/lib/SP/Domain/Providers/Ldap/LdapBase.php
similarity index 98%
rename from lib/SP/Providers/Auth/Ldap/LdapBase.php
rename to lib/SP/Domain/Providers/Ldap/LdapBase.php
index 2768f8e8..f5e6fe3c 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapBase.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapBase.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use Exception;
 use SP\Core\Events\EventDispatcher;
@@ -36,7 +36,7 @@ use function SP\__u;
 /**
  * Class LdapBase
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 abstract class LdapBase implements LdapService
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapCodeEnum.php b/lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php
similarity index 91%
rename from lib/SP/Providers/Auth/Ldap/LdapCodeEnum.php
rename to lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php
index 830856ed..1bc36c86 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapCodeEnum.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 /**
  * Class LdapCodeEnum
diff --git a/lib/SP/Providers/Auth/Ldap/LdapConnection.php b/lib/SP/Domain/Providers/Ldap/LdapConnection.php
similarity index 97%
rename from lib/SP/Providers/Auth/Ldap/LdapConnection.php
rename to lib/SP/Domain/Providers/Ldap/LdapConnection.php
index bda6ee17..3caf167e 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapConnection.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapConnection.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use Laminas\Ldap\Exception\LdapException as LaminasLdapException;
 use Laminas\Ldap\Ldap as LaminasLdap;
@@ -38,7 +38,7 @@ use function SP\__u;
 /**
  * Class LdapConnection
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class LdapConnection implements LdapConnectionInterface
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapException.php b/lib/SP/Domain/Providers/Ldap/LdapException.php
similarity index 86%
rename from lib/SP/Providers/Auth/Ldap/LdapException.php
rename to lib/SP/Domain/Providers/Ldap/LdapException.php
index f3972aba..726f0346 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapException.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapException.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Domain\Core\Exceptions\SPException;
 
 /**
  * Class LdapException
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class LdapException extends SPException
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php b/lib/SP/Domain/Providers/Ldap/LdapMsAds.php
similarity index 99%
rename from lib/SP/Providers/Auth/Ldap/LdapMsAds.php
rename to lib/SP/Domain/Providers/Ldap/LdapMsAds.php
index 721025a2..3ead5b64 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapMsAds.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
diff --git a/lib/SP/Providers/Auth/Ldap/LdapParams.php b/lib/SP/Domain/Providers/Ldap/LdapParams.php
similarity index 97%
rename from lib/SP/Providers/Auth/Ldap/LdapParams.php
rename to lib/SP/Domain/Providers/Ldap/LdapParams.php
index 9b456730..9c174165 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapParams.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapParams.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
@@ -32,7 +32,7 @@ use function SP\__u;
 /**
  * Class LdapParams
  *
- * @package SP\Providers\Auth\Ldap
+ * @package SP\Domain\Providers\Ldap
  */
 final class LdapParams
 {
diff --git a/lib/SP/Providers/Auth/Ldap/LdapResults.php b/lib/SP/Domain/Providers/Ldap/LdapResults.php
similarity index 96%
rename from lib/SP/Providers/Auth/Ldap/LdapResults.php
rename to lib/SP/Domain/Providers/Ldap/LdapResults.php
index 6fa37656..abe68ccf 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapResults.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapResults.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use Iterator;
 
diff --git a/lib/SP/Providers/Auth/Ldap/LdapStd.php b/lib/SP/Domain/Providers/Ldap/LdapStd.php
similarity index 99%
rename from lib/SP/Providers/Auth/Ldap/LdapStd.php
rename to lib/SP/Domain/Providers/Ldap/LdapStd.php
index 3cba99ae..71ccd701 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapStd.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapStd.php
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
diff --git a/lib/SP/Providers/Auth/Ldap/LdapTypeEnum.php b/lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php
similarity index 89%
rename from lib/SP/Providers/Auth/Ldap/LdapTypeEnum.php
rename to lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php
index 0802372e..6caa59e5 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapTypeEnum.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 /**
  * Class LdapTypeEnum
diff --git a/lib/SP/Providers/Auth/Ldap/LdapUtil.php b/lib/SP/Domain/Providers/Ldap/LdapUtil.php
similarity index 94%
rename from lib/SP/Providers/Auth/Ldap/LdapUtil.php
rename to lib/SP/Domain/Providers/Ldap/LdapUtil.php
index 95f751e8..34998743 100644
--- a/lib/SP/Providers/Auth/Ldap/LdapUtil.php
+++ b/lib/SP/Domain/Providers/Ldap/LdapUtil.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Providers\Auth\Ldap;
+namespace SP\Domain\Providers\Ldap;
 
 /**
  * Class LdapUtil
diff --git a/lib/SP/Providers/Log/DatabaseLogHandler.php b/lib/SP/Domain/Providers/Log/DatabaseLogHandler.php
similarity index 69%
rename from lib/SP/Providers/Log/DatabaseLogHandler.php
rename to lib/SP/Domain/Providers/Log/DatabaseLogHandler.php
index 0e94c789..2051b624 100644
--- a/lib/SP/Providers/Log/DatabaseLogHandler.php
+++ b/lib/SP/Domain/Providers/Log/DatabaseLogHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 use Exception;
 use SP\Core\Application;
@@ -31,10 +31,10 @@ use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Core\Exceptions\InvalidClassException;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\LanguageInterface;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Provider;
 use SP\Domain\Security\Models\Eventlog;
 use SP\Domain\Security\Ports\EventlogService;
-use SP\Providers\EventsTrait;
-use SP\Providers\Provider;
 
 use function SP\__;
 use function SP\processException;
@@ -42,13 +42,13 @@ use function SP\processException;
 /**
  * Class LogHandler
  *
- * @package SP\Providers\Log
+ * @package SP\Domain\Providers\Log
  */
 final class DatabaseLogHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
-    private string $events;
+    private readonly string $events;
 
     public function __construct(
         Application                        $application,
@@ -75,31 +75,29 @@ final class DatabaseLogHandler extends Provider implements EventReceiver
 
         $this->language->setAppLocales();
 
-        $eventlogData = new Eventlog();
-        $eventlogData->setAction($eventType);
-        $eventlogData->setLevel('INFO');
+        $properties = ['action' => $eventType, 'level' => 'INFO'];
 
         $source = $event->getSource();
 
         if ($source instanceof SPException) {
-            $eventlogData->setLevel('ERROR');
+            $properties['level'] = 'ERROR';
 
             $hint = $source->getHint();
 
             if ($hint !== null) {
-                $eventlogData->setDescription(__($source->getMessage()) . PHP_EOL . $hint);
+                $properties['description'] = __($source->getMessage()) . PHP_EOL . $hint;
             } else {
-                $eventlogData->setDescription(__($source->getMessage()));
+                $properties['description'] = __($source->getMessage());
             }
         } elseif ($source instanceof Exception) {
-            $eventlogData->setLevel('ERROR');
-            $eventlogData->setDescription(__($source->getMessage()));
+            $properties['level'] = 'ERROR';
+            $properties['description'] = __($source->getMessage());
         } elseif (($eventMessage = $event->getEventMessage()) !== null) {
-            $eventlogData->setDescription($eventMessage->composeText());
+            $properties['description'] = $eventMessage->composeText();
         }
 
         try {
-            $this->eventlogService->create($eventlogData);
+            $this->eventlogService->create(new Eventlog($properties));
         } catch (Exception $e) {
             processException($e);
         }
@@ -116,17 +114,4 @@ final class DatabaseLogHandler extends Provider implements EventReceiver
     {
         return $this->events;
     }
-
-    public function initialize(): void
-    {
-        $configEvents = $this->config->getConfigData()->getLogEvents();
-
-        if (count($configEvents) === 0) {
-            $this->events = $this->parseEventsToRegex(LogInterface::EVENTS_FIXED);
-        } else {
-            $this->events = $this->parseEventsToRegex(array_merge($configEvents, LogInterface::EVENTS_FIXED));
-        }
-
-        $this->initialized = true;
-    }
 }
diff --git a/lib/SP/Providers/Log/FileLogHandler.php b/lib/SP/Domain/Providers/Log/FileLogHandler.php
similarity index 78%
rename from lib/SP/Providers/Log/FileLogHandler.php
rename to lib/SP/Domain/Providers/Log/FileLogHandler.php
index 29a0a4de..51e01b04 100644
--- a/lib/SP/Providers/Log/FileLogHandler.php
+++ b/lib/SP/Domain/Providers/Log/FileLogHandler.php
@@ -22,35 +22,29 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 use Monolog\Handler\StreamHandler;
-use SP\Domain\Providers\FileLogHandlerProvider;
-use SP\Providers\EventsTrait;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Ports\FileLogHandlerProvider;
 
 /**
  * Class FileLogHandler
- *
- * @package SP\Providers\Log
  */
 final class FileLogHandler extends LoggerBase implements FileLogHandlerProvider
 {
     use EventsTrait;
 
     /**
-     * Devuelve los eventos que implementa el observador en formato cadena
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getEventsString(): string
     {
         return $this->events;
     }
 
-    public function initialize(): void
+    protected function setup(): void
     {
         $this->logger->pushHandler(new StreamHandler(LOG_FILE));
-
-        parent::initialize();
     }
 }
diff --git a/lib/SP/Providers/Log/LogInterface.php b/lib/SP/Domain/Providers/Log/LogInterface.php
similarity index 93%
rename from lib/SP/Providers/Log/LogInterface.php
rename to lib/SP/Domain/Providers/Log/LogInterface.php
index d3e5471c..df2e92c9 100644
--- a/lib/SP/Providers/Log/LogInterface.php
+++ b/lib/SP/Domain/Providers/Log/LogInterface.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,12 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 /**
  * Interface LogInterface
- *
- * @package SP\Providers\Log
  */
 interface LogInterface
 {
@@ -70,4 +68,4 @@ interface LogInterface
         'run.import.start',
         'run.import.end',
     ];
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Log/LoggerBase.php b/lib/SP/Domain/Providers/Log/LoggerBase.php
similarity index 83%
rename from lib/SP/Providers/Log/LoggerBase.php
rename to lib/SP/Domain/Providers/Log/LoggerBase.php
index df2cc804..c2c2184a 100644
--- a/lib/SP/Providers/Log/LoggerBase.php
+++ b/lib/SP/Domain/Providers/Log/LoggerBase.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,54 +22,39 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 use Exception;
 use Monolog\Logger;
 use SP\Core\Application;
 use SP\Core\Events\Event;
-use SP\Core\Language;
 use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Core\Exceptions\InvalidClassException;
 use SP\Domain\Core\LanguageInterface;
 use SP\Domain\Http\RequestInterface;
-use SP\Http\Request;
-use SP\Providers\EventsTrait;
-use SP\Providers\Provider;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Provider;
 
+use function SP\__;
 use function SP\getLastCaller;
 
 /**
  * Class LoggerBase
- *
- * @package SP\Providers\Log
  */
 abstract class LoggerBase extends Provider implements EventReceiver
 {
     use EventsTrait;
 
-    protected Logger   $logger;
-    protected Language $language;
-    protected Request  $request;
-    protected ?string  $events = null;
+    protected readonly string $events;
 
     public function __construct(
-        Application      $application,
-        Logger           $logger,
-        LanguageInterface $language,
-        RequestInterface $request
+        Application                          $application,
+        protected readonly Logger            $logger,
+        protected readonly LanguageInterface $language,
+        protected readonly RequestInterface  $request
     ) {
-        $this->logger = $logger;
-        $this->language = $language;
-        $this->request = $request;
-
         parent::__construct($application);
-    }
 
-    /**
-     */
-    public function initialize(): void
-    {
         $configEvents = $this->config->getConfigData()->getLogEvents();
 
         if (count($configEvents) === 0) {
@@ -78,9 +63,11 @@ abstract class LoggerBase extends Provider implements EventReceiver
             $this->events = $this->parseEventsToRegex(array_merge($configEvents, LogInterface::EVENTS_FIXED));
         }
 
-        $this->initialized = true;
+        $this->setup();
     }
 
+    abstract protected function setup(): void;
+
     /**
      * Evento de actualización
      *
diff --git a/lib/SP/Providers/Log/RemoteSyslogHandler.php b/lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php
similarity index 82%
rename from lib/SP/Providers/Log/RemoteSyslogHandler.php
rename to lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php
index 76ebd95e..9c2683ed 100644
--- a/lib/SP/Providers/Log/RemoteSyslogHandler.php
+++ b/lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 use Monolog\Handler\SyslogUdpHandler;
 use Monolog\Logger;
@@ -30,22 +30,19 @@ use Monolog\Logger;
 /**
  * Class RemoteSyslogHandler
  *
- * @package SP\Providers\Log
+ * @package SP\Domain\Providers\Log
  */
 final class RemoteSyslogHandler extends LoggerBase
 {
     /**
-     * Devuelve los eventos que implementa el observador en formato cadena
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getEventsString(): string
     {
         return $this->events;
     }
 
-
-    public function initialize(): void
+    protected function setup(): void
     {
         $configData = $this->config->getConfigData();
 
@@ -59,7 +56,5 @@ final class RemoteSyslogHandler extends LoggerBase
                 'syspass'
             )
         );
-
-        parent::initialize();
     }
 }
diff --git a/lib/SP/Providers/Log/SyslogHandler.php b/lib/SP/Domain/Providers/Log/SyslogHandler.php
similarity index 77%
rename from lib/SP/Providers/Log/SyslogHandler.php
rename to lib/SP/Domain/Providers/Log/SyslogHandler.php
index 4630e170..631a6a1a 100644
--- a/lib/SP/Providers/Log/SyslogHandler.php
+++ b/lib/SP/Domain/Providers/Log/SyslogHandler.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,33 +22,25 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Log;
+namespace SP\Domain\Providers\Log;
 
 use Monolog\Handler\SyslogHandler as MSyslogHandler;
 
 /**
  * Class SyslogHandler
- *
- * @package SP\Providers\Log
  */
 final class SyslogHandler extends LoggerBase
 {
     /**
-     * Devuelve los eventos que implementa el observador en formato cadena
-     *
-     * @return string
+     * @inheritDoc
      */
     public function getEventsString(): string
     {
         return $this->events;
     }
 
-    /**
-     */
-    public function initialize(): void
+    protected function setup(): void
     {
         $this->logger->pushHandler(new MSyslogHandler('syspass'));
-
-        parent::initialize();
     }
 }
diff --git a/lib/SP/Providers/Mail/MailHandler.php b/lib/SP/Domain/Providers/Mail/MailHandler.php
similarity index 95%
rename from lib/SP/Providers/Mail/MailHandler.php
rename to lib/SP/Domain/Providers/Mail/MailHandler.php
index 184b6b71..585a93a0 100644
--- a/lib/SP/Providers/Mail/MailHandler.php
+++ b/lib/SP/Domain/Providers/Mail/MailHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Mail;
+namespace SP\Domain\Providers\Mail;
 
 use Exception;
 use SP\Core\Application;
@@ -32,16 +32,14 @@ use SP\Core\Messages\TextFormatter;
 use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Http\RequestInterface;
 use SP\Domain\Notification\Ports\MailService;
-use SP\Providers\EventsTrait;
-use SP\Providers\Provider;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Provider;
 
 use function SP\__;
 use function SP\processException;
 
 /**
  * Class MailHandler
- *
- * @package SP\Providers\Mail
  */
 final class MailHandler extends Provider implements EventReceiver
 {
@@ -68,7 +66,7 @@ final class MailHandler extends Provider implements EventReceiver
         'create.tempMasterPassword',
     ];
 
-    private string $events;
+    private readonly string $events;
 
     public function __construct(
         Application                       $application,
@@ -76,6 +74,19 @@ final class MailHandler extends Provider implements EventReceiver
         private readonly RequestInterface $request
     ) {
         parent::__construct($application);
+
+        $this->setup();
+    }
+
+    private function setup(): void
+    {
+        $configEvents = $this->config->getConfigData()->getMailEvents();
+
+        if (count($configEvents) === 0) {
+            $this->events = $this->parseEventsToRegex(self::EVENTS_FIXED);
+        } else {
+            $this->events = $this->parseEventsToRegex(array_merge($configEvents, self::EVENTS_FIXED));
+        }
     }
 
     /**
@@ -164,17 +175,4 @@ final class MailHandler extends Provider implements EventReceiver
             }
         }
     }
-
-    public function initialize(): void
-    {
-        $configEvents = $this->config->getConfigData()->getMailEvents();
-
-        if (count($configEvents) === 0) {
-            $this->events = $this->parseEventsToRegex(self::EVENTS_FIXED);
-        } else {
-            $this->events = $this->parseEventsToRegex(array_merge($configEvents, self::EVENTS_FIXED));
-        }
-
-        $this->initialized = true;
-    }
 }
diff --git a/lib/SP/Providers/Mail/MailParams.php b/lib/SP/Domain/Providers/Mail/MailParams.php
similarity index 79%
rename from lib/SP/Providers/Mail/MailParams.php
rename to lib/SP/Domain/Providers/Mail/MailParams.php
index d56e12ea..a9a151ab 100644
--- a/lib/SP/Providers/Mail/MailParams.php
+++ b/lib/SP/Domain/Providers/Mail/MailParams.php
@@ -22,23 +22,21 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Mail;
+namespace SP\Domain\Providers\Mail;
 
 /**
  * Class MailParams
- *
- * @package SP\Providers\Mail
  */
-final class MailParams
+final readonly class MailParams
 {
     public function __construct(
-        private readonly string $server,
-        private readonly int    $port,
-        private readonly string $user,
-        private readonly string $pass,
-        private readonly string $security,
-        private readonly string $from,
-        private readonly bool   $mailAuthenabled
+        private string $server,
+        private int    $port,
+        private string $user,
+        private string $pass,
+        private string $security,
+        private string $from,
+        private bool   $mailAuthenabled
     ) {
     }
 
diff --git a/lib/SP/Providers/Mail/MailProviderException.php b/lib/SP/Domain/Providers/Mail/MailProviderException.php
similarity index 85%
rename from lib/SP/Providers/Mail/MailProviderException.php
rename to lib/SP/Domain/Providers/Mail/MailProviderException.php
index f09899cc..bbc42b31 100644
--- a/lib/SP/Providers/Mail/MailProviderException.php
+++ b/lib/SP/Domain/Providers/Mail/MailProviderException.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,14 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Mail;
+namespace SP\Domain\Providers\Mail;
 
 use SP\Domain\Core\Exceptions\SPException;
 
 /**
- * Class MailerException
- *
- * @package SP\Providers\Mail
+ * Class MailProviderException
  */
 final class MailProviderException extends SPException
 {
diff --git a/lib/SP/Providers/Mail/PhpMailerWrapper.php b/lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php
similarity index 93%
rename from lib/SP/Providers/Mail/PhpMailerWrapper.php
rename to lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php
index 362949d9..b69d7f19 100644
--- a/lib/SP/Providers/Mail/PhpMailerWrapper.php
+++ b/lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php
@@ -22,12 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Mail;
+namespace SP\Domain\Providers\Mail;
 
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\PHPMailer;
 use SP\Domain\Core\AppInfoInterface;
-use SP\Domain\Providers\MailerInterface;
+use SP\Domain\Providers\Ports\MailerInterface;
 
 use function SP\__u;
 use function SP\logger;
@@ -36,10 +36,10 @@ use function SP\processException;
 /**
  * A wrapper for PHPMailer
  */
-final class PhpMailerWrapper implements MailerInterface
+final readonly class PhpMailerWrapper implements MailerInterface
 {
 
-    public function __construct(private readonly PHPMailer $mailer, private readonly bool $debug = false)
+    public function __construct(private PHPMailer $mailer, private bool $debug = false)
     {
     }
 
diff --git a/lib/SP/Domain/Providers/MailProviderInterface.php b/lib/SP/Domain/Providers/MailProviderInterface.php
deleted file mode 100644
index dd1e4e99..00000000
--- a/lib/SP/Domain/Providers/MailProviderInterface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/*
- * sysPass
- *
- * @author nuxsmin
- * @link https://syspass.org
- * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sysPass is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SP\Domain\Providers;
-
-
-use SP\Providers\Mail\MailParams;
-use SP\Providers\Mail\MailProviderException;
-
-/**
- * Class MailProvider
- *
- * @package SP\Providers\Mail
- */
-interface MailProviderInterface
-{
-    /**
-     * Inicializar la clase PHPMailer.
-     *
-     * @param  MailParams  $mailParams
-     *
-     * @throws MailProviderException
-     */
-    public function getMailerFrom(MailParams $mailParams): MailerInterface;
-
-    public function isDebug(): bool;
-
-    public function setDebug(bool $debug): void;
-
-    public function initialize(): void;
-}
\ No newline at end of file
diff --git a/lib/SP/Providers/Notification/NotificationHandler.php b/lib/SP/Domain/Providers/Notification/NotificationHandler.php
similarity index 74%
rename from lib/SP/Providers/Notification/NotificationHandler.php
rename to lib/SP/Domain/Providers/Notification/NotificationHandler.php
index 6fe73d47..2ac11e52 100644
--- a/lib/SP/Providers/Notification/NotificationHandler.php
+++ b/lib/SP/Domain/Providers/Notification/NotificationHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers\Notification;
+namespace SP\Domain\Providers\Notification;
 
 use Exception;
 use SP\Core\Application;
@@ -30,8 +30,8 @@ use SP\Core\Events\Event;
 use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Notification\Models\Notification;
 use SP\Domain\Notification\Ports\NotificationService;
-use SP\Providers\EventsTrait;
-use SP\Providers\Provider;
+use SP\Domain\Providers\EventsTrait;
+use SP\Domain\Providers\Provider;
 
 use function SP\__;
 use function SP\processException;
@@ -39,7 +39,7 @@ use function SP\processException;
 /**
  * Class NotificationHandler
  *
- * @package SP\Providers\Notification
+ * @package SP\Domain\Providers\Notification
  */
 final class NotificationHandler extends Provider implements EventReceiver
 {
@@ -50,13 +50,20 @@ final class NotificationHandler extends Provider implements EventReceiver
         'show.account.link',
     ];
 
-    private string $events;
+    private readonly string $events;
 
     public function __construct(
-        Application                                   $application,
+        Application $application,
         private readonly NotificationService $notificationService
     ) {
         parent::__construct($application);
+
+        $this->setup();
+    }
+
+    private function setup(): void
+    {
+        $this->events = $this->parseEventsToRegex(self::EVENTS);
     }
 
     /**
@@ -96,14 +103,16 @@ final class NotificationHandler extends Provider implements EventReceiver
         $userIds = $eventMessage !== null ? $eventMessage->getExtra('userId') : [];
 
         foreach ($userIds as $userId) {
-            $description = $eventMessage->composeHtml();
-            $notificationData = new Notification();
-            $notificationData->setType(__('Request'));
-            $notificationData->setComponent(__('Accounts'));
-            $notificationData->setUserId($userId);
-            $notificationData->setDescription($eventMessage, true);
+            $notification = new Notification(
+                [
+                    'type' => __('Request'),
+                    'component' => __('Accounts'),
+                    'userId' => $userId,
+                    'description' => $eventMessage->composeHtml()
+                ]
+            );
 
-            $this->notify($notificationData);
+            $this->notify($notification);
         }
     }
 
@@ -129,21 +138,17 @@ final class NotificationHandler extends Provider implements EventReceiver
 
         if ($notify[0] === true) {
             $userId = $eventMessage->getExtra('userId')[0];
-            $description = $eventMessage->composeHtml();
 
-            $notificationData = new Notification();
-            $notificationData->setType(__('Notification'));
-            $notificationData->setComponent(__('Accounts'));
-            $notificationData->setUserId($userId);
-            $notificationData->setDescription($eventMessage, true);
+            $notification = new Notification(
+                [
+                    'type' => __('Notification'),
+                    'component' => __('Accounts'),
+                    'userId' => $userId,
+                    'description' => $eventMessage->composeHtml()
+                ]
+            );
 
-            $this->notify($notificationData);
+            $this->notify($notification);
         }
     }
-
-    public function initialize(): void
-    {
-        $this->events = $this->parseEventsToRegex(self::EVENTS);
-        $this->initialized = true;
-    }
 }
diff --git a/lib/SP/Domain/Providers/FileLogHandlerProvider.php b/lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php
similarity index 96%
rename from lib/SP/Domain/Providers/FileLogHandlerProvider.php
rename to lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php
index 8d059678..e7fd3ddd 100644
--- a/lib/SP/Domain/Providers/FileLogHandlerProvider.php
+++ b/lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers;
+namespace SP\Domain\Providers\Ports;
 
 use SP\Domain\Core\Events\EventReceiver;
 
diff --git a/lib/SP/Domain/Providers/MailerInterface.php b/lib/SP/Domain/Providers/Ports/MailerInterface.php
similarity index 94%
rename from lib/SP/Domain/Providers/MailerInterface.php
rename to lib/SP/Domain/Providers/Ports/MailerInterface.php
index 1bb65fee..902ebe34 100644
--- a/lib/SP/Domain/Providers/MailerInterface.php
+++ b/lib/SP/Domain/Providers/Ports/MailerInterface.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers;
+namespace SP\Domain\Providers\Ports;
 
-use SP\Providers\Mail\MailParams;
+use SP\Domain\Providers\Mail\MailParams;
 
 /**
  * A wrapper for a mailer
diff --git a/lib/SP/Providers/ProviderInterface.php b/lib/SP/Domain/Providers/Ports/ProviderInterface.php
similarity index 86%
rename from lib/SP/Providers/ProviderInterface.php
rename to lib/SP/Domain/Providers/Ports/ProviderInterface.php
index 5f824220..f86fffa4 100644
--- a/lib/SP/Providers/ProviderInterface.php
+++ b/lib/SP/Domain/Providers/Ports/ProviderInterface.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -22,13 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers;
-
+namespace SP\Domain\Providers\Ports;
 
 /**
  * ProviderInterface
  */
 interface ProviderInterface
 {
-    public function initialize(): void;
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Providers/Provider.php b/lib/SP/Domain/Providers/Provider.php
similarity index 80%
rename from lib/SP/Providers/Provider.php
rename to lib/SP/Domain/Providers/Provider.php
index 0e03e552..26f52fa1 100644
--- a/lib/SP/Providers/Provider.php
+++ b/lib/SP/Domain/Providers/Provider.php
@@ -22,42 +22,27 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Providers;
+namespace SP\Domain\Providers;
 
 use SP\Core\Application;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Events\EventDispatcherInterface;
+use SP\Domain\Providers\Ports\ProviderInterface;
 
 /**
- * Class Service
- *
- * @package SP\Providers
+ * Class Provider
  */
 abstract class Provider implements ProviderInterface
 {
     protected readonly ConfigFileService $config;
     protected readonly Context           $context;
     protected readonly EventDispatcherInterface $eventDispatcher;
-    protected bool                              $initialized = false;
 
-    /**
-     * Provider constructor.
-     *
-     * @param Application $application
-     */
     public function __construct(Application $application)
     {
         $this->config = $application->getConfig();
         $this->context = $application->getContext();
         $this->eventDispatcher = $application->getEventDispatcher();
     }
-
-    /**
-     * @return bool
-     */
-    public function isInitialized(): bool
-    {
-        return $this->initialized;
-    }
 }
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
index d6ee0354..9ad3c460 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
@@ -29,7 +29,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Providers\FileLogHandlerProvider;
+use SP\Domain\Providers\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Ports\UpgradeService;
 use SP\Infrastructure\File\FileException;
 use SP\Util\VersionUtil;
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
index 0b9abe6f..8ac8ccae 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
@@ -29,10 +29,10 @@ use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Database\Ports\DatabaseInterface;
+use SP\Domain\Providers\Log\FileLogHandler;
 use SP\Infrastructure\Database\MysqlFileParser;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Providers\Log\FileLogHandler;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Mvc/Controller/Validators/Validator.php b/lib/SP/Mvc/Controller/Validators/Validator.php
index 6f6fba05..ae4b81ab 100644
--- a/lib/SP/Mvc/Controller/Validators/Validator.php
+++ b/lib/SP/Mvc/Controller/Validators/Validator.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -38,7 +38,7 @@ final class Validator
 
     public static function hasNumbers(string $string): bool
     {
-        return preg_match('#[\d]+#', $string) === 1;
+        return preg_match('#\d+#', $string) === 1;
     }
 
     public static function hasUpper(string $string): bool
@@ -65,4 +65,4 @@ final class Validator
     {
         return @preg_match('#' . str_replace('#', '\#', $regex) . '#', null) !== false;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/SP/Mvc/Controller/WebControllerHelper.php b/lib/SP/Mvc/Controller/WebControllerHelper.php
index 369a5d8a..de249182 100644
--- a/lib/SP/Mvc/Controller/WebControllerHelper.php
+++ b/lib/SP/Mvc/Controller/WebControllerHelper.php
@@ -30,9 +30,9 @@ use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Browser\BrowserAuthService;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Mvc\View\TemplateInterface;
-use SP\Providers\Auth\Browser\BrowserAuthService;
 
 /**
  * Class WebControllerHelper
diff --git a/tests/SPT/Domain/Auth/Services/LdapCheckTest.php b/tests/SPT/Domain/Auth/Services/LdapCheckTest.php
index 2895bd0b..2eafba23 100644
--- a/tests/SPT/Domain/Auth/Services/LdapCheckTest.php
+++ b/tests/SPT/Domain/Auth/Services/LdapCheckTest.php
@@ -30,10 +30,10 @@ use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
 use SP\Domain\Auth\Services\LdapCheck;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php b/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php
index faf7158d..01997e37 100644
--- a/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php
@@ -39,14 +39,14 @@ use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Providers\Ldap\LdapCodeEnum;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserLoginRequest;
 use SP\Domain\User\Ports\UserService;
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
-use SP\Providers\Auth\Ldap\LdapCodeEnum;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Domain/Auth/Services/LoginTest.php b/tests/SPT/Domain/Auth/Services/LoginTest.php
index 0ccffbb7..f606c35d 100644
--- a/tests/SPT/Domain/Auth/Services/LoginTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginTest.php
@@ -44,20 +44,20 @@ use SP\Domain\Core\Context\SessionContext;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\LanguageInterface;
 use SP\Domain\Http\RequestInterface;
+use SP\Domain\Providers\Auth\AuthDataBase;
+use SP\Domain\Providers\Auth\AuthProviderService;
+use SP\Domain\Providers\Auth\AuthResult;
+use SP\Domain\Providers\Auth\AuthType;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Providers\Ports\ProviderInterface;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
-use SP\Providers\Auth\AuthDataBase;
-use SP\Providers\Auth\AuthProviderService;
-use SP\Providers\Auth\AuthResult;
-use SP\Providers\Auth\AuthType;
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
-use SP\Providers\ProviderInterface;
 use SPT\Generators\UserDataGenerator;
 use SPT\Generators\UserProfileDataGenerator;
 use SPT\UnitaryTestCase;
@@ -512,9 +512,6 @@ class LoginTest extends UnitaryTestCase
         $this->authProviderService = $this->createMockForIntersectionOfInterfaces(
             [AuthProviderService::class, ProviderInterface::class]
         );
-        $this->authProviderService
-            ->expects($this->once())
-            ->method('initialize');
 
         $this->language = $this->createMock(LanguageInterface::class);
         $this->userService = $this->createMock(UserService::class);
diff --git a/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php b/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php
index 31fb8143..92b3985e 100644
--- a/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php
+++ b/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php
@@ -32,7 +32,7 @@ use SP\Core\Application;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Domain\Config\Services\UpgradeConfig;
-use SP\Domain\Providers\FileLogHandlerProvider;
+use SP\Domain\Providers\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Services\UpgradeException;
 use SP\Infrastructure\File\FileException;
 use SPT\UnitaryTestCase;
diff --git a/tests/SPT/Domain/Import/Services/LdapImportTest.php b/tests/SPT/Domain/Import/Services/LdapImportTest.php
index 8ef76d69..eceed462 100644
--- a/tests/SPT/Domain/Import/Services/LdapImportTest.php
+++ b/tests/SPT/Domain/Import/Services/LdapImportTest.php
@@ -33,14 +33,14 @@ use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
 use SP\Domain\Import\Dtos\LdapImportParamsDto;
 use SP\Domain\Import\Services\LdapImport;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
 use SP\Domain\User\Models\User;
 use SP\Domain\User\Models\UserGroup;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserService;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Domain/Notification/Services/MailTest.php b/tests/SPT/Domain/Notification/Services/MailTest.php
index cffa85af..516cbb01 100644
--- a/tests/SPT/Domain/Notification/Services/MailTest.php
+++ b/tests/SPT/Domain/Notification/Services/MailTest.php
@@ -34,8 +34,8 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Notification\Services\Mail;
-use SP\Domain\Providers\MailerInterface;
-use SP\Providers\Mail\MailParams;
+use SP\Domain\Providers\Mail\MailParams;
+use SP\Domain\Providers\Ports\MailerInterface;
 use SPT\Generators\ConfigDataGenerator;
 use SPT\UnitaryTestCase;
 
diff --git a/tests/SPT/Providers/Acl/AclHandlerTest.php b/tests/SPT/Providers/Acl/AclHandlerTest.php
index 844c4e67..eaa2a059 100644
--- a/tests/SPT/Providers/Acl/AclHandlerTest.php
+++ b/tests/SPT/Providers/Acl/AclHandlerTest.php
@@ -31,9 +31,9 @@ use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Providers\Acl\AclHandler;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserProfileService;
-use SP\Providers\Acl\AclHandler;
 use SPT\UnitaryTestCase;
 
 /**
@@ -43,9 +43,9 @@ use SPT\UnitaryTestCase;
 #[Group('unitary')]
 class AclHandlerTest extends UnitaryTestCase
 {
-    private MockObject|UserProfileService $userProfileService;
-    private UserGroupService|MockObject   $userGroupService;
-    private AclHandler                             $aclHandler;
+    private MockObject|UserProfileService       $userProfileService;
+    private UserGroupService|MockObject         $userGroupService;
+    private AclHandler $aclHandler;
 
     public static function userEventProvider(): array
     {
@@ -58,28 +58,25 @@ class AclHandlerTest extends UnitaryTestCase
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserProfileEvent()
     {
-        $event = $this->createMock(Event::class);
+        $eventMessage = $this->createMock(EventMessage::class);
 
-        $event->expects(self::once())
-              ->method('getEventMessage');
+        $eventMessage->expects($this->once())
+                     ->method('getExtra')
+                     ->with('userProfileId');
 
-        $this->aclHandler->update('edit.userProfile', $event);
+        $this->aclHandler->update('edit.userProfile', new Event($this, $eventMessage));
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserProfileEventWithExtra()
     {
         $eventMessage = $this->createMock(EventMessage::class);
 
-        $event = new Event($this, $eventMessage);
-
         $eventMessage->expects(self::once())
                      ->method('getExtra')
                      ->with('userProfileId')
@@ -90,19 +87,16 @@ class AclHandlerTest extends UnitaryTestCase
                                  ->with(1)
                                  ->willReturn([self::$faker->randomNumber()]);
 
-        $this->aclHandler->update('edit.userProfile', $event);
+        $this->aclHandler->update('edit.userProfile', new Event($this, $eventMessage));
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserProfileEventWithoutExtra()
     {
         $eventMessage = $this->createMock(EventMessage::class);
 
-        $event = new Event($this, $eventMessage);
-
         $eventMessage->expects(self::once())
                      ->method('getExtra')
                      ->with('userProfileId')
@@ -111,27 +105,26 @@ class AclHandlerTest extends UnitaryTestCase
         $this->userProfileService->expects(self::never())
                                  ->method('getUsersForProfile');
 
-        $this->aclHandler->update('edit.userProfile', $event);
+        $this->aclHandler->update('edit.userProfile', new Event($this, $eventMessage));
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     #[DataProvider('userEventProvider')]
     public function testUpdateWithUserEvent(string $userEvent)
     {
-        $event = $this->createMock(Event::class);
+        $eventMessage = $this->createMock(EventMessage::class);
 
-        $event->expects(self::once())
-              ->method('getEventMessage');
+        $eventMessage->expects($this->once())
+                     ->method('getExtra')
+                     ->with('userId');
 
-        $this->aclHandler->update($userEvent, $event);
+        $this->aclHandler->update($userEvent, new Event($this, $eventMessage));
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     #[DataProvider('userEventProvider')]
     public function testUpdateWithUserEventWithExtra(string $userEvent)
@@ -169,21 +162,20 @@ class AclHandlerTest extends UnitaryTestCase
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserGroupEvent()
     {
-        $event = $this->createMock(Event::class);
+        $eventMessage = $this->createMock(EventMessage::class);
 
-        $event->expects(self::once())
-              ->method('getEventMessage');
+        $eventMessage->expects($this->once())
+                     ->method('getExtra')
+                     ->with('userGroupId');
 
-        $this->aclHandler->update('edit.userGroup', $event);
+        $this->aclHandler->update('edit.userGroup', new Event($this, $eventMessage));
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserGroupEventWithExtra()
     {
@@ -197,16 +189,15 @@ class AclHandlerTest extends UnitaryTestCase
                      ->willReturn([1]);
 
         $this->userGroupService->expects(self::once())
-                                 ->method('getUsageByUsers')
-                                 ->with(1)
-                                 ->willReturn([self::$faker->randomNumber()]);
+            ->method('getUsageByUsers')
+            ->with(1)
+            ->willReturn([self::$faker->randomNumber()]);
 
         $this->aclHandler->update('edit.userGroup', $event);
     }
 
     /**
      * @throws Exception
-     * @throws SPException
      */
     public function testUpdateWithUserGroupEventWithoutExtra()
     {
@@ -225,15 +216,6 @@ class AclHandlerTest extends UnitaryTestCase
         $this->aclHandler->update('edit.userGroup', $event);
     }
 
-    public function testInitialize()
-    {
-        $events = implode('|', array_map('preg_quote', AclHandler::EVENTS));
-        $this->aclHandler->initialize();
-
-        self::assertTrue($this->aclHandler->isInitialized());
-        self::assertEquals($events, $this->aclHandler->getEventsString());
-    }
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -241,7 +223,11 @@ class AclHandlerTest extends UnitaryTestCase
         $this->userProfileService = $this->createMock(UserProfileService::class);
         $this->userGroupService = $this->createMock(UserGroupService::class);
 
-        $this->aclHandler = new AclHandler($this->application, $this->userProfileService, $this->userGroupService);
+        $this->aclHandler = new AclHandler(
+            $this->application,
+            $this->userProfileService,
+            $this->userGroupService
+        );
     }
 
 }
diff --git a/tests/SPT/Providers/Auth/AuthProviderTest.php b/tests/SPT/Providers/Auth/AuthProviderTest.php
index 7f490742..3133310a 100644
--- a/tests/SPT/Providers/Auth/AuthProviderTest.php
+++ b/tests/SPT/Providers/Auth/AuthProviderTest.php
@@ -28,13 +28,13 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Services\AuthException;
-use SP\Providers\Auth\AuthProvider;
-use SP\Providers\Auth\AuthResult;
-use SP\Providers\Auth\AuthService;
-use SP\Providers\Auth\AuthType;
-use SP\Providers\Auth\Browser\BrowserAuthData;
-use SP\Providers\Auth\Database\DatabaseAuthData;
-use SP\Providers\Auth\Ldap\LdapAuthData;
+use SP\Domain\Providers\Auth\AuthProvider;
+use SP\Domain\Providers\Auth\AuthResult;
+use SP\Domain\Providers\Auth\AuthService;
+use SP\Domain\Providers\Auth\AuthType;
+use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Providers\Database\DatabaseAuthData;
+use SP\Domain\Providers\Ldap\LdapAuthData;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php b/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php
index 6e6ad68a..14e53b5f 100644
--- a/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php
+++ b/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php
@@ -29,8 +29,8 @@ use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Http\RequestInterface;
-use SP\Providers\Auth\Browser\BrowserAuth;
-use SP\Providers\Auth\Browser\BrowserAuthData;
+use SP\Domain\Providers\Browser\BrowserAuth;
+use SP\Domain\Providers\Browser\BrowserAuthData;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php b/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php
index e6e5082b..2d17c391 100644
--- a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php
+++ b/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php
@@ -28,10 +28,10 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Crypt\Hash;
 use SP\Domain\Auth\Dtos\UserLoginDto;
+use SP\Domain\Providers\Database\DatabaseAuth;
 use SP\Domain\User\Ports\UserPassService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Providers\Auth\Database\DatabaseAuth;
 use SPT\Generators\UserDataGenerator;
 use SPT\UnitaryTestCase;
 
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php b/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php
index 9dd44d31..c9c64aba 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php
@@ -31,13 +31,13 @@ use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Events\EventDispatcherInterface;
-use SP\Providers\Auth\Ldap\AttributeCollection;
-use SP\Providers\Auth\Ldap\LdapActions;
-use SP\Providers\Auth\Ldap\LdapCodeEnum;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\AttributeCollection;
+use SP\Domain\Providers\Ldap\LdapActions;
+use SP\Domain\Providers\Ldap\LdapCodeEnum;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php b/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php
index 7970b22e..774dacab 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php
@@ -35,9 +35,9 @@ use SP\Domain\Auth\Ports\LdapService;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Providers\Auth\Ldap\AttributeCollection;
-use SP\Providers\Auth\Ldap\LdapAuth;
-use SP\Providers\Auth\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\AttributeCollection;
+use SP\Domain\Providers\Ldap\LdapAuth;
+use SP\Domain\Providers\Ldap\LdapException;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php b/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php
index 16eb184e..20e973eb 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -30,10 +30,10 @@ use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Context\ContextException;
 use SP\Domain\Core\Events\EventDispatcherInterface;
-use SP\Providers\Auth\Ldap\LdapConnection;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\LdapConnection;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
 use SPT\UnitaryTestCase;
 
 use function PHPUnit\Framework\once;
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php b/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php
index aec38132..1a65f5df 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php
@@ -32,12 +32,12 @@ use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapMsAds;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
-use SP\Providers\Auth\Ldap\LdapUtil;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapMsAds;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\LdapUtil;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php b/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php
index 0f4bf431..e073a2d8 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php
@@ -32,12 +32,12 @@ use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Providers\Auth\Ldap\LdapException;
-use SP\Providers\Auth\Ldap\LdapParams;
-use SP\Providers\Auth\Ldap\LdapResults;
-use SP\Providers\Auth\Ldap\LdapStd;
-use SP\Providers\Auth\Ldap\LdapTypeEnum;
-use SP\Providers\Auth\Ldap\LdapUtil;
+use SP\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Providers\Ldap\LdapStd;
+use SP\Domain\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Providers\Ldap\LdapUtil;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php b/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php
index ed821efe..456ce5e0 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php
+++ b/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php
@@ -4,7 +4,7 @@
  *
  * @author nuxsmin
  * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
  *
  * This file is part of sysPass.
  *
@@ -26,7 +26,7 @@ namespace SPT\Providers\Auth\Ldap;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use SP\Providers\Auth\Ldap\LdapUtil;
+use SP\Domain\Providers\Ldap\LdapUtil;
 use SPT\UnitaryTestCase;
 
 /**