diff --git a/config/module.config.php b/config/module.config.php
index 5493142..a3a70e4 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -4,10 +4,10 @@
 
 use Laminas\Mvc\Middleware\PipeSpec;
 use Laminas\Router\Http\Literal;
+use Pi\Core\Middleware\RequestPreparationMiddleware;
 use Pi\Core\Middleware\SecurityMiddleware;
 use User\Middleware\AuthenticationMiddleware;
 use User\Middleware\AuthorizationMiddleware;
-use User\Middleware\RequestPreparationMiddleware;
 
 return [
     'service_manager' => [
diff --git a/src/Factory/Handler/InstallerHandlerFactory.php b/src/Factory/Handler/InstallerHandlerFactory.php
index 58141f9..064bb92 100644
--- a/src/Factory/Handler/InstallerHandlerFactory.php
+++ b/src/Factory/Handler/InstallerHandlerFactory.php
@@ -2,14 +2,14 @@
 
 namespace Logger\Factory\Handler;
 
-use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Logger\Handler\InstallerHandler;
+use Pi\Core\Service\InstallerService;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Service\InstallerService;
 
 class InstallerHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/LoggerRequestMiddlewareFactory.php b/src/Factory/Middleware/LoggerRequestMiddlewareFactory.php
index 1784a7e..ff51613 100644
--- a/src/Factory/Middleware/LoggerRequestMiddlewareFactory.php
+++ b/src/Factory/Middleware/LoggerRequestMiddlewareFactory.php
@@ -2,13 +2,13 @@
 
 namespace Logger\Factory\Middleware;
 
-use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Logger\Middleware\LoggerRequestMiddleware;
 use Logger\Service\LoggerService;
+use Pi\Core\Handler\ErrorHandler;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\ErrorHandler;
 
 class LoggerRequestMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/LoggerRequestResponseMiddlewareFactory.php b/src/Factory/Middleware/LoggerRequestResponseMiddlewareFactory.php
index 46aa94b..bef6fa4 100644
--- a/src/Factory/Middleware/LoggerRequestResponseMiddlewareFactory.php
+++ b/src/Factory/Middleware/LoggerRequestResponseMiddlewareFactory.php
@@ -2,13 +2,13 @@
 
 namespace Logger\Factory\Middleware;
 
-use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Logger\Middleware\LoggerRequestResponseMiddleware;
 use Logger\Service\LoggerService;
+use Pi\Core\Handler\ErrorHandler;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\ErrorHandler;
 
 class LoggerRequestResponseMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/LoggerServiceFactory.php b/src/Factory/Service/LoggerServiceFactory.php
index bc0c10d..3ed1ffa 100644
--- a/src/Factory/Service/LoggerServiceFactory.php
+++ b/src/Factory/Service/LoggerServiceFactory.php
@@ -2,11 +2,11 @@
 
 namespace Logger\Factory\Service;
 
-use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Logger\Repository\LogRepositoryInterface;
 use Logger\Service\LoggerService;
-use User\Service\UtilityService;
+use Pi\Core\Service\UtilityService;
+use Psr\Container\ContainerInterface;
 
 class LoggerServiceFactory implements FactoryInterface
 {
diff --git a/src/Handler/InstallerHandler.php b/src/Handler/InstallerHandler.php
index 4d9d8d2..b053a36 100644
--- a/src/Handler/InstallerHandler.php
+++ b/src/Handler/InstallerHandler.php
@@ -3,13 +3,13 @@
 namespace Logger\Handler;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\Core\Service\InstallerService;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use stdClass;
-use User\Service\InstallerService;
 
 class InstallerHandler implements RequestHandlerInterface
 {
diff --git a/src/Middleware/LoggerRequestMiddleware.php b/src/Middleware/LoggerRequestMiddleware.php
index 9f94588..3b3e23b 100644
--- a/src/Middleware/LoggerRequestMiddleware.php
+++ b/src/Middleware/LoggerRequestMiddleware.php
@@ -3,13 +3,13 @@
 namespace Logger\Middleware;
 
 use Logger\Service\LoggerService;
+use Pi\Core\Handler\ErrorHandler;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Handler\ErrorHandler;
 
 class LoggerRequestMiddleware implements MiddlewareInterface
 {
diff --git a/src/Middleware/LoggerRequestResponseMiddleware.php b/src/Middleware/LoggerRequestResponseMiddleware.php
index 2d1cefc..1056164 100644
--- a/src/Middleware/LoggerRequestResponseMiddleware.php
+++ b/src/Middleware/LoggerRequestResponseMiddleware.php
@@ -3,13 +3,13 @@
 namespace Logger\Middleware;
 
 use Logger\Service\LoggerService;
+use Pi\Core\Handler\ErrorHandler;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Handler\ErrorHandler;
 
 class LoggerRequestResponseMiddleware implements MiddlewareInterface
 {
diff --git a/src/Service/LoggerService.php b/src/Service/LoggerService.php
index 82bee14..bdcb282 100644
--- a/src/Service/LoggerService.php
+++ b/src/Service/LoggerService.php
@@ -10,7 +10,7 @@
 use Laminas\Log\Writer\Stream;
 use Logger\Repository\LogRepositoryInterface;
 use MongoDB\Driver\Manager;
-use User\Service\UtilityService;
+use Pi\Core\Service\UtilityService;
 
 class LoggerService implements ServiceInterface
 {