diff --git a/api.php b/api.php
index ec4779d1..4423efa1 100644
--- a/api.php
+++ b/api.php
@@ -25,8 +25,8 @@
 use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
+use SP\Infrastructure\File\FileSystem;
 use SP\Modules\Api\Bootstrap;
-use SP\Util\FileSystem;
 
 use function SP\processException;
 
diff --git a/app/modules/api/Controllers/ControllerBase.php b/app/modules/api/Controllers/ControllerBase.php
index 6a3fd140..7e013d2a 100644
--- a/app/modules/api/Controllers/ControllerBase.php
+++ b/app/modules/api/Controllers/ControllerBase.php
@@ -39,7 +39,7 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Services\JsonResponse;
 
 /**
  * Class ControllerBase
diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php
index 818cdd1b..eeb8c3fc 100644
--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -32,16 +32,16 @@ use SP\Core\Context\ContextException;
 use SP\Core\HttpModuleBase;
 use SP\Core\Language;
 use SP\Core\ProvidersHelper;
+use SP\Domain\Common\Providers\Http;
 use SP\Domain\Core\Exceptions\ConfigException;
 use SP\Domain\Core\Exceptions\InitializationException;
 use SP\Domain\Core\LanguageInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Upgrade\Services\UpgradeAppService;
 use SP\Domain\Upgrade\Services\UpgradeDatabaseService;
 use SP\Domain\Upgrade\Services\UpgradeUtil;
 use SP\Infrastructure\Database\DatabaseUtil;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Http;
 
 use function SP\logger;
 
@@ -54,12 +54,12 @@ final class Init extends HttpModuleBase
     private DatabaseUtil $databaseUtil;
 
     public function __construct(
-        Application      $application,
-        ProvidersHelper  $providersHelper,
-        RequestInterface $request,
-        Klein            $router,
+        Application     $application,
+        ProvidersHelper $providersHelper,
+        RequestService  $request,
+        Klein           $router,
         LanguageInterface $language,
-        DatabaseUtil     $databaseUtil
+        DatabaseUtil    $databaseUtil
     ) {
         parent::__construct(
             $application,
diff --git a/app/modules/cli/Init.php b/app/modules/cli/Init.php
index 2f7f8cfa..b8a7fdd9 100644
--- a/app/modules/cli/Init.php
+++ b/app/modules/cli/Init.php
@@ -30,8 +30,8 @@ use SP\Core\Context\ContextException;
 use SP\Core\Language;
 use SP\Core\ModuleBase;
 use SP\Core\ProvidersHelper;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Core\LanguageInterface;
-use SP\Util\Version;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/modules/web/Bootstrap.php b/app/modules/web/Bootstrap.php
index 5345f793..c4f3ea21 100644
--- a/app/modules/web/Bootstrap.php
+++ b/app/modules/web/Bootstrap.php
@@ -33,10 +33,10 @@ use Psr\Container\NotFoundExceptionInterface;
 use RuntimeException;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Bootstrap\RouteContext;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
 use SP\Domain\Core\Exceptions\SessionTimeout;
-use SP\Util\Filter;
 
 use function SP\__;
 use function SP\logger;
diff --git a/app/modules/web/Controllers/Account/SaveCopyController.php b/app/modules/web/Controllers/Account/SaveCopyController.php
index bd70e43a..7009af23 100644
--- a/app/modules/web/Controllers/Account/SaveCopyController.php
+++ b/app/modules/web/Controllers/Account/SaveCopyController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SaveCopyController
diff --git a/app/modules/web/Controllers/Account/SaveCreateController.php b/app/modules/web/Controllers/Account/SaveCreateController.php
index 7d8c5b7d..d940f52a 100644
--- a/app/modules/web/Controllers/Account/SaveCreateController.php
+++ b/app/modules/web/Controllers/Account/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SaveCreateController
diff --git a/app/modules/web/Controllers/Account/SaveDeleteController.php b/app/modules/web/Controllers/Account/SaveDeleteController.php
index 7ca5f25e..c1e8b6fb 100644
--- a/app/modules/web/Controllers/Account/SaveDeleteController.php
+++ b/app/modules/web/Controllers/Account/SaveDeleteController.php
@@ -33,7 +33,7 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Account/SaveEditController.php b/app/modules/web/Controllers/Account/SaveEditController.php
index fe4d9156..9701e07f 100644
--- a/app/modules/web/Controllers/Account/SaveEditController.php
+++ b/app/modules/web/Controllers/Account/SaveEditController.php
@@ -32,7 +32,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SaveEditController
diff --git a/app/modules/web/Controllers/Account/SaveEditPassController.php b/app/modules/web/Controllers/Account/SaveEditPassController.php
index 8f50175a..2d6d58ea 100644
--- a/app/modules/web/Controllers/Account/SaveEditPassController.php
+++ b/app/modules/web/Controllers/Account/SaveEditPassController.php
@@ -35,7 +35,7 @@ use SP\Domain\Account\Ports\AccountPresetService;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Modules\Web\Forms\AccountForm;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Account/SaveEditRestoreController.php b/app/modules/web/Controllers/Account/SaveEditRestoreController.php
index ffa24224..9fe47f00 100644
--- a/app/modules/web/Controllers/Account/SaveEditRestoreController.php
+++ b/app/modules/web/Controllers/Account/SaveEditRestoreController.php
@@ -33,7 +33,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
 
diff --git a/app/modules/web/Controllers/Account/SaveRequestController.php b/app/modules/web/Controllers/Account/SaveRequestController.php
index a213c6d9..c9ff9c05 100644
--- a/app/modules/web/Controllers/Account/SaveRequestController.php
+++ b/app/modules/web/Controllers/Account/SaveRequestController.php
@@ -34,9 +34,9 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Providers\Uri;
 use SP\Domain\User\Ports\UserService;
-use SP\Http\JsonMessage;
-use SP\Http\Uri;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Account/ViewLinkController.php b/app/modules/web/Controllers/Account/ViewLinkController.php
index 07f8b021..6dddf6f5 100644
--- a/app/modules/web/Controllers/Account/ViewLinkController.php
+++ b/app/modules/web/Controllers/Account/ViewLinkController.php
@@ -36,14 +36,14 @@ use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Account\Services\PublicLink;
+use SP\Domain\Common\Adapters\Serde;
+use SP\Domain\Common\Providers\Image;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Crypt\VaultInterface;
+use SP\Domain\Http\Providers\Uri;
 use SP\Domain\Image\Ports\ImageService;
-use SP\Http\Uri;
 use SP\Modules\Web\Util\ErrorUtil;
 use SP\Mvc\Controller\WebControllerHelper;
-use SP\Util\Image;
-use SP\Util\Serde;
 
 /**
  * Class ViewLinkController
diff --git a/app/modules/web/Controllers/AccountFavorite/MarkController.php b/app/modules/web/Controllers/AccountFavorite/MarkController.php
index cc53a1ae..9dad3ced 100644
--- a/app/modules/web/Controllers/AccountFavorite/MarkController.php
+++ b/app/modules/web/Controllers/AccountFavorite/MarkController.php
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\AccountFavorite;
 use Exception;
 use JsonException;
 use SP\Core\Events\Event;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/AccountFavorite/UnmarkController.php b/app/modules/web/Controllers/AccountFavorite/UnmarkController.php
index 1317c380..1febc82a 100644
--- a/app/modules/web/Controllers/AccountFavorite/UnmarkController.php
+++ b/app/modules/web/Controllers/AccountFavorite/UnmarkController.php
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\AccountFavorite;
 use Exception;
 use JsonException;
 use SP\Core\Events\Event;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/AccountFile/SearchController.php b/app/modules/web/Controllers/AccountFile/SearchController.php
index 1ebb227d..962d24aa 100644
--- a/app/modules/web/Controllers/AccountFile/SearchController.php
+++ b/app/modules/web/Controllers/AccountFile/SearchController.php
@@ -30,8 +30,8 @@ use SP\Domain\Account\Ports\AccountFileService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\FileGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/AccountFile/ViewController.php b/app/modules/web/Controllers/AccountFile/ViewController.php
index 65550868..a0b95b0e 100644
--- a/app/modules/web/Controllers/AccountFile/ViewController.php
+++ b/app/modules/web/Controllers/AccountFile/ViewController.php
@@ -29,9 +29,9 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Infrastructure\File\FileSystem;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\FileSystem;
 
 /**
  * Class ViewController
diff --git a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
index 1b85758a..37f55226 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
diff --git a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
index 47d8fe89..25e1f5ea 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
index dc31782c..037c0b47 100644
--- a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
+++ b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php
@@ -30,8 +30,8 @@ use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers;
 use SP\Modules\Web\Controllers\Helpers\Grid\AccountHistoryGrid;
diff --git a/app/modules/web/Controllers/AccountManager/BulkEditController.php b/app/modules/web/Controllers/AccountManager/BulkEditController.php
index 7cabe1f4..02d325bb 100644
--- a/app/modules/web/Controllers/AccountManager/BulkEditController.php
+++ b/app/modules/web/Controllers/AccountManager/BulkEditController.php
@@ -36,10 +36,10 @@ use SP\Domain\Category\Ports\CategoryService;
 use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Tag\Ports\TagService;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/AccountManager/DeleteController.php b/app/modules/web/Controllers/AccountManager/DeleteController.php
index caad6aef..3e47b1d3 100644
--- a/app/modules/web/Controllers/AccountManager/DeleteController.php
+++ b/app/modules/web/Controllers/AccountManager/DeleteController.php
@@ -32,7 +32,7 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
diff --git a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
index 1d6cd4c5..b7da4a2f 100644
--- a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
+++ b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php
@@ -34,7 +34,7 @@ use SP\Domain\Account\Ports\AccountPresetService;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Modules\Web\Forms\AccountForm;
diff --git a/app/modules/web/Controllers/AccountManager/SearchController.php b/app/modules/web/Controllers/AccountManager/SearchController.php
index 8b605903..8d317854 100644
--- a/app/modules/web/Controllers/AccountManager/SearchController.php
+++ b/app/modules/web/Controllers/AccountManager/SearchController.php
@@ -34,8 +34,8 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers;
 use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid;
diff --git a/app/modules/web/Controllers/AuthToken/CreateController.php b/app/modules/web/Controllers/AuthToken/CreateController.php
index 175e94c3..061708fe 100644
--- a/app/modules/web/Controllers/AuthToken/CreateController.php
+++ b/app/modules/web/Controllers/AuthToken/CreateController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class CreateController
diff --git a/app/modules/web/Controllers/AuthToken/DeleteController.php b/app/modules/web/Controllers/AuthToken/DeleteController.php
index 83600fb1..70fd659f 100644
--- a/app/modules/web/Controllers/AuthToken/DeleteController.php
+++ b/app/modules/web/Controllers/AuthToken/DeleteController.php
@@ -29,7 +29,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class DeleteController
diff --git a/app/modules/web/Controllers/AuthToken/EditController.php b/app/modules/web/Controllers/AuthToken/EditController.php
index 50feab48..42a2c845 100644
--- a/app/modules/web/Controllers/AuthToken/EditController.php
+++ b/app/modules/web/Controllers/AuthToken/EditController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class EditController
diff --git a/app/modules/web/Controllers/AuthToken/SaveCreateController.php b/app/modules/web/Controllers/AuthToken/SaveCreateController.php
index 5ca8bb8a..4a22f15d 100644
--- a/app/modules/web/Controllers/AuthToken/SaveCreateController.php
+++ b/app/modules/web/Controllers/AuthToken/SaveCreateController.php
@@ -29,7 +29,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SaveCreateController
diff --git a/app/modules/web/Controllers/AuthToken/SaveEditController.php b/app/modules/web/Controllers/AuthToken/SaveEditController.php
index 74c9449d..3dbcf3c2 100644
--- a/app/modules/web/Controllers/AuthToken/SaveEditController.php
+++ b/app/modules/web/Controllers/AuthToken/SaveEditController.php
@@ -30,7 +30,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SaveEditController
diff --git a/app/modules/web/Controllers/AuthToken/SearchController.php b/app/modules/web/Controllers/AuthToken/SearchController.php
index 702f805e..422ee660 100644
--- a/app/modules/web/Controllers/AuthToken/SearchController.php
+++ b/app/modules/web/Controllers/AuthToken/SearchController.php
@@ -31,8 +31,8 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\AuthTokenGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/AuthToken/ViewController.php b/app/modules/web/Controllers/AuthToken/ViewController.php
index 7f7919e4..1432d5fb 100644
--- a/app/modules/web/Controllers/AuthToken/ViewController.php
+++ b/app/modules/web/Controllers/AuthToken/ViewController.php
@@ -29,7 +29,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class ViewController
diff --git a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
index d57ceb2a..366ad395 100644
--- a/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
+++ b/app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php
@@ -28,11 +28,11 @@ use Exception;
 use JsonException;
 use SP\Core\Application;
 use SP\Core\Crypt\CryptPKI;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthService;
 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;
diff --git a/app/modules/web/Controllers/Category/CreateController.php b/app/modules/web/Controllers/Category/CreateController.php
index 0bed2ce4..79c1bed9 100644
--- a/app/modules/web/Controllers/Category/CreateController.php
+++ b/app/modules/web/Controllers/Category/CreateController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Category/DeleteController.php b/app/modules/web/Controllers/Category/DeleteController.php
index bd6d4d92..0b61405c 100644
--- a/app/modules/web/Controllers/Category/DeleteController.php
+++ b/app/modules/web/Controllers/Category/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * DeleteController
diff --git a/app/modules/web/Controllers/Category/EditController.php b/app/modules/web/Controllers/Category/EditController.php
index f8b07c55..43d0e668 100644
--- a/app/modules/web/Controllers/Category/EditController.php
+++ b/app/modules/web/Controllers/Category/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Category/SaveCreateAction.php b/app/modules/web/Controllers/Category/SaveCreateAction.php
index f9b9ae5f..4f34f406 100644
--- a/app/modules/web/Controllers/Category/SaveCreateAction.php
+++ b/app/modules/web/Controllers/Category/SaveCreateAction.php
@@ -30,7 +30,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * SaveCreateAction
diff --git a/app/modules/web/Controllers/Category/SaveEditController.php b/app/modules/web/Controllers/Category/SaveEditController.php
index 42fb5b44..71dd73d4 100644
--- a/app/modules/web/Controllers/Category/SaveEditController.php
+++ b/app/modules/web/Controllers/Category/SaveEditController.php
@@ -30,7 +30,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * SaveEditController
diff --git a/app/modules/web/Controllers/Category/SearchController.php b/app/modules/web/Controllers/Category/SearchController.php
index d9a5b218..180d0fd1 100644
--- a/app/modules/web/Controllers/Category/SearchController.php
+++ b/app/modules/web/Controllers/Category/SearchController.php
@@ -32,8 +32,8 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\CategoryGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Category/ViewController.php b/app/modules/web/Controllers/Category/ViewController.php
index 7f5b13ff..38b03c6d 100644
--- a/app/modules/web/Controllers/Category/ViewController.php
+++ b/app/modules/web/Controllers/Category/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Client/CreateController.php b/app/modules/web/Controllers/Client/CreateController.php
index 9748b60b..574cbe97 100644
--- a/app/modules/web/Controllers/Client/CreateController.php
+++ b/app/modules/web/Controllers/Client/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Client/DeleteController.php b/app/modules/web/Controllers/Client/DeleteController.php
index 751a242d..f47f7994 100644
--- a/app/modules/web/Controllers/Client/DeleteController.php
+++ b/app/modules/web/Controllers/Client/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Client/EditController.php b/app/modules/web/Controllers/Client/EditController.php
index 2b5bc995..099a2919 100644
--- a/app/modules/web/Controllers/Client/EditController.php
+++ b/app/modules/web/Controllers/Client/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Client/SaveCreateController.php b/app/modules/web/Controllers/Client/SaveCreateController.php
index 454d29dc..af9dd01e 100644
--- a/app/modules/web/Controllers/Client/SaveCreateController.php
+++ b/app/modules/web/Controllers/Client/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Client/SaveEditController.php b/app/modules/web/Controllers/Client/SaveEditController.php
index b19fe106..461633c3 100644
--- a/app/modules/web/Controllers/Client/SaveEditController.php
+++ b/app/modules/web/Controllers/Client/SaveEditController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Client/SearchController.php b/app/modules/web/Controllers/Client/SearchController.php
index 84ead72f..fb2344af 100644
--- a/app/modules/web/Controllers/Client/SearchController.php
+++ b/app/modules/web/Controllers/Client/SearchController.php
@@ -32,8 +32,8 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\ClientGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Client/ViewController.php b/app/modules/web/Controllers/Client/ViewController.php
index 3da6f6dc..27212490 100644
--- a/app/modules/web/Controllers/Client/ViewController.php
+++ b/app/modules/web/Controllers/Client/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
index d8656150..40048136 100644
--- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
+++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php
@@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Export\Ports\BackupFileService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
index 8e039c6e..ba47977c 100644
--- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
+++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php
@@ -35,7 +35,7 @@ use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Export\Ports\XmlExportService;
 use SP\Domain\Export\Ports\XmlVerifyService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\DirectoryHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
diff --git a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
index 54044067..8a88c591 100644
--- a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
+++ b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php
@@ -36,7 +36,7 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Crypt\Ports\MasterPassService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveController.php b/app/modules/web/Controllers/ConfigEncryption/SaveController.php
index 555e5daa..3a5acea0 100644
--- a/app/modules/web/Controllers/ConfigEncryption/SaveController.php
+++ b/app/modules/web/Controllers/ConfigEncryption/SaveController.php
@@ -38,10 +38,10 @@ use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Crypt\Dtos\UpdateMasterPassRequest;
 use SP\Domain\Crypt\Ports\MasterPassService;
 use SP\Domain\Crypt\Services\MasterPass;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Task\Ports\TaskInterface;
 use SP\Domain\Task\Services\Task;
 use SP\Domain\Task\Services\TaskFactory;
-use SP\Http\JsonMessage;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\File\FileException;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php
index 1d629ada..5b1a8e43 100644
--- a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php
+++ b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php
@@ -32,7 +32,7 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassService;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigGeneral/SaveController.php b/app/modules/web/Controllers/ConfigGeneral/SaveController.php
index 0518fdf3..82f7c1af 100644
--- a/app/modules/web/Controllers/ConfigGeneral/SaveController.php
+++ b/app/modules/web/Controllers/ConfigGeneral/SaveController.php
@@ -34,9 +34,10 @@ use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
+use SP\Infrastructure\File\FileException;
+use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
-use SP\Util\Util;
 
 /**
  * Class ConfigGeneral
@@ -69,7 +70,7 @@ final class SaveController extends SimpleControllerBase
             $this->config,
             function () use ($eventMessage, $configData) {
                 if ($configData->isMaintenance()) {
-                    Util::lockApp($this->session->getUserData()->getId(), 'config');
+                    self::lockApp($this->session->getUserData()->getId(), 'config');
                 }
 
                 $this->eventDispatcher->notify('save.config.general', new Event($this, $eventMessage));
@@ -223,6 +224,22 @@ final class SaveController extends SimpleControllerBase
         }
     }
 
+    /**
+     * Bloquear la aplicación
+     *
+     * @throws JsonException
+     * @throws FileException
+     */
+    private static function lockApp(int $userId, string $subject): void
+    {
+        $data = ['time' => time(), 'userId' => $userId, 'subject' => $subject];
+
+        $file = new FileHandler(LOCK_FILE);
+        $file->save(json_encode($data, JSON_THROW_ON_ERROR));
+
+        logger('Application locked out');
+    }
+
     /**
      * @throws JsonException
      * @throws SessionTimeout
diff --git a/app/modules/web/Controllers/ConfigImport/ImportController.php b/app/modules/web/Controllers/ConfigImport/ImportController.php
index c44d3d08..e0b28539 100644
--- a/app/modules/web/Controllers/ConfigImport/ImportController.php
+++ b/app/modules/web/Controllers/ConfigImport/ImportController.php
@@ -34,9 +34,9 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Import\Dtos\ImportParamsDto;
 use SP\Domain\Import\Ports\ItemsImportService;
-use SP\Http\JsonMessage;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
diff --git a/app/modules/web/Controllers/ConfigLdap/CheckController.php b/app/modules/web/Controllers/ConfigLdap/CheckController.php
index df631d4d..6ae343df 100644
--- a/app/modules/web/Controllers/ConfigLdap/CheckController.php
+++ b/app/modules/web/Controllers/ConfigLdap/CheckController.php
@@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\CheckException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php
index 5826c53e..c94d758a 100644
--- a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php
+++ b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php
@@ -35,7 +35,7 @@ use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\CheckException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
index 60b286f4..f99a64d8 100644
--- a/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
+++ b/app/modules/web/Controllers/ConfigLdap/ConfigLdapTrait.php
@@ -25,9 +25,9 @@
 namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Domain\Http\RequestInterface;
-use SP\Domain\Providers\Ldap\LdapParams;
-use SP\Domain\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
 
 use function SP\__u;
 
@@ -37,12 +37,12 @@ use function SP\__u;
 trait ConfigLdapTrait
 {
     /**
-     * @param RequestInterface $request
+     * @param \SP\Domain\Http\Ports\RequestService $request
      *
      * @return LdapParams
      * @throws ValidationException
      */
