diff --git a/application/symfony/config/services.yaml b/application/symfony/config/services.yaml
index 6fabd84..cd14d6a 100644
--- a/application/symfony/config/services.yaml
+++ b/application/symfony/config/services.yaml
@@ -42,7 +42,7 @@ services:
         public: true
     Infinito\Domain\Request\Right\RequestedRightService:
         public: true
-    Infinito\Domain\UserManagement\UserSourceDirectorService:
+    Infinito\Domain\User\UserSourceDirectorService:
         public: true
     Infinito\Domain\Request\User\RequestedUserService:
         public: true
diff --git a/application/symfony/src/Domain/Request/User/RequestedUser.php b/application/symfony/src/Domain/Request/User/RequestedUser.php
index 65a5a1f..1400012 100644
--- a/application/symfony/src/Domain/Request/User/RequestedUser.php
+++ b/application/symfony/src/Domain/Request/User/RequestedUser.php
@@ -3,7 +3,7 @@
 namespace Infinito\Domain\Request\User;
 
 use Infinito\Entity\Source\SourceInterface;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 use Infinito\Domain\Request\Right\RequestedRightInterface;
 use Infinito\Domain\Request\Right\AbstractRequestedRightFacade;
 use Infinito\Exception\Collection\NotPossibleSetElementException;
