diff --git a/bin/post-remove.php b/bin/post-remove.php
index fd0fbe2..91840d9 100644
--- a/bin/post-remove.php
+++ b/bin/post-remove.php
@@ -3,8 +3,8 @@
 use Laminas\Config\Config;
 use Laminas\Db\Adapter\Adapter;
 use Pi\Core\Installer\Remove;
-use User\Service\PermissionService;
-use User\Service\RoleService;
+use Pi\User\Service\PermissionService;
+use Pi\User\Service\RoleService;
 
 // Composer autoloading
 include realpath(__DIR__ . '/../../../vendor/autoload.php');
diff --git a/bin/post-update.php b/bin/post-update.php
index 1cedc5a..1378963 100644
--- a/bin/post-update.php
+++ b/bin/post-update.php
@@ -3,8 +3,8 @@
 use Laminas\Config\Config;
 use Laminas\Db\Adapter\Adapter;
 use Pi\Core\Installer\Update;
-use User\Service\PermissionService;
-use User\Service\RoleService;
+use Pi\User\Service\PermissionService;
+use Pi\User\Service\RoleService;
 
 // Composer autoloading
 include realpath(__DIR__ . '/../../../vendor/autoload.php');
diff --git a/config/module.config.php b/config/module.config.php
index 384da18..9b4c7e4 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User;
+namespace Pi\User;
 
 use Laminas\Mvc\Middleware\PipeSpec;
 use Laminas\Router\Http\Literal;
diff --git a/src/Authentication/Oauth/Google.php b/src/Authentication/Oauth/Google.php
index d88c294..3d63500 100644
--- a/src/Authentication/Oauth/Google.php
+++ b/src/Authentication/Oauth/Google.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Authentication\Oauth;
+namespace Pi\User\Authentication\Oauth;
 
 use Google\Auth\AccessToken;
 use Hybridauth\Exception\UnexpectedApiResponseException;
diff --git a/src/Authentication/Oauth/Microsoft.php b/src/Authentication/Oauth/Microsoft.php
index d04bb90..0eb76af 100644
--- a/src/Authentication/Oauth/Microsoft.php
+++ b/src/Authentication/Oauth/Microsoft.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Authentication\Oauth;
+namespace Pi\User\Authentication\Oauth;
 
 use Hybridauth\Exception\UnexpectedApiResponseException;
 use Hybridauth\Provider\MicrosoftGraph as HybridauthMicrosoftGraph;
diff --git a/src/Authentication/Oauth/Oauth2.php b/src/Authentication/Oauth/Oauth2.php
index b04e335..791020c 100644
--- a/src/Authentication/Oauth/Oauth2.php
+++ b/src/Authentication/Oauth/Oauth2.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Authentication\Oauth;
+namespace Pi\User\Authentication\Oauth;
 
 
 class Oauth2 implements OauthInterface