-    protected function getLdapParamsFromRequest(RequestInterface $request): LdapParams
+    protected function getLdapParamsFromRequest(RequestService $request): LdapParams
     {
         $data = LdapParams::getServerAndPort($request->analyzeString('ldap_server'));
 
diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php
index 0e2a9c50..542f5457 100644
--- a/app/modules/web/Controllers/ConfigLdap/ImportController.php
+++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php
@@ -36,9 +36,9 @@ use SP\Domain\Core\Exceptions\CheckException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Import\Dtos\LdapImportParamsDto;
 use SP\Domain\Import\Ports\LdapImportService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Controllers/ConfigLdap/SaveController.php b/app/modules/web/Controllers/ConfigLdap/SaveController.php
index 3e2ee3e8..1ed64231 100644
--- a/app/modules/web/Controllers/ConfigLdap/SaveController.php
+++ b/app/modules/web/Controllers/ConfigLdap/SaveController.php
@@ -34,7 +34,7 @@ use SP\Domain\Core\Exceptions\CheckException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 
diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php
index c858b16b..82b9d586 100644
--- a/app/modules/web/Controllers/ConfigMail/CheckController.php
+++ b/app/modules/web/Controllers/ConfigMail/CheckController.php
@@ -36,9 +36,9 @@ use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Notification\Dtos\MailParams;
 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;
@@ -101,7 +101,7 @@ final class CheckController extends SimpleControllerBase
     }
 
     /**
-     * @return MailParams
+     * @return \SP\Domain\Notification\Dtos\MailParams
      */
     private function handleMailConfig(): MailParams
     {
diff --git a/app/modules/web/Controllers/ConfigMail/SaveController.php b/app/modules/web/Controllers/ConfigMail/SaveController.php
index 49e7c9af..bacf21ad 100644
--- a/app/modules/web/Controllers/ConfigMail/SaveController.php
+++ b/app/modules/web/Controllers/ConfigMail/SaveController.php
@@ -31,7 +31,7 @@ use SP\Domain\Config\Services\ConfigUtil;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 
diff --git a/app/modules/web/Controllers/ConfigManager/IndexController.php b/app/modules/web/Controllers/ConfigManager/IndexController.php
index c1395499..86f19ff5 100644
--- a/app/modules/web/Controllers/ConfigManager/IndexController.php
+++ b/app/modules/web/Controllers/ConfigManager/IndexController.php
@@ -34,6 +34,9 @@ use SP\Core\Crypt\CryptSessionHandler;
 use SP\Core\Events\Event;
 use SP\Core\Language;
 use SP\Domain\Account\Ports\AccountService;
+use SP\Domain\Auth\Providers\Ldap\LdapMsAds;
+use SP\Domain\Auth\Providers\Ldap\LdapStd;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigService;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -47,11 +50,8 @@ 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\Log\Providers\LogInterface;
+use SP\Domain\Notification\Providers\MailHandler;
 use SP\Domain\Task\Services\Task;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserProfileService;
diff --git a/app/modules/web/Controllers/ConfigWiki/SaveController.php b/app/modules/web/Controllers/ConfigWiki/SaveController.php
index 48e2aa6a..308efdfd 100644
--- a/app/modules/web/Controllers/ConfigWiki/SaveController.php
+++ b/app/modules/web/Controllers/ConfigWiki/SaveController.php
@@ -30,7 +30,7 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 
diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php
index e077f8f5..e84fcfc3 100644
--- a/app/modules/web/Controllers/ControllerBase.php
+++ b/app/modules/web/Controllers/ControllerBase.php
@@ -31,6 +31,7 @@ use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Crypt\Hash;
 use SP\Core\Events\EventDispatcher;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthService;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
@@ -42,8 +43,7 @@ use SP\Domain\Core\Exceptions\SessionTimeout;
 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\Http\Ports\RequestService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
@@ -70,7 +70,7 @@ abstract class ControllerBase
     protected readonly ThemeInterface             $theme;
     protected readonly AclInterface               $acl;
     protected readonly ConfigDataInterface        $configData;
-    protected readonly RequestInterface           $request;
+    protected readonly RequestService $request;
     protected readonly PhpExtensionCheckerService $extensionChecker;
     protected readonly TemplateInterface          $view;
     protected readonly LayoutHelper               $layoutHelper;
diff --git a/app/modules/web/Controllers/CustomField/CreateController.php b/app/modules/web/Controllers/CustomField/CreateController.php
index c0b08c22..4ff06277 100644
--- a/app/modules/web/Controllers/CustomField/CreateController.php
+++ b/app/modules/web/Controllers/CustomField/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/CustomField/DeleteController.php b/app/modules/web/Controllers/CustomField/DeleteController.php
index 9e99a841..3982727a 100644
--- a/app/modules/web/Controllers/CustomField/DeleteController.php
+++ b/app/modules/web/Controllers/CustomField/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/CustomField/EditController.php b/app/modules/web/Controllers/CustomField/EditController.php
index fa6231d9..ebb5c1c1 100644
--- a/app/modules/web/Controllers/CustomField/EditController.php
+++ b/app/modules/web/Controllers/CustomField/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/CustomField/SaveCreateController.php b/app/modules/web/Controllers/CustomField/SaveCreateController.php
index 1999aa4d..b891f3ec 100644
--- a/app/modules/web/Controllers/CustomField/SaveCreateController.php
+++ b/app/modules/web/Controllers/CustomField/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/CustomField/SaveEditController.php b/app/modules/web/Controllers/CustomField/SaveEditController.php
index e61ecb57..9d53020e 100644
--- a/app/modules/web/Controllers/CustomField/SaveEditController.php
+++ b/app/modules/web/Controllers/CustomField/SaveEditController.php
@@ -30,7 +30,7 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/CustomField/SearchController.php b/app/modules/web/Controllers/CustomField/SearchController.php
index 8d13bafd..9b087755 100644
--- a/app/modules/web/Controllers/CustomField/SearchController.php
+++ b/app/modules/web/Controllers/CustomField/SearchController.php
@@ -31,8 +31,8 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\CustomField\Ports\CustomFieldDefinitionService;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\CustomFieldGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/CustomField/ViewController.php b/app/modules/web/Controllers/CustomField/ViewController.php
index e1f49321..05698f8d 100644
--- a/app/modules/web/Controllers/CustomField/ViewController.php
+++ b/app/modules/web/Controllers/CustomField/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Eventlog/ClearController.php b/app/modules/web/Controllers/Eventlog/ClearController.php
index 9c083113..22c2137a 100644
--- a/app/modules/web/Controllers/Eventlog/ClearController.php
+++ b/app/modules/web/Controllers/Eventlog/ClearController.php
@@ -32,8 +32,8 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Core\Exceptions\SessionTimeout;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Security\Ports\EventlogService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Eventlog/SearchController.php b/app/modules/web/Controllers/Eventlog/SearchController.php
index 10b6b334..7d3fd3f0 100644
--- a/app/modules/web/Controllers/Eventlog/SearchController.php
+++ b/app/modules/web/Controllers/Eventlog/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Security\Ports\EventlogService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\EventlogGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
index edd4b156..d9906fa3 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php
@@ -30,7 +30,7 @@ use SP\Core\UI\ThemeIcons;
 use SP\Domain\Account\Adapters\AccountPermission;
 use SP\Domain\Account\Adapters\AccountSearchItem;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Html\DataGrid\Action\DataGridActionType;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
@@ -45,7 +45,7 @@ final class AccountActionsHelper extends HelperBase
 {
     protected ThemeIcons $icons;
 
-    public function __construct(Application $application, TemplateInterface $template, RequestInterface $request)
+    public function __construct(Application $application, TemplateInterface $template, RequestService $request)
     {
         parent::__construct($application, $template, $request);
 
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
index 0555f489..3e591f34 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
@@ -36,6 +36,7 @@ use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Account\Services\PublicLink;
 use SP\Domain\Category\Ports\CategoryService;
 use SP\Domain\Client\Ports\ClientService;
+use SP\Domain\Common\Providers\Link;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AccountPermissionException;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -48,7 +49,7 @@ use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Crypt\Ports\MasterPassService;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\ItemPreset\Models\AccountPermission as AccountPermissionPreset;
 use SP\Domain\ItemPreset\Models\AccountPrivate;
 use SP\Domain\ItemPreset\Ports\ItemPresetInterface;
@@ -62,7 +63,6 @@ use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\View\Components\SelectItemAdapter;
 use SP\Mvc\View\TemplateInterface;
-use SP\Util\Link;
 
 /**
  * Class AccountHelper
@@ -89,19 +89,19 @@ final class AccountHelper extends AccountHelperBase
     private TagService             $tagService;
 
     public function __construct(
-        Application                          $application,
-        TemplateInterface                    $template,
-        RequestInterface                     $request,
-        AclInterface                         $acl,
-        AccountService                       $accountService,
-        AccountHistoryService                $accountHistoryService,
-        PublicLinkService                    $publicLinkService,
-        ItemPresetService                    $itemPresetService,
-        MasterPassService                    $masterPassService,
-        AccountActionsHelper                 $accountActionsHelper,
-        AccountAclService                    $accountAclService,
-        CategoryService                      $categoryService,
-        ClientService                        $clientService,
+        Application           $application,
+        TemplateInterface     $template,
+        RequestService        $request,
+        AclInterface          $acl,
+        AccountService        $accountService,
+        AccountHistoryService $accountHistoryService,
+        PublicLinkService     $publicLinkService,
+        ItemPresetService     $itemPresetService,
+        MasterPassService     $masterPassService,
+        AccountActionsHelper  $accountActionsHelper,
+        AccountAclService     $accountAclService,
+        CategoryService       $categoryService,
+        ClientService         $clientService,
         CustomFieldDataService               $customFieldService,
         UserService                          $userService,
         UserGroupService                     $userGroupService,
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php
index 014d4a00..10061d7d 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php
@@ -32,7 +32,7 @@ use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\Acl\UnauthorizedPageException;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Crypt\Ports\MasterPassService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\User\Services\UpdatedMasterPassException;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
@@ -52,7 +52,7 @@ abstract class AccountHelperBase extends HelperBase
     public function __construct(
         Application          $application,
         TemplateInterface    $template,
-        RequestInterface     $request,
+        RequestService    $request,
         AclInterface         $acl,
         AccountActionsHelper $accountActionsHelper,
         MasterPassService $masterPassService
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
index 9902d491..74c0005e 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
@@ -42,7 +42,7 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Crypt\Ports\MasterPassService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\User\Services\UpdatedMasterPassException;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Mvc\View\Components\SelectItemAdapter;
@@ -61,7 +61,7 @@ final class AccountHistoryHelper extends AccountHelperBase
     public function __construct(
         Application                       $application,
         TemplateInterface                 $template,
-        RequestInterface                  $request,
+        RequestService          $request,
         AclInterface                      $acl,
         AccountActionsHelper              $accountActionsHelper,
         MasterPassService       $masterPassService,
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
index 598d59c2..7fce2da4 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php
@@ -33,18 +33,18 @@ use SP\Core\Application;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\Session as CryptSession;
 use SP\Domain\Account\Adapters\AccountPassItemWithIdAndName;
+use SP\Domain\Common\Providers\Image;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\Exceptions\FileNotFoundException;
 use SP\Domain\Crypt\Ports\MasterPassService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Image\Ports\ImageService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Web\Controllers\Helpers\HelperBase;
 use SP\Modules\Web\Controllers\Helpers\HelperException;
 use SP\Mvc\View\TemplateInterface;
-use SP\Util\Image;
 
 /**
  * Class AccountPasswordHelper
@@ -60,7 +60,7 @@ final class AccountPasswordHelper extends HelperBase
     public function __construct(
         Application       $application,
         TemplateInterface $template,
-        RequestInterface  $request,
+        RequestService $request,
         AclInterface      $acl,
         ImageService      $imageUtil,
         MasterPassService $masterPassService
diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
index f5fef9ec..e9b77cfd 100644
--- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
@@ -38,7 +38,7 @@ use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Tag\Ports\TagService;
 use SP\Domain\User\Models\ProfileData;
 use SP\Domain\User\Models\UserPreferences;
@@ -77,10 +77,10 @@ final class AccountSearchHelper extends HelperBase
     public function __construct(
         Application          $application,
         TemplateInterface    $template,
-        RequestInterface     $request,
+        RequestService $request,
         ClientService        $clientService,
         CategoryService      $categoryService,
-        TagService $tagService,
+        TagService     $tagService,
         AccountSearchService $accountSearchService,
         AccountActionsHelper $accountActionsHelper
     ) {
diff --git a/app/modules/web/Controllers/Helpers/Grid/GridBase.php b/app/modules/web/Controllers/Helpers/Grid/GridBase.php
index ed83bf97..3d660ab5 100644
--- a/app/modules/web/Controllers/Helpers/Grid/GridBase.php
+++ b/app/modules/web/Controllers/Helpers/Grid/GridBase.php
@@ -29,7 +29,7 @@ use SP\Core\Application;
 use SP\Core\UI\ThemeIcons;
 use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\Dtos\ItemSearchDto;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
 use SP\Html\DataGrid\DataGridData;
 use SP\Html\DataGrid\DataGridInterface;
@@ -50,10 +50,10 @@ abstract class GridBase extends HelperBase implements GridInterface
     protected Acl        $acl;
 
     public function __construct(
-        Application $application,
+        Application    $application,
         TemplateInterface $template,
-        RequestInterface $request,
-        AclInterface $acl
+        RequestService $request,
+        AclInterface   $acl
     ) {
         parent::__construct($application, $template, $request);
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
index 1799fb87..2cf808e4 100644
--- a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php
@@ -26,7 +26,9 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid;
 
 
 use SP\Core\Acl\Acl;
+use SP\Domain\Common\Adapters\Date;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Html\Html;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Html\DataGrid\Action\DataGridActionInterface;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
@@ -35,9 +37,7 @@ use SP\Html\DataGrid\DataGrid;
 use SP\Html\DataGrid\DataGridData;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Html\DataGrid\Layout\DataGridHeader;
-use SP\Html\Html;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\Date;
 
 use function SP\__;
 
diff --git a/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php b/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php
index ee122ab5..951b3696 100644
--- a/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php
+++ b/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php
@@ -26,6 +26,7 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid;
 
 use SP\Core\Acl\Acl;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Http\Adapters\Address;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
 use SP\Html\DataGrid\Action\DataGridActionType;
@@ -33,7 +34,6 @@ use SP\Html\DataGrid\DataGridData;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Html\DataGrid\DataGridTab;
 use SP\Html\DataGrid\Layout\DataGridHeader;
-use SP\Http\Address;
 use SP\Infrastructure\Database\QueryResult;
 
 /**
diff --git a/app/modules/web/Controllers/Helpers/HelperBase.php b/app/modules/web/Controllers/Helpers/HelperBase.php
index ce125404..cc197035 100644
--- a/app/modules/web/Controllers/Helpers/HelperBase.php
+++ b/app/modules/web/Controllers/Helpers/HelperBase.php
@@ -29,8 +29,8 @@ use SP\Core\Events\EventDispatcher;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigFile;
 use SP\Domain\Core\Context\Context;
-use SP\Domain\Http\RequestInterface;
-use SP\Http\Request;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Services\Request;
 use SP\Mvc\View\TemplateInterface;
 
 /**
@@ -52,12 +52,12 @@ abstract class HelperBase
      *
      * @param Application $application
      * @param TemplateInterface $template
-     * @param RequestInterface $request
+     * @param \SP\Domain\Http\Ports\RequestService $request
      */
     public function __construct(
         Application $application,
         TemplateInterface $template,
-        RequestInterface $request
+        RequestService $request
     ) {
         $this->config = $application->getConfig();
         $this->context = $application->getContext();
diff --git a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php
index 903249d2..b69f14e4 100644
--- a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php
+++ b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php
@@ -29,7 +29,7 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\NoSuchPropertyException;
 use SP\Domain\Core\Exceptions\QueryException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\ItemPreset\Models\AccountPermission;
 use SP\Domain\ItemPreset\Models\AccountPrivate;
 use SP\Domain\ItemPreset\Models\ItemPreset;
@@ -57,7 +57,7 @@ final class ItemPresetHelper extends HelperBase
     public function __construct(
         Application       $application,
         TemplateInterface $template,
-        RequestInterface  $request,
+        RequestService    $request,
         UserService       $userService,
         UserGroupService  $userGroupService,
         UserProfileService $userProfileService
diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php
index c6dcbeac..c0ce444b 100644
--- a/app/modules/web/Controllers/Helpers/LayoutHelper.php
+++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php
@@ -27,6 +27,7 @@ namespace SP\Modules\Web\Controllers\Helpers;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Language;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\AclInterface;
 use SP\Domain\Core\AppInfoInterface;
@@ -34,14 +35,13 @@ use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\UI\ThemeInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Providers\Uri;
 use SP\Domain\Install\Services\Installer;
 use SP\Html\DataGrid\Action\DataGridAction;
-use SP\Http\Uri;
+use SP\Infrastructure\File\FileSystem;
 use SP\Mvc\View\TemplateInterface;
 use SP\Plugin\PluginManager;
-use SP\Util\FileSystem;
-use SP\Util\Version;
 
 use function SP\__;
 use function SP\processException;
@@ -60,7 +60,7 @@ final class LayoutHelper extends HelperBase
     public function __construct(
         Application                          $application,
         TemplateInterface                    $template,
-        RequestInterface                     $request,
+        RequestService $request,
         ThemeInterface                       $theme,
         CryptPKIInterface                    $cryptPKI,
         private readonly UriContextInterface $uriContext,
diff --git a/app/modules/web/Controllers/Install/InstallController.php b/app/modules/web/Controllers/Install/InstallController.php
index 546853ca..7a57b961 100644
--- a/app/modules/web/Controllers/Install/InstallController.php
+++ b/app/modules/web/Controllers/Install/InstallController.php
@@ -28,9 +28,9 @@ namespace SP\Modules\Web\Controllers\Install;
 use Exception;
 use SP\Core\Application;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Install\Adapters\InstallDataFactory;
 use SP\Domain\Install\Ports\InstallerService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/ItemPreset/CreateController.php b/app/modules/web/Controllers/ItemPreset/CreateController.php
index 2ddfdadd..8f68b3e1 100644
--- a/app/modules/web/Controllers/ItemPreset/CreateController.php
+++ b/app/modules/web/Controllers/ItemPreset/CreateController.php
@@ -28,10 +28,10 @@ namespace SP\Modules\Web\Controllers\ItemPreset;
 use Exception;
 use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\Filter;
 
 /**
  * Class CreateController
diff --git a/app/modules/web/Controllers/ItemPreset/DeleteController.php b/app/modules/web/Controllers/ItemPreset/DeleteController.php
index 95c3cae2..bd72f7a1 100644
--- a/app/modules/web/Controllers/ItemPreset/DeleteController.php
+++ b/app/modules/web/Controllers/ItemPreset/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/ItemPreset/EditController.php b/app/modules/web/Controllers/ItemPreset/EditController.php
index 8c5733c8..36cfe8f9 100644
--- a/app/modules/web/Controllers/ItemPreset/EditController.php
+++ b/app/modules/web/Controllers/ItemPreset/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
index 15fe2b9a..13aee48a 100644
--- a/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
+++ b/app/modules/web/Controllers/ItemPreset/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/ItemPreset/SaveEditController.php b/app/modules/web/Controllers/ItemPreset/SaveEditController.php
index 3e419a41..3a71d382 100644
--- a/app/modules/web/Controllers/ItemPreset/SaveEditController.php
+++ b/app/modules/web/Controllers/ItemPreset/SaveEditController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/ItemPreset/SearchController.php b/app/modules/web/Controllers/ItemPreset/SearchController.php
index 4e7e1004..7ff7c34e 100644
--- a/app/modules/web/Controllers/ItemPreset/SearchController.php
+++ b/app/modules/web/Controllers/ItemPreset/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\ItemPreset\Ports\ItemPresetService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\ItemPresetGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/ItemPreset/ViewController.php b/app/modules/web/Controllers/ItemPreset/ViewController.php
index ca71af50..820fe266 100644
--- a/app/modules/web/Controllers/ItemPreset/ViewController.php
+++ b/app/modules/web/Controllers/ItemPreset/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Items/AccountsUserController.php b/app/modules/web/Controllers/Items/AccountsUserController.php
index bb82a412..4bc00945 100644
--- a/app/modules/web/Controllers/Items/AccountsUserController.php
+++ b/app/modules/web/Controllers/Items/AccountsUserController.php
@@ -29,8 +29,8 @@ use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Services\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 use stdClass;
diff --git a/app/modules/web/Controllers/Items/CategoriesController.php b/app/modules/web/Controllers/Items/CategoriesController.php
index ed7043f3..0a080110 100644
--- a/app/modules/web/Controllers/Items/CategoriesController.php
+++ b/app/modules/web/Controllers/Items/CategoriesController.php
@@ -29,7 +29,7 @@ use SP\Domain\Category\Ports\CategoryService;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Services\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 use SP\Mvc\View\Components\SelectItemAdapter;
diff --git a/app/modules/web/Controllers/Items/ClientsController.php b/app/modules/web/Controllers/Items/ClientsController.php
index 7934d506..38ec08f8 100644
--- a/app/modules/web/Controllers/Items/ClientsController.php
+++ b/app/modules/web/Controllers/Items/ClientsController.php
@@ -29,7 +29,7 @@ use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Services\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 use SP\Mvc\View\Components\SelectItemAdapter;
diff --git a/app/modules/web/Controllers/Items/NotificationsController.php b/app/modules/web/Controllers/Items/NotificationsController.php
index 86239c8b..bcc1b707 100644
--- a/app/modules/web/Controllers/Items/NotificationsController.php
+++ b/app/modules/web/Controllers/Items/NotificationsController.php
@@ -28,11 +28,10 @@ use SP\Core\Application;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Notification\Models\Notification;
+use SP\Domain\Html\Html;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Services\JsonResponse;
 use SP\Domain\Notification\Ports\NotificationService;
-use SP\Html\Html;
-use SP\Http\JsonMessage;
-use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 
diff --git a/app/modules/web/Controllers/Items/TagsController.php b/app/modules/web/Controllers/Items/TagsController.php
index 0ebb8c87..836a8528 100644
--- a/app/modules/web/Controllers/Items/TagsController.php
+++ b/app/modules/web/Controllers/Items/TagsController.php
@@ -28,8 +28,8 @@ use SP\Core\Application;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Services\JsonResponse;
 use SP\Domain\Tag\Ports\TagService;
-use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 use SP\Mvc\View\Components\SelectItemAdapter;
diff --git a/app/modules/web/Controllers/Login/LoginController.php b/app/modules/web/Controllers/Login/LoginController.php
index 41296633..8771785b 100644
--- a/app/modules/web/Controllers/Login/LoginController.php
+++ b/app/modules/web/Controllers/Login/LoginController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Auth\Ports\LoginService;
 use SP\Domain\Auth\Services\Login;
-use SP\Http\Uri;
+use SP\Domain\Http\Providers\Uri;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Notification/CheckController.php b/app/modules/web/Controllers/Notification/CheckController.php
index 3fc32856..d181f581 100644
--- a/app/modules/web/Controllers/Notification/CheckController.php
+++ b/app/modules/web/Controllers/Notification/CheckController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 final class CheckController extends NotificationSaveBase
diff --git a/app/modules/web/Controllers/Notification/CreateController.php b/app/modules/web/Controllers/Notification/CreateController.php
index 1f7bab39..1e474da8 100644
--- a/app/modules/web/Controllers/Notification/CreateController.php
+++ b/app/modules/web/Controllers/Notification/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Notification/DeleteController.php b/app/modules/web/Controllers/Notification/DeleteController.php
index fd1a15a0..c4197a77 100644
--- a/app/modules/web/Controllers/Notification/DeleteController.php
+++ b/app/modules/web/Controllers/Notification/DeleteController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Notification/EditController.php b/app/modules/web/Controllers/Notification/EditController.php
index 9aa66d46..1065a232 100644
--- a/app/modules/web/Controllers/Notification/EditController.php
+++ b/app/modules/web/Controllers/Notification/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Notification/SaveCreateController.php b/app/modules/web/Controllers/Notification/SaveCreateController.php
index 9070cab9..6464c658 100644
--- a/app/modules/web/Controllers/Notification/SaveCreateController.php
+++ b/app/modules/web/Controllers/Notification/SaveCreateController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 final class SaveCreateController extends NotificationSaveBase
diff --git a/app/modules/web/Controllers/Notification/SaveEditController.php b/app/modules/web/Controllers/Notification/SaveEditController.php
index 11a438da..eb9eec2e 100644
--- a/app/modules/web/Controllers/Notification/SaveEditController.php
+++ b/app/modules/web/Controllers/Notification/SaveEditController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Notification/SearchController.php b/app/modules/web/Controllers/Notification/SearchController.php
index 86e7356b..5f6fe217 100644
--- a/app/modules/web/Controllers/Notification/SearchController.php
+++ b/app/modules/web/Controllers/Notification/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Notification\Ports\NotificationService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\NotificationGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Notification/ViewController.php b/app/modules/web/Controllers/Notification/ViewController.php
index 213e91b3..43835d13 100644
--- a/app/modules/web/Controllers/Notification/ViewController.php
+++ b/app/modules/web/Controllers/Notification/ViewController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Plugin/DeleteController.php b/app/modules/web/Controllers/Plugin/DeleteController.php
index 53cc6e85..d9e61c2e 100644
--- a/app/modules/web/Controllers/Plugin/DeleteController.php
+++ b/app/modules/web/Controllers/Plugin/DeleteController.php
@@ -30,8 +30,8 @@ use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Plugin\Ports\PluginManagerService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
diff --git a/app/modules/web/Controllers/Plugin/DisableController.php b/app/modules/web/Controllers/Plugin/DisableController.php
index 8494a843..bb7fdb81 100644
--- a/app/modules/web/Controllers/Plugin/DisableController.php
+++ b/app/modules/web/Controllers/Plugin/DisableController.php
@@ -30,8 +30,8 @@ use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Plugin\Ports\PluginManagerService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Plugin/EnableController.php b/app/modules/web/Controllers/Plugin/EnableController.php
index 75d743b4..f3685019 100644
--- a/app/modules/web/Controllers/Plugin/EnableController.php
+++ b/app/modules/web/Controllers/Plugin/EnableController.php
@@ -30,8 +30,8 @@ use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Plugin\Ports\PluginManagerService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Plugin/ResetController.php b/app/modules/web/Controllers/Plugin/ResetController.php
index ff8a2e24..dec948a1 100644
--- a/app/modules/web/Controllers/Plugin/ResetController.php
+++ b/app/modules/web/Controllers/Plugin/ResetController.php
@@ -30,9 +30,9 @@ use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Plugin\Ports\PluginDataService;
 use SP\Domain\Plugin\Ports\PluginManagerService;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
diff --git a/app/modules/web/Controllers/Plugin/SearchController.php b/app/modules/web/Controllers/Plugin/SearchController.php
index e148d410..fc0153cd 100644
--- a/app/modules/web/Controllers/Plugin/SearchController.php
+++ b/app/modules/web/Controllers/Plugin/SearchController.php
@@ -29,7 +29,7 @@ use JsonException;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
  * Class SearchController
diff --git a/app/modules/web/Controllers/Plugin/ViewController.php b/app/modules/web/Controllers/Plugin/ViewController.php
index 005ea0b3..569e70fe 100644
--- a/app/modules/web/Controllers/Plugin/ViewController.php
+++ b/app/modules/web/Controllers/Plugin/ViewController.php
@@ -33,9 +33,9 @@ use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Plugin\Models\Plugin;
 use SP\Domain\Plugin\Ports\PluginManagerService;
-use SP\Http\JsonMessage;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/PublicLink/CreateController.php b/app/modules/web/Controllers/PublicLink/CreateController.php
index 7f656b9c..c61c44b1 100644
--- a/app/modules/web/Controllers/PublicLink/CreateController.php
+++ b/app/modules/web/Controllers/PublicLink/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/PublicLink/DeleteController.php b/app/modules/web/Controllers/PublicLink/DeleteController.php
index e925f96a..77f21a20 100644
--- a/app/modules/web/Controllers/PublicLink/DeleteController.php
+++ b/app/modules/web/Controllers/PublicLink/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/PublicLink/EditController.php b/app/modules/web/Controllers/PublicLink/EditController.php
index 578da297..8c3d6d5f 100644
--- a/app/modules/web/Controllers/PublicLink/EditController.php
+++ b/app/modules/web/Controllers/PublicLink/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/PublicLink/PublicLinkController.php b/app/modules/web/Controllers/PublicLink/PublicLinkController.php
index 2ffb1927..2abf7db7 100644
--- a/app/modules/web/Controllers/PublicLink/PublicLinkController.php
+++ b/app/modules/web/Controllers/PublicLink/PublicLinkController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/PublicLink/RefreshController.php b/app/modules/web/Controllers/PublicLink/RefreshController.php
index 6d82e0a3..93f1c36f 100644
--- a/app/modules/web/Controllers/PublicLink/RefreshController.php
+++ b/app/modules/web/Controllers/PublicLink/RefreshController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/PublicLink/SaveCreate.php b/app/modules/web/Controllers/PublicLink/SaveCreate.php
index eb0e1acf..9671e3ce 100644
--- a/app/modules/web/Controllers/PublicLink/SaveCreate.php
+++ b/app/modules/web/Controllers/PublicLink/SaveCreate.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
index 30f26d22..0d1349ca 100644
--- a/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
+++ b/app/modules/web/Controllers/PublicLink/SaveCreateFromAccountController.php
@@ -29,10 +29,10 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Account\Models\PublicLink;
 use SP\Domain\Account\Services\PublicLink;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\Password;
 
 /**
  * Class SaveCreateFromAccountController
diff --git a/app/modules/web/Controllers/PublicLink/SearchController.php b/app/modules/web/Controllers/PublicLink/SearchController.php
index 908f3903..e371a0e6 100644
--- a/app/modules/web/Controllers/PublicLink/SearchController.php
+++ b/app/modules/web/Controllers/PublicLink/SearchController.php
@@ -31,8 +31,8 @@ use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\PublicLinkGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Resource/CssController.php b/app/modules/web/Controllers/Resource/CssController.php
index 378ac29b..21fe75ab 100644
--- a/app/modules/web/Controllers/Resource/CssController.php
+++ b/app/modules/web/Controllers/Resource/CssController.php
@@ -24,9 +24,9 @@
 
 namespace SP\Modules\Web\Controllers\Resource;
 
-use SP\Http\Request as HttpRequest;
+use SP\Domain\Http\Services\Request as HttpRequest;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 /**
  * Class CssController
diff --git a/app/modules/web/Controllers/Resource/JsController.php b/app/modules/web/Controllers/Resource/JsController.php
index f797fee6..e5f5bac7 100644
--- a/app/modules/web/Controllers/Resource/JsController.php
+++ b/app/modules/web/Controllers/Resource/JsController.php
@@ -24,9 +24,9 @@
 
 namespace SP\Modules\Web\Controllers\Resource;
 
-use SP\Http\Request as HttpRequest;
+use SP\Domain\Http\Services\Request as HttpRequest;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 /**
  * Class JsController
diff --git a/app/modules/web/Controllers/Resource/ResourceBase.php b/app/modules/web/Controllers/Resource/ResourceBase.php
index 4d665013..4c1b67a5 100644
--- a/app/modules/web/Controllers/Resource/ResourceBase.php
+++ b/app/modules/web/Controllers/Resource/ResourceBase.php
@@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Resource;
 use SP\Core\Application;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Html\MinifyInterface;
+use SP\Domain\Html\Ports\MinifyService;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Mvc\Controller\SimpleControllerHelper;
 
@@ -44,7 +44,7 @@ abstract class ResourceBase extends SimpleControllerBase
     public function __construct(
         Application                        $application,
         SimpleControllerHelper             $simpleControllerHelper,
-        protected readonly MinifyInterface $minify
+        protected readonly MinifyService $minify
     ) {
         parent::__construct($application, $simpleControllerHelper);
 
diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php
index 8ee3cb7a..64bcc23b 100644
--- a/app/modules/web/Controllers/SimpleControllerBase.php
+++ b/app/modules/web/Controllers/SimpleControllerBase.php
@@ -36,7 +36,7 @@ use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Exceptions\SessionTimeout;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\UI\ThemeInterface;
-use SP\Http\Request;
+use SP\Domain\Http\Services\Request;
 use SP\Modules\Web\Controllers\Traits\WebControllerTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
 
diff --git a/app/modules/web/Controllers/Status/CheckNotices.php b/app/modules/web/Controllers/Status/CheckNotices.php
index ff64f07f..382004f4 100644
--- a/app/modules/web/Controllers/Status/CheckNotices.php
+++ b/app/modules/web/Controllers/Status/CheckNotices.php
@@ -28,7 +28,7 @@ namespace SP\Modules\Web\Controllers\Status;
 use JsonException;
 use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\Exceptions\CheckException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use Throwable;
 
diff --git a/app/modules/web/Controllers/Status/StatusController.php b/app/modules/web/Controllers/Status/StatusController.php
index 4454dcff..e4ff9f3e 100644
--- a/app/modules/web/Controllers/Status/StatusController.php
+++ b/app/modules/web/Controllers/Status/StatusController.php
@@ -25,11 +25,11 @@
 namespace SP\Modules\Web\Controllers\Status;
 
 use JsonException;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\Exceptions\CheckException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
-use SP\Util\Version;
 use Throwable;
 
 /**
diff --git a/app/modules/web/Controllers/Tag/CreateController.php b/app/modules/web/Controllers/Tag/CreateController.php
index 530c2438..668738ae 100644
--- a/app/modules/web/Controllers/Tag/CreateController.php
+++ b/app/modules/web/Controllers/Tag/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Tag/DeleteController.php b/app/modules/web/Controllers/Tag/DeleteController.php
index dd1b0751..19691c32 100644
--- a/app/modules/web/Controllers/Tag/DeleteController.php
+++ b/app/modules/web/Controllers/Tag/DeleteController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/Tag/EditController.php b/app/modules/web/Controllers/Tag/EditController.php
index 3f22baa8..85ac1841 100644
--- a/app/modules/web/Controllers/Tag/EditController.php
+++ b/app/modules/web/Controllers/Tag/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Tag/SaveCreateController.php b/app/modules/web/Controllers/Tag/SaveCreateController.php
index f8ab6388..fbcfd0d9 100644
--- a/app/modules/web/Controllers/Tag/SaveCreateController.php
+++ b/app/modules/web/Controllers/Tag/SaveCreateController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Tag/SaveEditController.php b/app/modules/web/Controllers/Tag/SaveEditController.php
index 89a2d08d..6667d7fc 100644
--- a/app/modules/web/Controllers/Tag/SaveEditController.php
+++ b/app/modules/web/Controllers/Tag/SaveEditController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Tag/SearchController.php b/app/modules/web/Controllers/Tag/SearchController.php
index eeff354f..f25fdc7a 100644
--- a/app/modules/web/Controllers/Tag/SearchController.php
+++ b/app/modules/web/Controllers/Tag/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Tag\Ports\TagService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\TagGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/Tag/ViewController.php b/app/modules/web/Controllers/Tag/ViewController.php
index a0ab84b7..fddfc617 100644
--- a/app/modules/web/Controllers/Tag/ViewController.php
+++ b/app/modules/web/Controllers/Tag/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Track/ClearController.php b/app/modules/web/Controllers/Track/ClearController.php
index 0efed459..4938870a 100644
--- a/app/modules/web/Controllers/Track/ClearController.php
+++ b/app/modules/web/Controllers/Track/ClearController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedActionException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Track/UnlockController.php b/app/modules/web/Controllers/Track/UnlockController.php
index 48dd0518..f14bd0ae 100644
--- a/app/modules/web/Controllers/Track/UnlockController.php
+++ b/app/modules/web/Controllers/Track/UnlockController.php
@@ -30,7 +30,7 @@ use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Acl\UnauthorizedActionException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/Traits/ConfigTrait.php b/app/modules/web/Controllers/Traits/ConfigTrait.php
index 3c46b586..bbb291d4 100644
--- a/app/modules/web/Controllers/Traits/ConfigTrait.php
+++ b/app/modules/web/Controllers/Traits/ConfigTrait.php
@@ -29,8 +29,9 @@ use JsonException;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
-use SP\Http\JsonMessage;
-use SP\Util\Util;
+use SP\Domain\Http\Dtos\JsonMessage;
+
+use function SP\logger;
 
 /**
  * Trait ConfigTrait
@@ -59,7 +60,7 @@ trait ConfigTrait
             $config->save($configData);
 
             if (BootstrapBase::$LOCK !== false && $configData->isMaintenance() === false) {
-                Util::unlockApp();
+                self::unlockApp();
             }
 
             if ($onSuccess !== null) {
@@ -77,4 +78,14 @@ trait ConfigTrait
             );
         }
     }
+
+    /**
+     * Desbloquear la aplicación
+     */
+    private static function unlockApp(): bool
+    {
+        logger('Application unlocked');
+
+        return @unlink(LOCK_FILE);
+    }
 }
diff --git a/app/modules/web/Controllers/Traits/JsonTrait.php b/app/modules/web/Controllers/Traits/JsonTrait.php
index 1111e180..d6688a17 100644
--- a/app/modules/web/Controllers/Traits/JsonTrait.php
+++ b/app/modules/web/Controllers/Traits/JsonTrait.php
@@ -28,8 +28,8 @@ use Exception;
 use Klein\Klein;
 use SP\Core\Context\Session;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Services\JsonResponse;
 
 /**
  * Trait JsonTrait
diff --git a/app/modules/web/Controllers/Traits/WebControllerTrait.php b/app/modules/web/Controllers/Traits/WebControllerTrait.php
index e97afdce..2ed04d30 100644
--- a/app/modules/web/Controllers/Traits/WebControllerTrait.php
+++ b/app/modules/web/Controllers/Traits/WebControllerTrait.php
@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Traits;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Mvc\Controller\ControllerTrait;
 
 /**
@@ -43,7 +43,7 @@ trait WebControllerTrait
      * This component is used for deep linking
      */
     final protected function getSignedUriFromRequest(
-        RequestInterface $request,
+        RequestService $request,
         ConfigDataInterface $configData
     ): ?string {
         if (!$this->setup) {
diff --git a/app/modules/web/Controllers/Upgrade/UpgradeController.php b/app/modules/web/Controllers/Upgrade/UpgradeController.php
index 049311a4..d5e83f52 100644
--- a/app/modules/web/Controllers/Upgrade/UpgradeController.php
+++ b/app/modules/web/Controllers/Upgrade/UpgradeController.php
@@ -29,11 +29,11 @@ use JsonException;
 use SP\Core\Application;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\Exceptions\ValidationException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\Persistence\Ports\UpgradeServiceDatabaseService;
 use SP\Domain\Upgrade\Services\UpgradeAppService;
 use SP\Domain\Upgrade\Services\UpgradeDatabaseService;
 use SP\Domain\Upgrade\Services\UpgradeException;
-use SP\Http\JsonMessage;
 use SP\Infrastructure\File\FileException;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/User/CreateController.php b/app/modules/web/Controllers/User/CreateController.php
index 4e0ca79a..0b6b8b21 100644
--- a/app/modules/web/Controllers/User/CreateController.php
+++ b/app/modules/web/Controllers/User/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/User/DeleteController.php b/app/modules/web/Controllers/User/DeleteController.php
index 968c95a3..b47d2fd0 100644
--- a/app/modules/web/Controllers/User/DeleteController.php
+++ b/app/modules/web/Controllers/User/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/User/EditController.php b/app/modules/web/Controllers/User/EditController.php
index 9be2bf7c..d1f465c2 100644
--- a/app/modules/web/Controllers/User/EditController.php
+++ b/app/modules/web/Controllers/User/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/User/EditPassController.php b/app/modules/web/Controllers/User/EditPassController.php
index e18fc817..6800b311 100644
--- a/app/modules/web/Controllers/User/EditPassController.php
+++ b/app/modules/web/Controllers/User/EditPassController.php
@@ -29,8 +29,8 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Models\User;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/User/SaveCreateController.php b/app/modules/web/Controllers/User/SaveCreateController.php
index 0db24d0b..ac346e00 100644
--- a/app/modules/web/Controllers/User/SaveCreateController.php
+++ b/app/modules/web/Controllers/User/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/User/SaveEditController.php b/app/modules/web/Controllers/User/SaveEditController.php
index 3d014366..36e0e47d 100644
--- a/app/modules/web/Controllers/User/SaveEditController.php
+++ b/app/modules/web/Controllers/User/SaveEditController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/User/SaveEditPassController.php b/app/modules/web/Controllers/User/SaveEditPassController.php
index 92b08166..a78d8c19 100644
--- a/app/modules/web/Controllers/User/SaveEditPassController.php
+++ b/app/modules/web/Controllers/User/SaveEditPassController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/User/SearchController.php b/app/modules/web/Controllers/User/SearchController.php
index 038fdfff..a8560bfe 100644
--- a/app/modules/web/Controllers/User/SearchController.php
+++ b/app/modules/web/Controllers/User/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Ports\UserService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\UserGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/User/ViewController.php b/app/modules/web/Controllers/User/ViewController.php
index e974d3fb..239686dd 100644
--- a/app/modules/web/Controllers/User/ViewController.php
+++ b/app/modules/web/Controllers/User/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserGroup/CreateController.php b/app/modules/web/Controllers/UserGroup/CreateController.php
index a80a0ba8..6276ad28 100644
--- a/app/modules/web/Controllers/UserGroup/CreateController.php
+++ b/app/modules/web/Controllers/UserGroup/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserGroup/DeleteController.php b/app/modules/web/Controllers/UserGroup/DeleteController.php
index d95de452..638ce32d 100644
--- a/app/modules/web/Controllers/UserGroup/DeleteController.php
+++ b/app/modules/web/Controllers/UserGroup/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserGroup/EditController.php b/app/modules/web/Controllers/UserGroup/EditController.php
index d79190af..f2f8ede8 100644
--- a/app/modules/web/Controllers/UserGroup/EditController.php
+++ b/app/modules/web/Controllers/UserGroup/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserGroup/SaveCreateController.php b/app/modules/web/Controllers/UserGroup/SaveCreateController.php
index d8a9d95c..bc2f0282 100644
--- a/app/modules/web/Controllers/UserGroup/SaveCreateController.php
+++ b/app/modules/web/Controllers/UserGroup/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserGroup/SaveEditController.php b/app/modules/web/Controllers/UserGroup/SaveEditController.php
index 1d5956d2..c19dbda5 100644
--- a/app/modules/web/Controllers/UserGroup/SaveEditController.php
+++ b/app/modules/web/Controllers/UserGroup/SaveEditController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserGroup/SearchController.php b/app/modules/web/Controllers/UserGroup/SearchController.php
index 18392951..71965114 100644
--- a/app/modules/web/Controllers/UserGroup/SearchController.php
+++ b/app/modules/web/Controllers/UserGroup/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\UserGroupGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/UserGroup/ViewController.php b/app/modules/web/Controllers/UserGroup/ViewController.php
index 5edf1c05..1818e998 100644
--- a/app/modules/web/Controllers/UserGroup/ViewController.php
+++ b/app/modules/web/Controllers/UserGroup/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
index e5f58ac0..8caaf109 100644
--- a/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
+++ b/app/modules/web/Controllers/UserPassReset/SaveRequestController.php
@@ -30,8 +30,8 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Services\UserPassRecover;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserPassReset/SaveResetController.php b/app/modules/web/Controllers/UserPassReset/SaveResetController.php
index ecd7ae93..867fc2e3 100644
--- a/app/modules/web/Controllers/UserPassReset/SaveResetController.php
+++ b/app/modules/web/Controllers/UserPassReset/SaveResetController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserProfile/CreateController.php b/app/modules/web/Controllers/UserProfile/CreateController.php
index 806b421d..77c72d63 100644
--- a/app/modules/web/Controllers/UserProfile/CreateController.php
+++ b/app/modules/web/Controllers/UserProfile/CreateController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserProfile/DeleteController.php b/app/modules/web/Controllers/UserProfile/DeleteController.php
index 0bb89106..cf6ff2a9 100644
--- a/app/modules/web/Controllers/UserProfile/DeleteController.php
+++ b/app/modules/web/Controllers/UserProfile/DeleteController.php
@@ -30,7 +30,7 @@ use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserProfile/EditController.php b/app/modules/web/Controllers/UserProfile/EditController.php
index 59deb2ec..c7940f5c 100644
--- a/app/modules/web/Controllers/UserProfile/EditController.php
+++ b/app/modules/web/Controllers/UserProfile/EditController.php
@@ -29,7 +29,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserProfile/SaveCreateController.php b/app/modules/web/Controllers/UserProfile/SaveCreateController.php
index 09c32165..3e48a488 100644
--- a/app/modules/web/Controllers/UserProfile/SaveCreateController.php
+++ b/app/modules/web/Controllers/UserProfile/SaveCreateController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserProfile/SaveEditController.php b/app/modules/web/Controllers/UserProfile/SaveEditController.php
index 702c5b97..f3018f9f 100644
--- a/app/modules/web/Controllers/UserProfile/SaveEditController.php
+++ b/app/modules/web/Controllers/UserProfile/SaveEditController.php
@@ -31,7 +31,7 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
 
diff --git a/app/modules/web/Controllers/UserProfile/SearchController.php b/app/modules/web/Controllers/UserProfile/SearchController.php
index f4b76f50..3ab6a6d3 100644
--- a/app/modules/web/Controllers/UserProfile/SearchController.php
+++ b/app/modules/web/Controllers/UserProfile/SearchController.php
@@ -30,9 +30,9 @@ use SP\Core\Application;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Ports\UserProfileService;
 use SP\Html\DataGrid\DataGridInterface;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Grid\UserProfileGrid;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
diff --git a/app/modules/web/Controllers/UserProfile/ViewController.php b/app/modules/web/Controllers/UserProfile/ViewController.php
index 423ed250..58215940 100644
--- a/app/modules/web/Controllers/UserProfile/ViewController.php
+++ b/app/modules/web/Controllers/UserProfile/ViewController.php
@@ -28,7 +28,7 @@ use Exception;
 use JsonException;
 use SP\Core\Events\Event;
 use SP\Domain\Core\Acl\AclActionsInterface;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
 /**
diff --git a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php
index 73a2db38..29fa9174 100644
--- a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php
+++ b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php
@@ -28,11 +28,11 @@ use Exception;
 use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
+use SP\Domain\Http\Dtos\JsonMessage;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\UserPreferences;
 use SP\Domain\User\Ports\UserService;
 use SP\Domain\User\Services\User;
-use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
diff --git a/app/modules/web/Forms/AccountForm.php b/app/modules/web/Forms/AccountForm.php
index 9a947ecc..6afd3ce6 100644
--- a/app/modules/web/Forms/AccountForm.php
+++ b/app/modules/web/Forms/AccountForm.php
@@ -31,7 +31,7 @@ use SP\Domain\Account\Dtos\AccountUpdateDto;
 use SP\Domain\Account\Ports\AccountPresetService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ValidationException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Util\Chainable;
 
 use function SP\__u;
@@ -46,7 +46,7 @@ final class AccountForm extends FormBase implements FormInterface
 
     public function __construct(
         Application          $application,
-        RequestInterface     $request,
+        RequestService $request,
         AccountPresetService $accountPresetService,
         ?int                 $itemId = null
     ) {
diff --git a/app/modules/web/Forms/FormBase.php b/app/modules/web/Forms/FormBase.php
index 4833c5a6..3497fcca 100644
--- a/app/modules/web/Forms/FormBase.php
+++ b/app/modules/web/Forms/FormBase.php
@@ -28,7 +28,7 @@ use SP\Core\Application;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigFile;
 use SP\Domain\Core\Context\Context;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class FormBase
@@ -45,13 +45,13 @@ abstract class FormBase
      * FormBase constructor.
      *
      * @param Application $application
-     * @param RequestInterface $request
+     * @param RequestService $request
      * @param  int|null  $itemId
      */
     public function __construct(
-        Application $application,
-        protected RequestInterface $request,
-        protected ?int $itemId = null
+        Application              $application,
+        protected RequestService $request,
+        protected ?int           $itemId = null
     ) {
         $this->config = $application->getConfig();
         $this->configData = $this->config->getConfigData();
diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php
index 96d7b072..35bc9af3 100644
--- a/app/modules/web/Init.php
+++ b/app/modules/web/Init.php
@@ -38,6 +38,7 @@ use SP\Core\Crypt\Session as CryptSession;
 use SP\Core\HttpModuleBase;
 use SP\Core\Language;
 use SP\Core\ProvidersHelper;
+use SP\Domain\Common\Providers\Http;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Core\Crypt\CsrfInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -50,15 +51,15 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\LanguageInterface;
 use SP\Domain\Crypt\Ports\SecureSessionService;
 use SP\Domain\Crypt\Services\SecureSession;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Adapters\Address;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Providers\Uri;
 use SP\Domain\ItemPreset\Models\SessionTimeout;
 use SP\Domain\ItemPreset\Ports\ItemPresetInterface;
 use SP\Domain\ItemPreset\Services\ItemPreset;
 use SP\Domain\Upgrade\Services\UpgradeUtil;
 use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Services\UserProfile;
-use SP\Http\Address;
-use SP\Http\Uri;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\DatabaseUtil;
 use SP\Infrastructure\File\FileException;
@@ -80,7 +81,6 @@ use SP\Modules\Web\Controllers\Status\StatusController;
 use SP\Modules\Web\Controllers\Task\TrackStatusController;
 use SP\Modules\Web\Controllers\Upgrade\IndexController as UpgradeIndexController;
 use SP\Modules\Web\Controllers\Upgrade\UpgradeController;
-use SP\Util\Http;
 
 use function SP\logger;
 use function SP\processException;
@@ -145,7 +145,7 @@ final class Init extends HttpModuleBase
     public function __construct(
         Application                          $application,
         ProvidersHelper                      $providersHelper,
-        RequestInterface                     $request,
+        RequestService       $request,
         Klein                                $router,
         CsrfInterface                        $csrf,
         LanguageInterface                    $language,
diff --git a/app/modules/web/module.php b/app/modules/web/module.php
index 86bc7921..fd903fc1 100644
--- a/app/modules/web/module.php
+++ b/app/modules/web/module.php
@@ -24,9 +24,9 @@
 
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
-use SP\Domain\Html\MinifyInterface;
-use SP\Html\MinifyCss;
-use SP\Html\MinifyJs;
+use SP\Domain\Html\Ports\MinifyService;
+use SP\Domain\Html\Services\MinifyCss;
+use SP\Domain\Html\Services\MinifyJs;
 use SP\Modules\Web\Bootstrap;
 use SP\Modules\Web\Controllers\Resource\CssController;
 use SP\Modules\Web\Controllers\Resource\JsController;
@@ -43,9 +43,9 @@ return [
     ModuleInterface::class => autowire(Init::class),
     CssController::class => autowire(
         CssController::class
-    )->constructorParameter(MinifyInterface::class, autowire(MinifyCss::class)),
+    )->constructorParameter(MinifyService::class, autowire(MinifyCss::class)),
     JsController::class => autowire(
         JsController::class
-    )->constructorParameter(MinifyInterface::class, autowire(MinifyJs::class))
+    )->constructorParameter(MinifyService::class, autowire(MinifyJs::class))
 
 ];
diff --git a/app/modules/web/themes/material-blue/views/account/files-list.inc b/app/modules/web/themes/material-blue/views/account/files-list.inc
index c7e82bb5..8cd0c7ae 100644
--- a/app/modules/web/themes/material-blue/views/account/files-list.inc
+++ b/app/modules/web/themes/material-blue/views/account/files-list.inc
@@ -29,10 +29,9 @@
  * @var \SP\Domain\Account\Models\File $file
  */
 
-use SP\Domain\Account\Models\File;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
-use SP\Html\Html;
+use SP\Domain\Html\Html;
 
 ?>
 
diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc
index 715cb665..8a12d9f9 100644
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -34,12 +34,12 @@
  */
 
 use SP\Domain\Account\Adapters\AccountSearchItem;
+use SP\Domain\Common\Adapters\Date;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\Action\DataGridActionBase;
 use SP\Html\DataGrid\DataGridTab;
-use SP\Util\Date;
 
 if (!isset($data)) {
     $data = $_getvar('data');
diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc
index 4f46fe38..fad55bdd 100644
--- a/app/modules/web/themes/material-blue/views/config/info.inc
+++ b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -34,12 +34,12 @@
     <i class="material-icons">info</i>
     <?php
 
+    use SP\Domain\Common\Providers\Version;
     use SP\Domain\Config\Ports\ConfigDataInterface;
     use SP\Domain\Core\UI\ThemeIconsInterface;
     use SP\Domain\Install\Services\Installer;
     use SP\Domain\Plugin\Ports\Plugin;
     use SP\Mvc\View\TemplateInterface;
-    use SP\Util\Version;
 
     use function SP\__;
 
diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
index ec964fed..cb05fa8d 100644
--- a/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-rows.inc
@@ -5,8 +5,7 @@
  * @var callable $_getvar
  */
 
-use SP\Html\Html;
-use SP\Mvc\View\Template;
+use SP\Domain\Html\Html;
 
 if (!isset($data)) {
     $data = $_getvar('data');
@@ -99,4 +98,4 @@ if (!isset($data)) {
             <?php endif; ?>
         </tr>
     <?php endforeach; ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/app/modules/web/themes/material-blue/views/main/upgrade.inc b/app/modules/web/themes/material-blue/views/main/upgrade.inc
index 5f08dc9c..134bcbd6 100644
--- a/app/modules/web/themes/material-blue/views/main/upgrade.inc
+++ b/app/modules/web/themes/material-blue/views/main/upgrade.inc
@@ -34,10 +34,10 @@
         <div id="page-title">
             <h1><?php
 
+                use SP\Domain\Common\Providers\Version;
                 use SP\Domain\Config\Ports\ConfigDataInterface;
                 use SP\Domain\Core\UI\ThemeIconsInterface;
                 use SP\Mvc\View\TemplateInterface;
-                use SP\Util\Version;
 
                 printf(__('Update %s'), $_getvar('upgradeVersion')); ?></h1>
         </div>
diff --git a/app/modules/web/themes/material-blue/views/notification/notification.inc b/app/modules/web/themes/material-blue/views/notification/notification.inc
index e29a46fe..5c87a742 100644
--- a/app/modules/web/themes/material-blue/views/notification/notification.inc
+++ b/app/modules/web/themes/material-blue/views/notification/notification.inc
@@ -30,12 +30,12 @@
  * @var TemplateInterface $this
  */
 
+use SP\Domain\Common\Adapters\Date;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Domain\Notification\Models\Notification;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
-use SP\Util\Date;
 
 $notification = $_getvar('notification');
 ?>
diff --git a/cli.php b/cli.php
index 346ac6e5..7d6ed6db 100644
--- a/cli.php
+++ b/cli.php
@@ -24,7 +24,7 @@
 
 use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/index.php b/index.php
index 96293340..d6609440 100644
--- a/index.php
+++ b/index.php
@@ -25,8 +25,8 @@
 use Psr\Container\ContainerInterface;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
 use SP\Domain\Core\Bootstrap\ModuleInterface;
+use SP\Infrastructure\File\FileSystem;
 use SP\Modules\Web\Bootstrap;
-use SP\Util\FileSystem;
 
 use function SP\processException;
 
diff --git a/lib/BaseFunctions.php b/lib/BaseFunctions.php
index e63597e2..eb65ef24 100644
--- a/lib/BaseFunctions.php
+++ b/lib/BaseFunctions.php
@@ -26,7 +26,7 @@ namespace SP;
 
 use Exception;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 use Throwable;
 
 /**
diff --git a/lib/SP/Core/Bootstrap/BootstrapBase.php b/lib/SP/Core/Bootstrap/BootstrapBase.php
index ca6dd433..03d0a2da 100644
--- a/lib/SP/Core/Bootstrap/BootstrapBase.php
+++ b/lib/SP/Core/Bootstrap/BootstrapBase.php
@@ -34,6 +34,7 @@ use Psr\Container\NotFoundExceptionInterface;
 use RuntimeException;
 use SP\Core\Language;
 use SP\Core\PhpExtensionChecker;
+use SP\Domain\Common\Providers\Environment;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigUtil;
 use SP\Domain\Core\Bootstrap\BootstrapInterface;
@@ -42,9 +43,8 @@ use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Exceptions\CheckException;
 use SP\Domain\Core\Exceptions\ConfigException;
 use SP\Domain\Core\Exceptions\InitializationException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Checks;
 use Symfony\Component\Debug\Debug;
 use Throwable;
 
@@ -67,10 +67,10 @@ abstract class BootstrapBase implements BootstrapInterface
     final public function __construct(
         protected readonly ConfigDataInterface $configData,
         protected readonly Klein               $router,
-        protected readonly RequestInterface    $request,
+        protected readonly RequestService $request,
         private readonly UpgradeConfigChecker  $upgradeConfigChecker,
         protected readonly PhpExtensionChecker $extensionChecker,
-        protected readonly Context $context,
+        protected readonly Context        $context,
         private readonly ContainerInterface    $container,
         protected readonly Response            $response,
     ) {
@@ -151,7 +151,7 @@ abstract class BootstrapBase implements BootstrapInterface
     {
         logger(__FUNCTION__);
 
-        self::$checkPhpVersion = Checks::checkPhpVersion();
+        self::$checkPhpVersion = Environment::checkPhpVersion();
 
         // Initialize authentication variables
         $this->initAuthVariables();
diff --git a/lib/SP/Core/Bootstrap/RouteContext.php b/lib/SP/Core/Bootstrap/RouteContext.php
index 8c2ffb42..6262db64 100644
--- a/lib/SP/Core/Bootstrap/RouteContext.php
+++ b/lib/SP/Core/Bootstrap/RouteContext.php
@@ -25,8 +25,8 @@
 namespace SP\Core\Bootstrap;
 
 use RuntimeException;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Bootstrap\RouteContextData;
-use SP\Util\Filter;
 
 use function SP\__u;
 
diff --git a/lib/SP/Core/Bootstrap/UriContext.php b/lib/SP/Core/Bootstrap/UriContext.php
index 88358bf6..6a6028df 100644
--- a/lib/SP/Core/Bootstrap/UriContext.php
+++ b/lib/SP/Core/Bootstrap/UriContext.php
@@ -25,7 +25,7 @@
 namespace SP\Core\Bootstrap;
 
 use SP\Domain\Core\Bootstrap\UriContextInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class UriContext
@@ -36,19 +36,19 @@ final readonly class UriContext implements UriContextInterface
     private string $webRoot;
     private string $webUri;
 
-    public function __construct(RequestInterface $request)
+    public function __construct(RequestService $request)
     {
         $this->subUri = $this->buildSubUri($request);
         $this->webRoot = $this->buildWebRoot($request);
         $this->webUri = $request->getHttpHost() . $this->webRoot;
     }
 
-    private function buildSubUri(RequestInterface $request): string
+    private function buildSubUri(RequestService $request): string
     {
         return '/' . basename($request->getServer('SCRIPT_FILENAME'));
     }
 
-    private function buildWebRoot(RequestInterface $request): string
+    private function buildWebRoot(RequestService $request): string
     {
         $uri = $request->getServer('REQUEST_URI');
 
diff --git a/lib/SP/Core/Crypt/Cookie.php b/lib/SP/Core/Crypt/Cookie.php
index e9cebc0f..e763d2d6 100644
--- a/lib/SP/Core/Crypt/Cookie.php
+++ b/lib/SP/Core/Crypt/Cookie.php
@@ -25,7 +25,7 @@
 namespace SP\Core\Crypt;
 
 use SP\Domain\Core\Bootstrap\UriContextInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 use function SP\logger;
 
@@ -36,7 +36,7 @@ abstract class Cookie
 {
     protected function __construct(
         private readonly string              $cookieName,
-        protected readonly RequestInterface  $request,
+        protected readonly RequestService $request,
         private readonly UriContextInterface $uriContext
     ) {
     }
diff --git a/lib/SP/Core/Crypt/Csrf.php b/lib/SP/Core/Crypt/Csrf.php
index f875d0a3..4e2e7b26 100644
--- a/lib/SP/Core/Crypt/Csrf.php
+++ b/lib/SP/Core/Crypt/Csrf.php
@@ -28,7 +28,7 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Context\SessionContext;
 use SP\Domain\Core\Crypt\CsrfInterface;
 use SP\Domain\Http\Method;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 use function SP\logger;
 
@@ -42,7 +42,7 @@ class Csrf implements CsrfInterface
 
     public function __construct(
         private readonly SessionContext      $context,
-        private readonly RequestInterface    $request,
+        private readonly RequestService $request,
         private readonly ConfigDataInterface $configData
     ) {
     }
diff --git a/lib/SP/Core/Crypt/RequestBasedPassword.php b/lib/SP/Core/Crypt/RequestBasedPassword.php
index c7bcb66d..29ebe99a 100644
--- a/lib/SP/Core/Crypt/RequestBasedPassword.php
+++ b/lib/SP/Core/Crypt/RequestBasedPassword.php
@@ -26,7 +26,7 @@ namespace SP\Core\Crypt;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Crypt\RequestBasedPasswordInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class RequestBasedPassword
@@ -34,7 +34,7 @@ use SP\Domain\Http\RequestInterface;
 final readonly class RequestBasedPassword implements RequestBasedPasswordInterface
 {
     public function __construct(
-        private RequestInterface    $request,
+        private RequestService $request,
         private ConfigDataInterface $configData
     ) {
     }
diff --git a/lib/SP/Core/Crypt/UuidCookie.php b/lib/SP/Core/Crypt/UuidCookie.php
index e0f0bc62..50ff9c81 100644
--- a/lib/SP/Core/Crypt/UuidCookie.php
+++ b/lib/SP/Core/Crypt/UuidCookie.php
@@ -26,7 +26,7 @@ namespace SP\Core\Crypt;
 
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Core\Crypt\UuidCookieInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class UuidCookie
@@ -38,7 +38,7 @@ class UuidCookie extends Cookie implements UuidCookieInterface
      */
     public const COOKIE_NAME = 'SYSPASS_UUID';
 
-    public static function factory(RequestInterface $request, UriContextInterface $uriContext): UuidCookie
+    public static function factory(RequestService $request, UriContextInterface $uriContext): UuidCookie
     {
         return new self(self::COOKIE_NAME, $request, $uriContext);
     }
diff --git a/lib/SP/Core/Crypt/Vault.php b/lib/SP/Core/Crypt/Vault.php
index 51b7c6b0..6b0e2189 100644
--- a/lib/SP/Core/Crypt/Vault.php
+++ b/lib/SP/Core/Crypt/Vault.php
@@ -25,10 +25,10 @@
 namespace SP\Core\Crypt;
 
 use RuntimeException;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Core\Crypt\CryptInterface;
 use SP\Domain\Core\Crypt\VaultInterface;
 use SP\Domain\Core\Exceptions\CryptException;
-use SP\Util\Serde;
 
 /**
  * Class Vault
diff --git a/lib/SP/Core/Definitions/CoreDefinitions.php b/lib/SP/Core/Definitions/CoreDefinitions.php
index ecdfb8e3..307520fc 100644
--- a/lib/SP/Core/Definitions/CoreDefinitions.php
+++ b/lib/SP/Core/Definitions/CoreDefinitions.php
@@ -49,6 +49,19 @@ use SP\Core\UI\ThemeIcons;
 use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapAuthService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
+use SP\Domain\Auth\Providers\AclHandler;
+use SP\Domain\Auth\Providers\AuthProvider;
+use SP\Domain\Auth\Providers\AuthProviderService;
+use SP\Domain\Auth\Providers\AuthType;
+use SP\Domain\Auth\Providers\Browser\BrowserAuth;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthService;
+use SP\Domain\Auth\Providers\Database\DatabaseAuth;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthService;
+use SP\Domain\Auth\Providers\Ldap\LdapActions;
+use SP\Domain\Auth\Providers\Ldap\LdapAuth;
+use SP\Domain\Auth\Providers\Ldap\LdapBase;
+use SP\Domain\Auth\Providers\Ldap\LdapConnection;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Domain\Config\Services\ConfigBackup;
@@ -69,37 +82,24 @@ use SP\Domain\Database\Ports\DatabaseInterface;
 use SP\Domain\Database\Ports\DbStorageHandler;
 use SP\Domain\Export\Ports\BackupFileHelperService;
 use SP\Domain\Export\Services\BackupFileHelper;
-use SP\Domain\Html\MinifyInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Html\Ports\MinifyService;
+use SP\Domain\Html\Services\Minify;
+use SP\Domain\Http\Client;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Services\Request;
 use SP\Domain\Install\Adapters\InstallDataFactory;
 use SP\Domain\Install\Services\DatabaseSetupInterface;
 use SP\Domain\Install\Services\MysqlSetupBuilder;
+use SP\Domain\Log\Providers\DatabaseHandler;
+use SP\Domain\Log\Providers\FileHandler;
+use SP\Domain\Log\Providers\RemoteSyslogHandler;
+use SP\Domain\Log\Providers\SyslogHandler;
+use SP\Domain\Notification\Ports\MailerInterface;
+use SP\Domain\Notification\Providers\MailHandler;
+use SP\Domain\Notification\Providers\NotificationHandler;
+use SP\Domain\Notification\Providers\PhpMailerWrapper;
 use SP\Domain\Notification\Services\Mail;
-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;
-use SP\Http\Request;
 use SP\Infrastructure\Database\Database;
 use SP\Infrastructure\Database\DatabaseConnectionData;
 use SP\Infrastructure\Database\MysqlHandler;
@@ -127,7 +127,7 @@ final class CoreDefinitions
             Klein::class => autowire(Klein::class),
             KleinRequest::class => factory([KleinRequest::class, 'createFromGlobals']),
             KleinResponse::class => create(KleinResponse::class),
-            RequestInterface::class => autowire(Request::class),
+            RequestService::class => autowire(Request::class),
             UriContextInterface::class => autowire(UriContext::class),
             Context::class =>
                 static fn() => ContextFactory::getForModule(APP_MODULE),
@@ -211,7 +211,7 @@ final class CoreDefinitions
                     factory([Mail::class, 'getParamsFromConfig'])
                         ->parameter('configData', get(ConfigDataInterface::class))
                 ),
-            DatabaseSetupInterface::class => static function (RequestInterface $request) {
+            DatabaseSetupInterface::class => static function (RequestService $request) {
                 $installData = InstallDataFactory::buildFromRequest($request);
 
                 if ($installData->getBackendType() === 'mysql') {
@@ -224,12 +224,12 @@ final class CoreDefinitions
                 $configData = $c->get(ConfigDataInterface::class);
 
                 if (!$configData->isInstalled()) {
-                    return new ProvidersHelper($c->get(FileLogHandler::class));
+                    return new ProvidersHelper($c->get(FileHandler::class));
                 }
 
                 return new ProvidersHelper(
-                    $c->get(FileLogHandler::class),
-                    $c->get(DatabaseLogHandler::class),
+                    $c->get(FileHandler::class),
+                    $c->get(DatabaseHandler::class),
                     $c->get(MailHandler::class),
                     $c->get(SyslogHandler::class),
                     $c->get(RemoteSyslogHandler::class),
@@ -248,10 +248,10 @@ final class CoreDefinitions
             UuidCookie::class => factory([UuidCookie::class, 'factory'])
                 ->parameter(
                     'request',
-                    get(RequestInterface::class)
+                    get(RequestService::class)
                 ),
             RequestBasedPasswordInterface::class => autowire(RequestBasedPassword::class),
-            MinifyInterface::class => autowire(Minify::class),
+            MinifyService::class => autowire(Minify::class),
             BackupFileHelperService::class => autowire(BackupFileHelper::class)
                 ->constructorParameter('path', new DirectoryHandler(BACKUP_PATH))
         ];
diff --git a/lib/SP/Core/HttpModuleBase.php b/lib/SP/Core/HttpModuleBase.php
index e8249172..a62d49c8 100644
--- a/lib/SP/Core/HttpModuleBase.php
+++ b/lib/SP/Core/HttpModuleBase.php
@@ -27,8 +27,11 @@ namespace SP\Core;
 use JsonException;
 use Klein\Klein;
 use SP\Core\Bootstrap\BootstrapBase;
-use SP\Domain\Http\RequestInterface;
-use SP\Util\Util;
+use SP\Domain\Common\Adapters\Serde;
+use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Infrastructure\File\FileException;
+use SP\Infrastructure\File\FileHandler;
 
 /**
  * Base module for HTTP based modules
@@ -36,10 +39,10 @@ use SP\Util\Util;
 abstract class HttpModuleBase extends ModuleBase
 {
     public function __construct(
-        Application                         $application,
-        ProvidersHelper                     $providersHelper,
-        protected readonly RequestInterface $request,
-        protected readonly Klein            $router
+        Application                       $application,
+        ProvidersHelper                   $providersHelper,
+        protected readonly RequestService $request,
+        protected readonly Klein          $router
     ) {
         parent::__construct($application, $providersHelper);
     }
@@ -53,7 +56,7 @@ abstract class HttpModuleBase extends ModuleBase
     protected function checkMaintenanceMode(): bool
     {
         if ($this->configData->isMaintenance()) {
-            BootstrapBase::$LOCK = Util::getAppLock();
+            BootstrapBase::$LOCK = self::getAppLock();
 
             return !$this->request->isAjax()
                    || !(BootstrapBase::$LOCK !== false
@@ -64,4 +67,21 @@ abstract class HttpModuleBase extends ModuleBase
 
         return false;
     }
+
+    /**
+     * Comprueba si la aplicación está bloqueada
+     *
+     * @return bool|string
+     * @throws SPException
+     */
+    private static function getAppLock(): bool|string
+    {
+        try {
+            $file = new FileHandler(LOCK_FILE);
+
+            return Serde::deserializeJson($file->readToString());
+        } catch (FileException) {
+            return false;
+        }
+    }
 }
diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php
index beedf7a5..eaa2f94e 100644
--- a/lib/SP/Core/Language.php
+++ b/lib/SP/Core/Language.php
@@ -27,7 +27,7 @@ namespace SP\Core;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\LanguageInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 use function SP\logger;
 
@@ -79,7 +79,7 @@ final class Language implements LanguageInterface
     public function __construct(
         private readonly Context $context,
         private readonly ConfigDataInterface $configData,
-        private readonly RequestInterface    $request
+        private readonly RequestService $request
     ) {
         ksort(self::$langs);
     }
diff --git a/lib/SP/Core/Messages/HtmlFormatter.php b/lib/SP/Core/Messages/HtmlFormatter.php
index e7949256..36d2a703 100644
--- a/lib/SP/Core/Messages/HtmlFormatter.php
+++ b/lib/SP/Core/Messages/HtmlFormatter.php
@@ -25,7 +25,7 @@
 namespace SP\Core\Messages;
 
 use SP\Domain\Core\Messages\FormatterInterface;
-use SP\Html\Html;
+use SP\Domain\Html\Html;
 
 use function SP\__;
 
diff --git a/lib/SP/Core/ProvidersHelper.php b/lib/SP/Core/ProvidersHelper.php
index 59fb7e44..9e08a3c1 100644
--- a/lib/SP/Core/ProvidersHelper.php
+++ b/lib/SP/Core/ProvidersHelper.php
@@ -24,13 +24,13 @@
 
 namespace SP\Core;
 
-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;
+use SP\Domain\Auth\Providers\AclHandler;
+use SP\Domain\Log\Providers\DatabaseHandler;
+use SP\Domain\Log\Providers\FileHandler;
+use SP\Domain\Log\Providers\RemoteSyslogHandler;
+use SP\Domain\Log\Providers\SyslogHandler;
+use SP\Domain\Notification\Providers\MailHandler;
+use SP\Domain\Notification\Providers\NotificationHandler;
 
 /**
  * The Provider helper class will have oll the providers availabe in the application
@@ -39,8 +39,8 @@ final readonly class ProvidersHelper
 {
 
     public function __construct(
-        private FileLogHandler       $fileLogHandler,
-        private ?DatabaseLogHandler  $databaseLogHandler = null,
+        private FileHandler      $fileLogHandler,
+        private ?DatabaseHandler $databaseLogHandler = null,
         private ?MailHandler         $mailHandler = null,
         private ?SyslogHandler       $syslogHandler = null,
         private ?RemoteSyslogHandler $remoteSyslogHandler = null,
@@ -49,12 +49,12 @@ final readonly class ProvidersHelper
     ) {
     }
 
-    public function getFileLogHandler(): FileLogHandler
+    public function getFileLogHandler(): FileHandler
     {
         return $this->fileLogHandler;
     }
 
-    public function getDatabaseLogHandler(): DatabaseLogHandler
+    public function getDatabaseLogHandler(): DatabaseHandler
     {
         return $this->databaseLogHandler;
     }
diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php
index e700d650..55e19974 100644
--- a/lib/SP/Core/UI/Theme.php
+++ b/lib/SP/Core/UI/Theme.php
@@ -31,7 +31,7 @@ use SP\Domain\Core\UI\ThemeContextInterface;
 use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\processException;
 
diff --git a/lib/SP/Core/UI/ThemeContext.php b/lib/SP/Core/UI/ThemeContext.php
index 281319e3..43391d1f 100644
--- a/lib/SP/Core/UI/ThemeContext.php
+++ b/lib/SP/Core/UI/ThemeContext.php
@@ -26,7 +26,7 @@ namespace SP\Core\UI;
 
 use Directory;
 use SP\Domain\Core\UI\ThemeContextInterface;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 /**
  * Class ThemeContext
diff --git a/lib/SP/Core/UI/ThemeIcons.php b/lib/SP/Core/UI/ThemeIcons.php
index 1be41f57..318a4b57 100644
--- a/lib/SP/Core/UI/ThemeIcons.php
+++ b/lib/SP/Core/UI/ThemeIcons.php
@@ -33,7 +33,7 @@ use SP\Domain\Storage\Ports\FileCacheService;
 use SP\Html\Assets\FontIcon;
 use SP\Html\Assets\IconInterface;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/lib/SP/Domain/Account/Adapters/Account.php b/lib/SP/Domain/Account/Adapters/Account.php
index 575187fe..c670be2d 100644
--- a/lib/SP/Domain/Account/Adapters/Account.php
+++ b/lib/SP/Domain/Account/Adapters/Account.php
@@ -29,6 +29,7 @@ use SP\Domain\Account\Dtos\AccountEnrichedDto;
 use SP\Domain\Account\Ports\AccountAdapter;
 use SP\Domain\Common\Adapters\Adapter;
 use SP\Domain\Common\Dtos\Dto;
+use SP\Domain\Common\Providers\Link;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -41,7 +42,6 @@ use SP\Domain\CustomField\Adapters\CustomField;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\View\Components\SelectItemAdapter;
-use SP\Util\Link;
 
 /**
  * Class Account
diff --git a/lib/SP/Domain/Account/Adapters/AccountSearchItem.php b/lib/SP/Domain/Account/Adapters/AccountSearchItem.php
index 28ad3f6e..c0c5a691 100644
--- a/lib/SP/Domain/Account/Adapters/AccountSearchItem.php
+++ b/lib/SP/Domain/Account/Adapters/AccountSearchItem.php
@@ -27,10 +27,9 @@ namespace SP\Domain\Account\Adapters;
 use SP\Domain\Account\Models\AccountSearchView;
 use SP\Domain\Account\Services\PublicLink;
 use SP\Domain\Common\Dtos\ItemDataTrait;
-use SP\Domain\Common\Models\Item;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
-use SP\Html\Html;
+use SP\Domain\Html\Html;
 
 /**
  * Class AccountSearchItem
diff --git a/lib/SP/Domain/Account/Dtos/PublicLinkKey.php b/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
index 9ef98273..b0bdf23c 100644
--- a/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
+++ b/lib/SP/Domain/Account/Dtos/PublicLinkKey.php
@@ -25,7 +25,7 @@
 namespace SP\Domain\Account\Dtos;
 
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
-use SP\Util\Password;
+use SP\Domain\Common\Providers\Password;
 
 /**
  * Class PublicLinkKey
diff --git a/lib/SP/Domain/Account/Models/AccountHistory.php b/lib/SP/Domain/Account/Models/AccountHistory.php
index 1069892d..6183b8d1 100644
--- a/lib/SP/Domain/Account/Models/AccountHistory.php
+++ b/lib/SP/Domain/Account/Models/AccountHistory.php
@@ -31,6 +31,8 @@ use SP\Domain\Common\Models\Model;
  */
 final class AccountHistory extends Model
 {
+    public const TABLE = 'AccountHistory';
+
     protected ?int    $id                 = null;
     protected ?int    $userId             = null;
     protected ?int    $userGroupId        = null;
diff --git a/lib/SP/Domain/Account/Models/AccountSearchView.php b/lib/SP/Domain/Account/Models/AccountSearchView.php
index 32ad91fe..45e73e2c 100644
--- a/lib/SP/Domain/Account/Models/AccountSearchView.php
+++ b/lib/SP/Domain/Account/Models/AccountSearchView.php
@@ -31,6 +31,8 @@ use SP\Domain\Common\Models\Model;
  */
 final class AccountSearchView extends Model
 {
+    public const TABLE = 'account_search_v';
+
     protected ?int    $id                        = null;
     protected ?int    $clientId                  = null;
     protected ?int    $categoryId                = null;
diff --git a/lib/SP/Domain/Account/Models/AccountToUserGroup.php b/lib/SP/Domain/Account/Models/AccountToUserGroup.php
index 2a5f6555..9287e04c 100644
--- a/lib/SP/Domain/Account/Models/AccountToUserGroup.php
+++ b/lib/SP/Domain/Account/Models/AccountToUserGroup.php
@@ -31,6 +31,5 @@ use SP\Domain\Common\Models\Model;
  */
 final class AccountToUserGroup extends Model
 {
-
     public const TABLE = 'AccountToUserGroup';
 }
diff --git a/lib/SP/Domain/Account/Models/AccountView.php b/lib/SP/Domain/Account/Models/AccountView.php
index ea682057..90be0701 100644
--- a/lib/SP/Domain/Account/Models/AccountView.php
+++ b/lib/SP/Domain/Account/Models/AccountView.php
@@ -31,6 +31,8 @@ use SP\Domain\Common\Models\Model;
  */
 final class AccountView extends Model
 {
+    public const TABLE = 'account_data_v';
+
     protected ?int    $id                 = null;
     protected ?string $name               = null;
     protected ?int    $categoryId         = null;
diff --git a/lib/SP/Domain/Account/Models/File.php b/lib/SP/Domain/Account/Models/File.php
index a750e65e..b0752ec7 100644
--- a/lib/SP/Domain/Account/Models/File.php
+++ b/lib/SP/Domain/Account/Models/File.php
@@ -32,6 +32,8 @@ use SP\Domain\Common\Models\Model;
  */
 class File extends Model implements ItemWithIdAndNameModel
 {
+    public const TABLE = 'AccountFile';
+
     protected ?int    $id        = null;
     protected ?int    $accountId = null;
     protected ?string $name      = null;
diff --git a/lib/SP/Domain/Account/Services/AccountCrypt.php b/lib/SP/Domain/Account/Services/AccountCrypt.php
index 9b7187e4..ee5aac50 100644
--- a/lib/SP/Domain/Account/Services/AccountCrypt.php
+++ b/lib/SP/Domain/Account/Services/AccountCrypt.php
@@ -40,7 +40,6 @@ use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Crypt\Dtos\UpdateMasterPassRequest;
 use SP\Domain\Task\Services\TaskFactory;
-use SP\Util\Util;
 
 use function SP\__;
 use function SP\__u;
@@ -60,6 +59,23 @@ final class AccountCrypt extends Service implements AccountCryptService
         parent::__construct($application);
     }
 
+    /**
+     * Devolver el tiempo aproximado en segundos de una operación
+     *
+     * @return array Con el tiempo estimado y los elementos por segundo
+     */
+    public static function getETA(int $startTime, int $numItems, int $totalItems): array
+    {
+        if ($numItems > 0 && $totalItems > 0) {
+            $runtime = time() - $startTime;
+            $eta = (int)((($totalItems * $runtime) / $numItems) - $runtime);
+
+            return [$eta, $numItems / $runtime];
+        }
+
+        return [0, 0];
+    }
+
     /**
      * Actualiza las claves de todas las cuentas con la nueva clave maestra.
      *
@@ -157,7 +173,7 @@ final class AccountCrypt extends Service implements AccountCryptService
             }
 
             if ($counter % 100 === 0) {
-                $eta = Util::getETA($startTime, $counter, $numAccounts);
+                $eta = self::getETA($startTime, $counter, $numAccounts);
 
                 if (null !== $task) {
                     $taskMessage = TaskFactory::createMessage(
diff --git a/lib/SP/Domain/Account/Services/AccountFile.php b/lib/SP/Domain/Account/Services/AccountFile.php
index c1733456..d46494c2 100644
--- a/lib/SP/Domain/Account/Services/AccountFile.php
+++ b/lib/SP/Domain/Account/Services/AccountFile.php
@@ -39,7 +39,7 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Image\Ports\ImageService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\__u;
 
diff --git a/lib/SP/Domain/Account/Services/AccountSearch.php b/lib/SP/Domain/Account/Services/AccountSearch.php
index 0ed28da3..83b9bb37 100644
--- a/lib/SP/Domain/Account/Services/AccountSearch.php
+++ b/lib/SP/Domain/Account/Services/AccountSearch.php
@@ -32,6 +32,7 @@ use SP\Domain\Account\Ports\AccountSearchDataBuilder;
 use SP\Domain\Account\Ports\AccountSearchRepository;
 use SP\Domain\Account\Ports\AccountSearchService;
 use SP\Domain\Account\Services\Builders\AccountSearchTokenizer;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
@@ -39,7 +40,6 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\User\Ports\UserGroupService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\Filter;
 
 use function SP\processException;
 
diff --git a/lib/SP/Domain/Account/Services/Builders/AccountFilter.php b/lib/SP/Domain/Account/Services/Builders/AccountFilter.php
index 684e1ce0..9bb382f9 100644
--- a/lib/SP/Domain/Account/Services/Builders/AccountFilter.php
+++ b/lib/SP/Domain/Account/Services/Builders/AccountFilter.php
@@ -26,6 +26,8 @@ namespace SP\Domain\Account\Services\Builders;
 
 use Aura\SqlQuery\Common\SelectInterface;
 use Aura\SqlQuery\QueryFactory;
+use SP\Domain\Account\Models\Account as AccountModel;
+use SP\Domain\Account\Models\AccountHistory as AccountHistoryModel;
 use SP\Domain\Account\Ports\AccountFilterBuilder;
 use SP\Domain\Account\Ports\AccountSearchConstants;
 use SP\Domain\Config\Ports\ConfigDataInterface;
@@ -55,7 +57,7 @@ final class AccountFilter implements AccountFilterBuilder
         $userProfile = $this->context->getUserProfile();
 
         if ($query === null) {
-            $query = $this->queryFactory->newSelect()->from('AccountHistory');
+            $query = $this->queryFactory->newSelect()->from(AccountHistoryModel::TABLE);
         }
 
         if ($this->isFilterWithoutGlobalSearch($userData, $useGlobalSearch, $userProfile)) {
@@ -93,7 +95,7 @@ final class AccountFilter implements AccountFilterBuilder
     /**
      * @param UserDataDto $userData
      * @param bool $useGlobalSearch
-     * @param \SP\Domain\User\Models\ProfileData|null $userProfile
+     * @param ProfileData|null $userProfile
      *
      * @return bool
      */
@@ -116,7 +118,7 @@ final class AccountFilter implements AccountFilterBuilder
         $userProfile = $this->context->getUserProfile();
 
         if ($query === null) {
-            $query = $this->queryFactory->newSelect()->from('Account');
+            $query = $this->queryFactory->newSelect()->from(AccountModel::TABLE);
         }
 
         if ($this->isFilterWithoutGlobalSearch($userData, $useGlobalSearch, $userProfile)) {
diff --git a/lib/SP/Domain/Account/Services/Builders/AccountSearchTokenizer.php b/lib/SP/Domain/Account/Services/Builders/AccountSearchTokenizer.php
index 56cfe5c6..d290b440 100644
--- a/lib/SP/Domain/Account/Services/Builders/AccountSearchTokenizer.php
+++ b/lib/SP/Domain/Account/Services/Builders/AccountSearchTokenizer.php
@@ -26,7 +26,7 @@ namespace SP\Domain\Account\Services\Builders;
 
 use SP\Domain\Account\Dtos\AccountSearchTokensDto;
 use SP\Domain\Account\Ports\AccountSearchConstants;
-use SP\Util\Filter;
+use SP\Domain\Common\Providers\Filter;
 
 /**
  * Class AccountSearchTokenizer
diff --git a/lib/SP/Domain/Account/Services/PublicLink.php b/lib/SP/Domain/Account/Services/PublicLink.php
index 90e0cb29..23ae9a7f 100644
--- a/lib/SP/Domain/Account/Services/PublicLink.php
+++ b/lib/SP/Domain/Account/Services/PublicLink.php
@@ -34,6 +34,7 @@ use SP\Domain\Account\Models\PublicLinkList;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Account\Ports\PublicLinkRepository;
 use SP\Domain\Account\Ports\PublicLinkService;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Common\Models\Simple;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
@@ -44,11 +45,10 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
-use SP\Http\Uri;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Providers\Uri;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\Serde;
 
 use function SP\__u;
 
@@ -65,7 +65,7 @@ final class PublicLink extends Service implements PublicLinkService
     public function __construct(
         Application                           $application,
         private readonly PublicLinkRepository $publicLinkRepository,
-        private readonly RequestInterface     $request,
+        private readonly RequestService $request,
         private readonly AccountService       $accountService,
         private readonly CryptInterface       $crypt
     ) {
@@ -299,7 +299,7 @@ final class PublicLink extends Service implements PublicLinkService
     /**
      * Actualizar la información de uso
      */
-    public static function getUseInfo(string $hash, RequestInterface $request): array
+    public static function getUseInfo(string $hash, RequestService $request): array
     {
         return [
             'who' => $request->getClientAddress(true),
diff --git a/lib/SP/Domain/Api/Services/Api.php b/lib/SP/Domain/Api/Services/Api.php
index a2a254de..23e60003 100644
--- a/lib/SP/Domain/Api/Services/Api.php
+++ b/lib/SP/Domain/Api/Services/Api.php
@@ -35,6 +35,7 @@ use SP\Domain\Api\Ports\ApiService;
 use SP\Domain\Auth\Models\AuthToken as AuthTokenModel;
 use SP\Domain\Auth\Ports\AuthTokenService;
 use SP\Domain\Auth\Services\AuthToken;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Context\Context;
@@ -51,7 +52,6 @@ use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Api\Controllers\Help\HelpInterface;
-use SP\Util\Filter;
 
 use function SP\__u;
 use function SP\logger;
diff --git a/lib/SP/Domain/Api/Services/JsonRpcResponse.php b/lib/SP/Domain/Api/Services/JsonRpcResponse.php
index 3dcbd94b..fa1c03e3 100644
--- a/lib/SP/Domain/Api/Services/JsonRpcResponse.php
+++ b/lib/SP/Domain/Api/Services/JsonRpcResponse.php
@@ -27,7 +27,7 @@ namespace SP\Domain\Api\Services;
 use Exception;
 use SP\Domain\Api\Dtos\ApiResponse;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Services\JsonResponse;
 
 /**
  * Class JsonRpcResponse
diff --git a/lib/SP/Domain/Auth/Ports/LdapActionsService.php b/lib/SP/Domain/Auth/Ports/LdapActionsService.php
index 03f386dc..3cfa0172 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\Domain\Providers\Ldap\AttributeCollection;
-use SP\Domain\Providers\Ldap\LdapException;
-use SP\Domain\Providers\Ldap\LdapParams;
-use SP\Domain\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\Providers\Ldap\AttributeCollection;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
 
 /**
  * Class LdapActions
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 interface LdapActionsService
 {
diff --git a/lib/SP/Domain/Auth/Ports/LdapAuthService.php b/lib/SP/Domain/Auth/Ports/LdapAuthService.php
index de647c41..371013e3 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\Domain\Providers\Auth\AuthService;
-use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Auth\Providers\AuthService;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
 
 /**
  * Class LdapBase
diff --git a/lib/SP/Domain/Auth/Ports/LdapCheckService.php b/lib/SP/Domain/Auth/Ports/LdapCheckService.php
index 86c86c29..b96c9a7c 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\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
 
 /**
  * Class LdapCheckService
diff --git a/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php b/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
index f4da3a3a..e25f7969 100644
--- a/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
+++ b/lib/SP/Domain/Auth/Ports/LdapConnectionInterface.php
@@ -24,8 +24,8 @@
 
 namespace SP\Domain\Auth\Ports;
 
-use SP\Domain\Providers\Ldap\LdapException;
-use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
 
 /**
  * Interface LdapInterface
diff --git a/lib/SP/Domain/Auth/Ports/LdapService.php b/lib/SP/Domain/Auth/Ports/LdapService.php
index 625d7fd7..ce9ec6f2 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\Domain\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
 
 /**
  * Interface LdapInterface
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 interface LdapService
 {
diff --git a/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php b/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
index cf16b1e8..8d5b0e73 100644
--- a/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
+++ b/lib/SP/Domain/Auth/Ports/LoginAuthHandlerService.php
@@ -25,10 +25,10 @@
 namespace SP\Domain\Auth\Ports;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
 use SP\Domain\Auth\Services\AuthException;
-use SP\Domain\Providers\Browser\BrowserAuthData;
-use SP\Domain\Providers\Database\DatabaseAuthData;
-use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
 
 /**
  * Class LoginDatabase
diff --git a/lib/SP/Domain/Auth/Ports/LoginService.php b/lib/SP/Domain/Auth/Ports/LoginService.php
index eec111d4..4fb76d0d 100644
--- a/lib/SP/Domain/Auth/Ports/LoginService.php
+++ b/lib/SP/Domain/Auth/Ports/LoginService.php
@@ -25,8 +25,8 @@
 namespace SP\Domain\Auth\Ports;
 
 use SP\Domain\Auth\Dtos\LoginResponseDto;
+use SP\Domain\Auth\Providers\AuthResult;
 use SP\Domain\Auth\Services\AuthException;
-use SP\Domain\Providers\Auth\AuthResult;
 
 /**
  * Interface LoginService
diff --git a/lib/SP/Domain/Providers/Acl/AclHandler.php b/lib/SP/Domain/Auth/Providers/AclHandler.php
similarity index 97%
rename from lib/SP/Domain/Providers/Acl/AclHandler.php
rename to lib/SP/Domain/Auth/Providers/AclHandler.php
index 4cef69e7..455b624f 100644
--- a/lib/SP/Domain/Providers/Acl/AclHandler.php
+++ b/lib/SP/Domain/Auth/Providers/AclHandler.php
@@ -22,20 +22,20 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Acl;
+namespace SP\Domain\Auth\Providers;
 
 use Exception;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Domain\Account\Services\AccountAcl;
+use SP\Domain\Common\Providers\EventsTrait;
+use SP\Domain\Common\Providers\Provider;
 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\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\__u;
 use function SP\logger;
diff --git a/lib/SP/Domain/Providers/Auth/AuthDataBase.php b/lib/SP/Domain/Auth/Providers/AuthDataBase.php
similarity index 98%
rename from lib/SP/Domain/Providers/Auth/AuthDataBase.php
rename to lib/SP/Domain/Auth/Providers/AuthDataBase.php
index 8dbeab35..37a6d884 100644
--- a/lib/SP/Domain/Providers/Auth/AuthDataBase.php
+++ b/lib/SP/Domain/Auth/Providers/AuthDataBase.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
 use SP\Domain\User\Dtos\UserDataDto;
 
diff --git a/lib/SP/Domain/Providers/Auth/AuthProvider.php b/lib/SP/Domain/Auth/Providers/AuthProvider.php
similarity index 94%
rename from lib/SP/Domain/Providers/Auth/AuthProvider.php
rename to lib/SP/Domain/Auth/Providers/AuthProvider.php
index 6fa9b3dd..a7235aa3 100644
--- a/lib/SP/Domain/Providers/Auth/AuthProvider.php
+++ b/lib/SP/Domain/Auth/Providers/AuthProvider.php
@@ -22,12 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
 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 SplObjectStorage;
 
@@ -40,7 +39,7 @@ defined('APP_ROOT') || die();
  *
  * Esta clase es la encargada de realizar la autentificación de usuarios de sysPass.
  */
-final class AuthProvider extends Provider implements AuthProviderService
+final class AuthProvider extends \SP\Domain\Common\Providers\Provider implements AuthProviderService
 {
     /**
      * @var SplObjectStorage<AuthService,AuthType>
diff --git a/lib/SP/Domain/Providers/Auth/AuthProviderService.php b/lib/SP/Domain/Auth/Providers/AuthProviderService.php
similarity index 97%
rename from lib/SP/Domain/Providers/Auth/AuthProviderService.php
rename to lib/SP/Domain/Auth/Providers/AuthProviderService.php
index 96e2a36c..b801e2fb 100644
--- a/lib/SP/Domain/Providers/Auth/AuthProviderService.php
+++ b/lib/SP/Domain/Auth/Providers/AuthProviderService.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\User\Dtos\UserDataDto;
diff --git a/lib/SP/Domain/Providers/Auth/AuthResult.php b/lib/SP/Domain/Auth/Providers/AuthResult.php
similarity index 86%
rename from lib/SP/Domain/Providers/Auth/AuthResult.php
rename to lib/SP/Domain/Auth/Providers/AuthResult.php
index 0aeb5f6b..9b47f230 100644
--- a/lib/SP/Domain/Providers/Auth/AuthResult.php
+++ b/lib/SP/Domain/Auth/Providers/AuthResult.php
@@ -22,11 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
-use SP\Domain\Providers\Browser\BrowserAuthData;
-use SP\Domain\Providers\Database\DatabaseAuthData;
-use SP\Domain\Providers\Ldap\LdapAuthData;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
 
 /**
  * Class AuthResult
diff --git a/lib/SP/Domain/Providers/Auth/AuthService.php b/lib/SP/Domain/Auth/Providers/AuthService.php
similarity index 97%
rename from lib/SP/Domain/Providers/Auth/AuthService.php
rename to lib/SP/Domain/Auth/Providers/AuthService.php
index bf9f46ea..25575b79 100644
--- a/lib/SP/Domain/Providers/Auth/AuthService.php
+++ b/lib/SP/Domain/Auth/Providers/AuthService.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
 
diff --git a/lib/SP/Domain/Providers/Auth/AuthType.php b/lib/SP/Domain/Auth/Providers/AuthType.php
similarity index 96%
rename from lib/SP/Domain/Providers/Auth/AuthType.php
rename to lib/SP/Domain/Auth/Providers/AuthType.php
index 7b51017d..6ff9ab3a 100644
--- a/lib/SP/Domain/Providers/Auth/AuthType.php
+++ b/lib/SP/Domain/Auth/Providers/AuthType.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Auth;
+namespace SP\Domain\Auth\Providers;
 
 /**
  * Class AuthType
diff --git a/lib/SP/Domain/Providers/Browser/BrowserAuth.php b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuth.php
similarity index 95%
rename from lib/SP/Domain/Providers/Browser/BrowserAuth.php
rename to lib/SP/Domain/Auth/Providers/Browser/BrowserAuth.php
index 75a3d8ce..da8420cd 100644
--- a/lib/SP/Domain/Providers/Browser/BrowserAuth.php
+++ b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuth.php
@@ -22,12 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Browser;
+namespace SP\Domain\Auth\Providers\Browser;
 
 use SP\Domain\Auth\Dtos\UserLoginDto;
+use SP\Domain\Auth\Providers\AuthService;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
-use SP\Domain\Providers\Auth\AuthService;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class Browser
@@ -39,9 +39,9 @@ use SP\Domain\Providers\Auth\AuthService;
 final class BrowserAuth implements BrowserAuthService
 {
     private ConfigDataInterface $configData;
-    private RequestInterface    $request;
+    private RequestService $request;
 
-    public function __construct(ConfigDataInterface $configData, RequestInterface $request)
+    public function __construct(ConfigDataInterface $configData, RequestService $request)
     {
         $this->configData = $configData;
         $this->request = $request;
diff --git a/lib/SP/Domain/Providers/Browser/BrowserAuthData.php b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuthData.php
similarity index 87%
rename from lib/SP/Domain/Providers/Browser/BrowserAuthData.php
rename to lib/SP/Domain/Auth/Providers/Browser/BrowserAuthData.php
index 0d4f0a67..d134780a 100644
--- a/lib/SP/Domain/Providers/Browser/BrowserAuthData.php
+++ b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuthData.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Browser;
+namespace SP\Domain\Auth\Providers\Browser;
 
-use SP\Domain\Providers\Auth\AuthDataBase;
+use SP\Domain\Auth\Providers\AuthDataBase;
 
 /**
  * Class BrowserAuthData
  *
- * @package SP\Domain\Providers\Browser
+ * @package SP\Domain\Auth\Providers\Browser
  */
 final class BrowserAuthData extends AuthDataBase
 {
diff --git a/lib/SP/Domain/Providers/Browser/BrowserAuthService.php b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuthService.php
similarity index 94%
rename from lib/SP/Domain/Providers/Browser/BrowserAuthService.php
rename to lib/SP/Domain/Auth/Providers/Browser/BrowserAuthService.php
index b46400d8..fb92b8bf 100644
--- a/lib/SP/Domain/Providers/Browser/BrowserAuthService.php
+++ b/lib/SP/Domain/Auth/Providers/Browser/BrowserAuthService.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Browser;
+namespace SP\Domain\Auth\Providers\Browser;
 
-use SP\Domain\Providers\Auth\AuthService;
+use SP\Domain\Auth\Providers\AuthService;
 
 /**
  * Class Browser
diff --git a/lib/SP/Domain/Providers/Database/DatabaseAuth.php b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuth.php
similarity index 98%
rename from lib/SP/Domain/Providers/Database/DatabaseAuth.php
rename to lib/SP/Domain/Auth/Providers/Database/DatabaseAuth.php
index 4809d78c..ccb33011 100644
--- a/lib/SP/Domain/Providers/Database/DatabaseAuth.php
+++ b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuth.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Database;
+namespace SP\Domain\Auth\Providers\Database;
 
 use Exception;
 use SP\Core\Crypt\Hash;
diff --git a/lib/SP/Domain/Providers/Database/DatabaseAuthData.php b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuthData.php
similarity index 91%
rename from lib/SP/Domain/Providers/Database/DatabaseAuthData.php
rename to lib/SP/Domain/Auth/Providers/Database/DatabaseAuthData.php
index 451b0c2d..1f272827 100644
--- a/lib/SP/Domain/Providers/Database/DatabaseAuthData.php
+++ b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuthData.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Database;
+namespace SP\Domain\Auth\Providers\Database;
 
-use SP\Domain\Providers\Auth\AuthDataBase;
+use SP\Domain\Auth\Providers\AuthDataBase;
 
 /**
  * Class DatabaseAuthData
diff --git a/lib/SP/Domain/Providers/Database/DatabaseAuthService.php b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuthService.php
similarity index 92%
rename from lib/SP/Domain/Providers/Database/DatabaseAuthService.php
rename to lib/SP/Domain/Auth/Providers/Database/DatabaseAuthService.php
index 4c2577cb..a52ea9f1 100644
--- a/lib/SP/Domain/Providers/Database/DatabaseAuthService.php
+++ b/lib/SP/Domain/Auth/Providers/Database/DatabaseAuthService.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Database;
+namespace SP\Domain\Auth\Providers\Database;
 
-use SP\Domain\Providers\Auth\AuthService;
+use SP\Domain\Auth\Providers\AuthService;
 
 /**
  * Class Database
diff --git a/lib/SP/Domain/Providers/Ldap/AttributeCollection.php b/lib/SP/Domain/Auth/Providers/Ldap/AttributeCollection.php
similarity index 91%
rename from lib/SP/Domain/Providers/Ldap/AttributeCollection.php
rename to lib/SP/Domain/Auth/Providers/Ldap/AttributeCollection.php
index b281071f..3926aeaf 100644
--- a/lib/SP/Domain/Providers/Ldap/AttributeCollection.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/AttributeCollection.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use SP\Core\DataCollection;
 
 /**
  * Class AttributeCollection
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class AttributeCollection extends DataCollection
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapActions.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
similarity index 98%
rename from lib/SP/Domain/Providers/Ldap/LdapActions.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
index bc19de85..4b42e64c 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapActions.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapActions.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\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\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class LdapActions implements LdapActionsService
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapAuth.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
similarity index 99%
rename from lib/SP/Domain/Providers/Ldap/LdapAuth.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
index e8dd73f6..9d748595 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapAuth.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuth.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventDispatcher;
diff --git a/lib/SP/Domain/Providers/Ldap/LdapAuthData.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuthData.php
similarity index 92%
rename from lib/SP/Domain/Providers/Ldap/LdapAuthData.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapAuthData.php
index 3129b29c..c30268c1 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapAuthData.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapAuthData.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
-use SP\Domain\Providers\Auth\AuthDataBase;
+use SP\Domain\Auth\Providers\AuthDataBase;
 
 /**
  * Class LdapUserData
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class LdapAuthData extends AuthDataBase
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapBase.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapBase.php
similarity index 98%
rename from lib/SP/Domain/Providers/Ldap/LdapBase.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapBase.php
index f5e6fe3c..6b26ef99 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapBase.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapBase.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use Exception;
 use SP\Core\Events\EventDispatcher;
@@ -36,7 +36,7 @@ use function SP\__u;
 /**
  * Class LdapBase
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 abstract class LdapBase implements LdapService
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapCodeEnum.php
similarity index 96%
rename from lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapCodeEnum.php
index 1bc36c86..ab596eb0 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapCodeEnum.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapCodeEnum.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 /**
  * Class LdapCodeEnum
diff --git a/lib/SP/Domain/Providers/Ldap/LdapConnection.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
similarity index 98%
rename from lib/SP/Domain/Providers/Ldap/LdapConnection.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
index 3caf167e..be38b0d0 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapConnection.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapConnection.php
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\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\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class LdapConnection implements LdapConnectionInterface
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapException.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapException.php
similarity index 91%
rename from lib/SP/Domain/Providers/Ldap/LdapException.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapException.php
index 726f0346..4a034b2a 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapException.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapException.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use SP\Domain\Core\Exceptions\SPException;
 
 /**
  * Class LdapException
  *
- * @package SP\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class LdapException extends SPException
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapMsAds.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
similarity index 98%
rename from lib/SP/Domain/Providers/Ldap/LdapMsAds.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
index 3ead5b64..469180f0 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapMsAds.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapMsAds.php
@@ -22,12 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\Address;
+use SP\Domain\Http\Adapters\Address;
 
 use function SP\__u;
 use function SP\logger;
diff --git a/lib/SP/Domain/Providers/Ldap/LdapParams.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapParams.php
similarity index 98%
rename from lib/SP/Domain/Providers/Ldap/LdapParams.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapParams.php
index 9c174165..ad32cda2 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapParams.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapParams.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\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\Domain\Providers\Ldap
+ * @package SP\Domain\Auth\Providers\Ldap
  */
 final class LdapParams
 {
diff --git a/lib/SP/Domain/Providers/Ldap/LdapResults.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapResults.php
similarity index 96%
rename from lib/SP/Domain/Providers/Ldap/LdapResults.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapResults.php
index abe68ccf..76c10b31 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapResults.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapResults.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use Iterator;
 
diff --git a/lib/SP/Domain/Providers/Ldap/LdapStd.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
similarity index 99%
rename from lib/SP/Domain/Providers/Ldap/LdapStd.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
index 71ccd701..cea555a4 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapStd.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapStd.php
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
diff --git a/lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapTypeEnum.php
similarity index 95%
rename from lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapTypeEnum.php
index 6caa59e5..c218f306 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapTypeEnum.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapTypeEnum.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 /**
  * Class LdapTypeEnum
diff --git a/lib/SP/Domain/Providers/Ldap/LdapUtil.php b/lib/SP/Domain/Auth/Providers/Ldap/LdapUtil.php
similarity index 97%
rename from lib/SP/Domain/Providers/Ldap/LdapUtil.php
rename to lib/SP/Domain/Auth/Providers/Ldap/LdapUtil.php
index 34998743..d4fee087 100644
--- a/lib/SP/Domain/Providers/Ldap/LdapUtil.php
+++ b/lib/SP/Domain/Auth/Providers/Ldap/LdapUtil.php
@@ -24,7 +24,7 @@
 
 /** @noinspection PhpComposerExtensionStubsInspection */
 
-namespace SP\Domain\Providers\Ldap;
+namespace SP\Domain\Auth\Providers\Ldap;
 
 /**
  * Class LdapUtil
diff --git a/lib/SP/Domain/Auth/Services/AuthToken.php b/lib/SP/Domain/Auth/Services/AuthToken.php
index 4e9126bb..5faceee8 100644
--- a/lib/SP/Domain/Auth/Services/AuthToken.php
+++ b/lib/SP/Domain/Auth/Services/AuthToken.php
@@ -33,6 +33,8 @@ use SP\Core\Crypt\Vault;
 use SP\Domain\Auth\Models\AuthToken as AuthTokenModel;
 use SP\Domain\Auth\Ports\AuthTokenRepository;
 use SP\Domain\Auth\Ports\AuthTokenService;
+use SP\Domain\Common\Adapters\Serde;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -46,8 +48,6 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Infrastructure\Common\Repositories\DuplicatedItemException;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\Password;
-use SP\Util\Serde;
 
 use function SP\__u;
 
diff --git a/lib/SP/Domain/Auth/Services/LdapCheck.php b/lib/SP/Domain/Auth/Services/LdapCheck.php
index fefed4e7..0c1b53f4 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\Domain\Providers\Ldap\LdapBase;
-use SP\Domain\Providers\Ldap\LdapException;
-use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapBase;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
 
 /**
  * Class LdapCheck
diff --git a/lib/SP/Domain/Auth/Services/Login.php b/lib/SP/Domain/Auth/Services/Login.php
index 28ddfddc..d2dfe9c9 100644
--- a/lib/SP/Domain/Auth/Services/Login.php
+++ b/lib/SP/Domain/Auth/Services/Login.php
@@ -33,14 +33,14 @@ use SP\Domain\Auth\Ports\LoginAuthHandlerService;
 use SP\Domain\Auth\Ports\LoginMasterPassService;
 use SP\Domain\Auth\Ports\LoginService;
 use SP\Domain\Auth\Ports\LoginUserService;
+use SP\Domain\Auth\Providers\AuthProviderService;
+use SP\Domain\Auth\Providers\AuthResult;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\ConstraintException;
 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\Http\Ports\RequestService;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
@@ -63,7 +63,7 @@ final class Login extends LoginBase implements LoginService
     public function __construct(
         Application                              $application,
         TrackService                             $trackService,
-        RequestInterface                         $request,
+        RequestService $request,
         private readonly AuthProviderService     $authProviderService,
         private readonly LanguageInterface       $language,
         private readonly UserService             $userService,
diff --git a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
index 8aeb75d3..7d2418ad 100644
--- a/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
+++ b/lib/SP/Domain/Auth/Services/LoginAuthHandler.php
@@ -30,17 +30,17 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Ports\LdapAuthService;
 use SP\Domain\Auth\Ports\LoginAuthHandlerService;
+use SP\Domain\Auth\Providers\AuthType;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 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\Http\Ports\RequestService;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapCodeEnum;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserLoginRequest;
 use SP\Domain\User\Ports\UserService;
@@ -62,7 +62,7 @@ final class LoginAuthHandler extends LoginBase implements LoginAuthHandlerServic
     public function __construct(
         Application                  $application,
         TrackService                 $trackService,
-        RequestInterface             $request,
+        RequestService $request,
         private readonly UserService $userService
     ) {
         parent::__construct($application, $trackService, $request);
diff --git a/lib/SP/Domain/Auth/Services/LoginBase.php b/lib/SP/Domain/Auth/Services/LoginBase.php
index 1433d98a..803d4b7a 100644
--- a/lib/SP/Domain/Auth/Services/LoginBase.php
+++ b/lib/SP/Domain/Auth/Services/LoginBase.php
@@ -28,10 +28,10 @@ use Exception;
 use SP\Core\Application;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Providers\Uri;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
-use SP\Http\Uri;
 
 use function SP\__u;
 
@@ -48,7 +48,7 @@ abstract class LoginBase extends Service
     public function __construct(
         Application                         $application,
         private readonly TrackService       $trackService,
-        protected readonly RequestInterface $request
+        protected readonly RequestService $request
     ) {
         parent::__construct($application);
 
diff --git a/lib/SP/Domain/Auth/Services/LoginMasterPass.php b/lib/SP/Domain/Auth/Services/LoginMasterPass.php
index 3a842353..cc7939ee 100644
--- a/lib/SP/Domain/Auth/Services/LoginMasterPass.php
+++ b/lib/SP/Domain/Auth/Services/LoginMasterPass.php
@@ -33,7 +33,7 @@ use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Ports\UserMasterPassService;
@@ -50,7 +50,7 @@ final class LoginMasterPass extends LoginBase implements LoginMasterPassService
     public function __construct(
         Application                                 $application,
         TrackService                                $trackService,
-        RequestInterface                            $request,
+        RequestService $request,
         private readonly UserMasterPassService      $userMasterPassService,
         private readonly TemporaryMasterPassService $temporaryMasterPassService,
     ) {
diff --git a/lib/SP/Domain/Auth/Services/LoginUser.php b/lib/SP/Domain/Auth/Services/LoginUser.php
index 3b258665..48acdea6 100644
--- a/lib/SP/Domain/Auth/Services/LoginUser.php
+++ b/lib/SP/Domain/Auth/Services/LoginUser.php
@@ -30,15 +30,15 @@ use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Auth\Dtos\LoginResponseDto;
 use SP\Domain\Auth\Ports\LoginUserService;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Ports\UserPassRecoverService;
-use SP\Util\Password;
 
 use function SP\__u;
 
@@ -50,7 +50,7 @@ final class LoginUser extends LoginBase implements LoginUserService
     public function __construct(
         Application                             $application,
         TrackService                            $trackService,
-        RequestInterface                        $request,
+        RequestService $request,
         private readonly UserPassRecoverService $userPassRecoverService
     ) {
         parent::__construct($application, $trackService, $request);
diff --git a/lib/SP/Domain/Category/Adapters/Category.php b/lib/SP/Domain/Category/Adapters/Category.php
index 647aa8b0..45c4008d 100644
--- a/lib/SP/Domain/Category/Adapters/Category.php
+++ b/lib/SP/Domain/Category/Adapters/Category.php
@@ -29,6 +29,7 @@ use SP\Domain\Category\Models\Category as CategoryModel;
 use SP\Domain\Category\Ports\CategoryAdapter;
 use SP\Domain\Common\Adapters\Adapter;
 use SP\Domain\Common\Models\Model;
+use SP\Domain\Common\Providers\Link;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -40,7 +41,6 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\CustomField\Adapters\CustomField;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
 use SP\Mvc\Controller\ItemTrait;
-use SP\Util\Link;
 
 /**
  * Class Category
diff --git a/lib/SP/Domain/Category/Models/Category.php b/lib/SP/Domain/Category/Models/Category.php
index 8f5826d2..2e670807 100644
--- a/lib/SP/Domain/Category/Models/Category.php
+++ b/lib/SP/Domain/Category/Models/Category.php
@@ -32,6 +32,8 @@ use SP\Domain\Common\Models\Model;
  */
 class Category extends Model implements ItemWithIdAndNameModel
 {
+    public const TABLE = 'Category';
+
     protected ?int    $id          = null;
     protected ?string $name        = null;
     protected ?string $description = null;
diff --git a/lib/SP/Domain/Client/Adapters/Client.php b/lib/SP/Domain/Client/Adapters/Client.php
index 493346bb..6e28367c 100644
--- a/lib/SP/Domain/Client/Adapters/Client.php
+++ b/lib/SP/Domain/Client/Adapters/Client.php
@@ -29,6 +29,7 @@ use SP\Domain\Client\Models\Client as ClientModel;
 use SP\Domain\Client\Ports\ClientAdapter;
 use SP\Domain\Common\Adapters\Adapter;
 use SP\Domain\Common\Models\Model;
+use SP\Domain\Common\Providers\Link;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -37,7 +38,6 @@ use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\CustomField\Adapters\CustomField;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
 use SP\Mvc\Controller\ItemTrait;
-use SP\Util\Link;
 
 /**
  * Class Client
diff --git a/lib/SP/Util/Date.php b/lib/SP/Domain/Common/Adapters/Date.php
similarity index 95%
rename from lib/SP/Util/Date.php
rename to lib/SP/Domain/Common/Adapters/Date.php
index 6e804862..7fe57fa8 100644
--- a/lib/SP/Util/Date.php
+++ b/lib/SP/Domain/Common/Adapters/Date.php
@@ -22,10 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Adapters;
 
 /**
- * Class DateUtil
+ * Class Date
  */
 final class Date
 {
diff --git a/lib/SP/Util/Serde.php b/lib/SP/Domain/Common/Adapters/Serde.php
similarity index 98%
rename from lib/SP/Util/Serde.php
rename to lib/SP/Domain/Common/Adapters/Serde.php
index cbd084e0..cbb2340a 100644
--- a/lib/SP/Util/Serde.php
+++ b/lib/SP/Domain/Common/Adapters/Serde.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Adapters;
 
 use __PHP_Incomplete_Class;
 use JsonException;
diff --git a/lib/SP/Domain/Common/Models/SerializedModel.php b/lib/SP/Domain/Common/Models/SerializedModel.php
index e0c1f710..ffe54aa8 100644
--- a/lib/SP/Domain/Common/Models/SerializedModel.php
+++ b/lib/SP/Domain/Common/Models/SerializedModel.php
@@ -25,9 +25,9 @@
 namespace SP\Domain\Common\Models;
 
 use ReflectionClass;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Common\Attributes\Hydratable;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\Serde;
 
 /**
  * Trait SerializedModel
diff --git a/lib/SP/Util/Checks.php b/lib/SP/Domain/Common/Providers/Environment.php
similarity index 93%
rename from lib/SP/Util/Checks.php
rename to lib/SP/Domain/Common/Providers/Environment.php
index 8ba5d18e..b7e676ea 100644
--- a/lib/SP/Util/Checks.php
+++ b/lib/SP/Domain/Common/Providers/Environment.php
@@ -22,12 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 /**
- * Class Checks
+ * Class Environment
  */
-final class Checks
+final class Environment
 {
     private const MIN_PHP_VERSION = 80200;
     private const MAX_PHP_VERSION = 80400;
diff --git a/lib/SP/Domain/Providers/EventsTrait.php b/lib/SP/Domain/Common/Providers/EventsTrait.php
similarity index 96%
rename from lib/SP/Domain/Providers/EventsTrait.php
rename to lib/SP/Domain/Common/Providers/EventsTrait.php
index 5ae985c6..027ba4d3 100644
--- a/lib/SP/Domain/Providers/EventsTrait.php
+++ b/lib/SP/Domain/Common/Providers/EventsTrait.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers;
+namespace SP\Domain\Common\Providers;
 
 /**
  * Trait EventsTrait
diff --git a/lib/SP/Util/Filter.php b/lib/SP/Domain/Common/Providers/Filter.php
similarity index 93%
rename from lib/SP/Util/Filter.php
rename to lib/SP/Domain/Common/Providers/Filter.php
index 271b9786..8e3bf477 100644
--- a/lib/SP/Util/Filter.php
+++ b/lib/SP/Domain/Common/Providers/Filter.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,12 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 /**
- * Class Filter para el filtrado de datos
- *
- * @package SP\Util
+ * Class Filter
  */
 final class Filter
 {
diff --git a/lib/SP/Util/Http.php b/lib/SP/Domain/Common/Providers/Http.php
similarity index 92%
rename from lib/SP/Util/Http.php
rename to lib/SP/Domain/Common/Providers/Http.php
index 2db98c99..f2aef3a1 100644
--- a/lib/SP/Util/Http.php
+++ b/lib/SP/Domain/Common/Providers/Http.php
@@ -22,10 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class Http
@@ -35,7 +35,7 @@ final class Http
     /**
      * Comprobar y forzar (si es necesario) la conexión HTTPS
      */
-    public static function checkHttps(ConfigDataInterface $configData, RequestInterface $request): void
+    public static function checkHttps(ConfigDataInterface $configData, RequestService $request): void
     {
         if ($configData->isHttpsEnabled() && !$request->isHttps()) {
             $serverPort = $request->getServerPort();
diff --git a/lib/SP/Util/Image.php b/lib/SP/Domain/Common/Providers/Image.php
similarity index 98%
rename from lib/SP/Util/Image.php
rename to lib/SP/Domain/Common/Providers/Image.php
index 7fe6d59f..21e2b0c1 100644
--- a/lib/SP/Util/Image.php
+++ b/lib/SP/Domain/Common/Providers/Image.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 use GdImage;
 use SP\Domain\Core\Exceptions\InvalidImageException;
diff --git a/lib/SP/Util/Link.php b/lib/SP/Domain/Common/Providers/Link.php
similarity index 89%
rename from lib/SP/Util/Link.php
rename to lib/SP/Domain/Common/Providers/Link.php
index 8c5b663a..9b245189 100644
--- a/lib/SP/Util/Link.php
+++ b/lib/SP/Domain/Common/Providers/Link.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,10 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Http\Uri;
+use SP\Domain\Http\Providers\Uri;
 
 /**
  * Class Link
diff --git a/lib/SP/Util/Password.php b/lib/SP/Domain/Common/Providers/Password.php
similarity index 99%
rename from lib/SP/Util/Password.php
rename to lib/SP/Domain/Common/Providers/Password.php
index 73ca6a02..dbf49436 100644
--- a/lib/SP/Util/Password.php
+++ b/lib/SP/Domain/Common/Providers/Password.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 use Defuse\Crypto\Core;
 use Defuse\Crypto\Encoding;
diff --git a/lib/SP/Domain/Providers/Provider.php b/lib/SP/Domain/Common/Providers/Provider.php
similarity index 94%
rename from lib/SP/Domain/Providers/Provider.php
rename to lib/SP/Domain/Common/Providers/Provider.php
index 26f52fa1..7b2f92fe 100644
--- a/lib/SP/Domain/Providers/Provider.php
+++ b/lib/SP/Domain/Common/Providers/Provider.php
@@ -22,13 +22,13 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers;
+namespace SP\Domain\Common\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;
+use SP\Domain\Log\Ports\ProviderInterface;
 
 /**
  * Class Provider
diff --git a/lib/SP/Util/Version.php b/lib/SP/Domain/Common/Providers/Version.php
similarity index 99%
rename from lib/SP/Util/Version.php
rename to lib/SP/Domain/Common/Providers/Version.php
index 2b99dcbe..11859f9b 100644
--- a/lib/SP/Util/Version.php
+++ b/lib/SP/Domain/Common/Providers/Version.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Domain\Common\Providers;
 
 use SP\Domain\Install\Services\Installer;
 
diff --git a/lib/SP/Domain/Config/Adapters/ConfigData.php b/lib/SP/Domain/Config/Adapters/ConfigData.php
index 87755f7a..0872e547 100644
--- a/lib/SP/Domain/Config/Adapters/ConfigData.php
+++ b/lib/SP/Domain/Config/Adapters/ConfigData.php
@@ -25,9 +25,9 @@
 namespace SP\Domain\Config\Adapters;
 
 use SP\Core\DataCollection;
+use SP\Domain\Common\Adapters\Serde;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Util\Serde;
-use SP\Util\Version;
 
 /**
  * Class ConfigData
diff --git a/lib/SP/Domain/Config/Services/ConfigBackup.php b/lib/SP/Domain/Config/Services/ConfigBackup.php
index 45abde20..c62ffee5 100644
--- a/lib/SP/Domain/Config/Services/ConfigBackup.php
+++ b/lib/SP/Domain/Config/Services/ConfigBackup.php
@@ -25,6 +25,7 @@
 namespace SP\Domain\Config\Services;
 
 use Exception;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Adapters\ConfigData;
 use SP\Domain\Config\Ports\ConfigBackupService;
@@ -34,7 +35,6 @@ use SP\Domain\Config\Ports\ConfigService;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Serde;
 
 use function SP\__u;
 use function SP\processException;
diff --git a/lib/SP/Domain/Config/Services/ConfigFile.php b/lib/SP/Domain/Config/Services/ConfigFile.php
index db19ac11..e3e752b0 100644
--- a/lib/SP/Domain/Config/Services/ConfigFile.php
+++ b/lib/SP/Domain/Config/Services/ConfigFile.php
@@ -26,6 +26,7 @@ namespace SP\Domain\Config\Services;
 
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use Exception;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Config\Adapters\ConfigData;
 use SP\Domain\Config\Ports\ConfigBackupService;
 use SP\Domain\Config\Ports\ConfigDataInterface;
@@ -36,7 +37,6 @@ use SP\Domain\Core\Exceptions\ConfigException;
 use SP\Domain\Storage\Ports\FileCacheService;
 use SP\Domain\Storage\Ports\XmlFileStorageService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Password;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/lib/SP/Domain/Config/Services/ConfigUtil.php b/lib/SP/Domain/Config/Services/ConfigUtil.php
index 2621a294..9e744914 100644
--- a/lib/SP/Domain/Config/Services/ConfigUtil.php
+++ b/lib/SP/Domain/Config/Services/ConfigUtil.php
@@ -24,9 +24,9 @@
 
 namespace SP\Domain\Config\Services;
 
+use SP\Domain\Common\Providers\Environment;
 use SP\Domain\Core\Exceptions\ConfigException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\Checks;
 
 use function SP\__;
 use function SP\__u;
@@ -83,7 +83,7 @@ final class ConfigUtil
             throw new ConfigException(__u('Unable to write into \'/app/config\' directory'), SPException::CRITICAL);
         }
 
-        if (!Checks::checkIsWindows()
+        if (!Environment::checkIsWindows()
             && ($configPerms = decoct(fileperms(CONFIG_PATH) & 0777)) !== '750'
         ) {
             clearstatcache();
diff --git a/lib/SP/Domain/Config/Services/UpgradeConfig.php b/lib/SP/Domain/Config/Services/UpgradeConfig.php
index a17a677f..c7c00054 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\Ports\FileLogHandlerProvider;
+use SP\Domain\Log\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Services\UpgradeBase;
 
 /**
diff --git a/lib/SP/Domain/Core/Dtos/ItemSearchDto.php b/lib/SP/Domain/Core/Dtos/ItemSearchDto.php
index 8ba1bf00..0cb4d1cd 100644
--- a/lib/SP/Domain/Core/Dtos/ItemSearchDto.php
+++ b/lib/SP/Domain/Core/Dtos/ItemSearchDto.php
@@ -24,7 +24,7 @@
 
 namespace SP\Domain\Core\Dtos;
 
-use SP\Util\Filter;
+use SP\Domain\Common\Providers\Filter;
 
 /**
  * Class ItemSearchDto
diff --git a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
index 9719cedf..8b066458 100644
--- a/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
+++ b/lib/SP/Domain/Crypt/Services/TemporaryMasterPass.php
@@ -30,6 +30,7 @@ use SP\Core\Crypt\Hash;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Messages\MailMessage;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Dtos\ConfigRequest;
@@ -43,7 +44,6 @@ use SP\Domain\Crypt\Ports\TemporaryMasterPassService;
 use SP\Domain\Notification\Ports\MailService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/CustomField/Models/CustomFieldData.php b/lib/SP/Domain/CustomField/Models/CustomFieldData.php
index 9a390308..7e063254 100644
--- a/lib/SP/Domain/CustomField/Models/CustomFieldData.php
+++ b/lib/SP/Domain/CustomField/Models/CustomFieldData.php
@@ -31,6 +31,8 @@ use SP\Domain\Common\Models\Model;
  */
 class CustomFieldData extends Model
 {
+    public const TABLE = 'CustomFieldData';
+
     protected ?int    $moduleId     = null;
     protected ?int    $itemId       = null;
     protected ?int    $definitionId = null;
diff --git a/lib/SP/Domain/CustomField/Models/CustomFieldDefinition.php b/lib/SP/Domain/CustomField/Models/CustomFieldDefinition.php
index 3aab42cf..a4b685ed 100644
--- a/lib/SP/Domain/CustomField/Models/CustomFieldDefinition.php
+++ b/lib/SP/Domain/CustomField/Models/CustomFieldDefinition.php
@@ -31,6 +31,8 @@ use SP\Domain\Common\Models\Model;
  */
 class CustomFieldDefinition extends Model
 {
+    public const TABLE = 'CustomFieldDefinition';
+
     protected ?int    $id          = null;
     protected ?string $name        = null;
     protected ?int    $moduleId    = null;
diff --git a/lib/SP/Domain/CustomField/Models/CustomFieldType.php b/lib/SP/Domain/CustomField/Models/CustomFieldType.php
index 15f90177..b955da3a 100644
--- a/lib/SP/Domain/CustomField/Models/CustomFieldType.php
+++ b/lib/SP/Domain/CustomField/Models/CustomFieldType.php
@@ -32,6 +32,8 @@ use SP\Domain\Common\Models\Model;
  */
 class CustomFieldType extends Model implements ItemWithIdAndNameModel
 {
+    public const TABLE = 'CustomFieldType';
+
     protected ?int    $id   = null;
     protected ?string $name = null;
     protected ?string $text = null;
diff --git a/lib/SP/Domain/Export/Services/BackupFileHelper.php b/lib/SP/Domain/Export/Services/BackupFileHelper.php
index 86a79bd7..28b6d401 100644
--- a/lib/SP/Domain/Export/Services/BackupFileHelper.php
+++ b/lib/SP/Domain/Export/Services/BackupFileHelper.php
@@ -33,7 +33,7 @@ use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Domain\File\Ports\FileHandlerInterface;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 /**
  * BackupFileHelper
diff --git a/lib/SP/Domain/Export/Services/XmlExport.php b/lib/SP/Domain/Export/Services/XmlExport.php
index 75b33d41..9557922e 100644
--- a/lib/SP/Domain/Export/Services/XmlExport.php
+++ b/lib/SP/Domain/Export/Services/XmlExport.php
@@ -31,6 +31,7 @@ use DOMNode;
 use Exception;
 use SP\Core\Application;
 use SP\Core\Crypt\Hash;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
@@ -46,8 +47,7 @@ use SP\Domain\Export\Ports\XmlTagExportService;
 use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\FileException;
-use SP\Util\FileSystem;
-use SP\Util\Version;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\__u;
 
diff --git a/lib/SP/Domain/Export/Services/XmlVerify.php b/lib/SP/Domain/Export/Services/XmlVerify.php
index dd36ae24..97413020 100644
--- a/lib/SP/Domain/Export/Services/XmlVerify.php
+++ b/lib/SP/Domain/Export/Services/XmlVerify.php
@@ -29,12 +29,12 @@ use DOMElement;
 use DOMXPath;
 use SP\Core\Application;
 use SP\Core\Crypt\Hash;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Crypt\CryptInterface;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Export\Ports\XmlVerifyService;
-use SP\Util\Version;
 
 use function SP\__u;
 
diff --git a/lib/SP/Html/Html.php b/lib/SP/Domain/Html/Html.php
similarity index 99%
rename from lib/SP/Html/Html.php
rename to lib/SP/Domain/Html/Html.php
index 83fb59c5..8ee91f18 100644
--- a/lib/SP/Html/Html.php
+++ b/lib/SP/Domain/Html/Html.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Html;
+namespace SP\Domain\Html;
 
 /**
  * Class Html
diff --git a/lib/SP/Domain/Html/MinifyInterface.php b/lib/SP/Domain/Html/Ports/MinifyService.php
similarity index 87%
rename from lib/SP/Domain/Html/MinifyInterface.php
rename to lib/SP/Domain/Html/Ports/MinifyService.php
index ec654133..c5fe849f 100644
--- a/lib/SP/Domain/Html/MinifyInterface.php
+++ b/lib/SP/Domain/Html/Ports/MinifyService.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Html;
+namespace SP\Domain\Html\Ports;
 
 use SP\Domain\File\Ports\FileHandlerInterface;
 
 /**
  * Interface MinifyInterface
  */
-interface MinifyInterface
+interface MinifyService
 {
     /**
      * Devolver al navegador archivos CSS y JS comprimidos
@@ -44,16 +44,16 @@ interface MinifyInterface
      * @param FileHandlerInterface $fileHandler
      * @param bool $minify Si es necesario reducir
      *
-     * @return MinifyInterface
+     * @return MinifyService
      */
-    public function addFile(FileHandlerInterface $fileHandler, bool $minify = true): MinifyInterface;
+    public function addFile(FileHandlerInterface $fileHandler, bool $minify = true): MinifyService;
 
     /**
      * @param FileHandlerInterface[] $files
      * @param bool $minify
-     * @return MinifyInterface
+     * @return MinifyService
      */
-    public function addFiles(array $files, bool $minify = true): MinifyInterface;
+    public function addFiles(array $files, bool $minify = true): MinifyService;
 
-    public function builder(): MinifyInterface;
+    public function builder(): MinifyService;
 }
diff --git a/lib/SP/Html/Minify.php b/lib/SP/Domain/Html/Services/Minify.php
similarity index 90%
rename from lib/SP/Html/Minify.php
rename to lib/SP/Domain/Html/Services/Minify.php
index ca0f5d03..2c9d8c79 100644
--- a/lib/SP/Html/Minify.php
+++ b/lib/SP/Domain/Html/Services/Minify.php
@@ -22,21 +22,20 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Html;
+namespace SP\Domain\Html\Services;
 
 use Klein\Request;
 use Klein\Response;
 use SP\Domain\File\Ports\FileHandlerInterface;
-use SP\Domain\Html\Header;
-use SP\Domain\Html\MinifyFile;
-use SP\Domain\Html\MinifyInterface;
+use SP\Domain\Html\Ports\MinifyService;
+use SP\Domain\Http\Header;
 use SP\Infrastructure\File\FileException;
 use SplObjectStorage;
 
 /**
  * Class Minify
  */
-abstract class Minify implements MinifyInterface
+abstract class Minify implements MinifyService
 {
     private const OFFSET = 3600 * 24 * 30;
 
@@ -133,10 +132,10 @@ abstract class Minify implements MinifyInterface
     /**
      * @param FileHandlerInterface[] $files
      * @param bool $minify
-     * @return MinifyInterface
+     * @return \SP\Domain\Html\Ports\MinifyService
      * @throws FileException
      */
-    public function addFiles(array $files, bool $minify = true): MinifyInterface
+    public function addFiles(array $files, bool $minify = true): MinifyService
     {
         array_walk($files, fn(FileHandlerInterface $fileHandler) => $this->addFile($fileHandler));
 
@@ -149,13 +148,11 @@ abstract class Minify implements MinifyInterface
      * @param FileHandlerInterface $fileHandler
      * @param bool $minify Si es necesario reducir
      *
-     * @return MinifyInterface
+     * @return \SP\Domain\Html\Ports\MinifyService
      * @throws FileException
      */
-    public function addFile(
-        FileHandlerInterface $fileHandler,
-        bool                 $minify = true
-    ): MinifyInterface {
+    public function addFile(FileHandlerInterface $fileHandler, bool $minify = true): MinifyService
+    {
         $fileHandler->checkFileExists();
 
         $this->files->attach(new MinifyFile($fileHandler, $minify));
@@ -163,7 +160,7 @@ abstract class Minify implements MinifyInterface
         return $this;
     }
 
-    public function builder(): MinifyInterface
+    public function builder(): MinifyService
     {
         return clone $this;
     }
diff --git a/lib/SP/Html/MinifyCss.php b/lib/SP/Domain/Html/Services/MinifyCss.php
similarity index 90%
rename from lib/SP/Html/MinifyCss.php
rename to lib/SP/Domain/Html/Services/MinifyCss.php
index 4facd414..4dd16d11 100644
--- a/lib/SP/Html/MinifyCss.php
+++ b/lib/SP/Domain/Html/Services/MinifyCss.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,10 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Html;
+namespace SP\Domain\Html\Services;
 
-use SP\Domain\Html\Header;
-use SP\Domain\Html\MinifyFile;
+use SP\Domain\Http\Header;
 use SP\Infrastructure\File\FileException;
 use SplObjectStorage;
 
diff --git a/lib/SP/Domain/Html/MinifyFile.php b/lib/SP/Domain/Html/Services/MinifyFile.php
similarity index 95%
rename from lib/SP/Domain/Html/MinifyFile.php
rename to lib/SP/Domain/Html/Services/MinifyFile.php
index e4ad325d..e8950c04 100644
--- a/lib/SP/Domain/Html/MinifyFile.php
+++ b/lib/SP/Domain/Html/Services/MinifyFile.php
@@ -22,10 +22,10 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Html;
+namespace SP\Domain\Html\Services;
 
 use SP\Domain\File\Ports\FileHandlerInterface;
-use SP\Http\Request as HttpRequest;
+use SP\Domain\Http\Services\Request as HttpRequest;
 use SP\Infrastructure\File\FileException;
 
 /**
diff --git a/lib/SP/Html/MinifyJs.php b/lib/SP/Domain/Html/Services/MinifyJs.php
similarity index 93%
rename from lib/SP/Html/MinifyJs.php
rename to lib/SP/Domain/Html/Services/MinifyJs.php
index 1422f75e..824bf9b1 100644
--- a/lib/SP/Html/MinifyJs.php
+++ b/lib/SP/Domain/Html/Services/MinifyJs.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,10 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Html;
+namespace SP\Domain\Html\Services;
 
-use SP\Domain\Html\Header;
-use SP\Domain\Html\MinifyFile;
+use SP\Domain\Http\Header;
 use SP\Infrastructure\File\FileException;
 use SplObjectStorage;
 
diff --git a/lib/SP/Http/Address.php b/lib/SP/Domain/Http/Adapters/Address.php
similarity index 96%
rename from lib/SP/Http/Address.php
rename to lib/SP/Domain/Http/Adapters/Address.php
index 8cab110b..de390d7b 100644
--- a/lib/SP/Http/Address.php
+++ b/lib/SP/Domain/Http/Adapters/Address.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\Http;
+namespace SP\Domain\Http\Adapters;
 
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\SPException;
@@ -33,8 +33,6 @@ use function SP\logger;
 
 /**
  * Class Address
- *
- * @package SP\Http
  */
 final class Address
 {
diff --git a/lib/SP/Http/Client.php b/lib/SP/Domain/Http/Client.php
similarity index 92%
rename from lib/SP/Http/Client.php
rename to lib/SP/Domain/Http/Client.php
index 2b3c6811..c9d8ce94 100644
--- a/lib/SP/Http/Client.php
+++ b/lib/SP/Domain/Http/Client.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,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Http;
+namespace SP\Domain\Http;
 
 use SP\Domain\Config\Ports\ConfigDataInterface;
 
 /**
  * Class Client
  *
- * @package SP\Http
+ * @package SP\Domain\Http
  */
 final class Client
 {
diff --git a/lib/SP/Http/JsonMessage.php b/lib/SP/Domain/Http/Dtos/JsonMessage.php
similarity index 94%
rename from lib/SP/Http/JsonMessage.php
rename to lib/SP/Domain/Http/Dtos/JsonMessage.php
index 1c62275b..c0be5ed7 100644
--- a/lib/SP/Http/JsonMessage.php
+++ b/lib/SP/Domain/Http/Dtos/JsonMessage.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\Http;
+namespace SP\Domain\Http\Dtos;
 
 use JsonSerializable;
 use stdClass;
@@ -30,7 +30,7 @@ use stdClass;
 use function SP\__;
 
 /**
- * Class Json para definir la estructura de una respuesta en formato JSON
+ * Class JsonMessage
  */
 final class JsonMessage implements JsonSerializable
 {
@@ -38,6 +38,7 @@ final class JsonMessage implements JsonSerializable
     public const JSON_SUCCESS_STICKY = 100;
     public const JSON_ERROR          = 1;
     public const JSON_WARNING        = 2;
+
     protected int     $status      = self::JSON_ERROR;
     protected ?string $description = null;
     protected array   $data        = [];
diff --git a/lib/SP/Domain/Html/Header.php b/lib/SP/Domain/Http/Header.php
similarity index 98%
rename from lib/SP/Domain/Html/Header.php
rename to lib/SP/Domain/Http/Header.php
index 23f57b10..24bb1e7f 100644
--- a/lib/SP/Domain/Html/Header.php
+++ b/lib/SP/Domain/Http/Header.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Html;
+namespace SP\Domain\Http;
 
 /**
  * Class Header
diff --git a/lib/SP/Domain/Http/JsonResponseInterface.php b/lib/SP/Domain/Http/Ports/JsonResponseService.php
similarity index 86%
rename from lib/SP/Domain/Http/JsonResponseInterface.php
rename to lib/SP/Domain/Http/Ports/JsonResponseService.php
index 1e1c549f..e310a409 100644
--- a/lib/SP/Domain/Http/JsonResponseInterface.php
+++ b/lib/SP/Domain/Http/Ports/JsonResponseService.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,15 +22,15 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Http;
+namespace SP\Domain\Http\Ports;
 
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonMessage;
+use SP\Domain\Http\Dtos\JsonMessage;
 
 /**
- * Interface JsonResponseInterface
+ * Interface JsonResponseService
  */
-interface JsonResponseInterface
+interface JsonResponseService
 {
     /**
      * Devuelve una respuesta en formato JSON
diff --git a/lib/SP/Domain/Http/RequestInterface.php b/lib/SP/Domain/Http/Ports/RequestService.php
similarity index 94%
rename from lib/SP/Domain/Http/RequestInterface.php
rename to lib/SP/Domain/Http/Ports/RequestService.php
index 75116dca..fc72e7e9 100644
--- a/lib/SP/Domain/Http/RequestInterface.php
+++ b/lib/SP/Domain/Http/Ports/RequestService.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,17 +22,16 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Http;
+namespace SP\Domain\Http\Ports;
 
 use Klein\Request;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Http\Method;
 
 /**
- * Clase Request para la gestión de peticiones HTTP
- *
- * @package SP
+ * Interface RequestService
  */
-interface RequestInterface
+interface RequestService
 {
     public function getClientAddress(bool $fullForwarded = false): string;
 
diff --git a/lib/SP/Http/Uri.php b/lib/SP/Domain/Http/Providers/Uri.php
similarity index 95%
rename from lib/SP/Http/Uri.php
rename to lib/SP/Domain/Http/Providers/Uri.php
index 4a768520..00b9a733 100644
--- a/lib/SP/Http/Uri.php
+++ b/lib/SP/Domain/Http/Providers/Uri.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\Http;
+namespace SP\Domain\Http\Providers;
 
 use SP\Core\Crypt\Hash;
 
diff --git a/lib/SP/Http/JsonResponse.php b/lib/SP/Domain/Http/Services/JsonResponse.php
similarity index 88%
rename from lib/SP/Http/JsonResponse.php
rename to lib/SP/Domain/Http/Services/JsonResponse.php
index 8273608f..6f6a5b90 100644
--- a/lib/SP/Http/JsonResponse.php
+++ b/lib/SP/Domain/Http/Services/JsonResponse.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,29 +22,30 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Http;
+namespace SP\Domain\Http\Services;
 
 use JsonException;
 use Klein\Response;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Html\Header;
-use SP\Domain\Http\JsonResponseInterface;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Header;
+use SP\Domain\Http\Ports\JsonResponseService;
 
 use function SP\__u;
 
 /**
  * Class JsonResponse
  */
-final class JsonResponse implements JsonResponseInterface
+final readonly class JsonResponse implements JsonResponseService
 {
     /**
      * Json constructor.
      */
-    public function __construct(private readonly Response $response)
+    public function __construct(private Response $response)
     {
     }
 
-    public static function factory(Response $response): JsonResponseInterface
+    public static function factory(Response $response): JsonResponseService
     {
         return new self($response);
     }
diff --git a/lib/SP/Http/Request.php b/lib/SP/Domain/Http/Services/Request.php
similarity index 98%
rename from lib/SP/Http/Request.php
rename to lib/SP/Domain/Http/Services/Request.php
index eb07d6df..66c15961 100644
--- a/lib/SP/Http/Request.php
+++ b/lib/SP/Domain/Http/Services/Request.php
@@ -22,30 +22,28 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Http;
+namespace SP\Domain\Http\Services;
 
 use Exception;
 use Klein\DataCollection\DataCollection;
 use Klein\DataCollection\HeaderDataCollection;
 use SP\Core\Crypt\Hash;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Html\Header;
+use SP\Domain\Http\Header;
 use SP\Domain\Http\Method;
-use SP\Domain\Http\RequestInterface;
-use SP\Util\FileSystem;
-use SP\Util\Filter;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Infrastructure\File\FileSystem;
 use SP\Util\Util;
 
 use function SP\logger;
 use function SP\processException;
 
 /**
- * Clase Request para la gestión de peticiones HTTP
- *
- * @package SP
+ * Class Request
  */
-class Request implements RequestInterface
+class Request implements RequestService
 {
     /**
      * @var array Directorios seguros para include
diff --git a/lib/SP/Domain/Import/Ports/LdapImportService.php b/lib/SP/Domain/Import/Ports/LdapImportService.php
index 5192a11b..ad81e3cf 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\Domain\Providers\Ldap\LdapException;
-use SP\Domain\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
 
 /**
  * Class UserLdapService
diff --git a/lib/SP/Domain/Import/Services/KeepassImport.php b/lib/SP/Domain/Import/Services/KeepassImport.php
index 86b2d7af..aad4c0bd 100644
--- a/lib/SP/Domain/Import/Services/KeepassImport.php
+++ b/lib/SP/Domain/Import/Services/KeepassImport.php
@@ -32,11 +32,11 @@ use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Dtos\AccountCreateDto;
 use SP\Domain\Category\Models\Category;
 use SP\Domain\Client\Models\Client;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Import\Dtos\ImportParamsDto;
 use SP\Domain\Import\Ports\ItemsImportService;
 use SP\Infrastructure\Common\Repositories\DuplicatedItemException;
-use SP\Util\Filter;
 use SplObjectStorage;
 
 use function SP\__u;
diff --git a/lib/SP/Domain/Import/Services/LdapImport.php b/lib/SP/Domain/Import/Services/LdapImport.php
index 6535fc2a..5decbd46 100644
--- a/lib/SP/Domain/Import/Services/LdapImport.php
+++ b/lib/SP/Domain/Import/Services/LdapImport.php
@@ -35,10 +35,10 @@ 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\Auth\Providers\Ldap\LdapBase;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
 use SP\Domain\User\Models\User;
 use SP\Domain\User\Models\UserGroup;
 use SP\Domain\User\Ports\UserGroupService;
diff --git a/lib/SP/Domain/Import/Services/SyspassImport.php b/lib/SP/Domain/Import/Services/SyspassImport.php
index e2f1eded..acb4d136 100644
--- a/lib/SP/Domain/Import/Services/SyspassImport.php
+++ b/lib/SP/Domain/Import/Services/SyspassImport.php
@@ -37,12 +37,12 @@ use SP\Domain\Account\Dtos\AccountCreateDto;
 use SP\Domain\Account\Models\Account;
 use SP\Domain\Category\Models\Category;
 use SP\Domain\Client\Models\Client;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Export\Services\XmlVerify;
 use SP\Domain\Import\Dtos\ImportParamsDto;
 use SP\Domain\Import\Ports\ItemsImportService;
 use SP\Domain\Tag\Models\Tag;
-use SP\Util\Version;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/Install/Adapters/InstallDataFactory.php b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php
index f797a729..39ebf631 100644
--- a/lib/SP/Domain/Install/Adapters/InstallDataFactory.php
+++ b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php
@@ -24,14 +24,14 @@
 
 namespace SP\Domain\Install\Adapters;
 
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class InstallDataAdapter
  */
 final class InstallDataFactory
 {
-    public static function buildFromRequest(RequestInterface $request): InstallData
+    public static function buildFromRequest(RequestService $request): InstallData
     {
         $installData = new InstallData();
         $installData->setSiteLang($request->analyzeString('sitelang', 'en_US'));
diff --git a/lib/SP/Domain/Install/Services/Installer.php b/lib/SP/Domain/Install/Services/Installer.php
index f8b25153..a6916dd2 100644
--- a/lib/SP/Domain/Install/Services/Installer.php
+++ b/lib/SP/Domain/Install/Services/Installer.php
@@ -27,6 +27,7 @@ namespace SP\Domain\Install\Services;
 
 use Exception;
 use SP\Core\Crypt\Hash;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Config\Models\Config;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
@@ -35,7 +36,7 @@ use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Install\Adapters\InstallData;
 use SP\Domain\Install\Ports\InstallerService;
 use SP\Domain\User\Models\ProfileData;
@@ -47,7 +48,6 @@ use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Database\DatabaseConnectionData;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Version;
 
 use function SP\__u;
 use function SP\processException;
@@ -64,11 +64,11 @@ final class Installer implements InstallerService
     public const VERSION_TEXT = '4.0';
     public const BUILD        = 21031301;
 
-    private RequestInterface $request;
-    private ?InstallData     $installData = null;
+    private RequestService $request;
+    private ?InstallData   $installData = null;
 
     public function __construct(
-        RequestInterface                        $request,
+        RequestService               $request,
         private readonly ConfigFileService      $config,
         private readonly UserService $userService,
         private readonly UserGroupService       $userGroupService,
diff --git a/lib/SP/Domain/Install/Services/MysqlService.php b/lib/SP/Domain/Install/Services/MysqlService.php
index 12ab8302..bc64d966 100644
--- a/lib/SP/Domain/Install/Services/MysqlService.php
+++ b/lib/SP/Domain/Install/Services/MysqlService.php
@@ -26,6 +26,7 @@ namespace SP\Domain\Install\Services;
 
 use Exception;
 use PDOException;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Database\Ports\DatabaseFileInterface;
 use SP\Domain\Database\Ports\DbStorageHandler;
@@ -33,7 +34,6 @@ use SP\Domain\Install\Adapters\InstallData;
 use SP\Infrastructure\Database\DatabaseException;
 use SP\Infrastructure\Database\DatabaseUtil;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/ItemPreset/Models/AccountPrivate.php b/lib/SP/Domain/ItemPreset/Models/AccountPrivate.php
index feb21812..14952155 100644
--- a/lib/SP/Domain/ItemPreset/Models/AccountPrivate.php
+++ b/lib/SP/Domain/ItemPreset/Models/AccountPrivate.php
@@ -29,7 +29,7 @@ namespace SP\Domain\ItemPreset\Models;
  *
  * TODO: serde using JSON
  */
-final readonly class AccountPrivate
+readonly class AccountPrivate
 {
     public function __construct(
         private ?bool $privateUser = false,
diff --git a/lib/SP/Domain/ItemPreset/Models/ItemPreset.php b/lib/SP/Domain/ItemPreset/Models/ItemPreset.php
index 937a2902..5607edfd 100644
--- a/lib/SP/Domain/ItemPreset/Models/ItemPreset.php
+++ b/lib/SP/Domain/ItemPreset/Models/ItemPreset.php
@@ -42,6 +42,8 @@ class ItemPreset extends Model implements HydratableModel
 {
     use SerializedModel;
 
+    public const TABLE = 'ItemPreset';
+
     protected ?int    $id            = null;
     protected ?string $type          = null;
     protected ?int    $userId        = null;
diff --git a/lib/SP/Domain/ItemPreset/Models/Password.php b/lib/SP/Domain/ItemPreset/Models/Password.php
index 97711f03..de856ded 100644
--- a/lib/SP/Domain/ItemPreset/Models/Password.php
+++ b/lib/SP/Domain/ItemPreset/Models/Password.php
@@ -31,23 +31,24 @@ use SP\Domain\ItemPreset\Ports\PresetInterface;
  *
  * TODO: serde using JSON
  */
-class Password implements PresetInterface
+readonly class Password implements PresetInterface
 {
     private const PRESET_TYPE = 'password';
 
     public const EXPIRE_TIME_MULTIPLIER = 86400;
+    private int|float $expireTime;
 
     public function __construct(
-        private readonly int     $length,
-        private readonly bool    $useNumbers,
-        private readonly bool    $useLetters,
-        private readonly bool    $useSymbols,
-        private readonly bool    $useUpper,
-        private readonly bool    $useLower,
-        private readonly bool    $useImage,
-        private int              $expireTime,
-        private readonly int     $score,
-        private readonly ?string $regex = null
+        private int     $length,
+        private bool    $useNumbers,
+        private bool    $useLetters,
+        private bool    $useSymbols,
+        private bool    $useUpper,
+        private bool    $useLower,
+        private bool    $useImage,
+        int             $expireTime,
+        private int     $score,
+        private ?string $regex = null
     ) {
         $this->expireTime = $expireTime * self::EXPIRE_TIME_MULTIPLIER;
     }
diff --git a/lib/SP/Domain/ItemPreset/Models/SessionTimeout.php b/lib/SP/Domain/ItemPreset/Models/SessionTimeout.php
index 6d713555..42e8687a 100644
--- a/lib/SP/Domain/ItemPreset/Models/SessionTimeout.php
+++ b/lib/SP/Domain/ItemPreset/Models/SessionTimeout.php
@@ -25,7 +25,7 @@
 namespace SP\Domain\ItemPreset\Models;
 
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
-use SP\Http\Address;
+use SP\Domain\Http\Adapters\Address;
 
 /**
  * Class SessionTimeout
diff --git a/lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php b/lib/SP/Domain/Log/Ports/FileLogHandlerProvider.php
similarity index 96%
rename from lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php
rename to lib/SP/Domain/Log/Ports/FileLogHandlerProvider.php
index e7fd3ddd..15fca7f4 100644
--- a/lib/SP/Domain/Providers/Ports/FileLogHandlerProvider.php
+++ b/lib/SP/Domain/Log/Ports/FileLogHandlerProvider.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ports;
+namespace SP\Domain\Log\Ports;
 
 use SP\Domain\Core\Events\EventReceiver;
 
diff --git a/lib/SP/Domain/Providers/Ports/ProviderInterface.php b/lib/SP/Domain/Log/Ports/ProviderInterface.php
similarity index 95%
rename from lib/SP/Domain/Providers/Ports/ProviderInterface.php
rename to lib/SP/Domain/Log/Ports/ProviderInterface.php
index f86fffa4..b3f36940 100644
--- a/lib/SP/Domain/Providers/Ports/ProviderInterface.php
+++ b/lib/SP/Domain/Log/Ports/ProviderInterface.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ports;
+namespace SP\Domain\Log\Ports;
 
 /**
  * ProviderInterface
diff --git a/lib/SP/Domain/Providers/Log/DatabaseLogHandler.php b/lib/SP/Domain/Log/Providers/DatabaseHandler.php
similarity index 92%
rename from lib/SP/Domain/Providers/Log/DatabaseLogHandler.php
rename to lib/SP/Domain/Log/Providers/DatabaseHandler.php
index 2051b624..25b9a166 100644
--- a/lib/SP/Domain/Providers/Log/DatabaseLogHandler.php
+++ b/lib/SP/Domain/Log/Providers/DatabaseHandler.php
@@ -22,17 +22,17 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 use Exception;
 use SP\Core\Application;
 use SP\Core\Events\Event;
+use SP\Domain\Common\Providers\EventsTrait;
+use SP\Domain\Common\Providers\Provider;
 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;
 
@@ -40,11 +40,9 @@ use function SP\__;
 use function SP\processException;
 
 /**
- * Class LogHandler
- *
- * @package SP\Domain\Providers\Log
+ * Class DatabaseHandler
  */
-final class DatabaseLogHandler extends Provider implements EventReceiver
+final class DatabaseHandler extends Provider implements EventReceiver
 {
     use EventsTrait;
 
diff --git a/lib/SP/Domain/Providers/Log/FileLogHandler.php b/lib/SP/Domain/Log/Providers/FileHandler.php
similarity index 82%
rename from lib/SP/Domain/Providers/Log/FileLogHandler.php
rename to lib/SP/Domain/Log/Providers/FileHandler.php
index 51e01b04..4ae1550d 100644
--- a/lib/SP/Domain/Providers/Log/FileLogHandler.php
+++ b/lib/SP/Domain/Log/Providers/FileHandler.php
@@ -22,16 +22,16 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 use Monolog\Handler\StreamHandler;
-use SP\Domain\Providers\EventsTrait;
-use SP\Domain\Providers\Ports\FileLogHandlerProvider;
+use SP\Domain\Common\Providers\EventsTrait;
+use SP\Domain\Log\Ports\FileLogHandlerProvider;
 
 /**
- * Class FileLogHandler
+ * Class FileHandler
  */
-final class FileLogHandler extends LoggerBase implements FileLogHandlerProvider
+final class FileHandler extends LoggerBase implements FileLogHandlerProvider
 {
     use EventsTrait;
 
diff --git a/lib/SP/Domain/Providers/Log/LogInterface.php b/lib/SP/Domain/Log/Providers/LogInterface.php
similarity index 98%
rename from lib/SP/Domain/Providers/Log/LogInterface.php
rename to lib/SP/Domain/Log/Providers/LogInterface.php
index df2e92c9..5bd6b6e0 100644
--- a/lib/SP/Domain/Providers/Log/LogInterface.php
+++ b/lib/SP/Domain/Log/Providers/LogInterface.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 /**
  * Interface LogInterface
diff --git a/lib/SP/Domain/Providers/Log/LoggerBase.php b/lib/SP/Domain/Log/Providers/LoggerBase.php
similarity index 94%
rename from lib/SP/Domain/Providers/Log/LoggerBase.php
rename to lib/SP/Domain/Log/Providers/LoggerBase.php
index c2c2184a..05926582 100644
--- a/lib/SP/Domain/Providers/Log/LoggerBase.php
+++ b/lib/SP/Domain/Log/Providers/LoggerBase.php
@@ -22,18 +22,18 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 use Exception;
 use Monolog\Logger;
 use SP\Core\Application;
 use SP\Core\Events\Event;
+use SP\Domain\Common\Providers\EventsTrait;
+use SP\Domain\Common\Providers\Provider;
 use SP\Domain\Core\Events\EventReceiver;
 use SP\Domain\Core\Exceptions\InvalidClassException;
 use SP\Domain\Core\LanguageInterface;
-use SP\Domain\Http\RequestInterface;
-use SP\Domain\Providers\EventsTrait;
-use SP\Domain\Providers\Provider;
+use SP\Domain\Http\Ports\RequestService;
 
 use function SP\__;
 use function SP\getLastCaller;
@@ -51,7 +51,7 @@ abstract class LoggerBase extends Provider implements EventReceiver
         Application                          $application,
         protected readonly Logger            $logger,
         protected readonly LanguageInterface $language,
-        protected readonly RequestInterface  $request
+        protected readonly RequestService $request
     ) {
         parent::__construct($application);
 
diff --git a/lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php b/lib/SP/Domain/Log/Providers/RemoteSyslogHandler.php
similarity index 95%
rename from lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php
rename to lib/SP/Domain/Log/Providers/RemoteSyslogHandler.php
index 9c2683ed..c4692d98 100644
--- a/lib/SP/Domain/Providers/Log/RemoteSyslogHandler.php
+++ b/lib/SP/Domain/Log/Providers/RemoteSyslogHandler.php
@@ -22,15 +22,13 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 use Monolog\Handler\SyslogUdpHandler;
 use Monolog\Logger;
 
 /**
  * Class RemoteSyslogHandler
- *
- * @package SP\Domain\Providers\Log
  */
 final class RemoteSyslogHandler extends LoggerBase
 {
diff --git a/lib/SP/Domain/Providers/Log/SyslogHandler.php b/lib/SP/Domain/Log/Providers/SyslogHandler.php
similarity index 97%
rename from lib/SP/Domain/Providers/Log/SyslogHandler.php
rename to lib/SP/Domain/Log/Providers/SyslogHandler.php
index 631a6a1a..76dcb5b0 100644
--- a/lib/SP/Domain/Providers/Log/SyslogHandler.php
+++ b/lib/SP/Domain/Log/Providers/SyslogHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Log;
+namespace SP\Domain\Log\Providers;
 
 use Monolog\Handler\SyslogHandler as MSyslogHandler;
 
diff --git a/lib/SP/Domain/Providers/Mail/MailParams.php b/lib/SP/Domain/Notification/Dtos/MailParams.php
similarity index 97%
rename from lib/SP/Domain/Providers/Mail/MailParams.php
rename to lib/SP/Domain/Notification/Dtos/MailParams.php
index a9a151ab..b8fc8b8b 100644
--- a/lib/SP/Domain/Providers/Mail/MailParams.php
+++ b/lib/SP/Domain/Notification/Dtos/MailParams.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Mail;
+namespace SP\Domain\Notification\Dtos;
 
 /**
  * Class MailParams
diff --git a/lib/SP/Domain/Notification/Models/Notification.php b/lib/SP/Domain/Notification/Models/Notification.php
index ecb065e5..37952f98 100644
--- a/lib/SP/Domain/Notification/Models/Notification.php
+++ b/lib/SP/Domain/Notification/Models/Notification.php
@@ -32,6 +32,8 @@ use SP\Domain\Common\Models\Model;
  */
 class Notification extends Model implements ItemWithIdAndNameModel
 {
+    public const TABLE = 'Notification';
+
     protected ?int    $id          = null;
     protected ?string $type        = null;
     protected ?string $component   = null;
diff --git a/lib/SP/Domain/Notification/Ports/MailService.php b/lib/SP/Domain/Notification/Ports/MailService.php
index 96994448..52650610 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\Domain\Providers\Mail\MailParams;
+use SP\Domain\Notification\Dtos\MailParams;
 
 /**
  * Class MailService
diff --git a/lib/SP/Domain/Providers/Ports/MailerInterface.php b/lib/SP/Domain/Notification/Ports/MailerInterface.php
similarity index 93%
rename from lib/SP/Domain/Providers/Ports/MailerInterface.php
rename to lib/SP/Domain/Notification/Ports/MailerInterface.php
index 902ebe34..be1ff954 100644
--- a/lib/SP/Domain/Providers/Ports/MailerInterface.php
+++ b/lib/SP/Domain/Notification/Ports/MailerInterface.php
@@ -22,9 +22,9 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Ports;
+namespace SP\Domain\Notification\Ports;
 
-use SP\Domain\Providers\Mail\MailParams;
+use SP\Domain\Notification\Dtos\MailParams;
 
 /**
  * A wrapper for a mailer
diff --git a/lib/SP/Domain/Providers/Mail/MailHandler.php b/lib/SP/Domain/Notification/Providers/MailHandler.php
similarity index 94%
rename from lib/SP/Domain/Providers/Mail/MailHandler.php
rename to lib/SP/Domain/Notification/Providers/MailHandler.php
index 585a93a0..3e17d7be 100644
--- a/lib/SP/Domain/Providers/Mail/MailHandler.php
+++ b/lib/SP/Domain/Notification/Providers/MailHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Mail;
+namespace SP\Domain\Notification\Providers;
 
 use Exception;
 use SP\Core\Application;
@@ -30,10 +30,8 @@ use SP\Core\Events\Event;
 use SP\Core\Messages\MailMessage;
 use SP\Core\Messages\TextFormatter;
 use SP\Domain\Core\Events\EventReceiver;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Notification\Ports\MailService;
-use SP\Domain\Providers\EventsTrait;
-use SP\Domain\Providers\Provider;
 
 use function SP\__;
 use function SP\processException;
@@ -41,9 +39,9 @@ use function SP\processException;
 /**
  * Class MailHandler
  */
-final class MailHandler extends Provider implements EventReceiver
+final class MailHandler extends \SP\Domain\Common\Providers\Provider implements EventReceiver
 {
-    use EventsTrait;
+    use \SP\Domain\Common\Providers\EventsTrait;
 
     public const EVENTS = [
         'create.',
@@ -71,7 +69,7 @@ final class MailHandler extends Provider implements EventReceiver
     public function __construct(
         Application                       $application,
         private readonly MailService      $mailService,
-        private readonly RequestInterface $request
+        private readonly RequestService $request
     ) {
         parent::__construct($application);
 
diff --git a/lib/SP/Domain/Providers/Mail/MailProviderException.php b/lib/SP/Domain/Notification/Providers/MailProviderException.php
similarity index 95%
rename from lib/SP/Domain/Providers/Mail/MailProviderException.php
rename to lib/SP/Domain/Notification/Providers/MailProviderException.php
index bbc42b31..3cfd99cd 100644
--- a/lib/SP/Domain/Providers/Mail/MailProviderException.php
+++ b/lib/SP/Domain/Notification/Providers/MailProviderException.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Mail;
+namespace SP\Domain\Notification\Providers;
 
 use SP\Domain\Core\Exceptions\SPException;
 
diff --git a/lib/SP/Domain/Providers/Notification/NotificationHandler.php b/lib/SP/Domain/Notification/Providers/NotificationHandler.php
similarity index 95%
rename from lib/SP/Domain/Providers/Notification/NotificationHandler.php
rename to lib/SP/Domain/Notification/Providers/NotificationHandler.php
index 2ac11e52..f59ae82a 100644
--- a/lib/SP/Domain/Providers/Notification/NotificationHandler.php
+++ b/lib/SP/Domain/Notification/Providers/NotificationHandler.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Notification;
+namespace SP\Domain\Notification\Providers;
 
 use Exception;
 use SP\Core\Application;
@@ -30,8 +30,6 @@ 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\Domain\Providers\EventsTrait;
-use SP\Domain\Providers\Provider;
 
 use function SP\__;
 use function SP\processException;
@@ -41,9 +39,9 @@ use function SP\processException;
  *
  * @package SP\Domain\Providers\Notification
  */
-final class NotificationHandler extends Provider implements EventReceiver
+final class NotificationHandler extends \SP\Domain\Common\Providers\Provider implements EventReceiver
 {
-    use EventsTrait;
+    use \SP\Domain\Common\Providers\EventsTrait;
 
     public const EVENTS = [
         'request.account',
diff --git a/lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php b/lib/SP/Domain/Notification/Providers/PhpMailerWrapper.php
similarity index 96%
rename from lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php
rename to lib/SP/Domain/Notification/Providers/PhpMailerWrapper.php
index b69d7f19..60cadded 100644
--- a/lib/SP/Domain/Providers/Mail/PhpMailerWrapper.php
+++ b/lib/SP/Domain/Notification/Providers/PhpMailerWrapper.php
@@ -22,12 +22,13 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Domain\Providers\Mail;
+namespace SP\Domain\Notification\Providers;
 
 use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\PHPMailer;
 use SP\Domain\Core\AppInfoInterface;
-use SP\Domain\Providers\Ports\MailerInterface;
+use SP\Domain\Notification\Dtos\MailParams;
+use SP\Domain\Notification\Ports\MailerInterface;
 
 use function SP\__u;
 use function SP\logger;
diff --git a/lib/SP/Domain/Notification/Services/Mail.php b/lib/SP/Domain/Notification/Services/Mail.php
index aa82e2bc..c6ac48d3 100644
--- a/lib/SP/Domain/Notification/Services/Mail.php
+++ b/lib/SP/Domain/Notification/Services/Mail.php
@@ -34,10 +34,10 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
+use SP\Domain\Html\Html;
+use SP\Domain\Notification\Dtos\MailParams;
+use SP\Domain\Notification\Ports\MailerInterface;
 use SP\Domain\Notification\Ports\MailService;
-use SP\Domain\Providers\Mail\MailParams;
-use SP\Domain\Providers\Ports\MailerInterface;
-use SP\Html\Html;
 
 use function SP\__u;
 use function SP\processException;
diff --git a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
index 6d6d6566..bdeccb1a 100644
--- a/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
+++ b/lib/SP/Domain/Plugin/Services/PluginUpgrader.php
@@ -27,6 +27,7 @@ namespace SP\Domain\Plugin\Services;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
@@ -34,7 +35,6 @@ use SP\Domain\Plugin\Ports\Plugin;
 use SP\Domain\Plugin\Ports\PluginManagerService;
 use SP\Domain\Plugin\Ports\PluginUpgraderInterface;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
-use SP\Util\Version;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Domain/Security/Dtos/TrackRequest.php b/lib/SP/Domain/Security/Dtos/TrackRequest.php
index fb800074..0b1028ed 100644
--- a/lib/SP/Domain/Security/Dtos/TrackRequest.php
+++ b/lib/SP/Domain/Security/Dtos/TrackRequest.php
@@ -25,7 +25,7 @@
 namespace SP\Domain\Security\Dtos;
 
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
-use SP\Http\Address;
+use SP\Domain\Http\Adapters\Address;
 
 /**
  * Class TrackRequest
diff --git a/lib/SP/Domain/Security/Services/Eventlog.php b/lib/SP/Domain/Security/Services/Eventlog.php
index f1a232a9..19242efe 100644
--- a/lib/SP/Domain/Security/Services/Eventlog.php
+++ b/lib/SP/Domain/Security/Services/Eventlog.php
@@ -30,7 +30,7 @@ use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Models\Eventlog as EventlogModel;
 use SP\Domain\Security\Ports\EventlogRepository;
 use SP\Domain\Security\Ports\EventlogService;
@@ -45,7 +45,7 @@ final class Eventlog extends Service implements EventlogService
     public function __construct(
         Application                         $application,
         private readonly EventlogRepository $eventLogRepository,
-        private readonly RequestInterface   $request
+        private readonly RequestService $request
     ) {
         parent::__construct($application);
     }
diff --git a/lib/SP/Domain/Security/Services/Track.php b/lib/SP/Domain/Security/Services/Track.php
index 2e1fea2e..1e445dd1 100644
--- a/lib/SP/Domain/Security/Services/Track.php
+++ b/lib/SP/Domain/Security/Services/Track.php
@@ -33,7 +33,7 @@ use SP\Domain\Core\Dtos\ItemSearchDto;
 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\Http\Ports\RequestService;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Models\Track as TrackModel;
 use SP\Domain\Security\Ports\TrackRepository;
@@ -58,7 +58,7 @@ final class Track extends Service implements TrackService
     public function __construct(
         Application                       $application,
         private readonly TrackRepository  $trackRepository,
-        private readonly RequestInterface $request
+        private readonly RequestService $request
     ) {
         parent::__construct($application);
     }
diff --git a/lib/SP/Domain/Tag/Models/Tag.php b/lib/SP/Domain/Tag/Models/Tag.php
index 2947841c..ff530ab5 100644
--- a/lib/SP/Domain/Tag/Models/Tag.php
+++ b/lib/SP/Domain/Tag/Models/Tag.php
@@ -32,6 +32,8 @@ use SP\Domain\Common\Models\Model;
  */
 class Tag extends Model implements ItemWithIdAndNameModel
 {
+    public const TABLE = 'Tag';
+
     protected ?int    $id   = null;
     protected ?string $name = null;
     protected ?string $hash = null;
diff --git a/lib/SP/Domain/Task/Services/Task.php b/lib/SP/Domain/Task/Services/Task.php
index 9f4817c2..7a90bcc0 100644
--- a/lib/SP/Domain/Task/Services/Task.php
+++ b/lib/SP/Domain/Task/Services/Task.php
@@ -27,12 +27,12 @@ namespace SP\Domain\Task\Services;
 use JsonException;
 use SP\Core\Context\Session;
 use SP\Core\Messages\TaskMessage;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\File\Ports\FileHandlerInterface;
 use SP\Domain\Task\Ports\TaskInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystem;
-use SP\Util\Serde;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/lib/SP/Domain/Task/Services/TaskService.php b/lib/SP/Domain/Task/Services/TaskService.php
index 6fc88861..8809afed 100644
--- a/lib/SP/Domain/Task/Services/TaskService.php
+++ b/lib/SP/Domain/Task/Services/TaskService.php
@@ -31,7 +31,7 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Task\Ports\TaskServiceInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 /**
  * Class TaskService
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
index fd9f16e7..1157b291 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeBase.php
@@ -27,12 +27,12 @@ namespace SP\Domain\Upgrade\Services;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Providers\Ports\FileLogHandlerProvider;
+use SP\Domain\Log\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Ports\UpgradeService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Version;
 
 use function SP\__u;
 use function SP\logger;
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
index 8ac8ccae..6def4f13 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeDatabase.php
@@ -29,7 +29,7 @@ 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\Domain\Log\Providers\FileHandler;
 use SP\Infrastructure\Database\MysqlFileParser;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
@@ -46,7 +46,7 @@ final class UpgradeDatabase extends UpgradeBase
 {
     public function __construct(
         Application                        $application,
-        FileLogHandler                     $fileLogHandler,
+        FileHandler $fileLogHandler,
         private readonly DatabaseInterface $database,
     ) {
         parent::__construct($application, $fileLogHandler);
diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
index c0e4eea0..e6c3fcc9 100644
--- a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
+++ b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php
@@ -24,10 +24,10 @@
 
 namespace SP\Domain\Upgrade\Services;
 
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Version;
 
 /**
  * Class UpgradeUtil
diff --git a/lib/SP/Domain/User/Services/UserPassRecover.php b/lib/SP/Domain/User/Services/UserPassRecover.php
index 75644071..1c7b5cc3 100644
--- a/lib/SP/Domain/User/Services/UserPassRecover.php
+++ b/lib/SP/Domain/User/Services/UserPassRecover.php
@@ -27,16 +27,16 @@ namespace SP\Domain\User\Services;
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use SP\Core\Application;
 use SP\Core\Messages\MailMessage;
+use SP\Domain\Common\Providers\Password;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\Html\Html;
 use SP\Domain\User\Models\UserPassRecover as UserPassRecoverModel;
 use SP\Domain\User\Ports\UserPassRecoverRepository;
 use SP\Domain\User\Ports\UserPassRecoverService;
-use SP\Html\Html;
-use SP\Util\Password;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Infrastructure/Account/Repositories/Account.php b/lib/SP/Infrastructure/Account/Repositories/Account.php
index e5dfe31f..b0ef7243 100644
--- a/lib/SP/Infrastructure/Account/Repositories/Account.php
+++ b/lib/SP/Infrastructure/Account/Repositories/Account.php
@@ -31,6 +31,7 @@ use SP\Domain\Account\Models\AccountSearchView as AccountSearchViewModel;
 use SP\Domain\Account\Models\AccountView as AccountViewModel;
 use SP\Domain\Account\Ports\AccountFilterBuilder;
 use SP\Domain\Account\Ports\AccountRepository;
+use SP\Domain\Client\Models\Client as ClientModel;
 use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Events\EventDispatcherInterface;
@@ -63,6 +64,10 @@ final class Account extends BaseRepository implements AccountRepository
 
     /**
      * Devolver el número total de cuentas
+     *
+     * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getTotalNumAccounts(): QueryResult
     {
@@ -78,6 +83,8 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getPasswordForId(int $accountId): QueryResult
     {
@@ -102,6 +109,8 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getPasswordHistoryForId(int $accountId): QueryResult
     {
@@ -135,7 +144,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->set('countDecrypt', '(countDecrypt + 1)')
             ->where('id = :id')
             ->bindValues(['id' => $accountId]);
@@ -156,7 +165,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into('Account')
+            ->into(AccountModel::TABLE)
             ->cols($account->toArray(null, ['countDecrypt', 'countView', 'dateAdd', 'dateEdit', 'id']))
             ->set('dateAdd', 'NOW()')
             ->set('passDate', 'UNIX_TIMESTAMP()');
@@ -179,7 +188,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into('Account')
+            ->into(AccountModel::TABLE)
             ->cols($account->toArray(null, ['id']));
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while creating the account'));
@@ -201,7 +210,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->cols($account->toArray(['pass', 'key', 'userEditId', 'passDateChange']))
             ->set('dateEdit', 'NOW()')
             ->set('passDate', 'UNIX_TIMESTAMP()')
@@ -227,7 +236,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->cols(['pass' => $encryptedPassword->getPass(), 'key' => $encryptedPassword->getKey()])
             ->where('id = :id')
             ->bindValues(['id' => $accountId]);
@@ -251,7 +260,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->cols(
                 $account->toArray(
                     null,
@@ -287,7 +296,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $accountId]);
 
@@ -312,7 +321,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->where('id = :id')
             ->cols(
                 $account->toArray(
@@ -383,7 +392,7 @@ final class Account extends BaseRepository implements AccountRepository
 
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->cols(
                 array_merge(
                     $cols,
@@ -405,12 +414,14 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getByIdEnriched(int $accountId): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('account_data_v')
+            ->from(AccountViewModel::TABLE)
             ->cols(AccountViewModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $accountId])
@@ -428,12 +439,14 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getById(int $accountId): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->cols(AccountModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $accountId])
@@ -449,12 +462,14 @@ final class Account extends BaseRepository implements AccountRepository
      * Returns all the items
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getAll(): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->cols(AccountModel::getCols(['pass', 'key']));
 
         return $this->db->runQuery(QueryData::buildWithMapper($query, AccountModel::class));
@@ -477,7 +492,7 @@ final class Account extends BaseRepository implements AccountRepository
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $accountsId]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the accounts'));
@@ -491,12 +506,14 @@ final class Account extends BaseRepository implements AccountRepository
      * @param ItemSearchDto $itemSearchData
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function search(ItemSearchDto $itemSearchData): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('account_search_v')
+            ->from(AccountSearchViewModel::TABLE)
             ->cols(AccountSearchViewModel::getCols())
             ->orderBy(['name ASC', 'clientName ASC'])
             ->limit($itemSearchData->getLimitCount())
@@ -536,7 +553,7 @@ final class Account extends BaseRepository implements AccountRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('Account')
+            ->table(AccountModel::TABLE)
             ->set('countView', '(countView + 1)')
             ->where('id = :id')
             ->bindValues(['id' => $accountId]);
@@ -550,12 +567,14 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getDataForLink(int $accountId): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->cols([
                        'Account.name',
                        'Account.login',
@@ -580,6 +599,8 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int|null $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getForUser(?int $accountId = null): QueryResult
     {
@@ -607,6 +628,8 @@ final class Account extends BaseRepository implements AccountRepository
      * @param int $accountId
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getLinked(int $accountId): QueryResult
     {
@@ -617,7 +640,7 @@ final class Account extends BaseRepository implements AccountRepository
                        'Account.name',
                        'Client.name AS clientName',
                    ])
-            ->join('INNER', 'Client', 'Account.clientId = Client.id')
+            ->join('INNER', ClientModel::TABLE, 'Account.clientId = Client.id')
             ->where('Account.parentId = :parentId')
             ->bindValues(['parentId' => $accountId])
             ->orderBy(['Account.name ASC']);
@@ -629,12 +652,14 @@ final class Account extends BaseRepository implements AccountRepository
      * Obtener los datos relativos a la clave de todas las cuentas.
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getAccountsPassData(): QueryResult
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('Account')
+            ->from(AccountModel::TABLE)
             ->cols([
                        'id',
                        'name',
diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountFile.php b/lib/SP/Infrastructure/Account/Repositories/AccountFile.php
index 9c9d26f0..057d2dde 100644
--- a/lib/SP/Infrastructure/Account/Repositories/AccountFile.php
+++ b/lib/SP/Infrastructure/Account/Repositories/AccountFile.php
@@ -24,7 +24,7 @@
 
 namespace SP\Infrastructure\Account\Repositories;
 
-use SP\Domain\Account\Models\File;
+use SP\Domain\Account\Models\File as FileModel;
 use SP\Domain\Account\Ports\AccountFileRepository;
 use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -46,17 +46,17 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
     /**
      * Creates an item
      *
-     * @param File $fileData
+     * @param FileModel $fileData
      *
      * @return int
      * @throws ConstraintException
      * @throws QueryException
      */
-    public function create(File $fileData): int
+    public function create(FileModel $fileData): int
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into('AccountFile')
+            ->into(FileModel::TABLE)
             ->cols([
                        'accountId' => $fileData->getAccountId(),
                        'name' => $fileData->getName(),
@@ -77,6 +77,8 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
      * @param int $id
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getById(int $id): QueryResult
     {
@@ -94,7 +96,7 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
                        'Account.name AS accountName',
                        'Client.name AS clientName',
                    ])
-            ->from('AccountFile')
+            ->from(FileModel::TABLE)
             ->join('INNER', 'Account', 'Account.id = AccountFile.accountId')
             ->join('INNER', 'Client', 'Client.id = Account.clientId')
             ->where('AccountFile.id = :id')
@@ -110,6 +112,8 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
      * @param int $id
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function getByAccountId(int $id): QueryResult
     {
@@ -125,7 +129,7 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
                        'content',
                        'thumb',
                    ])
-            ->from('AccountFile')
+            ->from(FileModel::TABLE)
             ->where('accountId = :accountId')
             ->bindValues(['accountId' => $id])
             ->orderBy(['name ASC'])
@@ -147,7 +151,7 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from('AccountFile')
+            ->from(FileModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id]);
 
@@ -173,7 +177,7 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from('AccountFile')
+            ->from(FileModel::TABLE)
             ->where('AccountFile.id IN (:accountFileIds)', ['accountFileIds' => $ids]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the files'));
@@ -187,6 +191,8 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
      * @param ItemSearchDto $itemSearchData
      *
      * @return QueryResult
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function search(ItemSearchDto $itemSearchData): QueryResult
     {
@@ -203,7 +209,7 @@ final class AccountFile extends BaseRepository implements AccountFileRepository
                        'Account.name AS accountName',
                        'Client.name AS clientName',
                    ])
-            ->from('AccountFile')
+            ->from(FileModel::TABLE)
             ->join('INNER', 'Account', 'Account.id = AccountFile.accountId')
             ->join('INNER', 'Client', 'Client.id = Account.clientId')
             ->orderBy(['AccountFile.name ASC'])
diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountHistory.php b/lib/SP/Infrastructure/Account/Repositories/AccountHistory.php
index 289b89e9..d99d5292 100644
--- a/lib/SP/Infrastructure/Account/Repositories/AccountHistory.php
+++ b/lib/SP/Infrastructure/Account/Repositories/AccountHistory.php
@@ -26,6 +26,8 @@ namespace SP\Infrastructure\Account\Repositories;
 
 use SP\Domain\Account\Dtos\AccountHistoryCreateDto;
 use SP\Domain\Account\Dtos\EncryptedPassword;
+use SP\Domain\Account\Models\Account as AccountModel;
+use SP\Domain\Account\Models\AccountHistory as AccountHistoryModel;
 use SP\Domain\Account\Ports\AccountHistoryRepository;
 use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -54,7 +56,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('AccountHistory AS Account')
+            ->from(sprintf('%s AS Account', AccountHistoryModel::TABLE))
             ->cols([
                        'Account.id',
                        'Account.dateEdit',
@@ -86,7 +88,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
 
         $query = $this->queryFactory
             ->newInsert()
-            ->into('Account')
+            ->into(AccountModel::TABLE)
             ->cols([
                        'accountId' => $accountData->getId(),
                        'clientId' => $accountData->getClientId(),
@@ -134,7 +136,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from('AccountHistory')
+            ->from(AccountHistoryModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id]);
 
@@ -156,7 +158,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('AccountHistory AS Account')
+            ->from(sprintf('%s AS Account', AccountHistoryModel::TABLE))
             ->cols([
                        'Account.id',
                        'Account.accountId',
@@ -217,7 +219,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('AccountHistory AS Account')
+            ->from(sprintf('%s AS Account', AccountHistoryModel::TABLE))
             ->cols([
                        'Account.id',
                        'Account.accountId',
@@ -280,7 +282,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from('AccountHistory')
+            ->from(AccountHistoryModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $ids]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the accounts'));
@@ -305,7 +307,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from('AccountHistory')
+            ->from(AccountHistoryModel::TABLE)
             ->where('accountId IN (:accountIds)', ['accountIds' => $ids]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the accounts'));
@@ -326,7 +328,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('AccountHistory AS Account')
+            ->from(sprintf('%s AS Account', AccountHistoryModel::TABLE))
             ->cols([
                        'Account.id',
                        'Account.name',
@@ -369,7 +371,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from('AccountHistory')
+            ->from(AccountHistoryModel::TABLE)
             ->cols(
                 [
                     'id',
@@ -399,7 +401,7 @@ final class AccountHistory extends BaseRepository implements AccountHistoryRepos
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table('AccountHistory')
+            ->table(AccountHistoryModel::TABLE)
             ->cols([
                        'pass' => $encryptedPassword->getPass(),
                        'key' => $encryptedPassword->getKey(),
diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountSearch.php b/lib/SP/Infrastructure/Account/Repositories/AccountSearch.php
index b2d39a20..79361a0c 100644
--- a/lib/SP/Infrastructure/Account/Repositories/AccountSearch.php
+++ b/lib/SP/Infrastructure/Account/Repositories/AccountSearch.php
@@ -27,10 +27,11 @@ namespace SP\Infrastructure\Account\Repositories;
 use Aura\SqlQuery\Common\SelectInterface;
 use Aura\SqlQuery\QueryFactory;
 use SP\Domain\Account\Dtos\AccountSearchFilterDto;
-use SP\Domain\Account\Models\AccountSearchView;
+use SP\Domain\Account\Models\AccountSearchView as AccountSearchViewModel;
 use SP\Domain\Account\Ports\AccountFilterBuilder;
 use SP\Domain\Account\Ports\AccountSearchConstants;
 use SP\Domain\Account\Ports\AccountSearchRepository;
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Core\Context\Context;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -39,7 +40,6 @@ use SP\Domain\Database\Ports\DatabaseInterface;
 use SP\Infrastructure\Common\Repositories\BaseRepository;
 use SP\Infrastructure\Database\QueryData;
 use SP\Infrastructure\Database\QueryResult;
-use SP\Util\Filter;
 
 /**
  * Class AccountSearch
@@ -94,7 +94,11 @@ final class AccountSearch extends BaseRepository implements AccountSearchReposit
             'publicLinkDateExpire',
             'publicLinkTotalCountViews',
         ];
-        $this->query = $this->queryFactory->newSelect()->cols($cols)->from('account_search_v AS Account')->distinct();
+        $this->query = $this->queryFactory
+            ->newSelect()
+            ->cols($cols)
+            ->from(sprintf('%s AS Account', AccountSearchViewModel::TABLE))
+            ->distinct();
     }
 
     /**
@@ -122,7 +126,7 @@ final class AccountSearch extends BaseRepository implements AccountSearchReposit
         }
 
         return $this->db->runQuery(
-            QueryData::build($this->query)->setMapClassName(AccountSearchView::class),
+            QueryData::build($this->query)->setMapClassName(AccountSearchViewModel::class),
             true
         );
     }
diff --git a/lib/SP/Infrastructure/Category/Repositories/Category.php b/lib/SP/Infrastructure/Category/Repositories/Category.php
index e1f2ddd2..df5ce240 100644
--- a/lib/SP/Infrastructure/Category/Repositories/Category.php
+++ b/lib/SP/Infrastructure/Category/Repositories/Category.php
@@ -47,8 +47,6 @@ final class Category extends BaseRepository implements CategoryRepository
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'Category';
-
     /**
      * Creates an item
      *
@@ -67,7 +65,7 @@ final class Category extends BaseRepository implements CategoryRepository
 
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(CategoryModel::TABLE)
             ->cols($category->toArray(null, ['id', 'hash']))
             ->col('hash', $this->makeItemHash($category->getName()));
 
@@ -90,7 +88,7 @@ final class Category extends BaseRepository implements CategoryRepository
         $query = $this->queryFactory
             ->newSelect()
             ->cols(['id'])
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->where('hash = :hash')
             ->orWhere('name = :name')
             ->bindValues(
@@ -121,7 +119,7 @@ final class Category extends BaseRepository implements CategoryRepository
 
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(CategoryModel::TABLE)
             ->cols($category->toArray(null, ['id', 'hash']))
             ->where('id = :id')
             ->limit(1)
@@ -151,7 +149,7 @@ final class Category extends BaseRepository implements CategoryRepository
         $query = $this->queryFactory
             ->newSelect()
             ->cols(['id'])
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->where('(hash = :hash OR name = :name)')
             ->where('id <> :id')
             ->bindValues(
@@ -178,7 +176,7 @@ final class Category extends BaseRepository implements CategoryRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->cols(CategoryModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $categoryId])
@@ -202,7 +200,7 @@ final class Category extends BaseRepository implements CategoryRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->cols(CategoryModel::getCols())
             ->where('(name = :name OR hash = :hash)')
             ->bindValues(['name' => $name, 'hash' => $this->makeItemHash($name)])
@@ -224,7 +222,7 @@ final class Category extends BaseRepository implements CategoryRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->cols(CategoryModel::getCols());
 
         return $this->db->runQuery(QueryData::buildWithMapper($query, CategoryModel::class));
@@ -247,7 +245,7 @@ final class Category extends BaseRepository implements CategoryRepository
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $categoryIds]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the categories'));
@@ -268,7 +266,7 @@ final class Category extends BaseRepository implements CategoryRepository
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id]);
 
@@ -289,7 +287,7 @@ final class Category extends BaseRepository implements CategoryRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CategoryModel::TABLE)
             ->cols(CategoryModel::getCols(['hash']))
             ->orderBy(['name'])
             ->limit($itemSearchData->getLimitCount())
diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldData.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldData.php
index a3228f86..e7be57f6 100644
--- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldData.php
+++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldData.php
@@ -45,8 +45,6 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'CustomFieldData';
-
     /**
      * Updates an item
      *
@@ -60,7 +58,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(CustomFieldDataModel::TABLE)
             ->cols($customFieldData->toArray(['data', 'key']))
             ->where('moduleId = :moduleId')
             ->where('itemId = :itemId')
@@ -91,7 +89,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
         $query = $this->queryFactory
             ->newSelect()
             ->cols(['itemId'])
-            ->from(self::TABLE)
+            ->from(CustomFieldDataModel::TABLE)
             ->where('moduleId = :moduleId')
             ->where('itemId = :itemId')
             ->where('definitionId = :definitionId')
@@ -119,7 +117,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(CustomFieldDataModel::TABLE)
             ->cols(CustomFieldDataModel::getCols())
             ->bindValues([
                              'itemId' => $customFieldData->getItemId(),
@@ -150,7 +148,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(CustomFieldDataModel::TABLE)
             ->where('itemId IN (:itemIds)')
             ->where('moduleId = :moduleId')
             ->bindValues(['itemIds' => $itemIds, 'moduleId' => $moduleId]);
@@ -169,7 +167,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CustomFieldDataModel::TABLE)
             ->cols(CustomFieldDataModel::getCols());
 
         return $this->db->runQuery(QueryData::buildWithMapper($query, CustomFieldDataModel::class));
@@ -186,7 +184,7 @@ final class CustomFieldData extends BaseRepository implements CustomFieldDataRep
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CustomFieldDataModel::TABLE)
             ->cols(CustomFieldDataModel::getCols())
             ->where('key IS NOT NULL')
             ->orderBy(['definitionId ASC']);
diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefinition.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefinition.php
index d5cd117b..df214be0 100644
--- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefinition.php
+++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefinition.php
@@ -46,8 +46,6 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'CustomFieldDefinition';
-
     /**
      * Creates an item
      *
@@ -61,7 +59,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(CustomFieldDefinitionModel::TABLE)
             ->cols(CustomFieldDefinitionModel::getCols(['id']))
             ->bindValues([
                              'name' => $customFieldDefinition->getName(),
@@ -91,7 +89,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(CustomFieldDefinitionModel::TABLE)
             ->cols($customFieldDefinition->toArray(null, ['id', 'moduleId']))
             ->where('id = :id')
             ->bindValues(['id' => $customFieldDefinition->getId()]);
@@ -113,7 +111,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CustomFieldDefinitionModel::TABLE)
             ->cols(CustomFieldDefinitionModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $id])
@@ -135,7 +133,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CustomFieldDefinitionModel::TABLE)
             ->cols(CustomFieldDefinitionModel::getCols())
             ->orderBy(['moduleId ASC']);
 
@@ -159,7 +157,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(CustomFieldDefinitionModel::TABLE)
             ->where('id IN (:ids)')
             ->bindValues(['ids' => $ids]);
 
@@ -181,7 +179,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(CustomFieldDefinitionModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id]);
 
@@ -204,7 +202,7 @@ final class CustomFieldDefinition extends BaseRepository implements CustomFieldD
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(sprintf('%s AS CF_Definition', self::TABLE))
+            ->from(sprintf('%s AS CF_Definition', CustomFieldDefinitionModel::TABLE))
             ->innerJoin('CustomFieldType AS CF_Type', 'CF_Type.id = CustomFieldDefinition.typeId')
             ->cols(CustomFieldDefinitionModel::getColsWithPreffix('CF_Definition'))
             ->orderBy(['CF_Definition.moduleId ASC'])
diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldType.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldType.php
index 264248b9..95053557 100644
--- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldType.php
+++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldType.php
@@ -42,8 +42,6 @@ final class CustomFieldType extends BaseRepository implements CustomFieldTypeRep
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'CustomFieldType';
-
     /**
      * Returns all the items
      *
@@ -55,7 +53,7 @@ final class CustomFieldType extends BaseRepository implements CustomFieldTypeRep
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(CustomFieldTypeModel::TABLE)
             ->cols(CustomFieldTypeModel::getCols())
             ->orderBy(['name ASC']);
 
diff --git a/lib/SP/Infrastructure/File/FileCache.php b/lib/SP/Infrastructure/File/FileCache.php
index 0b6b7fec..38ab0747 100644
--- a/lib/SP/Infrastructure/File/FileCache.php
+++ b/lib/SP/Infrastructure/File/FileCache.php
@@ -24,9 +24,9 @@
 
 namespace SP\Infrastructure\File;
 
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Core\Exceptions\InvalidClassException;
 use SP\Domain\Storage\Ports\FileCacheService;
-use SP\Util\Serde;
 
 use function SP\__u;
 
diff --git a/lib/SP/Util/FileSystem.php b/lib/SP/Infrastructure/File/FileSystem.php
similarity index 98%
rename from lib/SP/Util/FileSystem.php
rename to lib/SP/Infrastructure/File/FileSystem.php
index a80bbdeb..c62363a9 100644
--- a/lib/SP/Util/FileSystem.php
+++ b/lib/SP/Infrastructure/File/FileSystem.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SP\Util;
+namespace SP\Infrastructure\File;
 
 use FilesystemIterator;
 use RecursiveDirectoryIterator;
@@ -30,7 +30,6 @@ use RecursiveIteratorIterator;
 use SP\Domain\Account\Models\File;
 use SP\Domain\Core\Exceptions\FileNotFoundException;
 use SP\Domain\Core\Exceptions\InvalidClassException;
-use SP\Infrastructure\File\FileException;
 
 use function SP\__;
 use function SP\__u;
diff --git a/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPreset.php b/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPreset.php
index 9f2cf6b0..1c5f409c 100644
--- a/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPreset.php
+++ b/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPreset.php
@@ -46,8 +46,6 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'ItemPreset';
-
     /**
      * Creates an item
      *
@@ -58,7 +56,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(ItemPresetModel::TABLE)
             ->cols($itemPreset->toArray(null, ['id']));
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while creating the permission'));
@@ -76,7 +74,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(ItemPresetModel::TABLE)
             ->cols($itemPreset->toArray(null, ['id']))
             ->where('id = :id')
             ->limit(1)
@@ -101,7 +99,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id]);
 
@@ -123,7 +121,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->cols(ItemPresetModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $itemPresetId])
@@ -150,7 +148,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->cols(ItemPresetModel::getCols())
             ->cols(
                 [
@@ -191,7 +189,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->cols(ItemPresetModel::getCols());
 
         return $this->db->runQuery(QueryData::buildWithMapper($query, ItemPresetModel::class));
@@ -211,7 +209,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $itemPresetIds]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while removing the permissions'));
@@ -235,7 +233,7 @@ class ItemPreset extends BaseRepository implements ItemPresetRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(ItemPresetModel::TABLE)
             ->cols(ItemPresetModel::getColsWithPreffix('ItemPreset'))
             ->cols([
                        'IF(userId IS NOT NULL, priority + 3, 
diff --git a/lib/SP/Infrastructure/Notification/Repositories/Notification.php b/lib/SP/Infrastructure/Notification/Repositories/Notification.php
index cd49f4c3..87f15f38 100644
--- a/lib/SP/Infrastructure/Notification/Repositories/Notification.php
+++ b/lib/SP/Infrastructure/Notification/Repositories/Notification.php
@@ -46,8 +46,6 @@ final class Notification extends BaseRepository implements NotificationRepositor
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'Notification';
-
     /**
      * Creates an item
      *
@@ -60,7 +58,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(NotificationModel::TABLE)
             ->cols($notification->toArray(null, ['id', 'date']))
             ->set('date', 'UNIX_TIMESTAMP()');
 
@@ -82,7 +80,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(NotificationModel::TABLE)
             ->cols($notification->toArray(null, ['id']))
             ->set('date', 'UNIX_TIMESTAMP()')
             ->where('id = :id', ['id' => $notification->getId()])
@@ -106,7 +104,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->where('id = :id AND sticky = 0', ['id' => $id])
             ->limit(1);
 
@@ -128,7 +126,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->where('id = :id', ['id' => $id])
             ->limit(1);
 
@@ -154,7 +152,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $notificationsId]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the notifications'));
@@ -175,7 +173,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $notificationId])
@@ -197,7 +195,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->orderBy(['id']);
 
@@ -217,7 +215,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('id IN (:ids)', ['ids' => $notificationsId]);
 
@@ -242,7 +240,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->where('id IN (:ids) AND sticky = 0', ['ids' => $notificationsId]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the notifications'));
@@ -277,7 +275,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->orderBy(['date DESC'])
             ->limit($itemSearchData->getLimitCount())
@@ -327,7 +325,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(NotificationModel::TABLE)
             ->cols(['checked' => 1])
             ->where('id = :id', ['id' => $id])
             ->limit(1);
@@ -351,7 +349,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('userId = :userId AND component = :component AND (UNIX_TIMESTAMP() - date) <= 86400')
             ->bindValues([
@@ -376,7 +374,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('(userId = :userId OR (userId IS NULL AND sticky = 1)) AND onlyAdmin = 0')
             ->bindValues(['userId' => $userId])
@@ -397,7 +395,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('(userId = :userId OR sticky = 1) AND onlyAdmin = 0 AND checked = 0')
             ->bindValues(['userId' => $userId])
@@ -419,7 +417,7 @@ final class Notification extends BaseRepository implements NotificationRepositor
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(NotificationModel::TABLE)
             ->cols(NotificationModel::getCols())
             ->where('(userId = :userId OR sticky = 1 OR userId IS NULL) AND checked = 0')
             ->bindValues(['userId' => $userId])
diff --git a/lib/SP/Infrastructure/Tag/Repositories/Tag.php b/lib/SP/Infrastructure/Tag/Repositories/Tag.php
index 2f853b04..e36c8789 100644
--- a/lib/SP/Infrastructure/Tag/Repositories/Tag.php
+++ b/lib/SP/Infrastructure/Tag/Repositories/Tag.php
@@ -46,8 +46,6 @@ final class Tag extends BaseRepository implements TagRepository
 {
     use RepositoryItemTrait;
 
-    public const TABLE = 'Tag';
-
     /**
      * Creates an item
      *
@@ -66,7 +64,7 @@ final class Tag extends BaseRepository implements TagRepository
 
         $query = $this->queryFactory
             ->newInsert()
-            ->into(self::TABLE)
+            ->into(TagModel::TABLE)
             ->cols($tag->toArray(null, ['id', 'hash']))
             ->col('hash', $this->makeItemHash($tag->getName()));
 
@@ -88,7 +86,7 @@ final class Tag extends BaseRepository implements TagRepository
         $query = $this->queryFactory
             ->newSelect()
             ->cols(['id'])
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->where('hash = :hash')
             ->orWhere('name = :name')
             ->bindValues(
@@ -119,7 +117,7 @@ final class Tag extends BaseRepository implements TagRepository
 
         $query = $this->queryFactory
             ->newUpdate()
-            ->table(self::TABLE)
+            ->table(TagModel::TABLE)
             ->cols($tag->toArray(null, ['id', 'hash']))
             ->where('id = :id')
             ->limit(1)
@@ -149,7 +147,7 @@ final class Tag extends BaseRepository implements TagRepository
         $query = $this->queryFactory
             ->newSelect()
             ->cols(['id'])
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->where('(hash = :hash OR name = :name)')
             ->where('id <> :id')
             ->bindValues(
@@ -176,7 +174,7 @@ final class Tag extends BaseRepository implements TagRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->cols(TagModel::getCols())
             ->where('id = :id')
             ->bindValues(['id' => $tagId])
@@ -200,7 +198,7 @@ final class Tag extends BaseRepository implements TagRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->cols(TagModel::getCols())
             ->where('(name = :name OR hash = :hash)')
             ->bindValues(['name' => $name, 'hash' => $this->makeItemHash($name)])
@@ -222,7 +220,7 @@ final class Tag extends BaseRepository implements TagRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->cols(TagModel::getCols())
             ->orderBy(['name']);
 
@@ -246,7 +244,7 @@ final class Tag extends BaseRepository implements TagRepository
 
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->where('id IN (:ids)', ['ids' => $ids]);
 
         $queryData = QueryData::build($query)->setOnErrorMessage(__u('Error while deleting the tags'));
@@ -267,7 +265,7 @@ final class Tag extends BaseRepository implements TagRepository
     {
         $query = $this->queryFactory
             ->newDelete()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->where('id = :id')
             ->bindValues(['id' => $id])
             ->limit(1);
@@ -290,7 +288,7 @@ final class Tag extends BaseRepository implements TagRepository
     {
         $query = $this->queryFactory
             ->newSelect()
-            ->from(self::TABLE)
+            ->from(TagModel::TABLE)
             ->cols(TagModel::getCols(['hash']))
             ->orderBy(['name'])
             ->limit($itemSearchData->getLimitCount())
diff --git a/lib/SP/Mvc/Controller/ControllerTrait.php b/lib/SP/Mvc/Controller/ControllerTrait.php
index fb40d03a..2f69e9e8 100644
--- a/lib/SP/Mvc/Controller/ControllerTrait.php
+++ b/lib/SP/Mvc/Controller/ControllerTrait.php
@@ -25,14 +25,14 @@
 namespace SP\Mvc\Controller;
 
 use Closure;
+use JetBrains\PhpStorm\NoReturn;
 use Klein\Klein;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
-use SP\Http\JsonMessage;
-use SP\Http\JsonResponse;
-use SP\Http\Uri;
-use SP\Util\Util;
+use SP\Domain\Http\Dtos\JsonMessage;
+use SP\Domain\Http\Ports\RequestService;
+use SP\Domain\Http\Providers\Uri;
+use SP\Domain\Http\Services\JsonResponse;
 
 use function SP\__u;
 use function SP\processException;
@@ -62,16 +62,16 @@ trait ControllerTrait
     /**
      * Logout from current session
      *
-     * @param RequestInterface $request
+     * @param RequestService $request
      * @param ConfigDataInterface $configData
      * @param Closure $onRedirect
      *
      * @throws SPException
      */
     protected function sessionLogout(
-        RequestInterface $request,
+        RequestService $request,
         ConfigDataInterface $configData,
-        Closure          $onRedirect
+        Closure        $onRedirect
     ): void {
         if ($request->isJson()) {
             $jsonResponse = new JsonMessage(__u('Session not started or timed out'));
@@ -79,7 +79,7 @@ trait ControllerTrait
 
             JsonResponse::factory($this->router->response())->send($jsonResponse);
         } elseif ($request->isAjax()) {
-            Util::logout();
+            self::logout();
         } else {
             try {
                 // Analyzes if there is any direct route within the URL
@@ -107,6 +107,14 @@ trait ControllerTrait
         }
     }
 
+    /**
+     * Realiza el proceso de logout.
+     */
+    #[NoReturn] private static function logout(): void
+    {
+        exit('<script>sysPassApp.actions.main.logout();</script>');
+    }
+
     /**
      * Acción no disponible
      *
@@ -122,8 +130,8 @@ trait ControllerTrait
      * @deprecated
      */
     protected function checkSecurityToken(
-        string           $previousToken,
-        RequestInterface $request,
+        string         $previousToken,
+        RequestService $request,
         ConfigDataInterface $configData
     ): void {
         if ($request->analyzeString('h') !== null && $request->analyzeString('from') === null) {
diff --git a/lib/SP/Mvc/Controller/ItemTrait.php b/lib/SP/Mvc/Controller/ItemTrait.php
index d6899877..5fc71d10 100644
--- a/lib/SP/Mvc/Controller/ItemTrait.php
+++ b/lib/SP/Mvc/Controller/ItemTrait.php
@@ -24,14 +24,14 @@
 
 namespace SP\Mvc\Controller;
 
+use SP\Domain\Common\Providers\Filter;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\CustomField\Models\CustomFieldData as CustomFieldDataModel;
 use SP\Domain\CustomField\Ports\CustomFieldDataService;
 use SP\Domain\CustomField\Services\CustomFieldItem;
-use SP\Domain\Http\RequestInterface;
-use SP\Util\Filter;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Trait ItemTrait
@@ -108,7 +108,7 @@ trait ItemTrait
      *
      * @param int $moduleId
      * @param int|int[] $itemId
-     * @param RequestInterface $request
+     * @param RequestService $request
      * @param CustomFieldDataService $customFieldDataService
      *
      * @throws SPException
@@ -117,7 +117,7 @@ trait ItemTrait
     protected function addCustomFieldsForItem(
         int                    $moduleId,
         int|array              $itemId,
-        RequestInterface       $request,
+        RequestService $request,
         CustomFieldDataService $customFieldDataService
     ): void {
         $customFields = self::getCustomFieldsFromRequest($request);
@@ -141,11 +141,11 @@ trait ItemTrait
     }
 
     /**
-     * @param RequestInterface $request
+     * @param RequestService $request
      *
      * @return array|null
      */
-    private static function getCustomFieldsFromRequest(RequestInterface $request): ?array
+    private static function getCustomFieldsFromRequest(RequestService $request): ?array
     {
         return $request->analyzeArray(
             'customfield',
@@ -175,7 +175,7 @@ trait ItemTrait
      *
      * @param int $moduleId
      * @param int|int[] $itemId
-     * @param RequestInterface $request
+     * @param RequestService $request
      * @param CustomFieldDataService $customFieldDataService
      *
      * @throws ServiceException
@@ -184,7 +184,7 @@ trait ItemTrait
     protected function updateCustomFieldsForItem(
         int                    $moduleId,
         int|array              $itemId,
-        RequestInterface       $request,
+        RequestService $request,
         CustomFieldDataService $customFieldDataService
     ): void {
         $customFields = self::getCustomFieldsFromRequest($request);
@@ -212,7 +212,7 @@ trait ItemTrait
     /**
      * Returns search data object for the current request
      */
-    protected function getSearchData(int $limitCount, RequestInterface $request): ItemSearchDto
+    protected function getSearchData(int $limitCount, RequestService $request): ItemSearchDto
     {
         return new ItemSearchDto(
             $request->analyzeString('search'),
@@ -221,7 +221,7 @@ trait ItemTrait
         );
     }
 
-    protected function getItemsIdFromRequest(RequestInterface $request): ?array
+    protected function getItemsIdFromRequest(RequestService $request): ?array
     {
         return $request->analyzeArray('items');
     }
diff --git a/lib/SP/Mvc/Controller/SimpleControllerHelper.php b/lib/SP/Mvc/Controller/SimpleControllerHelper.php
index ded76cce..41f7a59a 100644
--- a/lib/SP/Mvc/Controller/SimpleControllerHelper.php
+++ b/lib/SP/Mvc/Controller/SimpleControllerHelper.php
@@ -29,7 +29,7 @@ use SP\Core\PhpExtensionChecker;
 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\Http\Ports\RequestService;
 
 /**
  * Class SimpleControllerHelper
@@ -41,7 +41,7 @@ final readonly class SimpleControllerHelper
         private ThemeInterface      $theme,
         private Klein               $router,
         private AclInterface        $acl,
-        private RequestInterface    $request,
+        private RequestService $request,
         private PhpExtensionChecker $extensionChecker,
         private UriContextInterface $uriContext
     ) {
@@ -62,7 +62,7 @@ final readonly class SimpleControllerHelper
         return $this->acl;
     }
 
-    public function getRequest(): RequestInterface
+    public function getRequest(): RequestService
     {
         return $this->request;
     }
diff --git a/lib/SP/Mvc/Controller/WebControllerHelper.php b/lib/SP/Mvc/Controller/WebControllerHelper.php
index de249182..8f5a7a2e 100644
--- a/lib/SP/Mvc/Controller/WebControllerHelper.php
+++ b/lib/SP/Mvc/Controller/WebControllerHelper.php
@@ -26,11 +26,11 @@ namespace SP\Mvc\Controller;
 
 use Klein\Klein;
 use SP\Core\PhpExtensionChecker;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthService;
 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\Domain\Http\Ports\RequestService;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Mvc\View\TemplateInterface;
 
@@ -42,7 +42,7 @@ final readonly class WebControllerHelper
     private ThemeInterface      $theme;
     private Klein               $router;
     private AclInterface        $acl;
-    private RequestInterface    $request;
+    private RequestService $request;
     private PhpExtensionChecker $extensionChecker;
     private UriContextInterface $uriContext;
 
@@ -75,7 +75,7 @@ final readonly class WebControllerHelper
         return $this->acl;
     }
 
-    public function getRequest(): RequestInterface
+    public function getRequest(): RequestService
     {
         return $this->request;
     }
diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
index 83905ea3..cb11962a 100644
--- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php
+++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php
@@ -27,7 +27,7 @@ namespace SP\Mvc\View\Components;
 use RuntimeException;
 use SP\Domain\Common\Models\ItemWithIdAndNameModel;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Http\JsonResponse;
+use SP\Domain\Http\Services\JsonResponse;
 
 use function SP\__u;
 
diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php
index 187e52d1..90a88cec 100644
--- a/lib/SP/Mvc/View/Template.php
+++ b/lib/SP/Mvc/View/Template.php
@@ -28,7 +28,7 @@ use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
 use SP\Domain\Core\Exceptions\FileNotFoundException;
 use SP\Domain\Core\UI\ThemeInterface;
-use SP\Http\Uri;
+use SP\Domain\Http\Providers\Uri;
 
 use function SP\__;
 use function SP\logger;
diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php
index db26f3ae..5327f436 100644
--- a/lib/SP/Util/Util.php
+++ b/lib/SP/Util/Util.php
@@ -24,28 +24,13 @@
 
 namespace SP\Util;
 
-use JetBrains\PhpStorm\NoReturn;
-use JsonException;
-use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
 
-use function SP\logger;
-
 /**
- * Clase con utilizades para la aplicación
+ * Class Util
  */
 final class Util
 {
-    /**
-     * Realiza el proceso de logout.
-     *
-     * FIXME
-     */
-    #[NoReturn] public static function logout(): void
-    {
-        exit('<script>sysPassApp.actions.main.logout();</script>');
-    }
-
     /**
      * Obtener el tamaño máximo de subida de PHP.
      */
@@ -109,71 +94,6 @@ final class Util
         return (bool)$in;
     }
 
-    /**
-     * Bloquear la aplicación
-     *
-     * @throws JsonException
-     * @throws FileException
-     */
-    public static function lockApp(int $userId, string $subject): void
-    {
-        $data = ['time' => time(), 'userId' => $userId, 'subject' => $subject];
-
-        $file = new FileHandler(LOCK_FILE);
-        $file->save(json_encode($data, JSON_THROW_ON_ERROR));
-
-        logger('Application locked out');
-    }
-
-    /**
-     * Desbloquear la aplicación
-     */
-    public static function unlockApp(): bool
-    {
-        logger('Application unlocked');
-
-        return @unlink(LOCK_FILE);
-    }
-
-    /**
-     * Comprueba si la aplicación está bloqueada
-     *
-     * @return bool|string
-     * @throws JsonException
-     */
-    public static function getAppLock(): bool|string
-    {
-        try {
-            $file = new FileHandler(LOCK_FILE);
-
-            return json_decode(
-                $file->readToString(),
-                false,
-                512,
-                JSON_THROW_ON_ERROR
-            );
-        } catch (FileException) {
-            return false;
-        }
-    }
-
-    /**
-     * Devolver el tiempo aproximado en segundos de una operación
-     *
-     * @return array Con el tiempo estimado y los elementos por segundo
-     */
-    public static function getETA(int $startTime, int $numItems, int $totalItems): array
-    {
-        if ($numItems > 0 && $totalItems > 0) {
-            $runtime = time() - $startTime;
-            $eta = (int)((($totalItems * $runtime) / $numItems) - $runtime);
-
-            return [$eta, $numItems / $runtime];
-        }
-
-        return [0, 0];
-    }
-
     /**
      * Adaptador para convertir una cadena de IDs a un array
      */
diff --git a/tests/SPT/Core/Bootstrap/UriContextTest.php b/tests/SPT/Core/Bootstrap/UriContextTest.php
index cbb629d8..7fe48f4e 100644
--- a/tests/SPT/Core/Bootstrap/UriContextTest.php
+++ b/tests/SPT/Core/Bootstrap/UriContextTest.php
@@ -27,7 +27,7 @@ namespace SPT\Core\Bootstrap;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use SP\Core\Bootstrap\UriContext;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SPT\UnitaryTestCase;
 
 /**
@@ -41,7 +41,7 @@ class UriContextTest extends UnitaryTestCase
      */
     public function testConstruct()
     {
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
         $request->expects(self::exactly(2))
                 ->method('getServer')
                 ->with(...$this->withConsecutive(['SCRIPT_FILENAME'], ['REQUEST_URI']))
@@ -65,7 +65,7 @@ class UriContextTest extends UnitaryTestCase
      */
     public function testConstructWithoutWebRoot()
     {
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
         $request->expects(self::exactly(2))
                 ->method('getServer')
                 ->with(...$this->withConsecutive(['SCRIPT_FILENAME'], ['REQUEST_URI']))
diff --git a/tests/SPT/Core/Crypt/CsrfTest.php b/tests/SPT/Core/Crypt/CsrfTest.php
index ad5b8280..eec0710b 100644
--- a/tests/SPT/Core/Crypt/CsrfTest.php
+++ b/tests/SPT/Core/Crypt/CsrfTest.php
@@ -32,7 +32,7 @@ use SP\Core\Crypt\Hash;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Context\SessionContext;
 use SP\Domain\Http\Method;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SPT\UnitaryTestCase;
 
 /**
@@ -43,9 +43,9 @@ use SPT\UnitaryTestCase;
 class CsrfTest extends UnitaryTestCase
 {
 
-    private SessionContext|MockObject   $sessionContext;
-    private RequestInterface|MockObject $requestInterface;
-    private ConfigDataInterface|MockObject     $configData;
+    private SessionContext|MockObject      $sessionContext;
+    private RequestService|MockObject      $requestInterface;
+    private ConfigDataInterface|MockObject $configData;
     private Csrf                               $csrf;
 
     public static function httpMethodDataProvider(): array
@@ -278,7 +278,7 @@ class CsrfTest extends UnitaryTestCase
         parent::setUp();
 
         $this->sessionContext = $this->createMock(SessionContext::class);
-        $this->requestInterface = $this->createMock(RequestInterface::class);
+        $this->requestInterface = $this->createMock(RequestService::class);
         $this->configData = $this->createMock(ConfigDataInterface::class);
 
         $this->csrf = new Csrf($this->sessionContext, $this->requestInterface, $this->configData);
diff --git a/tests/SPT/Core/Crypt/RequestBasedPasswordTest.php b/tests/SPT/Core/Crypt/RequestBasedPasswordTest.php
index 8a8aaa98..40ef43db 100644
--- a/tests/SPT/Core/Crypt/RequestBasedPasswordTest.php
+++ b/tests/SPT/Core/Crypt/RequestBasedPasswordTest.php
@@ -28,7 +28,7 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use SP\Core\Crypt\RequestBasedPassword;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SPT\UnitaryTestCase;
 
 /**
@@ -43,7 +43,7 @@ class RequestBasedPasswordTest extends UnitaryTestCase
      */
     public function testBuild()
     {
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
         $configData = $this->createMock(ConfigDataInterface::class);
 
         $request->expects($this->once())
diff --git a/tests/SPT/Core/Crypt/UuidCookieTest.php b/tests/SPT/Core/Crypt/UuidCookieTest.php
index e5ee9cec..9cd6678c 100644
--- a/tests/SPT/Core/Crypt/UuidCookieTest.php
+++ b/tests/SPT/Core/Crypt/UuidCookieTest.php
@@ -32,7 +32,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Crypt\Hash;
 use SP\Core\Crypt\UuidCookie;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SPT\UnitaryTestCase;
 
 /**
@@ -43,7 +43,7 @@ use SPT\UnitaryTestCase;
 class UuidCookieTest extends UnitaryTestCase
 {
 
-    private RequestInterface|MockObject    $requestInterface;
+    private RequestService|MockObject $requestInterface;
     private UriContextInterface|MockObject $uriContext;
 
 
@@ -187,7 +187,7 @@ class UuidCookieTest extends UnitaryTestCase
     {
         parent::setUp();
 
-        $this->requestInterface = $this->createMock(RequestInterface::class);
+        $this->requestInterface = $this->createMock(RequestService::class);
         $this->uriContext = $this->createMock(UriContextInterface::class);
     }
 }
diff --git a/tests/SPT/Core/LanguageTest.php b/tests/SPT/Core/LanguageTest.php
index 09a7c43f..dde07492 100644
--- a/tests/SPT/Core/LanguageTest.php
+++ b/tests/SPT/Core/LanguageTest.php
@@ -28,7 +28,7 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Language;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\User;
 use SP\Domain\User\Models\UserPreferences;
@@ -42,7 +42,7 @@ class LanguageTest extends UnitaryTestCase
 {
 
     private ConfigDataInterface|MockObject $configData;
-    private RequestInterface|MockObject    $request;
+    private RequestService|MockObject $request;
     private Language                       $language;
 
     public function testSetLocales()
@@ -186,7 +186,7 @@ class LanguageTest extends UnitaryTestCase
         parent::setUp();
 
         $this->configData = $this->createMock(ConfigDataInterface::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
 
         $this->language = new Language($this->context, $this->configData, $this->request);
     }
diff --git a/tests/SPT/Domain/Account/Services/PublicLinkTest.php b/tests/SPT/Domain/Account/Services/PublicLinkTest.php
index 628a8033..d3db0a5b 100644
--- a/tests/SPT/Domain/Account/Services/PublicLinkTest.php
+++ b/tests/SPT/Domain/Account/Services/PublicLinkTest.php
@@ -41,7 +41,7 @@ use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Infrastructure\Database\QueryResult;
 use SPT\Generators\PublicLinkDataGenerator;
@@ -474,7 +474,7 @@ class PublicLinkTest extends UnitaryTestCase
         $who = self::$faker->ipv4;
         $userAgent = self::$faker->userAgent;
 
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
 
         $request->expects(self::once())
                 ->method('getClientAddress')
@@ -566,7 +566,7 @@ class PublicLinkTest extends UnitaryTestCase
         parent::setUp();
 
         $this->publicLinkRepository = $this->createMock(PublicLinkRepository::class);
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
         $request->method('getClientAddress')
                 ->willReturn(self::$faker->ipv4);
         $request->method('getHeader')
diff --git a/tests/SPT/Providers/Acl/AclHandlerTest.php b/tests/SPT/Domain/Auth/Providers/AclHandlerTest.php
similarity index 95%
rename from tests/SPT/Providers/Acl/AclHandlerTest.php
rename to tests/SPT/Domain/Auth/Providers/AclHandlerTest.php
index eaa2a059..c13cebcb 100644
--- a/tests/SPT/Providers/Acl/AclHandlerTest.php
+++ b/tests/SPT/Domain/Auth/Providers/AclHandlerTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Acl;
+namespace SPT\Domain\Auth\Providers;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
@@ -31,7 +31,6 @@ 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 SPT\UnitaryTestCase;
@@ -43,9 +42,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 \SP\Domain\Auth\Providers\AclHandler $aclHandler;
 
     public static function userEventProvider(): array
     {
@@ -223,7 +222,7 @@ class AclHandlerTest extends UnitaryTestCase
         $this->userProfileService = $this->createMock(UserProfileService::class);
         $this->userGroupService = $this->createMock(UserGroupService::class);
 
-        $this->aclHandler = new AclHandler(
+        $this->aclHandler = new \SP\Domain\Auth\Providers\AclHandler(
             $this->application,
             $this->userProfileService,
             $this->userGroupService
diff --git a/tests/SPT/Providers/Auth/AuthProviderTest.php b/tests/SPT/Domain/Auth/Providers/AuthProviderTest.php
similarity index 91%
rename from tests/SPT/Providers/Auth/AuthProviderTest.php
rename to tests/SPT/Domain/Auth/Providers/AuthProviderTest.php
index 3133310a..8a32103c 100644
--- a/tests/SPT/Providers/Auth/AuthProviderTest.php
+++ b/tests/SPT/Domain/Auth/Providers/AuthProviderTest.php
@@ -22,19 +22,19 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth;
+namespace SPT\Domain\Auth\Providers;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use SP\Domain\Auth\Dtos\UserLoginDto;
+use SP\Domain\Auth\Providers\AuthProvider;
+use SP\Domain\Auth\Providers\AuthResult;
+use SP\Domain\Auth\Providers\AuthService;
+use SP\Domain\Auth\Providers\AuthType;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
 use SP\Domain\Auth\Services\AuthException;
-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/Domain/Auth/Providers/Browser/BrowserAuthTest.php
similarity index 96%
rename from tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php
rename to tests/SPT/Domain/Auth/Providers/Browser/BrowserAuthTest.php
index 14e53b5f..946b6f52 100644
--- a/tests/SPT/Providers/Auth/Browser/BrowserAuthTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Browser/BrowserAuthTest.php
@@ -22,15 +22,15 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Browser;
+namespace SPT\Domain\Auth\Providers\Browser;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\Auth\Dtos\UserLoginDto;
+use SP\Domain\Auth\Providers\Browser\BrowserAuth;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
-use SP\Domain\Providers\Browser\BrowserAuth;
-use SP\Domain\Providers\Browser\BrowserAuthData;
+use SP\Domain\Http\Ports\RequestService;
 use SPT\UnitaryTestCase;
 
 /**
@@ -41,8 +41,8 @@ use SPT\UnitaryTestCase;
 class BrowserAuthTest extends UnitaryTestCase
 {
 
-    private RequestInterface|MockObject    $request;
-    private BrowserAuth                    $browserAuth;
+    private RequestService|MockObject $request;
+    private BrowserAuth               $browserAuth;
     private ConfigDataInterface|MockObject $configData;
 
     public function testGetServerAuthUser()
@@ -335,7 +335,7 @@ class BrowserAuthTest extends UnitaryTestCase
         parent::setUp();
 
         $this->configData = $this->createMock(ConfigDataInterface::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
 
         $this->browserAuth = new BrowserAuth($this->configData, $this->request);
     }
diff --git a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php b/tests/SPT/Domain/Auth/Providers/Database/DatabaseAuthTest.php
similarity index 98%
rename from tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php
rename to tests/SPT/Domain/Auth/Providers/Database/DatabaseAuthTest.php
index 2d17c391..1da03b1a 100644
--- a/tests/SPT/Providers/Auth/Database/DatabaseAuthTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Database/DatabaseAuthTest.php
@@ -22,13 +22,13 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Database;
+namespace SPT\Domain\Auth\Providers\Database;
 
 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\Auth\Providers\Database\DatabaseAuth;
 use SP\Domain\User\Ports\UserPassService;
 use SP\Domain\User\Ports\UserService;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
diff --git a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php b/tests/SPT/Domain/Auth/Providers/Ldap/LdapActionsTest.php
similarity index 95%
rename from tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapActionsTest.php
index c9c64aba..3cfecf12 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapActionsTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapActionsTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use Laminas\Ldap\Collection;
 use Laminas\Ldap\Ldap;
@@ -30,14 +30,14 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Events\Event;
+use SP\Domain\Auth\Providers\Ldap\AttributeCollection;
+use SP\Domain\Auth\Providers\Ldap\LdapActions;
+use SP\Domain\Auth\Providers\Ldap\LdapCodeEnum;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
 use SP\Domain\Core\Events\EventDispatcherInterface;
-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/Domain/Auth/Providers/Ldap/LdapAuthTest.php
similarity index 97%
rename from tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapAuthTest.php
index 774dacab..3bfe213d 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapAuthTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapAuthTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Constraint\Callback;
@@ -32,12 +32,12 @@ use PHPUnit\Framework\MockObject\Rule\InvokedCount;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapService;
+use SP\Domain\Auth\Providers\Ldap\AttributeCollection;
+use SP\Domain\Auth\Providers\Ldap\LdapAuth;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-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/Domain/Auth/Providers/Ldap/LdapConnectionTest.php
similarity index 96%
rename from tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapConnectionTest.php
index 20e973eb..bcd57e7f 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapConnectionTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapConnectionTest.php
@@ -22,18 +22,18 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use Laminas\Ldap\Ldap;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Context\ContextException;
+use SP\Domain\Auth\Providers\Ldap\LdapConnection;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
 use SP\Domain\Core\Events\EventDispatcherInterface;
-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/Domain/Auth/Providers/Ldap/LdapMsAdsTest.php
similarity index 97%
rename from tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapMsAdsTest.php
index 1a65f5df..0d14b6c5 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapMsAdsTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapMsAdsTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use EmptyIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -30,14 +30,14 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapMsAds;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Auth\Providers\Ldap\LdapUtil;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-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/Domain/Auth/Providers/Ldap/LdapStdTest.php
similarity index 97%
rename from tests/SPT/Providers/Auth/Ldap/LdapStdTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapStdTest.php
index e073a2d8..6f06127b 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapStdTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapStdTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use EmptyIterator;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -30,14 +30,14 @@ use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\Auth\Ports\LdapActionsService;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
+use SP\Domain\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\Providers\Ldap\LdapStd;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
+use SP\Domain\Auth\Providers\Ldap\LdapUtil;
 use SP\Domain\Core\Events\EventDispatcherInterface;
 use SP\Domain\Core\Exceptions\SPException;
-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/Domain/Auth/Providers/Ldap/LdapUtilTest.php
similarity index 95%
rename from tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php
rename to tests/SPT/Domain/Auth/Providers/Ldap/LdapUtilTest.php
index 456ce5e0..ac787030 100644
--- a/tests/SPT/Providers/Auth/Ldap/LdapUtilTest.php
+++ b/tests/SPT/Domain/Auth/Providers/Ldap/LdapUtilTest.php
@@ -22,11 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Providers\Auth\Ldap;
+namespace SPT\Domain\Auth\Providers\Ldap;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use SP\Domain\Providers\Ldap\LdapUtil;
+use SP\Domain\Auth\Providers\Ldap\LdapUtil;
 use SPT\UnitaryTestCase;
 
 /**
diff --git a/tests/SPT/Domain/Auth/Services/LdapCheckTest.php b/tests/SPT/Domain/Auth/Services/LdapCheckTest.php
index 2eafba23..df961fbe 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\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\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\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 01997e37..07b2f7bc 100644
--- a/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginAuthHandlerTest.php
@@ -31,6 +31,8 @@ use PHPUnit\Framework\MockObject\MockObject;
 use SP\Core\Application;
 use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Ports\LdapAuthService;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Auth\Services\LoginAuthHandler;
 use SP\Domain\Config\Adapters\ConfigData;
@@ -38,11 +40,9 @@ use SP\Domain\Config\Ports\ConfigFileService;
 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\Http\Ports\RequestService;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapCodeEnum;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserLoginRequest;
@@ -56,9 +56,9 @@ use SPT\UnitaryTestCase;
 class LoginAuthHandlerTest extends UnitaryTestCase
 {
 
-    private TrackService|MockObject     $trackService;
-    private RequestInterface|MockObject $request;
-    private UserService|MockObject      $userService;
+    private TrackService|MockObject   $trackService;
+    private RequestService|MockObject $request;
+    private UserService|MockObject    $userService;
     private LoginAuthHandler            $loginAuthHandler;
 
     public static function authLdapDataProvider(): array
@@ -528,7 +528,7 @@ class LoginAuthHandlerTest extends UnitaryTestCase
                 )
             );
 
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
         $this->userService = $this->createMock(UserService::class);
 
         $this->loginAuthHandler = new LoginAuthHandler(
diff --git a/tests/SPT/Domain/Auth/Services/LoginBaseTest.php b/tests/SPT/Domain/Auth/Services/LoginBaseTest.php
index 6bdacd79..4edfb698 100644
--- a/tests/SPT/Domain/Auth/Services/LoginBaseTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginBaseTest.php
@@ -32,7 +32,7 @@ use SP\Core\Context\ContextException;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Auth\Services\LoginBase;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SPT\UnitaryTestCase;
@@ -43,9 +43,9 @@ use SPT\UnitaryTestCase;
 #[Group('unitary')]
 class LoginBaseTest extends UnitaryTestCase
 {
-    private LoginBase                   $loginBase;
-    private RequestInterface|MockObject $request;
-    private TrackService|MockObject     $trackService;
+    private LoginBase                 $loginBase;
+    private RequestService|MockObject $request;
+    private TrackService|MockObject   $trackService;
 
     public function testCheckTracking()
     {
@@ -118,7 +118,7 @@ class LoginBaseTest extends UnitaryTestCase
                 )
             );
 
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
 
         $this->loginBase = new class($this->application, $this->trackService, $this->request) extends LoginBase {
             public function check(): void
diff --git a/tests/SPT/Domain/Auth/Services/LoginMasterPassTest.php b/tests/SPT/Domain/Auth/Services/LoginMasterPassTest.php
index 3297eedc..38a8452f 100644
--- a/tests/SPT/Domain/Auth/Services/LoginMasterPassTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginMasterPassTest.php
@@ -36,7 +36,7 @@ use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\CryptException;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassService;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
@@ -53,9 +53,9 @@ use SPT\UnitaryTestCase;
 class LoginMasterPassTest extends UnitaryTestCase
 {
 
-    private TrackService|MockObject               $trackService;
-    private RequestInterface|MockObject           $request;
-    private MockObject|UserMasterPassService      $userMasterPassService;
+    private TrackService|MockObject          $trackService;
+    private RequestService|MockObject        $request;
+    private MockObject|UserMasterPassService $userMasterPassService;
     private MockObject|TemporaryMasterPassService $temporaryMasterPassService;
     private LoginMasterPass                       $loginMasterPass;
 
@@ -405,7 +405,7 @@ class LoginMasterPassTest extends UnitaryTestCase
                 )
             );
 
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
         $this->userMasterPassService = $this->createMock(UserMasterPassService::class);
         $this->temporaryMasterPassService = $this->createMock(TemporaryMasterPassService::class);
 
diff --git a/tests/SPT/Domain/Auth/Services/LoginTest.php b/tests/SPT/Domain/Auth/Services/LoginTest.php
index f606c35d..21b540c0 100644
--- a/tests/SPT/Domain/Auth/Services/LoginTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginTest.php
@@ -35,6 +35,13 @@ use SP\Domain\Auth\Dtos\UserLoginDto;
 use SP\Domain\Auth\Ports\LoginAuthHandlerService;
 use SP\Domain\Auth\Ports\LoginMasterPassService;
 use SP\Domain\Auth\Ports\LoginUserService;
+use SP\Domain\Auth\Providers\AuthDataBase;
+use SP\Domain\Auth\Providers\AuthProviderService;
+use SP\Domain\Auth\Providers\AuthResult;
+use SP\Domain\Auth\Providers\AuthType;
+use SP\Domain\Auth\Providers\Browser\BrowserAuthData;
+use SP\Domain\Auth\Providers\Database\DatabaseAuthData;
+use SP\Domain\Auth\Providers\Ldap\LdapAuthData;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Auth\Services\Login;
 use SP\Domain\Auth\Services\LoginStatus;
@@ -43,15 +50,8 @@ use SP\Domain\Core\Context\Context;
 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\Http\Ports\RequestService;
+use SP\Domain\Log\Ports\ProviderInterface;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
@@ -72,7 +72,7 @@ class LoginTest extends UnitaryTestCase
 {
 
     private TrackService|MockObject                          $trackService;
-    private RequestInterface|MockObject                      $request;
+    private RequestService|MockObject $request;
     private MockObject|AuthProviderService|ProviderInterface $authProviderService;
     private MockObject|LanguageInterface                     $language;
     private UserService|MockObject                           $userService;
@@ -508,7 +508,7 @@ class LoginTest extends UnitaryTestCase
                 )
             );
 
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
         $this->authProviderService = $this->createMockForIntersectionOfInterfaces(
             [AuthProviderService::class, ProviderInterface::class]
         );
diff --git a/tests/SPT/Domain/Auth/Services/LoginUserTest.php b/tests/SPT/Domain/Auth/Services/LoginUserTest.php
index 45b8584e..a2275adf 100644
--- a/tests/SPT/Domain/Auth/Services/LoginUserTest.php
+++ b/tests/SPT/Domain/Auth/Services/LoginUserTest.php
@@ -34,7 +34,7 @@ use SP\Domain\Auth\Services\LoginUser;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\QueryException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Ports\TrackService;
 use SP\Domain\User\Dtos\UserDataDto;
@@ -48,8 +48,8 @@ use SPT\UnitaryTestCase;
 #[Group('unitary')]
 class LoginUserTest extends UnitaryTestCase
 {
-    private TrackService|MockObject     $trackService;
-    private RequestInterface|MockObject $request;
+    private TrackService|MockObject   $trackService;
+    private RequestService|MockObject $request;
 
     private LoginUser                         $loginUser;
     private MockObject|UserPassRecoverService $userPassRecoverService;
@@ -147,7 +147,7 @@ class LoginUserTest extends UnitaryTestCase
                 )
             );
 
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
         $this->userPassRecoverService = $this->createMock(UserPassRecoverService::class);
 
         $this->loginUser = new LoginUser(
diff --git a/tests/SPT/Util/DateUtilTest.php b/tests/SPT/Domain/Common/Adapters/DateTest.php
similarity index 83%
rename from tests/SPT/Util/DateUtilTest.php
rename to tests/SPT/Domain/Common/Adapters/DateTest.php
index ce9c35cc..fc99943b 100644
--- a/tests/SPT/Util/DateUtilTest.php
+++ b/tests/SPT/Domain/Common/Adapters/DateTest.php
@@ -22,21 +22,20 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Adapters;
 
 use PHPUnit\Framework\Attributes\Group;
-use SP\Util\Date;
 use SPT\UnitaryTestCase;
 
 /**
  * Class DateUtilTest
  */
 #[Group('unitary')]
-class DateUtilTest extends UnitaryTestCase
+class DateTest extends UnitaryTestCase
 {
     public function testGetDateFromUnix()
     {
-        $out = Date::getDateFromUnix(self::$faker->unixTime());
+        $out = \SP\Domain\Common\Adapters\Date::getDateFromUnix(self::$faker->unixTime());
 
         $this->assertMatchesRegularExpression('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/', $out);
     }
@@ -44,7 +43,7 @@ class DateUtilTest extends UnitaryTestCase
     public function testGetDateFromUnixFromString()
     {
         $date = self::$faker->date();
-        $out = Date::getDateFromUnix($date);
+        $out = \SP\Domain\Common\Adapters\Date::getDateFromUnix($date);
 
         $this->assertEquals($date, $out);
     }
diff --git a/tests/SPT/Util/SerdeTest.php b/tests/SPT/Domain/Common/Adapters/SerdeTest.php
similarity index 93%
rename from tests/SPT/Util/SerdeTest.php
rename to tests/SPT/Domain/Common/Adapters/SerdeTest.php
index d08d97c7..5ee45f5f 100644
--- a/tests/SPT/Util/SerdeTest.php
+++ b/tests/SPT/Domain/Common/Adapters/SerdeTest.php
@@ -22,14 +22,14 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Adapters;
 
 use __PHP_Incomplete_Class;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
+use SP\Domain\Common\Adapters\Serde;
 use SP\Domain\Config\Adapters\ConfigData;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\Serde;
 use SPT\UnitaryTestCase;
 use stdClass;
 
@@ -56,7 +56,7 @@ class SerdeTest extends UnitaryTestCase
     #[DataProvider('serializeDataProvider')]
     public function testSerialize(mixed $data, string $expected)
     {
-        $out = Serde::serialize($data);
+        $out = \SP\Domain\Common\Adapters\Serde::serialize($data);
 
         $this->assertEquals($expected, $out);
     }
@@ -92,7 +92,7 @@ class SerdeTest extends UnitaryTestCase
                 . "\0" . '*' . "\0" .
                 'attributes";a:4:{s:12:"passwordSalt";s:60:"901a4d025ab807564c3c46afc69ab9fd1ae25c6dbba7d62ce3b279f7523c";s:10:"configDate";i:1633156732;s:11:"configSaver";s:7:"sysPass";s:10:"configHash";s:40:"0f099212786ab8090432f2889ac37c2a977f164a";}}';
 
-        $out = Serde::deserialize($data, __PHP_Incomplete_Class::class);
+        $out = \SP\Domain\Common\Adapters\Serde::deserialize($data, __PHP_Incomplete_Class::class);
 
         $this->assertInstanceOf(stdClass::class, $out);
         $this->assertIsArray($out->attributes);
@@ -117,7 +117,7 @@ class SerdeTest extends UnitaryTestCase
         $this->expectException(SPException::class);
         $this->expectExceptionMessage('Invalid target class');
 
-        Serde::deserialize($data, ConfigData::class);
+        \SP\Domain\Common\Adapters\Serde::deserialize($data, ConfigData::class);
     }
 
     /**
@@ -174,6 +174,6 @@ class SerdeTest extends UnitaryTestCase
 
         $this->expectException(SPException::class);
 
-        Serde::deserializeJson($data);
+        \SP\Domain\Common\Adapters\Serde::deserializeJson($data);
     }
 }
diff --git a/tests/SPT/Util/ChecksTest.php b/tests/SPT/Domain/Common/Providers/EnvironmentTest.php
similarity index 79%
rename from tests/SPT/Util/ChecksTest.php
rename to tests/SPT/Domain/Common/Providers/EnvironmentTest.php
index bab496a6..245097b0 100644
--- a/tests/SPT/Util/ChecksTest.php
+++ b/tests/SPT/Domain/Common/Providers/EnvironmentTest.php
@@ -22,26 +22,26 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Providers;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
-use SP\Util\Checks;
+use SP\Domain\Common\Providers\Environment;
 
 /**
- * Class ChecksTest
+ * Class EnvironmentTest
  */
 #[Group('unitary')]
-class ChecksTest extends TestCase
+class EnvironmentTest extends TestCase
 {
 
     public function testCheckIsWindows()
     {
-        $this->assertFalse(Checks::checkIsWindows());
+        $this->assertFalse(Environment::checkIsWindows());
     }
 
     public function testCheckPhpVersion()
     {
-        $this->assertTrue(Checks::checkPhpVersion());
+        $this->assertTrue(Environment::checkPhpVersion());
     }
 }
diff --git a/tests/SPT/Util/HttpUtilTest.php b/tests/SPT/Domain/Common/Providers/HttpTest.php
similarity index 90%
rename from tests/SPT/Util/HttpUtilTest.php
rename to tests/SPT/Domain/Common/Providers/HttpTest.php
index 06892deb..24d64989 100644
--- a/tests/SPT/Util/HttpUtilTest.php
+++ b/tests/SPT/Domain/Common/Providers/HttpTest.php
@@ -22,20 +22,20 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Providers;
 
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
+use SP\Domain\Common\Providers\Http;
 use SP\Domain\Config\Ports\ConfigDataInterface;
-use SP\Domain\Http\RequestInterface;
-use SP\Util\Http;
+use SP\Domain\Http\Ports\RequestService;
 
 /**
  * Class HttpUtilTest
  */
 #[Group('unitary')]
-class HttpUtilTest extends TestCase
+class HttpTest extends TestCase
 {
 
     /**
@@ -44,7 +44,7 @@ class HttpUtilTest extends TestCase
     public function testCheckHttps()
     {
         $configData = $this->createMock(ConfigDataInterface::class);
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
 
         $configData->expects($this->once())
                    ->method('isHttpsEnabled')
@@ -71,7 +71,7 @@ class HttpUtilTest extends TestCase
     public function testCheckHttpsWithNoHttpsEnabled()
     {
         $configData = $this->createMock(ConfigDataInterface::class);
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
 
         $configData->expects($this->once())
                    ->method('isHttpsEnabled')
@@ -95,7 +95,7 @@ class HttpUtilTest extends TestCase
     public function testCheckHttpsWithHttpsEnabledAndHttpsRequest()
     {
         $configData = $this->createMock(ConfigDataInterface::class);
-        $request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestService::class);
 
         $configData->expects($this->once())
                    ->method('isHttpsEnabled')
diff --git a/tests/SPT/Util/ImageTest.php b/tests/SPT/Domain/Common/Providers/ImageTest.php
similarity index 93%
rename from tests/SPT/Util/ImageTest.php
rename to tests/SPT/Domain/Common/Providers/ImageTest.php
index c365808f..aa11894c 100644
--- a/tests/SPT/Util/ImageTest.php
+++ b/tests/SPT/Domain/Common/Providers/ImageTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Providers;
 
 use GdImage;
 use PHPUnit\Framework\Attributes\Group;
@@ -30,7 +30,6 @@ use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use SP\Domain\Core\Exceptions\InvalidImageException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Util\Image;
 use SPT\Stubs\PhpExtensionCheckerStub;
 
 /**
@@ -39,7 +38,7 @@ use SPT\Stubs\PhpExtensionCheckerStub;
 #[Group('unitary')]
 class ImageTest extends TestCase
 {
-    private Image $imageUtil;
+    private \SP\Domain\Common\Providers\Image $imageUtil;
 
     /**
      * @throws InvalidImageException
@@ -88,6 +87,6 @@ class ImageTest extends TestCase
                                    ->method('checkCurl')
                                    ->with(true);
 
-        $this->imageUtil = new Image($phpExtensionCheckerService);
+        $this->imageUtil = new \SP\Domain\Common\Providers\Image($phpExtensionCheckerService);
     }
 }
diff --git a/tests/SPT/Util/PasswordUtilTest.php b/tests/SPT/Domain/Common/Providers/PasswordTest.php
similarity index 87%
rename from tests/SPT/Util/PasswordUtilTest.php
rename to tests/SPT/Domain/Common/Providers/PasswordTest.php
index 4b08f5b8..6cb57464 100644
--- a/tests/SPT/Util/PasswordUtilTest.php
+++ b/tests/SPT/Domain/Common/Providers/PasswordTest.php
@@ -22,19 +22,19 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Util;
+namespace SPT\Domain\Common\Providers;
 
 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use Random\RandomException;
-use SP\Util\Password;
+use SP\Domain\Common\Providers\Password;
 
 /**
  * Class PasswordUtilTest
  */
 #[Group('unitary')]
-class PasswordUtilTest extends TestCase
+class PasswordTest extends TestCase
 {
 
     public function testCheckStrength()
@@ -69,7 +69,7 @@ class PasswordUtilTest extends TestCase
 
             $this->assertEquals($length, strlen($pass));
 
-            foreach (Password::checkStrength(str_split($pass)) as $type => $count) {
+            foreach (\SP\Domain\Common\Providers\Password::checkStrength(str_split($pass)) as $type => $count) {
                 $this->assertGreaterThan(0, $count);
             }
         }
@@ -94,9 +94,10 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordSpecial()
     {
-        $flags = Password::FLAG_PASSWORD_SPECIAL | Password::FLAG_PASSWORD_STRENGTH;
+        $flags = \SP\Domain\Common\Providers\Password::FLAG_PASSWORD_SPECIAL |
+                 \SP\Domain\Common\Providers\Password::FLAG_PASSWORD_STRENGTH;
         $pass = Password::randomPassword(16, $flags);
-        $strength = Password::checkStrength(str_split($pass));
+        $strength = \SP\Domain\Common\Providers\Password::checkStrength(str_split($pass));
 
         $this->assertGreaterThan(0, $strength['lower']);
         $this->assertGreaterThan(0, $strength['upper']);
@@ -125,7 +126,7 @@ class PasswordUtilTest extends TestCase
      */
     public function testRandomPasswordAll()
     {
-        $flags = Password::FLAG_PASSWORD_NUMBER | Password::FLAG_PASSWORD_SPECIAL |
+        $flags = \SP\Domain\Common\Providers\Password::FLAG_PASSWORD_NUMBER | Password::FLAG_PASSWORD_SPECIAL |
                  Password::FLAG_PASSWORD_STRENGTH;
         $pass = Password::randomPassword(16, $flags);
         $strength = Password::checkStrength(str_split($pass));
@@ -145,7 +146,7 @@ class PasswordUtilTest extends TestCase
 
         $this->assertEquals(32, strlen($bytesHex));
 
-        $bytesHex = Password::generateRandomBytes(32);
+        $bytesHex = \SP\Domain\Common\Providers\Password::generateRandomBytes(32);
 
         $this->assertEquals(64, strlen($bytesHex));
 
diff --git a/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php b/tests/SPT/Domain/Config/Services/UpgradeConfigTest.php
index 92b3985e..cb42268b 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\Ports\FileLogHandlerProvider;
+use SP\Domain\Log\Ports\FileLogHandlerProvider;
 use SP\Domain\Upgrade\Services\UpgradeException;
 use SP\Infrastructure\File\FileException;
 use SPT\UnitaryTestCase;
diff --git a/tests/SPT/Domain/Export/Services/XmlExportTest.php b/tests/SPT/Domain/Export/Services/XmlExportTest.php
index 69de894f..521af59a 100644
--- a/tests/SPT/Domain/Export/Services/XmlExportTest.php
+++ b/tests/SPT/Domain/Export/Services/XmlExportTest.php
@@ -36,6 +36,7 @@ use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use RuntimeException;
 use SP\Core\Context\ContextException;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Crypt\CryptInterface;
 use SP\Domain\Core\Exceptions\CheckException;
@@ -49,7 +50,6 @@ use SP\Domain\Export\Services\XmlExport;
 use SP\Domain\File\Ports\DirectoryHandlerService;
 use SP\Domain\User\Dtos\UserDataDto;
 use SP\Infrastructure\File\FileException;
-use SP\Util\Version;
 use SPT\Generators\UserDataGenerator;
 use SPT\UnitaryTestCase;
 
diff --git a/tests/SPT/Html/HtmlTest.php b/tests/SPT/Domain/Html/HtmlTest.php
similarity index 88%
rename from tests/SPT/Html/HtmlTest.php
rename to tests/SPT/Domain/Html/HtmlTest.php
index 64e94885..3689fb70 100644
--- a/tests/SPT/Html/HtmlTest.php
+++ b/tests/SPT/Domain/Html/HtmlTest.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,11 +22,11 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Html;
+namespace SPT\Domain\Html;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use SP\Html\Html;
+use SP\Domain\Html\Html;
 use SPT\UnitaryTestCase;
 
 /**
@@ -59,6 +59,6 @@ class HtmlTest extends UnitaryTestCase
     #[DataProvider('urlProvider')]
     public function testGetSafeUrlEncoded(string $url)
     {
-        $this->assertEquals(0, preg_match('/["<>\']+/', Html::getSafeUrl($url)));
+        $this->assertEquals(0, preg_match('/["<>\']+/', \SP\Domain\Html\Html::getSafeUrl($url)));
     }
 }
diff --git a/tests/SPT/Html/MinifyCssTest.php b/tests/SPT/Domain/Html/Services/MinifyCssTest.php
similarity index 92%
rename from tests/SPT/Html/MinifyCssTest.php
rename to tests/SPT/Domain/Html/Services/MinifyCssTest.php
index 1938500d..afb4c77c 100644
--- a/tests/SPT/Html/MinifyCssTest.php
+++ b/tests/SPT/Domain/Html/Services/MinifyCssTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Html;
+namespace SPT\Domain\Html\Services;
 
 use Klein\DataCollection\HeaderDataCollection;
 use Klein\DataCollection\ServerDataCollection;
@@ -33,8 +33,7 @@ use PHPUnit\Framework\Constraint\Callback;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\File\Ports\FileHandlerInterface;
-use SP\Domain\Html\Header;
-use SP\Html\MinifyCss;
+use SP\Domain\Http\Header;
 use SP\Infrastructure\File\FileException;
 use SPT\UnitaryTestCase;
 use TypeError;
@@ -47,9 +46,9 @@ use TypeError;
 class MinifyCssTest extends UnitaryTestCase
 {
 
-    private Response|MockObject $response;
-    private Request|MockObject  $request;
-    private MinifyCss           $minifyCss;
+    private Response|MockObject                $response;
+    private Request|MockObject                 $request;
+    private \SP\Domain\Html\Services\MinifyCss $minifyCss;
 
     /**
      * @throws Exception
@@ -105,7 +104,7 @@ class MinifyCssTest extends UnitaryTestCase
                 ->with(
                     new Callback(function (string $header) {
                         return $header === Header::IF_NONE_MATCH->value
-                               || $header === Header::CACHE_CONTROL->value
+                               || $header === \SP\Domain\Http\Header::CACHE_CONTROL->value
                                || $header === Header::PRAGMA->value;
                     })
                 )
@@ -193,7 +192,7 @@ class MinifyCssTest extends UnitaryTestCase
         $headers = $this->createMock(HeaderDataCollection::class);
         $headers->expects(self::once())
                 ->method('get')
-                ->with(Header::IF_NONE_MATCH->value)
+            ->with(\SP\Domain\Http\Header::IF_NONE_MATCH->value)
                 ->willReturn(self::$faker->sha1);
 
         $this->request->expects(self::once())
@@ -204,13 +203,13 @@ class MinifyCssTest extends UnitaryTestCase
                        ->method('header')
                        ->with(
                            ...self::withConsecutive(
-                           [Header::ETAG->value, $etag],
+                           [\SP\Domain\Http\Header::ETAG->value, $etag],
                            [
-                               Header::CACHE_CONTROL->value,
+                               \SP\Domain\Http\Header::CACHE_CONTROL->value,
                                'public, max-age={2592000}, must-revalidate'
                            ],
                            [Header::PRAGMA->value, 'public; maxage={2592000}'],
-                           [Header::EXPIRES->value, self::anything()],
+                           [\SP\Domain\Http\Header::EXPIRES->value, self::anything()],
                            [Header::CONTENT_TYPE->value, 'text/css; charset: UTF-8']
                        )
                        );
@@ -293,7 +292,7 @@ class MinifyCssTest extends UnitaryTestCase
         $this->response = $this->createMock(Response::class);
         $this->request = $this->createMock(Request::class);
 
-        $this->minifyCss = new MinifyCss($this->response, $this->request);
+        $this->minifyCss = new \SP\Domain\Html\Services\MinifyCss($this->response, $this->request);
     }
 
 }
diff --git a/tests/SPT/Html/MinifyJsTest.php b/tests/SPT/Domain/Html/Services/MinifyJsTest.php
similarity index 89%
rename from tests/SPT/Html/MinifyJsTest.php
rename to tests/SPT/Domain/Html/Services/MinifyJsTest.php
index 32dc344e..6da109b0 100644
--- a/tests/SPT/Html/MinifyJsTest.php
+++ b/tests/SPT/Domain/Html/Services/MinifyJsTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Html;
+namespace SPT\Domain\Html\Services;
 
 use Klein\DataCollection\HeaderDataCollection;
 use Klein\DataCollection\ServerDataCollection;
@@ -33,8 +33,7 @@ use PHPUnit\Framework\Constraint\Callback;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
 use SP\Domain\File\Ports\FileHandlerInterface;
-use SP\Domain\Html\Header;
-use SP\Html\MinifyJs;
+use SP\Domain\Html\Services\MinifyJs;
 use SP\Infrastructure\File\FileException;
 use SPT\UnitaryTestCase;
 use TypeError;
@@ -104,9 +103,9 @@ class MinifyJsTest extends UnitaryTestCase
                 ->method('get')
                 ->with(
                     new Callback(function (string $header) {
-                        return $header === Header::IF_NONE_MATCH->value
-                               || $header === Header::CACHE_CONTROL->value
-                               || $header === Header::PRAGMA->value;
+                        return $header === \SP\Domain\Http\Header::IF_NONE_MATCH->value
+                               || $header === \SP\Domain\Http\Header::CACHE_CONTROL->value
+                               || $header === \SP\Domain\Http\Header::PRAGMA->value;
                     })
                 )
                 ->willReturn($etag);
@@ -193,7 +192,7 @@ class MinifyJsTest extends UnitaryTestCase
         $headers = $this->createMock(HeaderDataCollection::class);
         $headers->expects(self::once())
                 ->method('get')
-                ->with(Header::IF_NONE_MATCH->value)
+            ->with(\SP\Domain\Http\Header::IF_NONE_MATCH->value)
                 ->willReturn(self::$faker->sha1);
 
         $this->request->expects(self::once())
@@ -204,14 +203,14 @@ class MinifyJsTest extends UnitaryTestCase
                        ->method('header')
                        ->with(
                            ...self::withConsecutive(
-                           [Header::ETAG->value, $etag],
+                           [\SP\Domain\Http\Header::ETAG->value, $etag],
                            [
-                               Header::CACHE_CONTROL->value,
+                               \SP\Domain\Http\Header::CACHE_CONTROL->value,
                                'public, max-age={2592000}, must-revalidate'
                            ],
-                           [Header::PRAGMA->value, 'public; maxage={2592000}'],
-                           [Header::EXPIRES->value, self::anything()],
-                           [Header::CONTENT_TYPE->value, 'application/javascript; charset: UTF-8']
+                           [\SP\Domain\Http\Header::PRAGMA->value, 'public; maxage={2592000}'],
+                           [\SP\Domain\Http\Header::EXPIRES->value, self::anything()],
+                           [\SP\Domain\Http\Header::CONTENT_TYPE->value, 'application/javascript; charset: UTF-8']
                        )
                        );
 
@@ -293,7 +292,7 @@ class MinifyJsTest extends UnitaryTestCase
         $this->response = $this->createMock(Response::class);
         $this->request = $this->createMock(Request::class);
 
-        $this->minifyJs = new MinifyJs($this->response, $this->request);
+        $this->minifyJs = new \SP\Domain\Html\Services\MinifyJs($this->response, $this->request);
     }
 
 }
diff --git a/tests/SPT/Http/AddressTest.php b/tests/SPT/Domain/Http/Adapters/AddressTest.php
similarity index 82%
rename from tests/SPT/Http/AddressTest.php
rename to tests/SPT/Domain/Http/Adapters/AddressTest.php
index ea520830..f2709dd1 100644
--- a/tests/SPT/Http/AddressTest.php
+++ b/tests/SPT/Domain/Http/Adapters/AddressTest.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,13 +22,12 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Http;
+namespace SPT\Domain\Http\Adapters;
 
 use Faker\Factory;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
-use SP\Http\Address;
 use SPT\UnitaryTestCase;
 
 /**
@@ -117,10 +116,10 @@ class AddressTest extends UnitaryTestCase
     #[DataProvider('binaryCheckProvider')]
     public function testToBinary(string $address)
     {
-        $binary = Address::toBinary($address);
+        $binary = \SP\Domain\Http\Adapters\Address::toBinary($address);
 
         $this->assertNotEmpty($binary);
-        $this->assertEquals($address, Address::fromBinary($binary));
+        $this->assertEquals($address, \SP\Domain\Http\Adapters\Address::fromBinary($binary));
     }
 
     /**
@@ -130,7 +129,7 @@ class AddressTest extends UnitaryTestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        Address::toBinary('192.168.0.256');
+        \SP\Domain\Http\Adapters\Address::toBinary('192.168.0.256');
     }
 
     /**
@@ -140,7 +139,7 @@ class AddressTest extends UnitaryTestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        Address::toBinary('1200::AB00:1234::2552:7777:1313');
+        \SP\Domain\Http\Adapters\Address::toBinary('1200::AB00:1234::2552:7777:1313');
     }
 
     /**
@@ -150,7 +149,7 @@ class AddressTest extends UnitaryTestCase
     {
         $address = self::$faker->ipv4;
 
-        $out = Address::fromBinary(inet_pton($address));
+        $out = \SP\Domain\Http\Adapters\Address::fromBinary(inet_pton($address));
 
         $this->assertEquals($address, $out);
     }
@@ -162,7 +161,7 @@ class AddressTest extends UnitaryTestCase
     {
         $address = self::$faker->ipv6;
 
-        $out = Address::fromBinary(inet_pton($address));
+        $out = \SP\Domain\Http\Adapters\Address::fromBinary(inet_pton($address));
 
         $this->assertEquals($address, $out);
     }
@@ -175,7 +174,7 @@ class AddressTest extends UnitaryTestCase
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid IP');
 
-        Address::fromBinary('something');
+        \SP\Domain\Http\Adapters\Address::fromBinary('something');
     }
 
     /**
@@ -189,7 +188,7 @@ class AddressTest extends UnitaryTestCase
     #[DataProvider('checkAddressProvider')]
     public function testCheck(string $address, string $inAddress, string $inMask, bool $expected)
     {
-        $this->assertEquals($expected, Address::check($address, $inAddress, $inMask));
+        $this->assertEquals($expected, \SP\Domain\Http\Adapters\Address::check($address, $inAddress, $inMask));
     }
 
     /**
@@ -203,7 +202,14 @@ class AddressTest extends UnitaryTestCase
     #[DataProvider('checkAddressCidrProvider')]
     public function testCheckWithCidr(string $address, string $inAddress, string $inMask, bool $expected)
     {
-        $this->assertEquals($expected, Address::check($address, $inAddress, Address::cidrToDec($inMask)));
+        $this->assertEquals(
+            $expected,
+            \SP\Domain\Http\Adapters\Address::check(
+                $address,
+                $inAddress,
+                \SP\Domain\Http\Adapters\Address::cidrToDec($inMask)
+            )
+        );
     }
 
     /**
@@ -214,7 +220,7 @@ class AddressTest extends UnitaryTestCase
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid IP');
 
-        Address::check('123', '123', '123');
+        \SP\Domain\Http\Adapters\Address::check('123', '123', '123');
     }
 
     /**
@@ -223,7 +229,7 @@ class AddressTest extends UnitaryTestCase
     public function testParseWithFullMask()
     {
         $address = '192.168.0.1/255.255.255.0';
-        $parse = Address::parse4($address);
+        $parse = \SP\Domain\Http\Adapters\Address::parse4($address);
 
         $this->assertCount(5, $parse);
         $this->assertArrayHasKey('address', $parse);
@@ -238,14 +244,14 @@ class AddressTest extends UnitaryTestCase
     public function testParseWithoutMask()
     {
         $address = '192.168.0.2';
-        $parse = Address::parse4($address);
+        $parse = \SP\Domain\Http\Adapters\Address::parse4($address);
 
         $this->assertCount(3, $parse);
         $this->assertArrayHasKey('address', $parse);
         $this->assertEquals('192.168.0.2', $parse['address']);
 
         $address = '192.168.0.1/24';
-        $parse = Address::parse4($address);
+        $parse = \SP\Domain\Http\Adapters\Address::parse4($address);
 
         $this->assertCount(7, $parse);
         $this->assertArrayHasKey('address', $parse);
@@ -260,7 +266,7 @@ class AddressTest extends UnitaryTestCase
     public function testParseWithCIDR()
     {
         $address = '192.168.0.1/24';
-        $parse = Address::parse4($address);
+        $parse = \SP\Domain\Http\Adapters\Address::parse4($address);
 
         $this->assertCount(7, $parse);
         $this->assertArrayHasKey('address', $parse);
@@ -277,7 +283,7 @@ class AddressTest extends UnitaryTestCase
         $this->expectException(InvalidArgumentException::class);
 
         $address = '192.168.0.1000/255.255.255.0';
-        Address::parse4($address);
+        \SP\Domain\Http\Adapters\Address::parse4($address);
     }
 
     /**
@@ -288,7 +294,7 @@ class AddressTest extends UnitaryTestCase
         $this->expectException(InvalidArgumentException::class);
 
         $address = '192.168.0.100/255.255.2500.0';
-        Address::parse4($address);
+        \SP\Domain\Http\Adapters\Address::parse4($address);
     }
 
     /**
@@ -299,7 +305,7 @@ class AddressTest extends UnitaryTestCase
         $this->expectException(InvalidArgumentException::class);
 
         $address = '192.168.0.100/100';
-        Address::parse4($address);
+        \SP\Domain\Http\Adapters\Address::parse4($address);
     }
 
     /**
@@ -309,6 +315,6 @@ class AddressTest extends UnitaryTestCase
     #[DataProvider('checkCidrProvider')]
     public function testCidrToDec($cidr, $mask)
     {
-        $this->assertEquals($mask, Address::cidrToDec($cidr));
+        $this->assertEquals($mask, \SP\Domain\Http\Adapters\Address::cidrToDec($cidr));
     }
 }
diff --git a/tests/SPT/Http/RequestTest.php b/tests/SPT/Domain/Http/Services/RequestTest.php
similarity index 89%
rename from tests/SPT/Http/RequestTest.php
rename to tests/SPT/Domain/Http/Services/RequestTest.php
index aa84705b..1ef1d039 100644
--- a/tests/SPT/Http/RequestTest.php
+++ b/tests/SPT/Domain/Http/Services/RequestTest.php
@@ -22,7 +22,7 @@
  * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace SPT\Http;
+namespace SPT\Domain\Http\Services;
 
 use Klein\DataCollection\DataCollection;
 use Klein\DataCollection\HeaderDataCollection;
@@ -34,7 +34,7 @@ use SP\Core\Crypt\Hash;
 use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Http\Method;
-use SP\Http\Request;
+use SP\Domain\Http\Services\Request;
 use SPT\UnitaryTestCase;
 
 use function PHPUnit\Framework\exactly;
@@ -66,7 +66,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->ensureGet();
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertTrue($request->isJson());
     }
@@ -102,7 +102,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', 'a_value');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeString('test');
 
         $this->assertEquals('a_value', $out);
@@ -124,7 +124,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->server->set('SERVER_PORT', 1080);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals(1080, $request->getServerPort());
     }
@@ -144,7 +144,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', 'True');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeBool('test');
 
         $this->assertTrue($out);
@@ -178,7 +178,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn($host, $proto, null, null);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $expected = [
             'host' => $host,
             'proto' => $proto,
@@ -201,7 +201,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn('', '');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertNull($request->getXForwardedData());
     }
@@ -234,7 +234,7 @@ class RequestTest extends UnitaryTestCase
     public function testGetMethodWithGet()
     {
         $this->ensureGet();
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals(Method::GET, $request->getMethod());
     }
@@ -242,7 +242,7 @@ class RequestTest extends UnitaryTestCase
     public function testGetMethodWithPost()
     {
         $this->ensurePost();
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals(Method::POST, $request->getMethod());
     }
@@ -271,7 +271,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn(null, null);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $this->assertEquals($address, $request->getClientAddress());
     }
 
@@ -289,7 +289,7 @@ class RequestTest extends UnitaryTestCase
                       ->with('Http-Forwarded')
                       ->willReturn(sprintf('for=%s;host=%s;proto=https', $address, $domain));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals($address, $request->getClientAddress());
     }
@@ -310,7 +310,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn(null, sprintf('%s,', $address));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals($address, $request->getClientAddress());
     }
@@ -329,7 +329,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn(null, $addresses);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals($addresses, $request->getClientAddress(true));
     }
@@ -386,7 +386,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', ['a' => 'a_test', 'b' => 1]);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeArray('test', $mapper);
 
         $this->assertEquals(['a' => 'A_TEST', 'b' => 1], $out);
@@ -428,7 +428,7 @@ class RequestTest extends UnitaryTestCase
                       ->with('Http-Forwarded')
                       ->willReturn(sprintf('for=%s;proto=https', self::$faker->ipv4));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertNull($request->getForwardedData());
     }
@@ -444,7 +444,7 @@ class RequestTest extends UnitaryTestCase
                       ->with('Http-Forwarded')
                       ->willReturn(sprintf('host=%s;for=192.168.0.1', self::$faker->domainName));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertNull($request->getForwardedData());
     }
@@ -483,7 +483,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', 'me@email.com');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeEmail('test');
 
         $this->assertEquals('me@email.com', $out);
@@ -505,7 +505,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', 123);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeInt('test');
 
         $this->assertEquals(123, $out);
@@ -583,7 +583,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('isAjax', 0);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertFalse($request->isAjax());
     }
@@ -600,7 +600,7 @@ class RequestTest extends UnitaryTestCase
             ->with('value_encrypted')
             ->willReturn('value');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $out = $request->analyzeEncrypted('test');
 
@@ -632,7 +632,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->cryptPKI->expects(self::never())->method('decryptRSA');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $out = $request->analyzeEncrypted('test');
 
@@ -650,7 +650,7 @@ class RequestTest extends UnitaryTestCase
             ->method('decryptRSA')
             ->willThrowException(new RuntimeException());
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $out = $request->analyzeEncrypted('test');
 
@@ -679,7 +679,7 @@ class RequestTest extends UnitaryTestCase
             ->with('h')
             ->willReturn($params);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $request->verifySignature('a_key');
     }
@@ -696,7 +696,7 @@ class RequestTest extends UnitaryTestCase
         $this->paramsGet->set('h', $signature);
         $this->paramsGet->set('test', 'a_value');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $request->verifySignature('a_key', 'test');
     }
@@ -710,7 +710,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->kleinRequest->expects(self::never())->method('params');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->expectException(SPException::class);
         $this->expectExceptionMessage('URI string altered');
@@ -732,7 +732,7 @@ class RequestTest extends UnitaryTestCase
                       ->with('Http-Forwarded')
                       ->willReturn(sprintf('for=%s,for=%s', $addresses[0], $addresses[1]));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals($addresses, $request->getForwardedFor());
     }
@@ -754,7 +754,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn(null, sprintf('%s,%s', $addresses[0], $addresses[1]));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals($addresses, $request->getForwardedFor());
     }
@@ -771,7 +771,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn(null, null);
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertNull($request->getForwardedFor());
     }
@@ -782,7 +782,7 @@ class RequestTest extends UnitaryTestCase
 
         $this->paramsGet->set('test', 'me@email.com');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
         $out = $request->analyzeUnsafeString('test');
 
         $this->assertEquals('me@email.com', $out);
@@ -824,7 +824,7 @@ class RequestTest extends UnitaryTestCase
     {
         $path = '../../opt/project/index.test';
 
-        $out = Request::getSecureAppPath($path, '/tmp');
+        $out = \SP\Domain\Http\Services\Request::getSecureAppPath($path, '/tmp');
 
         $this->assertEmpty($out);
     }
@@ -841,7 +841,7 @@ class RequestTest extends UnitaryTestCase
                       ->with('Http-Forwarded')
                       ->willReturn(sprintf('for=%s;host=%s;proto=https', $address, $domain));
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         $this->assertEquals(sprintf('https://%s', $domain), $request->getHttpHost());
     }
@@ -890,7 +890,7 @@ class RequestTest extends UnitaryTestCase
                       )
                       ->willReturn('', '', '');
 
-        $request = new Request($this->kleinRequest, $this->cryptPKI);
+        $request = new \SP\Domain\Http\Services\Request($this->kleinRequest, $this->cryptPKI);
 
         /** @noinspection HttpUrlsUsage */
         $this->assertEquals(sprintf('http://%s', $domain), $request->getHttpHost());
@@ -938,7 +938,7 @@ class RequestTest extends UnitaryTestCase
     {
         $path = '../../opt/project/index.php';
 
-        $out = Request::getSecureAppFile($path, '/tmp');
+        $out = \SP\Domain\Http\Services\Request::getSecureAppFile($path, '/tmp');
 
         $this->assertEquals('', $out);
     }
diff --git a/tests/SPT/Domain/Import/Services/LdapImportTest.php b/tests/SPT/Domain/Import/Services/LdapImportTest.php
index eceed462..dd562724 100644
--- a/tests/SPT/Domain/Import/Services/LdapImportTest.php
+++ b/tests/SPT/Domain/Import/Services/LdapImportTest.php
@@ -33,10 +33,10 @@ 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\Auth\Providers\Ldap\LdapException;
+use SP\Domain\Auth\Providers\Ldap\LdapParams;
+use SP\Domain\Auth\Providers\Ldap\LdapResults;
+use SP\Domain\Auth\Providers\Ldap\LdapTypeEnum;
 use SP\Domain\User\Models\User;
 use SP\Domain\User\Models\UserGroup;
 use SP\Domain\User\Ports\UserGroupService;
diff --git a/tests/SPT/Domain/Install/Services/InstallerTest.php b/tests/SPT/Domain/Install/Services/InstallerTest.php
index 09677196..98b54347 100644
--- a/tests/SPT/Domain/Install/Services/InstallerTest.php
+++ b/tests/SPT/Domain/Install/Services/InstallerTest.php
@@ -28,10 +28,11 @@ use Exception;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
+use SP\Domain\Common\Providers\Version;
 use SP\Domain\Config\Ports\ConfigService;
 use SP\Domain\Core\Exceptions\InvalidArgumentException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Install\Adapters\InstallData;
 use SP\Domain\Install\Ports\InstallerService;
 use SP\Domain\Install\Services\DatabaseSetupInterface;
@@ -41,7 +42,6 @@ use SP\Domain\User\Ports\UserProfileService;
 use SP\Domain\User\Ports\UserService;
 use SP\Domain\User\Services\User;
 use SP\Infrastructure\Database\DatabaseConnectionData;
-use SP\Util\Version;
 use SPT\UnitaryTestCase;
 
 /**
@@ -60,7 +60,7 @@ class InstallerTest extends UnitaryTestCase
      */
     private $userService;
     /**
-     * @var Stub|RequestInterface
+     * @var Stub|\SP\Domain\Http\Ports\RequestService
      */
     private $request;
     /**
@@ -440,7 +440,7 @@ class InstallerTest extends UnitaryTestCase
     {
         $this->databaseSetup = $this->createMock(DatabaseSetupInterface::class);
         $this->userService = $this->createMock(UserService::class);
-        $this->request = $this->createStub(RequestInterface::class);
+        $this->request = $this->createStub(RequestService::class);
         $this->configService = $this->createMock(ConfigService::class);
         $this->userGroupService = $this->createMock(UserGroupService::class);
         $this->userProfileService = $this->createMock(UserProfileService::class);
diff --git a/tests/SPT/Domain/Notification/Services/MailTest.php b/tests/SPT/Domain/Notification/Services/MailTest.php
index 516cbb01..37b3f1d6 100644
--- a/tests/SPT/Domain/Notification/Services/MailTest.php
+++ b/tests/SPT/Domain/Notification/Services/MailTest.php
@@ -33,9 +33,9 @@ use SP\Core\Messages\MailMessage;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigFileService;
 use SP\Domain\Core\Bootstrap\UriContextInterface;
+use SP\Domain\Notification\Dtos\MailParams;
+use SP\Domain\Notification\Ports\MailerInterface;
 use SP\Domain\Notification\Services\Mail;
-use SP\Domain\Providers\Mail\MailParams;
-use SP\Domain\Providers\Ports\MailerInterface;
 use SPT\Generators\ConfigDataGenerator;
 use SPT\UnitaryTestCase;
 
diff --git a/tests/SPT/Domain/Security/Services/EventlogTest.php b/tests/SPT/Domain/Security/Services/EventlogTest.php
index 50e23ab5..67587c13 100644
--- a/tests/SPT/Domain/Security/Services/EventlogTest.php
+++ b/tests/SPT/Domain/Security/Services/EventlogTest.php
@@ -30,7 +30,7 @@ use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
-use SP\Domain\Http\RequestInterface;
+use SP\Domain\Http\Ports\RequestService;
 use SP\Domain\Security\Models\Eventlog as EventlogModel;
 use SP\Domain\Security\Ports\EventlogRepository;
 use SP\Domain\Security\Services\Eventlog;
@@ -45,7 +45,7 @@ class EventlogTest extends UnitaryTestCase
 {
 
     private EventlogRepository|MockObject $eventlogRepository;
-    private RequestInterface|MockObject   $request;
+    private RequestService|MockObject $request;
     private Eventlog                      $eventlog;
 
     /**
@@ -124,7 +124,7 @@ class EventlogTest extends UnitaryTestCase
         parent::setUp();
 
         $this->eventlogRepository = $this->createMock(EventlogRepository::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
 
         $this->eventlog = new Eventlog($this->application, $this->eventlogRepository, $this->request);
     }
diff --git a/tests/SPT/Domain/Security/Services/TrackTest.php b/tests/SPT/Domain/Security/Services/TrackTest.php
index 3557c932..ee685f97 100644
--- a/tests/SPT/Domain/Security/Services/TrackTest.php
+++ b/tests/SPT/Domain/Security/Services/TrackTest.php
@@ -32,7 +32,7 @@ use SP\Domain\Core\Dtos\ItemSearchDto;
 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\Http\Ports\RequestService;
 use SP\Domain\Security\Dtos\TrackRequest;
 use SP\Domain\Security\Models\Track as TrackModel;
 use SP\Domain\Security\Ports\TrackRepository;
@@ -48,9 +48,9 @@ use SPT\UnitaryTestCase;
 class TrackTest extends UnitaryTestCase
 {
 
-    private TrackRepository|MockObject  $trackRepository;
-    private RequestInterface|MockObject $request;
-    private Track                       $track;
+    private TrackRepository|MockObject $trackRepository;
+    private RequestService|MockObject  $request;
+    private Track                      $track;
 
     public function testSearch()
     {
@@ -259,7 +259,7 @@ class TrackTest extends UnitaryTestCase
         parent::setUp();
 
         $this->trackRepository = $this->createMock(TrackRepository::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $this->request = $this->createMock(RequestService::class);
 
         $this->track = new Track($this->application, $this->trackRepository, $this->request);
     }
diff --git a/tests/SPT/Modules/Api/ApiTestCase.php b/tests/SPT/Modules/Api/ApiTestCase.php
index bc01d738..1569e19f 100644
--- a/tests/SPT/Modules/Api/ApiTestCase.php
+++ b/tests/SPT/Modules/Api/ApiTestCase.php
@@ -210,7 +210,7 @@ abstract class ApiTestCase extends TestCase
         );
 
         $router = $dic->get(Klein::class);
-        $request = $dic->get(\SP\Http\Request::class);
+        $request = $dic->get(\SP\Domain\Http\Services\Request::class);
 
         $bs = new BootstrapApi(self::$configData, $router, $request);
         $router->dispatch($request, null, false);
diff --git a/tests/SPT/bootstrap.php b/tests/SPT/bootstrap.php
index 11274752..1e43f57c 100644
--- a/tests/SPT/bootstrap.php
+++ b/tests/SPT/bootstrap.php
@@ -36,7 +36,7 @@ use SP\Domain\User\Dtos\UserDataDto;
 use SP\Domain\User\Models\ProfileData;
 use SP\Infrastructure\Database\DatabaseConnectionData;
 use SP\Infrastructure\Database\MysqlHandler;
-use SP\Util\FileSystem;
+use SP\Infrastructure\File\FileSystem;
 
 use function SP\logger;
 use function SP\processException;
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index df6157e8..f7c1e5a0 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -42,11 +42,8 @@
         <testsuite name="core">
             <directory suffix=".php">./SPT/Core</directory>
             <directory suffix=".php">./SPT/Domain</directory>
-            <directory suffix=".php">./SPT/Html</directory>
-            <directory suffix=".php">./SPT/Http</directory>
             <directory suffix=".php">./SPT/Infrastructure</directory>
             <directory suffix=".php">./SPT/Mvc</directory>
-            <directory suffix=".php">./SPT/Providers</directory>
             <directory suffix=".php">./SPT/Util</directory>
             <exclude>./SPT/Domain/Account/Services/Builders/AccountSearchTokenizerDataTrait.php</exclude>
             <exclude>./SPT/Domain/Export/Services/XmlTrait.php</exclude>
@@ -64,7 +61,6 @@
             <directory suffix=".php">../lib/SP</directory>
         </include>
         <exclude>
-            <directory suffix=".php">../lib/SP/DataModel</directory>
             <directory suffix=".php">../lib/SP/Html/Assets</directory>
             <directory suffix=".php">../lib/SP/Html/DataGrid</directory>
             <file>../lib/SP/Domain/Config/Adapters/ConfigData.php</file>