diff --git a/application/symfony/src/Domain/Request/User/RequestedUserInterface.php b/application/symfony/src/Domain/Request/User/RequestedUserInterface.php
index 3238603..fc475f4 100644
--- a/application/symfony/src/Domain/Request/User/RequestedUserInterface.php
+++ b/application/symfony/src/Domain/Request/User/RequestedUserInterface.php
@@ -3,7 +3,7 @@
 namespace Infinito\Domain\Request\User;
 
 use Infinito\Domain\Request\Right\RequestedRightInterface;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 
 /**
  * Offers a Service for managing the rights.
diff --git a/application/symfony/src/Domain/Request/User/RequestedUserService.php b/application/symfony/src/Domain/Request/User/RequestedUserService.php
index 78ea436..4cd8826 100644
--- a/application/symfony/src/Domain/Request/User/RequestedUserService.php
+++ b/application/symfony/src/Domain/Request/User/RequestedUserService.php
@@ -2,7 +2,7 @@
 
 namespace Infinito\Domain\Request\User;
 
-use Infinito\Domain\UserManagement\UserSourceDirectorServiceInterface;
+use Infinito\Domain\User\UserSourceDirectorServiceInterface;
 use Infinito\Domain\Request\Right\RequestedRightServiceInterface;
 
 /**
diff --git a/application/symfony/src/Domain/UserManagement/UserSourceDirector.php b/application/symfony/src/Domain/User/UserSourceDirector.php
similarity index 90%
rename from application/symfony/src/Domain/UserManagement/UserSourceDirector.php
rename to application/symfony/src/Domain/User/UserSourceDirector.php
index 3caeab1..3f191ba 100644
--- a/application/symfony/src/Domain/UserManagement/UserSourceDirector.php
+++ b/application/symfony/src/Domain/User/UserSourceDirector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\UserManagement;
+namespace Infinito\Domain\User;
 
 use Infinito\Entity\UserInterface;
 use Infinito\Entity\User;
@@ -49,7 +49,7 @@ final class UserSourceDirector implements UserSourceDirectorInterface
     /**
      * {@inheritdoc}
      *
-     * @see \Infinito\Domain\UserManagement\UserSourceDirectorInterface::getUser()
+     * @see \Infinito\Domain\User\UserSourceDirectorInterface::getUser()
      */
     public function getUser(): UserInterface
     {
diff --git a/application/symfony/src/Domain/UserManagement/UserSourceDirectorInterface.php b/application/symfony/src/Domain/User/UserSourceDirectorInterface.php
similarity index 86%
rename from application/symfony/src/Domain/UserManagement/UserSourceDirectorInterface.php
rename to application/symfony/src/Domain/User/UserSourceDirectorInterface.php
index 39c457e..46f3e03 100644
--- a/application/symfony/src/Domain/UserManagement/UserSourceDirectorInterface.php
+++ b/application/symfony/src/Domain/User/UserSourceDirectorInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\UserManagement;
+namespace Infinito\Domain\User;
 
 use Infinito\Entity\UserInterface;
 
diff --git a/application/symfony/src/Domain/UserManagement/UserSourceDirectorService.php b/application/symfony/src/Domain/User/UserSourceDirectorService.php
similarity index 96%
rename from application/symfony/src/Domain/UserManagement/UserSourceDirectorService.php
rename to application/symfony/src/Domain/User/UserSourceDirectorService.php
index 77c9357..90758b5 100644
--- a/application/symfony/src/Domain/UserManagement/UserSourceDirectorService.php
+++ b/application/symfony/src/Domain/User/UserSourceDirectorService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\UserManagement;
+namespace Infinito\Domain\User;
 
 use Infinito\Entity\UserInterface;
 use Doctrine\ORM\EntityManager;
diff --git a/application/symfony/src/Domain/UserManagement/UserSourceDirectorServiceInterface.php b/application/symfony/src/Domain/User/UserSourceDirectorServiceInterface.php
similarity index 83%
rename from application/symfony/src/Domain/UserManagement/UserSourceDirectorServiceInterface.php
rename to application/symfony/src/Domain/User/UserSourceDirectorServiceInterface.php
index be0f99d..d26e6d5 100644
--- a/application/symfony/src/Domain/UserManagement/UserSourceDirectorServiceInterface.php
+++ b/application/symfony/src/Domain/User/UserSourceDirectorServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\UserManagement;
+namespace Infinito\Domain\User;
 
 /**
  * Offers UserSourceDirector to be used as a Service.
diff --git a/application/symfony/src/Domain/UserManagement/UserSourceStandartRightMapInterface.php b/application/symfony/src/Domain/User/UserSourceStandartRightMapInterface.php
similarity index 89%
rename from application/symfony/src/Domain/UserManagement/UserSourceStandartRightMapInterface.php
rename to application/symfony/src/Domain/User/UserSourceStandartRightMapInterface.php
index eaf4c30..308ea6e 100644
--- a/application/symfony/src/Domain/UserManagement/UserSourceStandartRightMapInterface.php
+++ b/application/symfony/src/Domain/User/UserSourceStandartRightMapInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Infinito\Domain\UserManagement;
+namespace Infinito\Domain\User;
 
 use Infinito\DBAL\Types\Meta\Right\LayerType;
 use Infinito\DBAL\Types\ActionType;
diff --git a/application/symfony/src/Entity/Source/Complex/UserSource.php b/application/symfony/src/Entity/Source/Complex/UserSource.php
index 16c13f7..8a5cc41 100644
--- a/application/symfony/src/Entity/Source/Complex/UserSource.php
+++ b/application/symfony/src/Entity/Source/Complex/UserSource.php
@@ -7,7 +7,7 @@ use Infinito\Attribut\UserAttribut;
 use Infinito\Entity\UserInterface;
 use Infinito\Attribut\PersonIdentitySourceAttribut;
 use Infinito\Entity\Meta\Right;
-use Infinito\Domain\UserManagement\UserSourceStandartRightMapInterface;
+use Infinito\Domain\User\UserSourceStandartRightMapInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Integration/Domain/Action/Create/CreateSourceActionIntegrationTest.php b/application/symfony/tests/Integration/Domain/Action/Create/CreateSourceActionIntegrationTest.php
index 02c8794..ffa2022 100644
--- a/application/symfony/tests/Integration/Domain/Action/Create/CreateSourceActionIntegrationTest.php
+++ b/application/symfony/tests/Integration/Domain/Action/Create/CreateSourceActionIntegrationTest.php
@@ -14,7 +14,7 @@ use Infinito\Domain\Request\Action\RequestedActionServiceInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Infinito\DBAL\Types\ActionType;
 use Infinito\Domain\Request\User\RequestedUserService;
-use Infinito\Domain\UserManagement\UserSourceDirectorService;
+use Infinito\Domain\User\UserSourceDirectorService;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Infinito\Domain\Form\RequestedActionFormBuilderService;
diff --git a/application/symfony/tests/Integration/Domain/UserManagement/UserSourceDirectorServiceIntegrationTest.php b/application/symfony/tests/Integration/Domain/User/UserSourceDirectorServiceIntegrationTest.php
similarity index 85%
rename from application/symfony/tests/Integration/Domain/UserManagement/UserSourceDirectorServiceIntegrationTest.php
rename to application/symfony/tests/Integration/Domain/User/UserSourceDirectorServiceIntegrationTest.php
index ea18250..1129003 100644
--- a/application/symfony/tests/Integration/Domain/UserManagement/UserSourceDirectorServiceIntegrationTest.php
+++ b/application/symfony/tests/Integration/Domain/User/UserSourceDirectorServiceIntegrationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace tests\Integration\Domain\UserManagement;
+namespace tests\Integration\Domain\User;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Infinito\Domain\UserManagement\UserSourceDirectorServiceInterface;
+use Infinito\Domain\User\UserSourceDirectorServiceInterface;
 use Infinito\Entity\UserInterface;
 
 /**
diff --git a/application/symfony/tests/Unit/Domain/Action/ActionFactoryServiceTest.php b/application/symfony/tests/Unit/Domain/Action/ActionFactoryServiceTest.php
index cc93d52..c3a822a 100644
--- a/application/symfony/tests/Unit/Domain/Action/ActionFactoryServiceTest.php
+++ b/application/symfony/tests/Unit/Domain/Action/ActionFactoryServiceTest.php
@@ -10,7 +10,7 @@ use Infinito\Domain\Request\Action\RequestedAction;
 use Infinito\Domain\Request\Right\RequestedRight;
 use Infinito\Domain\Layer\LayerActionMap;
 use Infinito\Domain\Request\User\RequestedUser;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionServiceTest.php b/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionServiceTest.php
index 5e0ae87..d1b9fb3 100644
--- a/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionServiceTest.php
+++ b/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionServiceTest.php
@@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
 use Infinito\Domain\Request\Action\RequestedActionService;
 use Infinito\Domain\Request\Action\RequestedActionServiceInterface;
 use Infinito\Domain\Request\User\RequestedUserServiceInterface;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionTest.php b/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionTest.php
index d46bdd8..e752866 100644
--- a/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionTest.php
+++ b/application/symfony/tests/Unit/Domain/Request/Action/RequestedActionTest.php
@@ -10,7 +10,7 @@ use Infinito\Domain\Request\Action\RequestedAction;
 use Infinito\DBAL\Types\ActionType;
 use Infinito\Repository\Source\SourceRepositoryInterface;
 use Infinito\DBAL\Types\Meta\Right\LayerType;
-use Infinito\Domain\UserManagement\UserSourceDirector;
+use Infinito\Domain\User\UserSourceDirector;
 use Infinito\Domain\Request\User\RequestedUser;
 use Infinito\Entity\Source\Complex\UserSourceInterface;
 
diff --git a/application/symfony/tests/Unit/Domain/Request/Right/AbstractRequestedRightFacadeTest.php b/application/symfony/tests/Unit/Domain/Request/Right/AbstractRequestedRightFacadeTest.php
index 0aa2ef3..09aab3a 100644
--- a/application/symfony/tests/Unit/Domain/Request/Right/AbstractRequestedRightFacadeTest.php
+++ b/application/symfony/tests/Unit/Domain/Request/Right/AbstractRequestedRightFacadeTest.php
@@ -8,7 +8,7 @@ use Infinito\Domain\Request\User\RequestedUser;
 use Infinito\DBAL\Types\Meta\Right\LayerType;
 use Infinito\DBAL\Types\Meta\Right\CRUDType;
 use Infinito\Entity\Source\AbstractSource;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 use Infinito\Domain\Request\Right\RequestedRightInterface;
 use Infinito\Domain\Request\Right\RequestedRight;
 use Infinito\Domain\Request\Entity\RequestedEntityInterface;
diff --git a/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightServiceTest.php b/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightServiceTest.php
index d3fd813..44cdd35 100644
--- a/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightServiceTest.php
+++ b/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightServiceTest.php
@@ -4,7 +4,7 @@ namespace tests\Unit\Domain\Request\User;
 
 use PHPUnit\Framework\TestCase;
 use Infinito\Domain\Request\User\RequestedUserService;
-use Infinito\Domain\UserManagement\UserSourceDirectorServiceInterface;
+use Infinito\Domain\User\UserSourceDirectorServiceInterface;
 use Infinito\Domain\Request\User\RequestedUserServiceInterface;
 use Infinito\Domain\Request\Right\RequestedRightServiceInterface;
 
diff --git a/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightTest.php b/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightTest.php
index 7cce68c..99d438e 100644
--- a/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightTest.php
+++ b/application/symfony/tests/Unit/Domain/Request/User/RequestedUserRightTest.php
@@ -8,10 +8,10 @@ use Infinito\Domain\Request\User\RequestedUser;
 use Infinito\DBAL\Types\Meta\Right\LayerType;
 use Infinito\DBAL\Types\Meta\Right\CRUDType;
 use Infinito\Entity\Source\AbstractSource;
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorInterface;
 use Infinito\Domain\Request\Right\RequestedRightInterface;
 use Infinito\Domain\Request\Right\RequestedRight;
-use Infinito\Domain\UserManagement\UserSourceDirector;
+use Infinito\Domain\User\UserSourceDirector;
 use Infinito\Repository\Source\SourceRepositoryInterface;
 use Infinito\Domain\Request\Entity\RequestedEntityInterface;
 use Infinito\Domain\Fixture\FixtureSource\ImpressumFixtureSource;
diff --git a/application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorServiceTest.php b/application/symfony/tests/Unit/Domain/User/UserSourceDirectorServiceTest.php
similarity index 84%
rename from application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorServiceTest.php
rename to application/symfony/tests/Unit/Domain/User/UserSourceDirectorServiceTest.php
index b0e96ea..7664b5f 100644
--- a/application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorServiceTest.php
+++ b/application/symfony/tests/Unit/Domain/User/UserSourceDirectorServiceTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace tests\Unit\Domain\UserManagement;
+namespace tests\Unit\Domain\User;
 
-use Infinito\Domain\UserManagement\UserSourceDirectorInterface;
-use Infinito\Domain\UserManagement\UserSourceDirectorService;
+use Infinito\Domain\User\UserSourceDirectorInterface;
+use Infinito\Domain\User\UserSourceDirectorService;
 use Infinito\Entity\User;
 use Infinito\Entity\Source\SourceInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
diff --git a/application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorTest.php b/application/symfony/tests/Unit/Domain/User/UserSourceDirectorTest.php
similarity index 92%
rename from application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorTest.php
rename to application/symfony/tests/Unit/Domain/User/UserSourceDirectorTest.php
index dfad187..b89af5d 100644
--- a/application/symfony/tests/Unit/Domain/UserManagement/UserSourceDirectorTest.php
+++ b/application/symfony/tests/Unit/Domain/User/UserSourceDirectorTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Domain\UserManagement;
+namespace Tests\Unit\Domain\User;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Infinito\Entity\User;
-use Infinito\Domain\UserManagement\UserSourceDirector;
+use Infinito\Domain\User\UserSourceDirector;
 use Infinito\Repository\Source\SourceRepository;
 use Infinito\Entity\Source\AbstractSource;
 use Infinito\Domain\Fixture\FixtureSource\GuestUserFixtureSource;