diff --git a/src/Authentication/Oauth/OauthInterface.php b/src/Authentication/Oauth/OauthInterface.php
index 4137d79..e098ee3 100644
--- a/src/Authentication/Oauth/OauthInterface.php
+++ b/src/Authentication/Oauth/OauthInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Authentication\Oauth;
+namespace Pi\User\Authentication\Oauth;
 
 interface OauthInterface
 {
diff --git a/src/Factory/Handler/Admin/Cache/DeleteHandlerFactory.php b/src/Factory/Handler/Admin/Cache/DeleteHandlerFactory.php
index cda2515..46845f5 100644
--- a/src/Factory/Handler/Admin/Cache/DeleteHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Cache/DeleteHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Cache;
+namespace Pi\User\Factory\Handler\Admin\Cache;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
+use Pi\User\Handler\Admin\Cache\DeleteHandler;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Cache\DeleteHandler;
 
 class DeleteHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Cache/ListHandlerFactory.php b/src/Factory/Handler/Admin/Cache/ListHandlerFactory.php
index 61a8b50..2dd8535 100644
--- a/src/Factory/Handler/Admin/Cache/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Cache/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Cache;
+namespace Pi\User\Factory\Handler\Admin\Cache;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
+use Pi\User\Handler\Admin\Cache\ListHandler;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Cache\ListHandler;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Cache/PersistHandlerFactory.php b/src/Factory/Handler/Admin/Cache/PersistHandlerFactory.php
index 98c5517..c936039 100644
--- a/src/Factory/Handler/Admin/Cache/PersistHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Cache/PersistHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Cache;
+namespace Pi\User\Factory\Handler\Admin\Cache;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
@@ -9,7 +9,7 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Cache\PersistHandler;
+use Pi\User\Handler\Admin\Cache\PersistHandler;
 
 class PersistHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Cache/ViewHandlerFactory.php b/src/Factory/Handler/Admin/Cache/ViewHandlerFactory.php
index c029a52..7928ae5 100644
--- a/src/Factory/Handler/Admin/Cache/ViewHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Cache/ViewHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Cache;
+namespace Pi\User\Factory\Handler\Admin\Cache;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
@@ -9,7 +9,7 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Cache\ViewHandler;
+use Pi\User\Handler\Admin\Cache\ViewHandler;
 
 class ViewHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Permission/Page/ListHandlerFactory.php b/src/Factory/Handler/Admin/Permission/Page/ListHandlerFactory.php
index 137ed9d..ed74fba 100644
--- a/src/Factory/Handler/Admin/Permission/Page/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Permission/Page/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Permission\Page;
+namespace Pi\User\Factory\Handler\Admin\Permission\Page;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Permission\Page\ListHandler;
+use Pi\User\Service\PermissionService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Permission\Page\ListHandler;
-use User\Service\PermissionService;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Permission/Resource/ListHandlerFactory.php b/src/Factory/Handler/Admin/Permission/Resource/ListHandlerFactory.php
index 38d9b09..8bd9453 100644
--- a/src/Factory/Handler/Admin/Permission/Resource/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Permission/Resource/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Permission\Resource;
+namespace Pi\User\Factory\Handler\Admin\Permission\Resource;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Permission\Resource\ListHandler;
+use Pi\User\Service\PermissionService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Permission\Resource\ListHandler;
-use User\Service\PermissionService;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Permission/Role/ListHandlerFactory.php b/src/Factory/Handler/Admin/Permission/Role/ListHandlerFactory.php
index 0ebfca3..6084e1f 100644
--- a/src/Factory/Handler/Admin/Permission/Role/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Permission/Role/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Permission\Role;
+namespace Pi\User\Factory\Handler\Admin\Permission\Role;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Permission\Role\ListHandler;
+use Pi\User\Service\PermissionService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Permission\Role\ListHandler;
-use User\Service\PermissionService;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/AddHandlerFactory.php b/src/Factory/Handler/Admin/Profile/AddHandlerFactory.php
index b1d1c84..db1437d 100644
--- a/src/Factory/Handler/Admin/Profile/AddHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/AddHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Profile\AddHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\AddHandler;
-use User\Service\AccountService;
 
 class AddHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/CleanHandlerFactory.php b/src/Factory/Handler/Admin/Profile/CleanHandlerFactory.php
index bc7bb0d..3492bd3 100644
--- a/src/Factory/Handler/Admin/Profile/CleanHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/CleanHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Profile\CleanHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\CleanHandler;
-use User\Service\AccountService;
 
 class CleanHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/DeleteHandlerFactory.php b/src/Factory/Handler/Admin/Profile/DeleteHandlerFactory.php
index 4e30146..fbe7f72 100644
--- a/src/Factory/Handler/Admin/Profile/DeleteHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/DeleteHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Profile\DeleteHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\DeleteHandler;
-use User\Service\AccountService;
 
 class DeleteHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/EditHandlerFactory.php b/src/Factory/Handler/Admin/Profile/EditHandlerFactory.php
index 26e491d..966226d 100644
--- a/src/Factory/Handler/Admin/Profile/EditHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/EditHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Profile\EditHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\EditHandler;
-use User\Service\AccountService;
 
 class EditHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/ExportHandlerFactory.php b/src/Factory/Handler/Admin/Profile/ExportHandlerFactory.php
index 34eb38d..99081e7 100644
--- a/src/Factory/Handler/Admin/Profile/ExportHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/ExportHandlerFactory.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Media\Service\MediaService;
+use Pi\User\Handler\Admin\Profile\ExportHandler;
+use Pi\User\Handler\Admin\Profile\ListHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\ExportService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\ExportHandler;
-use User\Handler\Admin\Profile\ListHandler;
-use User\Service\AccountService;
-use User\Service\ExportService;
 
 class ExportHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/ListHandlerFactory.php b/src/Factory/Handler/Admin/Profile/ListHandlerFactory.php
index 1ca393e..54c0ee5 100644
--- a/src/Factory/Handler/Admin/Profile/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Profile\ListHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\ListHandler;
-use User\Service\AccountService;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/PasswordHandlerFactory.php b/src/Factory/Handler/Admin/Profile/PasswordHandlerFactory.php
index 7c1a4aa..914fff8 100644
--- a/src/Factory/Handler/Admin/Profile/PasswordHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/PasswordHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\PasswordHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Admin\Profile\PasswordHandler;
+use Pi\User\Service\AccountService;
 
 class PasswordHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/StatusHandlerFactory.php b/src/Factory/Handler/Admin/Profile/StatusHandlerFactory.php
index 20a71a6..79003b7 100644
--- a/src/Factory/Handler/Admin/Profile/StatusHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/StatusHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\StatusHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Admin\Profile\StatusHandler;
+use Pi\User\Service\AccountService;
 
 class StatusHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Profile/ViewHandlerFactory.php b/src/Factory/Handler/Admin/Profile/ViewHandlerFactory.php
index d15095c..38f3ea8 100644
--- a/src/Factory/Handler/Admin/Profile/ViewHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Profile/ViewHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Profile;
+namespace Pi\User\Factory\Handler\Admin\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Profile\ViewHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Admin\Profile\ViewHandler;
+use Pi\User\Service\AccountService;
 
 class ViewHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Role/AddHandlerFactory.php b/src/Factory/Handler/Admin/Role/AddHandlerFactory.php
index 6d17bcb..ba6ef1f 100644
--- a/src/Factory/Handler/Admin/Role/AddHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Role/AddHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Role;
+namespace Pi\User\Factory\Handler\Admin\Role;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Role\AddHandler;
+use Pi\User\Service\RoleService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Role\AddHandler;
-use User\Service\RoleService;
 
 class AddHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Role/DeleteHandlerFactory.php b/src/Factory/Handler/Admin/Role/DeleteHandlerFactory.php
index f8f545f..8cb9a7a 100644
--- a/src/Factory/Handler/Admin/Role/DeleteHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Role/DeleteHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Role;
+namespace Pi\User\Factory\Handler\Admin\Role;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Role\DeleteHandler;
+use Pi\User\Service\RoleService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Role\DeleteHandler;
-use User\Service\RoleService;
 
 class DeleteHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Role/EditHandlerFactory.php b/src/Factory/Handler/Admin/Role/EditHandlerFactory.php
index 064c3f3..316d30a 100644
--- a/src/Factory/Handler/Admin/Role/EditHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Role/EditHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Role;
+namespace Pi\User\Factory\Handler\Admin\Role;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Role\EditHandler;
+use Pi\User\Service\RoleService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Role\EditHandler;
-use User\Service\RoleService;
 
 class EditHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Admin/Role/ListHandlerFactory.php b/src/Factory/Handler/Admin/Role/ListHandlerFactory.php
index 2639f0d..3b98640 100644
--- a/src/Factory/Handler/Admin/Role/ListHandlerFactory.php
+++ b/src/Factory/Handler/Admin/Role/ListHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Admin\Role;
+namespace Pi\User\Factory\Handler\Admin\Role;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Admin\Role\ListHandler;
+use Pi\User\Service\RoleService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Admin\Role\ListHandler;
-use User\Service\RoleService;
 
 class ListHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Email/RequestHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Email/RequestHandlerFactory.php
index c1be62d..5867b31 100644
--- a/src/Factory/Handler/Api/Authentication/Email/RequestHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Email/RequestHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Email;
+namespace Pi\User\Factory\Handler\Api\Authentication\Email;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Email\RequestHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Email\RequestHandler;
+use Pi\User\Service\AccountService;
 
 class RequestHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Email/VerifyHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Email/VerifyHandlerFactory.php
index 96a59e1..1919c3b 100644
--- a/src/Factory/Handler/Api/Authentication/Email/VerifyHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Email/VerifyHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Email;
+namespace Pi\User\Factory\Handler\Api\Authentication\Email;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Email\VerifyHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Email\VerifyHandler;
+use Pi\User\Service\AccountService;
 
 class VerifyHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/LoginHandlerFactory.php b/src/Factory/Handler/Api/Authentication/LoginHandlerFactory.php
index 8cfdf1f..7413d78 100644
--- a/src/Factory/Handler/Api/Authentication/LoginHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/LoginHandlerFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication;
+namespace Pi\User\Factory\Handler\Api\Authentication;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Authentication\LoginHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\LoginHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
 
 class LoginHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/LogoutHandlerFactory.php b/src/Factory/Handler/Api/Authentication/LogoutHandlerFactory.php
index e4181d8..5b58c37 100644
--- a/src/Factory/Handler/Api/Authentication/LogoutHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/LogoutHandlerFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication;
+namespace Pi\User\Factory\Handler\Api\Authentication;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Authentication\LogoutHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\LogoutHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
 
 class LogoutHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Mfa/RequestHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Mfa/RequestHandlerFactory.php
index d72b90f..3b3db59 100644
--- a/src/Factory/Handler/Api/Authentication/Mfa/RequestHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Mfa/RequestHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Mfa;
+namespace Pi\User\Factory\Handler\Api\Authentication\Mfa;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Mfa\RequestHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Mfa\RequestHandler;
+use Pi\User\Service\AccountService;
 
 class RequestHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Mfa/VerifyHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Mfa/VerifyHandlerFactory.php
index e48a663..49a068b 100644
--- a/src/Factory/Handler/Api/Authentication/Mfa/VerifyHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Mfa/VerifyHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Mfa;
+namespace Pi\User\Factory\Handler\Api\Authentication\Mfa;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Mfa\VerifyHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Mfa\VerifyHandler;
+use Pi\User\Service\AccountService;
 
 class VerifyHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Mobile/RequestHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Mobile/RequestHandlerFactory.php
index 300ca55..68761ab 100644
--- a/src/Factory/Handler/Api/Authentication/Mobile/RequestHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Mobile/RequestHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Mobile;
+namespace Pi\User\Factory\Handler\Api\Authentication\Mobile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Mobile\RequestHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Mobile\RequestHandler;
+use Pi\User\Service\AccountService;
 
 class RequestHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Mobile/VerifyHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Mobile/VerifyHandlerFactory.php
index 54f5ba6..f057a8b 100644
--- a/src/Factory/Handler/Api/Authentication/Mobile/VerifyHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Mobile/VerifyHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Mobile;
+namespace Pi\User\Factory\Handler\Api\Authentication\Mobile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Mobile\VerifyHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Mobile\VerifyHandler;
+use Pi\User\Service\AccountService;
 
 class VerifyHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Oauth/GoogleHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Oauth/GoogleHandlerFactory.php
index 5d3174d..63c65f3 100644
--- a/src/Factory/Handler/Api/Authentication/Oauth/GoogleHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Oauth/GoogleHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Factory\Handler\Api\Authentication\Oauth;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Authentication\Oauth\GoogleHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Oauth\GoogleHandler;
-use User\Service\AccountService;
 
 class GoogleHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Oauth/MicrosoftHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Oauth/MicrosoftHandlerFactory.php
index c1b57c9..8adc722 100644
--- a/src/Factory/Handler/Api/Authentication/Oauth/MicrosoftHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Oauth/MicrosoftHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Factory\Handler\Api\Authentication\Oauth;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Authentication\Oauth\MicrosoftHandler;
+use Pi\User\Service\AccountService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Oauth\MicrosoftHandler;
-use User\Service\AccountService;
 
 class MicrosoftHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Oauth/Oauth2HandlerFactory.php b/src/Factory/Handler/Api/Authentication/Oauth/Oauth2HandlerFactory.php
index e63e0e3..2a5e9dd 100644
--- a/src/Factory/Handler/Api/Authentication/Oauth/Oauth2HandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Oauth/Oauth2HandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Factory\Handler\Api\Authentication\Oauth;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Oauth\MicrosoftHandler;
-use User\Handler\Api\Authentication\Oauth\Oauth2Handler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Oauth\MicrosoftHandler;
+use Pi\User\Handler\Api\Authentication\Oauth\Oauth2Handler;
+use Pi\User\Service\AccountService;
 
 class Oauth2HandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/Oauth/SettingHandlerFactory.php b/src/Factory/Handler/Api/Authentication/Oauth/SettingHandlerFactory.php
index 82f47b5..2132dcc 100644
--- a/src/Factory/Handler/Api/Authentication/Oauth/SettingHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/Oauth/SettingHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Factory\Handler\Api\Authentication\Oauth;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,8 +8,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\Oauth\SettingHandler;
-use User\Service\AccountService;
+use Pi\User\Handler\Api\Authentication\Oauth\SettingHandler;
+use Pi\User\Service\AccountService;
 
 class SettingHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/RefreshHandlerFactory.php b/src/Factory/Handler/Api/Authentication/RefreshHandlerFactory.php
index 7b94909..4b04873 100644
--- a/src/Factory/Handler/Api/Authentication/RefreshHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/RefreshHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication;
+namespace Pi\User\Factory\Handler\Api\Authentication;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\RefreshHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Handler\Api\Authentication\RefreshHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class RefreshHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Authentication/RegisterHandlerFactory.php b/src/Factory/Handler/Api/Authentication/RegisterHandlerFactory.php
index b59eeaa..4c87b0f 100644
--- a/src/Factory/Handler/Api/Authentication/RegisterHandlerFactory.php
+++ b/src/Factory/Handler/Api/Authentication/RegisterHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Authentication;
+namespace Pi\User\Factory\Handler\Api\Authentication;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Authentication\RegisterHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Handler\Api\Authentication\RegisterHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class RegisterHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Avatar/UploadHandlerFactory.php b/src/Factory/Handler/Api/Avatar/UploadHandlerFactory.php
index 97f482c..21f3bd8 100644
--- a/src/Factory/Handler/Api/Avatar/UploadHandlerFactory.php
+++ b/src/Factory/Handler/Api/Avatar/UploadHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Avatar;
+namespace Pi\User\Factory\Handler\Api\Avatar;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Avatar\UploadHandler;
-use User\Service\AccountService;
-use User\Service\AvatarService;
+use Pi\User\Handler\Api\Avatar\UploadHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\AvatarService;
 
 class UploadHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Captcha/ReCaptcha/VerifyHandlerFactory.php b/src/Factory/Handler/Api/Captcha/ReCaptcha/VerifyHandlerFactory.php
index 11c46bf..55c5a20 100644
--- a/src/Factory/Handler/Api/Captcha/ReCaptcha/VerifyHandlerFactory.php
+++ b/src/Factory/Handler/Api/Captcha/ReCaptcha/VerifyHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Captcha\ReCaptcha;
+namespace Pi\User\Factory\Handler\Api\Captcha\ReCaptcha;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,7 +8,7 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Captcha\ReCaptcha\VerifyHandler;
+use Pi\User\Handler\Api\Captcha\ReCaptcha\VerifyHandler;
 
 class VerifyHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Password/AddHandlerFactory.php b/src/Factory/Handler/Api/Password/AddHandlerFactory.php
index cc5fffd..317ac6e 100644
--- a/src/Factory/Handler/Api/Password/AddHandlerFactory.php
+++ b/src/Factory/Handler/Api/Password/AddHandlerFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Factory\Handler\Api\Password;
+namespace Pi\User\Factory\Handler\Api\Password;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Password\AddHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Password\AddHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
 
 class AddHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Password/UpdateHandlerFactory.php b/src/Factory/Handler/Api/Password/UpdateHandlerFactory.php
index a50ec08..6dd0128 100644
--- a/src/Factory/Handler/Api/Password/UpdateHandlerFactory.php
+++ b/src/Factory/Handler/Api/Password/UpdateHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Password;
+namespace Pi\User\Factory\Handler\Api\Password;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Password\UpdateHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Handler\Api\Password\UpdateHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class UpdateHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Profile/DeviceTokenHandlerFactory.php b/src/Factory/Handler/Api/Profile/DeviceTokenHandlerFactory.php
index da25178..8f6d4b7 100644
--- a/src/Factory/Handler/Api/Profile/DeviceTokenHandlerFactory.php
+++ b/src/Factory/Handler/Api/Profile/DeviceTokenHandlerFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Factory\Handler\Api\Profile;
+namespace Pi\User\Factory\Handler\Api\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Profile\DeviceTokenHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Profile\DeviceTokenHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
 
 class DeviceTokenHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Profile/HistoryHandlerFactory.php b/src/Factory/Handler/Api/Profile/HistoryHandlerFactory.php
index 60a1ab3..b7f5d41 100644
--- a/src/Factory/Handler/Api/Profile/HistoryHandlerFactory.php
+++ b/src/Factory/Handler/Api/Profile/HistoryHandlerFactory.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Factory\Handler\Api\Profile;
+namespace Pi\User\Factory\Handler\Api\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Handler\Api\Profile\HistoryHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\HistoryService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Profile\HistoryHandler;
-use User\Service\AccountService;
-use User\Service\HistoryService;
 
 class HistoryHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Profile/UpdateHandlerFactory.php b/src/Factory/Handler/Api/Profile/UpdateHandlerFactory.php
index 63bcfa3..8af2b74 100644
--- a/src/Factory/Handler/Api/Profile/UpdateHandlerFactory.php
+++ b/src/Factory/Handler/Api/Profile/UpdateHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Profile;
+namespace Pi\User\Factory\Handler\Api\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Profile\UpdateHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Handler\Api\Profile\UpdateHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class UpdateHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/Api/Profile/ViewHandlerFactory.php b/src/Factory/Handler/Api/Profile/ViewHandlerFactory.php
index 0ad613b..0d6ffb9 100644
--- a/src/Factory/Handler/Api/Profile/ViewHandlerFactory.php
+++ b/src/Factory/Handler/Api/Profile/ViewHandlerFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Handler\Api\Profile;
+namespace Pi\User\Factory\Handler\Api\Profile;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -8,9 +8,9 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\Api\Profile\ViewHandler;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Handler\Api\Profile\ViewHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class ViewHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Handler/InstallerHandlerFactory.php b/src/Factory/Handler/InstallerHandlerFactory.php
index 7c0a5e1..4bb0e44 100644
--- a/src/Factory/Handler/InstallerHandlerFactory.php
+++ b/src/Factory/Handler/InstallerHandlerFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Handler;
+namespace Pi\User\Factory\Handler;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\InstallerService;
+use Pi\User\Handler\InstallerHandler;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Handler\InstallerHandler;
 
 class InstallerHandlerFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/AuthenticationMiddlewareFactory.php b/src/Factory/Middleware/AuthenticationMiddlewareFactory.php
index 47c2ae0..fe05941 100644
--- a/src/Factory/Middleware/AuthenticationMiddlewareFactory.php
+++ b/src/Factory/Middleware/AuthenticationMiddlewareFactory.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace User\Factory\Middleware;
+namespace Pi\User\Factory\Middleware;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Handler\ErrorHandler;
 use Pi\Core\Security\Account\AccountLocked;
 use Pi\Core\Service\CacheService;
+use Pi\User\Middleware\AuthenticationMiddleware;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Middleware\AuthenticationMiddleware;
-use User\Service\AccountService;
-use User\Service\TokenService;
 
 class AuthenticationMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/AuthorizationMiddlewareFactory.php b/src/Factory/Middleware/AuthorizationMiddlewareFactory.php
index 8ebcef5..fb05fc5 100644
--- a/src/Factory/Middleware/AuthorizationMiddlewareFactory.php
+++ b/src/Factory/Middleware/AuthorizationMiddlewareFactory.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace User\Factory\Middleware;
+namespace Pi\User\Factory\Middleware;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Handler\ErrorHandler;
+use Pi\User\Middleware\AuthorizationMiddleware;
+use Pi\User\Service\PermissionService;
+use Pi\User\Service\RoleService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Middleware\AuthorizationMiddleware;
-use User\Service\PermissionService;
-use User\Service\RoleService;
 
 class AuthorizationMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php b/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php
index 5b44dce..21b372a 100644
--- a/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php
+++ b/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace User\Factory\Middleware;
+namespace Pi\User\Factory\Middleware;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Handler\ErrorHandler;
 use Pi\Core\Middleware\SecurityMiddleware;
+use Pi\User\Middleware\AvatarUploadMiddleware;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\AvatarService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Middleware\AvatarUploadMiddleware;
-use User\Service\AccountService;
-use User\Service\AvatarService;
 
 class AvatarUploadMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Middleware/ValidationMiddlewareFactory.php b/src/Factory/Middleware/ValidationMiddlewareFactory.php
index c90de64..1774e1b 100644
--- a/src/Factory/Middleware/ValidationMiddlewareFactory.php
+++ b/src/Factory/Middleware/ValidationMiddlewareFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Middleware;
+namespace Pi\User\Factory\Middleware;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Handler\ErrorHandler;
@@ -11,8 +11,8 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
-use User\Middleware\ValidationMiddleware;
-use User\Service\AccountService;
+use Pi\User\Middleware\ValidationMiddleware;
+use Pi\User\Service\AccountService;
 
 class ValidationMiddlewareFactory implements FactoryInterface
 {
diff --git a/src/Factory/Repository/AccountRepositoryFactory.php b/src/Factory/Repository/AccountRepositoryFactory.php
index 50c6df1..b3c58db 100644
--- a/src/Factory/Repository/AccountRepositoryFactory.php
+++ b/src/Factory/Repository/AccountRepositoryFactory.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace User\Factory\Repository;
+namespace Pi\User\Factory\Repository;
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\ReflectionHydrator;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Model\Account\Account;
+use Pi\User\Model\Account\AccountProfile;
+use Pi\User\Model\Account\Credential;
+use Pi\User\Model\Account\MultiFactor;
+use Pi\User\Model\Account\Profile;
+use Pi\User\Model\Role\Account as AccountRole;
+use Pi\User\Repository\AccountRepository;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Account\Account;
-use User\Model\Account\AccountProfile;
-use User\Model\Account\Credential;
-use User\Model\Account\MultiFactor;
-use User\Model\Account\Profile;
-use User\Model\Role\Account as AccountRole;
-use User\Repository\AccountRepository;
 
 class AccountRepositoryFactory implements FactoryInterface
 {
diff --git a/src/Factory/Repository/PermissionRepositoryFactory.php b/src/Factory/Repository/PermissionRepositoryFactory.php
index 44562a0..e80a628 100644
--- a/src/Factory/Repository/PermissionRepositoryFactory.php
+++ b/src/Factory/Repository/PermissionRepositoryFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Repository;
+namespace Pi\User\Factory\Repository;
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\ReflectionHydrator;
@@ -8,10 +8,10 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Permission\Page;
-use User\Model\Permission\Resource;
-use User\Model\Permission\Role;
-use User\Repository\PermissionRepository;
+use Pi\User\Model\Permission\Page;
+use Pi\User\Model\Permission\Resource;
+use Pi\User\Model\Permission\Role;
+use Pi\User\Repository\PermissionRepository;
 
 class PermissionRepositoryFactory implements FactoryInterface
 {
diff --git a/src/Factory/Repository/ProfileRepositoryFactory.php b/src/Factory/Repository/ProfileRepositoryFactory.php
index d82242b..b4ec939 100644
--- a/src/Factory/Repository/ProfileRepositoryFactory.php
+++ b/src/Factory/Repository/ProfileRepositoryFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Repository;
+namespace Pi\User\Factory\Repository;
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\ReflectionHydrator;
@@ -8,8 +8,8 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Profile\Profile;
-use User\Repository\ProfileRepository;
+use Pi\User\Model\Profile\Profile;
+use Pi\User\Repository\ProfileRepository;
 
 class ProfileRepositoryFactory implements FactoryInterface
 {
diff --git a/src/Factory/Repository/RoleRepositoryFactory.php b/src/Factory/Repository/RoleRepositoryFactory.php
index cf9cb46..4ab1ddf 100644
--- a/src/Factory/Repository/RoleRepositoryFactory.php
+++ b/src/Factory/Repository/RoleRepositoryFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Repository;
+namespace Pi\User\Factory\Repository;
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\ReflectionHydrator;
@@ -8,9 +8,9 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Model\Role\Account;
-use User\Model\Role\Resource;
-use User\Repository\RoleRepository;
+use Pi\User\Model\Role\Account;
+use Pi\User\Model\Role\Resource;
+use Pi\User\Repository\RoleRepository;
 
 class RoleRepositoryFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/AccountServiceFactory.php b/src/Factory/Service/AccountServiceFactory.php
index 4effdb0..c5f3996 100644
--- a/src/Factory/Service/AccountServiceFactory.php
+++ b/src/Factory/Service/AccountServiceFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Notification\Service\NotificationService;
@@ -9,16 +9,16 @@
 use Pi\Core\Service\CacheService;
 use Pi\Core\Service\TranslatorService;
 use Pi\Core\Service\UtilityService;
+use Pi\User\Repository\AccountRepositoryInterface;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\AvatarService;
+use Pi\User\Service\HistoryService;
+use Pi\User\Service\PermissionService;
+use Pi\User\Service\RoleService;
+use Pi\User\Service\TokenService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Repository\AccountRepositoryInterface;
-use User\Service\AccountService;
-use User\Service\AvatarService;
-use User\Service\HistoryService;
-use User\Service\PermissionService;
-use User\Service\RoleService;
-use User\Service\TokenService;
 
 class AccountServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/AvatarServiceFactory.php b/src/Factory/Service/AvatarServiceFactory.php
index f8e0b3d..a32d65d 100644
--- a/src/Factory/Service/AvatarServiceFactory.php
+++ b/src/Factory/Service/AvatarServiceFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Service\AvatarService;
+use Pi\User\Service\HistoryService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AvatarService;
-use User\Service\HistoryService;
 
 class AvatarServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/ExportServiceFactory.php b/src/Factory/Service/ExportServiceFactory.php
index 7789379..5b6b9f1 100644
--- a/src/Factory/Service/ExportServiceFactory.php
+++ b/src/Factory/Service/ExportServiceFactory.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Service\ExportService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\ExportService;
 
 class ExportServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/HistoryServiceFactory.php b/src/Factory/Service/HistoryServiceFactory.php
index eb276dc..564dd10 100644
--- a/src/Factory/Service/HistoryServiceFactory.php
+++ b/src/Factory/Service/HistoryServiceFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Logger\Service\LoggerService;
+use Pi\User\Service\HistoryService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\HistoryService;
 
 class HistoryServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/PermissionServiceFactory.php b/src/Factory/Service/PermissionServiceFactory.php
index b8c0abb..775bb41 100644
--- a/src/Factory/Service/PermissionServiceFactory.php
+++ b/src/Factory/Service/PermissionServiceFactory.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Repository\PermissionRepositoryInterface;
-use User\Service\PermissionService;
+use Pi\User\Repository\PermissionRepositoryInterface;
+use Pi\User\Service\PermissionService;
 
 class PermissionServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/RoleServiceFactory.php b/src/Factory/Service/RoleServiceFactory.php
index d3d6478..0f8c4f2 100644
--- a/src/Factory/Service/RoleServiceFactory.php
+++ b/src/Factory/Service/RoleServiceFactory.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Repository\RoleRepositoryInterface;
-use User\Service\HistoryService;
-use User\Service\RoleService;
+use Pi\User\Repository\RoleRepositoryInterface;
+use Pi\User\Service\HistoryService;
+use Pi\User\Service\RoleService;
 
 class RoleServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Service/TokenServiceFactory.php b/src/Factory/Service/TokenServiceFactory.php
index 86c5176..1f89969 100644
--- a/src/Factory/Service/TokenServiceFactory.php
+++ b/src/Factory/Service/TokenServiceFactory.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace User\Factory\Service;
+namespace Pi\User\Factory\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
 use Psr\Container\ContainerInterface;
-use User\Service\TokenService;
+use Pi\User\Service\TokenService;
 
 class TokenServiceFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/EmailValidatorFactory.php b/src/Factory/Validator/EmailValidatorFactory.php
index 3395452..8e2a0ce 100644
--- a/src/Factory/Validator/EmailValidatorFactory.php
+++ b/src/Factory/Validator/EmailValidatorFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\EmailValidator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\EmailValidator;
 
 class EmailValidatorFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/IdentityValidatorFactory.php b/src/Factory/Validator/IdentityValidatorFactory.php
index ef25dbf..273c260 100644
--- a/src/Factory/Validator/IdentityValidatorFactory.php
+++ b/src/Factory/Validator/IdentityValidatorFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\IdentityValidator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\IdentityValidator;
 
 class IdentityValidatorFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/MobileValidatorFactory.php b/src/Factory/Validator/MobileValidatorFactory.php
index 6ad835e..9fc6465 100644
--- a/src/Factory/Validator/MobileValidatorFactory.php
+++ b/src/Factory/Validator/MobileValidatorFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\MobileValidator;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\MobileValidator;
 
 class MobileValidatorFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/NameValidatorFactory.php b/src/Factory/Validator/NameValidatorFactory.php
index 8a5475f..7ba0e1d 100644
--- a/src/Factory/Validator/NameValidatorFactory.php
+++ b/src/Factory/Validator/NameValidatorFactory.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\NameValidator;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\NameValidator;
 
 class NameValidatorFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/OtpValidatorFactory.php b/src/Factory/Validator/OtpValidatorFactory.php
index b1acf6c..859acc7 100644
--- a/src/Factory/Validator/OtpValidatorFactory.php
+++ b/src/Factory/Validator/OtpValidatorFactory.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\CacheService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\OtpValidator;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\OtpValidator;
 
 class OtpValidatorFactory implements FactoryInterface
 {
diff --git a/src/Factory/Validator/PasswordValidatorFactory.php b/src/Factory/Validator/PasswordValidatorFactory.php
index 2f0897f..fea2f99 100644
--- a/src/Factory/Validator/PasswordValidatorFactory.php
+++ b/src/Factory/Validator/PasswordValidatorFactory.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Factory\Validator;
+namespace Pi\User\Factory\Validator;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Pi\Core\Service\UtilityService;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use User\Service\AccountService;
-use User\Validator\PasswordValidator;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\PasswordValidator;
 
 class PasswordValidatorFactory implements FactoryInterface
 {
diff --git a/src/Handler/Admin/Cache/DeleteHandler.php b/src/Handler/Admin/Cache/DeleteHandler.php
index becc900..f95bc52 100644
--- a/src/Handler/Admin/Cache/DeleteHandler.php
+++ b/src/Handler/Admin/Cache/DeleteHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Cache;
+namespace Pi\User\Handler\Admin\Cache;
 
 use Laminas\Diactoros\Response\JsonResponse;
 use Pi\Core\Service\CacheService;
diff --git a/src/Handler/Admin/Cache/ListHandler.php b/src/Handler/Admin/Cache/ListHandler.php
index d4e67dd..26a3abf 100644
--- a/src/Handler/Admin/Cache/ListHandler.php
+++ b/src/Handler/Admin/Cache/ListHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Cache;
+namespace Pi\User\Handler\Admin\Cache;
 
 use Laminas\Diactoros\Response\JsonResponse;
 use Pi\Core\Service\CacheService;
diff --git a/src/Handler/Admin/Cache/PersistHandler.php b/src/Handler/Admin/Cache/PersistHandler.php
index d1f2334..4b11277 100644
--- a/src/Handler/Admin/Cache/PersistHandler.php
+++ b/src/Handler/Admin/Cache/PersistHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Cache;
+namespace Pi\User\Handler\Admin\Cache;
 
 use Laminas\Diactoros\Response\JsonResponse;
 use Pi\Core\Service\CacheService;
diff --git a/src/Handler/Admin/Cache/ViewHandler.php b/src/Handler/Admin/Cache/ViewHandler.php
index 2294d50..a70d53c 100644
--- a/src/Handler/Admin/Cache/ViewHandler.php
+++ b/src/Handler/Admin/Cache/ViewHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Cache;
+namespace Pi\User\Handler\Admin\Cache;
 
 use Laminas\Diactoros\Response\JsonResponse;
 use Pi\Core\Service\CacheService;
diff --git a/src/Handler/Admin/Permission/Page/ListHandler.php b/src/Handler/Admin/Permission/Page/ListHandler.php
index 5a83f29..e5eae31 100644
--- a/src/Handler/Admin/Permission/Page/ListHandler.php
+++ b/src/Handler/Admin/Permission/Page/ListHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Permission\Page;
+namespace Pi\User\Handler\Admin\Permission\Page;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\PermissionService;
 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 User\Service\PermissionService;
 
 class ListHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Permission/Resource/ListHandler.php b/src/Handler/Admin/Permission/Resource/ListHandler.php
index 0f9ccd1..ccf28a2 100644
--- a/src/Handler/Admin/Permission/Resource/ListHandler.php
+++ b/src/Handler/Admin/Permission/Resource/ListHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Permission\Resource;
+namespace Pi\User\Handler\Admin\Permission\Resource;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\PermissionService;
 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 User\Service\PermissionService;
 
 class ListHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Permission/Role/ListHandler.php b/src/Handler/Admin/Permission/Role/ListHandler.php
index 59161b4..2c79464 100644
--- a/src/Handler/Admin/Permission/Role/ListHandler.php
+++ b/src/Handler/Admin/Permission/Role/ListHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Permission\Role;
+namespace Pi\User\Handler\Admin\Permission\Role;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\PermissionService;
 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 User\Service\PermissionService;
 
 class ListHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/AddHandler.php b/src/Handler/Admin/Profile/AddHandler.php
index 506ac8a..56ecc9d 100644
--- a/src/Handler/Admin/Profile/AddHandler.php
+++ b/src/Handler/Admin/Profile/AddHandler.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
 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 User\Service\AccountService;
 
 class AddHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/CleanHandler.php b/src/Handler/Admin/Profile/CleanHandler.php
index e12946a..368ee2c 100644
--- a/src/Handler/Admin/Profile/CleanHandler.php
+++ b/src/Handler/Admin/Profile/CleanHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
 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 User\Service\AccountService;
 
 class CleanHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/DeleteHandler.php b/src/Handler/Admin/Profile/DeleteHandler.php
index f7e5e7e..99f539d 100644
--- a/src/Handler/Admin/Profile/DeleteHandler.php
+++ b/src/Handler/Admin/Profile/DeleteHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
 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 User\Service\AccountService;
 
 class DeleteHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/EditHandler.php b/src/Handler/Admin/Profile/EditHandler.php
index 3f5264f..bf94c71 100644
--- a/src/Handler/Admin/Profile/EditHandler.php
+++ b/src/Handler/Admin/Profile/EditHandler.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
 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 User\Service\AccountService;
 
 class EditHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/ExportHandler.php b/src/Handler/Admin/Profile/ExportHandler.php
index e2408e0..c09924c 100644
--- a/src/Handler/Admin/Profile/ExportHandler.php
+++ b/src/Handler/Admin/Profile/ExportHandler.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
 use Media\Service\MediaService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\ExportService;
 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 User\Service\AccountService;
-use User\Service\ExportService;
 
 class ExportHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/ListHandler.php b/src/Handler/Admin/Profile/ListHandler.php
index aef3052..04831fa 100644
--- a/src/Handler/Admin/Profile/ListHandler.php
+++ b/src/Handler/Admin/Profile/ListHandler.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
 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 User\Service\AccountService;
 
 class ListHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/PasswordHandler.php b/src/Handler/Admin/Profile/PasswordHandler.php
index 627f980..fe4df7e 100644
--- a/src/Handler/Admin/Profile/PasswordHandler.php
+++ b/src/Handler/Admin/Profile/PasswordHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class PasswordHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/StatusHandler.php b/src/Handler/Admin/Profile/StatusHandler.php
index 6e563b5..ede653b 100644
--- a/src/Handler/Admin/Profile/StatusHandler.php
+++ b/src/Handler/Admin/Profile/StatusHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class StatusHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Profile/ViewHandler.php b/src/Handler/Admin/Profile/ViewHandler.php
index 07f881a..e47f44e 100644
--- a/src/Handler/Admin/Profile/ViewHandler.php
+++ b/src/Handler/Admin/Profile/ViewHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Admin\Profile;
+namespace Pi\User\Handler\Admin\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class ViewHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Role/AddHandler.php b/src/Handler/Admin/Role/AddHandler.php
index bfe55f7..dc0aba5 100644
--- a/src/Handler/Admin/Role/AddHandler.php
+++ b/src/Handler/Admin/Role/AddHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Role;
+namespace Pi\User\Handler\Admin\Role;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\RoleService;
 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\RoleService;
 
 class AddHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Role/DeleteHandler.php b/src/Handler/Admin/Role/DeleteHandler.php
index 4b2062e..9bd051a 100644
--- a/src/Handler/Admin/Role/DeleteHandler.php
+++ b/src/Handler/Admin/Role/DeleteHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Role;
+namespace Pi\User\Handler\Admin\Role;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\RoleService;
 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\RoleService;
 
 class DeleteHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Role/EditHandler.php b/src/Handler/Admin/Role/EditHandler.php
index 1e17043..5667f26 100644
--- a/src/Handler/Admin/Role/EditHandler.php
+++ b/src/Handler/Admin/Role/EditHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace User\Handler\Admin\Role;
+namespace Pi\User\Handler\Admin\Role;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\RoleService;
 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\RoleService;
 
 class EditHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Admin/Role/ListHandler.php b/src/Handler/Admin/Role/ListHandler.php
index 6711f3b..3fa480a 100644
--- a/src/Handler/Admin/Role/ListHandler.php
+++ b/src/Handler/Admin/Role/ListHandler.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace User\Handler\Admin\Role;
+namespace Pi\User\Handler\Admin\Role;
 
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\RoleService;
 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 User\Service\RoleService;
 
 class ListHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Email/RequestHandler.php b/src/Handler/Api/Authentication/Email/RequestHandler.php
index 63edffd..149782e 100644
--- a/src/Handler/Api/Authentication/Email/RequestHandler.php
+++ b/src/Handler/Api/Authentication/Email/RequestHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Email;
+namespace Pi\User\Handler\Api\Authentication\Email;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class RequestHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Email/VerifyHandler.php b/src/Handler/Api/Authentication/Email/VerifyHandler.php
index 386912b..264f917 100644
--- a/src/Handler/Api/Authentication/Email/VerifyHandler.php
+++ b/src/Handler/Api/Authentication/Email/VerifyHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Email;
+namespace Pi\User\Handler\Api\Authentication\Email;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class VerifyHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/LoginHandler.php b/src/Handler/Api/Authentication/LoginHandler.php
index b57a01d..7d0806e 100644
--- a/src/Handler/Api/Authentication/LoginHandler.php
+++ b/src/Handler/Api/Authentication/LoginHandler.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Handler\Api\Authentication;
+namespace Pi\User\Handler\Api\Authentication;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 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 User\Service\AccountService;
-use User\Service\TokenService;
 
 class LoginHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/LogoutHandler.php b/src/Handler/Api/Authentication/LogoutHandler.php
index b4ba346..8fc95f7 100644
--- a/src/Handler/Api/Authentication/LogoutHandler.php
+++ b/src/Handler/Api/Authentication/LogoutHandler.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Handler\Api\Authentication;
+namespace Pi\User\Handler\Api\Authentication;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 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 User\Service\AccountService;
-use User\Service\TokenService;
 
 class LogoutHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Mfa/RequestHandler.php b/src/Handler/Api/Authentication/Mfa/RequestHandler.php
index 4d60a89..aed2a49 100644
--- a/src/Handler/Api/Authentication/Mfa/RequestHandler.php
+++ b/src/Handler/Api/Authentication/Mfa/RequestHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Mfa;
+namespace Pi\User\Handler\Api\Authentication\Mfa;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class RequestHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Mfa/VerifyHandler.php b/src/Handler/Api/Authentication/Mfa/VerifyHandler.php
index 88526f7..258c550 100644
--- a/src/Handler/Api/Authentication/Mfa/VerifyHandler.php
+++ b/src/Handler/Api/Authentication/Mfa/VerifyHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Mfa;
+namespace Pi\User\Handler\Api\Authentication\Mfa;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class VerifyHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Mobile/RequestHandler.php b/src/Handler/Api/Authentication/Mobile/RequestHandler.php
index 78ecdf0..026d7e7 100644
--- a/src/Handler/Api/Authentication/Mobile/RequestHandler.php
+++ b/src/Handler/Api/Authentication/Mobile/RequestHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Mobile;
+namespace Pi\User\Handler\Api\Authentication\Mobile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class RequestHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Mobile/VerifyHandler.php b/src/Handler/Api/Authentication/Mobile/VerifyHandler.php
index 685cb7a..ffd3c7e 100644
--- a/src/Handler/Api/Authentication/Mobile/VerifyHandler.php
+++ b/src/Handler/Api/Authentication/Mobile/VerifyHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Mobile;
+namespace Pi\User\Handler\Api\Authentication\Mobile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class VerifyHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Oauth/GoogleHandler.php b/src/Handler/Api/Authentication/Oauth/GoogleHandler.php
index 9a30875..c2ac4f1 100644
--- a/src/Handler/Api/Authentication/Oauth/GoogleHandler.php
+++ b/src/Handler/Api/Authentication/Oauth/GoogleHandler.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Handler\Api\Authentication\Oauth;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Hybridauth\Exception\UnexpectedApiResponseException;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Authentication\Oauth\Google;
+use Pi\User\Service\AccountService;
 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 User\Authentication\Oauth\Google;
-use User\Service\AccountService;
 
 class GoogleHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Oauth/MicrosoftHandler.php b/src/Handler/Api/Authentication/Oauth/MicrosoftHandler.php
index 569fbfe..fcf2a6c 100644
--- a/src/Handler/Api/Authentication/Oauth/MicrosoftHandler.php
+++ b/src/Handler/Api/Authentication/Oauth/MicrosoftHandler.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Handler\Api\Authentication\Oauth;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Hybridauth\Exception\UnexpectedApiResponseException;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Authentication\Oauth\Microsoft;
+use Pi\User\Service\AccountService;
 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 User\Authentication\Oauth\Microsoft;
-use User\Service\AccountService;
 
 class MicrosoftHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Oauth/Oauth2Handler.php b/src/Handler/Api/Authentication/Oauth/Oauth2Handler.php
index 5d2e617..a6705e2 100644
--- a/src/Handler/Api/Authentication/Oauth/Oauth2Handler.php
+++ b/src/Handler/Api/Authentication/Oauth/Oauth2Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Handler\Api\Authentication\Oauth;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Authentication\Oauth\Oauth2;
-use User\Service\AccountService;
+use Pi\User\Authentication\Oauth\Oauth2;
+use Pi\User\Service\AccountService;
 
 class Oauth2Handler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/Oauth/SettingHandler.php b/src/Handler/Api/Authentication/Oauth/SettingHandler.php
index b8da297..130f0f7 100644
--- a/src/Handler/Api/Authentication/Oauth/SettingHandler.php
+++ b/src/Handler/Api/Authentication/Oauth/SettingHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication\Oauth;
+namespace Pi\User\Handler\Api\Authentication\Oauth;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,7 +9,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class SettingHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/RefreshHandler.php b/src/Handler/Api/Authentication/RefreshHandler.php
index 6d0ccbd..a27be6d 100644
--- a/src/Handler/Api/Authentication/RefreshHandler.php
+++ b/src/Handler/Api/Authentication/RefreshHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication;
+namespace Pi\User\Handler\Api\Authentication;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class RefreshHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Authentication/RegisterHandler.php b/src/Handler/Api/Authentication/RegisterHandler.php
index eb5923f..aaa8e64 100644
--- a/src/Handler/Api/Authentication/RegisterHandler.php
+++ b/src/Handler/Api/Authentication/RegisterHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Authentication;
+namespace Pi\User\Handler\Api\Authentication;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class RegisterHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Avatar/UploadHandler.php b/src/Handler/Api/Avatar/UploadHandler.php
index 383c854..dcdc2db 100644
--- a/src/Handler/Api/Avatar/UploadHandler.php
+++ b/src/Handler/Api/Avatar/UploadHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Avatar;
+namespace Pi\User\Handler\Api\Avatar;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\AvatarService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\AvatarService;
 
 class UploadHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Captcha/ReCaptcha/VerifyHandler.php b/src/Handler/Api/Captcha/ReCaptcha/VerifyHandler.php
index b8b25e0..47dadbe 100644
--- a/src/Handler/Api/Captcha/ReCaptcha/VerifyHandler.php
+++ b/src/Handler/Api/Captcha/ReCaptcha/VerifyHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Captcha\ReCaptcha;
+namespace Pi\User\Handler\Api\Captcha\ReCaptcha;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
diff --git a/src/Handler/Api/Password/AddHandler.php b/src/Handler/Api/Password/AddHandler.php
index 1c140dd..759f4be 100644
--- a/src/Handler/Api/Password/AddHandler.php
+++ b/src/Handler/Api/Password/AddHandler.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Handler\Api\Password;
+namespace Pi\User\Handler\Api\Password;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 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 User\Service\AccountService;
-use User\Service\TokenService;
 
 class AddHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Password/UpdateHandler.php b/src/Handler/Api/Password/UpdateHandler.php
index d3689b5..7ac4cd1 100644
--- a/src/Handler/Api/Password/UpdateHandler.php
+++ b/src/Handler/Api/Password/UpdateHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Password;
+namespace Pi\User\Handler\Api\Password;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class UpdateHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Profile/DeviceTokenHandler.php b/src/Handler/Api/Profile/DeviceTokenHandler.php
index 6f87e81..a8f0c88 100644
--- a/src/Handler/Api/Profile/DeviceTokenHandler.php
+++ b/src/Handler/Api/Profile/DeviceTokenHandler.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Handler\Api\Profile;
+namespace Pi\User\Handler\Api\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 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 User\Service\AccountService;
-use User\Service\TokenService;
 
 class DeviceTokenHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Profile/HistoryHandler.php b/src/Handler/Api/Profile/HistoryHandler.php
index d767156..8cca322 100644
--- a/src/Handler/Api/Profile/HistoryHandler.php
+++ b/src/Handler/Api/Profile/HistoryHandler.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace User\Handler\Api\Profile;
+namespace Pi\User\Handler\Api\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\HistoryService;
 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 User\Service\AccountService;
-use User\Service\HistoryService;
 
 class HistoryHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Profile/UpdateHandler.php b/src/Handler/Api/Profile/UpdateHandler.php
index 4742eb4..6037c5e 100644
--- a/src/Handler/Api/Profile/UpdateHandler.php
+++ b/src/Handler/Api/Profile/UpdateHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Profile;
+namespace Pi\User\Handler\Api\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class UpdateHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/Api/Profile/ViewHandler.php b/src/Handler/Api/Profile/ViewHandler.php
index 1a6a018..e70f415 100644
--- a/src/Handler/Api/Profile/ViewHandler.php
+++ b/src/Handler/Api/Profile/ViewHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler\Api\Profile;
+namespace Pi\User\Handler\Api\Profile;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\JsonResponse;
@@ -9,8 +9,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Service\TokenService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 
 class ViewHandler implements RequestHandlerInterface
 {
diff --git a/src/Handler/InstallerHandler.php b/src/Handler/InstallerHandler.php
index 61b06bb..88bc4d5 100644
--- a/src/Handler/InstallerHandler.php
+++ b/src/Handler/InstallerHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Handler;
+namespace Pi\User\Handler;
 
 use Laminas\Diactoros\Response\JsonResponse;
 use Pi\Core\Service\InstallerService;
diff --git a/src/Middleware/AuthenticationMiddleware.php b/src/Middleware/AuthenticationMiddleware.php
index 19e9ab7..7c883ac 100644
--- a/src/Middleware/AuthenticationMiddleware.php
+++ b/src/Middleware/AuthenticationMiddleware.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace User\Middleware;
+namespace Pi\User\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Pi\Core\Handler\ErrorHandler;
 use Pi\Core\Security\Account\AccountLocked;
 use Pi\Core\Service\CacheService;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\TokenService;
 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\Service\AccountService;
-use User\Service\TokenService;
 
 class AuthenticationMiddleware implements MiddlewareInterface
 {
diff --git a/src/Middleware/AuthorizationMiddleware.php b/src/Middleware/AuthorizationMiddleware.php
index 105cd40..da6fd83 100644
--- a/src/Middleware/AuthorizationMiddleware.php
+++ b/src/Middleware/AuthorizationMiddleware.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace User\Middleware;
+namespace Pi\User\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Pi\Core\Handler\ErrorHandler;
+use Pi\User\Service\PermissionService;
+use Pi\User\Service\RoleService;
 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\Service\PermissionService;
-use User\Service\RoleService;
 
 class AuthorizationMiddleware implements MiddlewareInterface
 {
diff --git a/src/Middleware/AvatarUploadMiddleware.php b/src/Middleware/AvatarUploadMiddleware.php
index f2390db..d0a7db4 100644
--- a/src/Middleware/AvatarUploadMiddleware.php
+++ b/src/Middleware/AvatarUploadMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Middleware;
+namespace Pi\User\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Validator\File\Extension;
@@ -8,14 +8,14 @@
 use Laminas\Validator\File\Size;
 use Laminas\Validator\File\UploadFile;
 use Pi\Core\Handler\ErrorHandler;
+use Pi\User\Service\AccountService;
+use Pi\User\Service\AvatarService;
 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\Service\AccountService;
-use User\Service\AvatarService;
 
 class AvatarUploadMiddleware implements MiddlewareInterface
 {
diff --git a/src/Middleware/ValidationMiddleware.php b/src/Middleware/ValidationMiddleware.php
index ea6a91f..fe2629a 100644
--- a/src/Middleware/ValidationMiddleware.php
+++ b/src/Middleware/ValidationMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Middleware;
+namespace Pi\User\Middleware;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\InputFilter\Input;
@@ -14,13 +14,13 @@
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use User\Service\AccountService;
-use User\Validator\EmailValidator;
-use User\Validator\IdentityValidator;
-use User\Validator\MobileValidator;
-use User\Validator\NameValidator;
-use User\Validator\OtpValidator;
-use User\Validator\PasswordValidator;
+use Pi\User\Service\AccountService;
+use Pi\User\Validator\EmailValidator;
+use Pi\User\Validator\IdentityValidator;
+use Pi\User\Validator\MobileValidator;
+use Pi\User\Validator\NameValidator;
+use Pi\User\Validator\OtpValidator;
+use Pi\User\Validator\PasswordValidator;
 use function sprintf;
 
 class ValidationMiddleware implements MiddlewareInterface
diff --git a/src/Model/Account/Account.php b/src/Model/Account/Account.php
index 9b1e882..8fd7886 100644
--- a/src/Model/Account/Account.php
+++ b/src/Model/Account/Account.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Account;
+namespace Pi\User\Model\Account;
 
 class Account
 {
diff --git a/src/Model/Account/AccountProfile.php b/src/Model/Account/AccountProfile.php
index 5d643dc..e0c2fe7 100644
--- a/src/Model/Account/AccountProfile.php
+++ b/src/Model/Account/AccountProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Account;
+namespace Pi\User\Model\Account;
 
 class AccountProfile
 {
diff --git a/src/Model/Account/Credential.php b/src/Model/Account/Credential.php
index 28b583b..8010992 100644
--- a/src/Model/Account/Credential.php
+++ b/src/Model/Account/Credential.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Account;
+namespace Pi\User\Model\Account;
 
 class Credential
 {
diff --git a/src/Model/Account/MultiFactor.php b/src/Model/Account/MultiFactor.php
index ad6c635..68b5f0e 100644
--- a/src/Model/Account/MultiFactor.php
+++ b/src/Model/Account/MultiFactor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Account;
+namespace Pi\User\Model\Account;
 
 class MultiFactor
 {
diff --git a/src/Model/Account/Profile.php b/src/Model/Account/Profile.php
index 537b221..b0b5be1 100644
--- a/src/Model/Account/Profile.php
+++ b/src/Model/Account/Profile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Account;
+namespace Pi\User\Model\Account;
 
 class Profile
 {
diff --git a/src/Model/Permission/AssertRolesMatches.php b/src/Model/Permission/AssertRolesMatches.php
index 3b44287..3a570e6 100644
--- a/src/Model/Permission/AssertRolesMatches.php
+++ b/src/Model/Permission/AssertRolesMatches.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Permission;
+namespace Pi\User\Model\Permission;
 
 use Laminas\Permissions\Rbac\AssertionInterface;
 use Laminas\Permissions\Rbac\Rbac;
diff --git a/src/Model/Permission/Page.php b/src/Model/Permission/Page.php
index 080ddcb..69d2ea2 100644
--- a/src/Model/Permission/Page.php
+++ b/src/Model/Permission/Page.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Permission;
+namespace Pi\User\Model\Permission;
 
 class Page
 {
diff --git a/src/Model/Permission/Resource.php b/src/Model/Permission/Resource.php
index dca233c..b95c919 100644
--- a/src/Model/Permission/Resource.php
+++ b/src/Model/Permission/Resource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Permission;
+namespace Pi\User\Model\Permission;
 
 class Resource
 {
diff --git a/src/Model/Permission/Role.php b/src/Model/Permission/Role.php
index 3de7d4a..07dccdf 100644
--- a/src/Model/Permission/Role.php
+++ b/src/Model/Permission/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Permission;
+namespace Pi\User\Model\Permission;
 
 class Role
 {
diff --git a/src/Model/Role/Account.php b/src/Model/Role/Account.php
index f23a2ae..f5bcd06 100644
--- a/src/Model/Role/Account.php
+++ b/src/Model/Role/Account.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Role;
+namespace Pi\User\Model\Role;
 
 class Account
 {
diff --git a/src/Model/Role/Resource.php b/src/Model/Role/Resource.php
index 30ed198..8bbc756 100644
--- a/src/Model/Role/Resource.php
+++ b/src/Model/Role/Resource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Model\Role;
+namespace Pi\User\Model\Role;
 
 class Resource
 {
diff --git a/src/Module.php b/src/Module.php
index fbfcfde..7242e61 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User;
+namespace Pi\User;
 
 use Laminas\Mvc\MvcEvent;
 
diff --git a/src/Repository/AccountRepository.php b/src/Repository/AccountRepository.php
index d8f2ff8..473675e 100644
--- a/src/Repository/AccountRepository.php
+++ b/src/Repository/AccountRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use InvalidArgumentException;
 use Laminas\Authentication\Adapter\DbTable\CallbackCheckAdapter;
@@ -16,14 +16,14 @@
 use Laminas\Db\Sql\Sql;
 use Laminas\Db\Sql\Update;
 use Laminas\Hydrator\HydratorInterface;
+use Pi\User\Authentication\Adapter\OauthAdapter;
+use Pi\User\Model\Account\Account;
+use Pi\User\Model\Account\AccountProfile;
+use Pi\User\Model\Account\Credential;
+use Pi\User\Model\Account\MultiFactor;
+use Pi\User\Model\Account\Profile;
+use Pi\User\Model\Role\Account as AccountRole;
 use RuntimeException;
-use User\Authentication\Adapter\OauthAdapter;
-use User\Model\Account\Account;
-use User\Model\Account\AccountProfile;
-use User\Model\Account\Credential;
-use User\Model\Account\MultiFactor;
-use User\Model\Account\Profile;
-use User\Model\Role\Account as AccountRole;
 use function sprintf;
 
 class AccountRepository implements AccountRepositoryInterface
diff --git a/src/Repository/AccountRepositoryInterface.php b/src/Repository/AccountRepositoryInterface.php
index 05f2cc2..0e27a99 100644
--- a/src/Repository/AccountRepositoryInterface.php
+++ b/src/Repository/AccountRepositoryInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use Laminas\Authentication\AuthenticationService;
 use Laminas\Authentication\Result as AuthenticationResult;
 use Laminas\Db\ResultSet\HydratingResultSet;
-use User\Model\Account\Account;
+use Pi\User\Model\Account\Account;
 
 interface AccountRepositoryInterface
 {
diff --git a/src/Repository/PermissionRepository.php b/src/Repository/PermissionRepository.php
index 6f8ddd6..6c39a6a 100644
--- a/src/Repository/PermissionRepository.php
+++ b/src/Repository/PermissionRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use InvalidArgumentException;
 use Laminas\Db\Adapter\AdapterInterface;
@@ -12,9 +12,9 @@
 use Laminas\Db\Sql\Update;
 use Laminas\Hydrator\HydratorInterface;
 use RuntimeException;
-use User\Model\Permission\Page;
-use User\Model\Permission\Resource;
-use User\Model\Permission\Role;
+use Pi\User\Model\Permission\Page;
+use Pi\User\Model\Permission\Resource;
+use Pi\User\Model\Permission\Role;
 
 class PermissionRepository implements PermissionRepositoryInterface
 {
diff --git a/src/Repository/PermissionRepositoryInterface.php b/src/Repository/PermissionRepositoryInterface.php
index ba7feba..439c546 100644
--- a/src/Repository/PermissionRepositoryInterface.php
+++ b/src/Repository/PermissionRepositoryInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use Laminas\Db\ResultSet\HydratingResultSet;
-use User\Model\Permission\Page;
-use User\Model\Permission\Resource;
-use User\Model\Permission\Role;
+use Pi\User\Model\Permission\Page;
+use Pi\User\Model\Permission\Resource;
+use Pi\User\Model\Permission\Role;
 
 interface PermissionRepositoryInterface
 {
diff --git a/src/Repository/ProfileRepository.php b/src/Repository/ProfileRepository.php
index 26921a0..a82aa88 100644
--- a/src/Repository/ProfileRepository.php
+++ b/src/Repository/ProfileRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Hydrator\HydratorInterface;
-use User\Model\Profile\Profile;
+use Pi\User\Model\Profile\Profile;
 
 class ProfileRepository implements AccountRoleRepositoryInterface
 {
diff --git a/src/Repository/ProfileRepositoryInterface.php b/src/Repository/ProfileRepositoryInterface.php
index c04f059..f87eb53 100644
--- a/src/Repository/ProfileRepositoryInterface.php
+++ b/src/Repository/ProfileRepositoryInterface.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 interface ProfileRepositoryInterface {}
\ No newline at end of file
diff --git a/src/Repository/RoleRepository.php b/src/Repository/RoleRepository.php
index c497023..c1e862b 100644
--- a/src/Repository/RoleRepository.php
+++ b/src/Repository/RoleRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use InvalidArgumentException;
 use Laminas\Db\Adapter\AdapterInterface;
@@ -12,8 +12,8 @@
 use Laminas\Db\Sql\Update;
 use Laminas\Hydrator\HydratorInterface;
 use RuntimeException;
-use User\Model\Role\Account;
-use User\Model\Role\Resource;
+use Pi\User\Model\Role\Account;
+use Pi\User\Model\Role\Resource;
 
 class RoleRepository implements RoleRepositoryInterface
 {
diff --git a/src/Repository/RoleRepositoryInterface.php b/src/Repository/RoleRepositoryInterface.php
index e82838d..87daebe 100644
--- a/src/Repository/RoleRepositoryInterface.php
+++ b/src/Repository/RoleRepositoryInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace User\Repository;
+namespace Pi\User\Repository;
 
 use Laminas\Db\ResultSet\HydratingResultSet;
-use User\Model\Role\Resource;
+use Pi\User\Model\Role\Resource;
 
 interface RoleRepositoryInterface
 {
diff --git a/src/Service/AccountService.php b/src/Service/AccountService.php
index a23495c..4c15467 100644
--- a/src/Service/AccountService.php
+++ b/src/Service/AccountService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Math\Rand;
@@ -10,11 +10,11 @@
 use Pi\Core\Service\CacheService;
 use Pi\Core\Service\TranslatorService;
 use Pi\Core\Service\UtilityService;
+use Pi\User\Repository\AccountRepositoryInterface;
 use RobThree\Auth\Algorithm;
 use RobThree\Auth\Providers\Qr\EndroidQrCodeProvider;
 use RobThree\Auth\TwoFactorAuth;
 use RobThree\Auth\TwoFactorAuthException;
-use User\Repository\AccountRepositoryInterface;
 use function array_merge;
 use function in_array;
 use function is_object;
diff --git a/src/Service/AvatarService.php b/src/Service/AvatarService.php
index 2ee3e7b..b105017 100644
--- a/src/Service/AvatarService.php
+++ b/src/Service/AvatarService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use ArrayObject;
 use Exception;
diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 0607fb0..469aae1 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
diff --git a/src/Service/HistoryService.php b/src/Service/HistoryService.php
index 1596ed4..6823c41 100644
--- a/src/Service/HistoryService.php
+++ b/src/Service/HistoryService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use Logger\Service\LoggerService;
 
diff --git a/src/Service/PermissionService.php b/src/Service/PermissionService.php
index e8e5d46..ff96968 100644
--- a/src/Service/PermissionService.php
+++ b/src/Service/PermissionService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use Laminas\Permissions\Rbac\Rbac;
 use Laminas\Permissions\Rbac\Role;
 use Pi\Core\Service\CacheService;
-use User\Model\Permission\AssertRolesMatches;
-use User\Repository\PermissionRepositoryInterface;
+use Pi\User\Model\Permission\AssertRolesMatches;
+use Pi\User\Repository\PermissionRepositoryInterface;
 
 class PermissionService implements ServiceInterface
 {
diff --git a/src/Service/RoleService.php b/src/Service/RoleService.php
index 510cdb3..c5c0376 100644
--- a/src/Service/RoleService.php
+++ b/src/Service/RoleService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use Pi\Core\Service\CacheService;
-use User\Repository\RoleRepositoryInterface;
+use Pi\User\Repository\RoleRepositoryInterface;
 use function in_array;
 
 class RoleService implements ServiceInterface
diff --git a/src/Service/ServiceInterface.php b/src/Service/ServiceInterface.php
index 04ee75d..841aa96 100644
--- a/src/Service/ServiceInterface.php
+++ b/src/Service/ServiceInterface.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 interface ServiceInterface {}
\ No newline at end of file
diff --git a/src/Service/TokenService.php b/src/Service/TokenService.php
index 6601be1..de5e05c 100644
--- a/src/Service/TokenService.php
+++ b/src/Service/TokenService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace User\Service;
+namespace Pi\User\Service;
 
 use Exception;
 use Firebase\JWT\JWT;
diff --git a/src/Validator/EmailValidator.php b/src/Validator/EmailValidator.php
index 12c68db..15e5eff 100644
--- a/src/Validator/EmailValidator.php
+++ b/src/Validator/EmailValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\Validator\EmailAddress;
 use Laminas\Validator\Hostname;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class EmailValidator extends EmailAddress
 {
diff --git a/src/Validator/IdentityValidator.php b/src/Validator/IdentityValidator.php
index ec69243..13471ea 100644
--- a/src/Validator/IdentityValidator.php
+++ b/src/Validator/IdentityValidator.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\Validator\AbstractValidator;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class IdentityValidator extends AbstractValidator
 {
diff --git a/src/Validator/MobileValidator.php b/src/Validator/MobileValidator.php
index 87c28a8..f9e4794 100644
--- a/src/Validator/MobileValidator.php
+++ b/src/Validator/MobileValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\I18n\Validator\PhoneNumber;
 use Laminas\Validator\AbstractValidator;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 use function preg_match;
 
 class MobileValidator extends AbstractValidator
diff --git a/src/Validator/NameValidator.php b/src/Validator/NameValidator.php
index 1165078..bc8a11c 100644
--- a/src/Validator/NameValidator.php
+++ b/src/Validator/NameValidator.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\Validator\AbstractValidator;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 
 class NameValidator extends AbstractValidator
 {
diff --git a/src/Validator/OtpValidator.php b/src/Validator/OtpValidator.php
index 6541d0f..d7128a7 100644
--- a/src/Validator/OtpValidator.php
+++ b/src/Validator/OtpValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\Validator\AbstractValidator;
 use Pi\Core\Service\CacheService;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 use function array_merge;
 
 class OtpValidator extends AbstractValidator
diff --git a/src/Validator/PasswordValidator.php b/src/Validator/PasswordValidator.php
index 66cffa6..4a8796d 100644
--- a/src/Validator/PasswordValidator.php
+++ b/src/Validator/PasswordValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace User\Validator;
+namespace Pi\User\Validator;
 
 use Laminas\Validator\AbstractValidator;
 use Pi\Core\Service\UtilityService;
-use User\Service\AccountService;
+use Pi\User\Service\AccountService;
 use function sprintf;
 
 class PasswordValidator extends AbstractValidator