diff --git a/application/symfony/src/Entity/Attribut/ActionTypeAttribut.php b/application/symfony/src/Attribut/ActionTypeAttribut.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/ActionTypeAttribut.php
rename to application/symfony/src/Attribut/ActionTypeAttribut.php
index 8c2829e..cfe3b64 100644
--- a/application/symfony/src/Entity/Attribut/ActionTypeAttribut.php
+++ b/application/symfony/src/Attribut/ActionTypeAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Exception\NoValidChoiceException;
 use App\DBAL\Types\ActionType;
diff --git a/application/symfony/src/Entity/Attribut/ActionTypeAttributInterface.php b/application/symfony/src/Attribut/ActionTypeAttributInterface.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/ActionTypeAttributInterface.php
rename to application/symfony/src/Attribut/ActionTypeAttributInterface.php
index 3e04d8c..e7d14e6 100644
--- a/application/symfony/src/Entity/Attribut/ActionTypeAttributInterface.php
+++ b/application/symfony/src/Attribut/ActionTypeAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\DBAL\Types\ActionType;
 
diff --git a/application/symfony/src/Entity/Attribut/ChildsAttribut.php b/application/symfony/src/Attribut/ChildsAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/ChildsAttribut.php
rename to application/symfony/src/Attribut/ChildsAttribut.php
index 47cd280..3fbbca7 100644
--- a/application/symfony/src/Entity/Attribut/ChildsAttribut.php
+++ b/application/symfony/src/Attribut/ChildsAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/ChildsAttributeInterface.php b/application/symfony/src/Attribut/ChildsAttributeInterface.php
similarity index 87%
rename from application/symfony/src/Entity/Attribut/ChildsAttributeInterface.php
rename to application/symfony/src/Attribut/ChildsAttributeInterface.php
index d22984c..f24ce4e 100644
--- a/application/symfony/src/Entity/Attribut/ChildsAttributeInterface.php
+++ b/application/symfony/src/Attribut/ChildsAttributeInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/CollectionAttribut.php b/application/symfony/src/Attribut/CollectionAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/CollectionAttribut.php
rename to application/symfony/src/Attribut/CollectionAttribut.php
index 8e0678b..7aa2913 100644
--- a/application/symfony/src/Entity/Attribut/CollectionAttribut.php
+++ b/application/symfony/src/Attribut/CollectionAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/CollectionAttributInterface.php b/application/symfony/src/Attribut/CollectionAttributInterface.php
similarity index 87%
rename from application/symfony/src/Entity/Attribut/CollectionAttributInterface.php
rename to application/symfony/src/Attribut/CollectionAttributInterface.php
index 6889cde..869d2ac 100644
--- a/application/symfony/src/Entity/Attribut/CollectionAttributInterface.php
+++ b/application/symfony/src/Attribut/CollectionAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/ConditionAttribut.php b/application/symfony/src/Attribut/ConditionAttribut.php
similarity index 94%
rename from application/symfony/src/Entity/Attribut/ConditionAttribut.php
rename to application/symfony/src/Attribut/ConditionAttribut.php
index b477c98..299e1b0 100644
--- a/application/symfony/src/Entity/Attribut/ConditionAttribut.php
+++ b/application/symfony/src/Attribut/ConditionAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Logic\Operation\OperationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/ConditionAttributInterface.php b/application/symfony/src/Attribut/ConditionAttributInterface.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/ConditionAttributInterface.php
rename to application/symfony/src/Attribut/ConditionAttributInterface.php
index 1c60971..33f181e 100644
--- a/application/symfony/src/Entity/Attribut/ConditionAttributInterface.php
+++ b/application/symfony/src/Attribut/ConditionAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Logic\Operation\OperationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/CreatorRelationAttribut.php b/application/symfony/src/Attribut/CreatorRelationAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/CreatorRelationAttribut.php
rename to application/symfony/src/Attribut/CreatorRelationAttribut.php
index a5cb5b6..43b0a6e 100644
--- a/application/symfony/src/Entity/Attribut/CreatorRelationAttribut.php
+++ b/application/symfony/src/Attribut/CreatorRelationAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Parent\CreatorRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/CreatorRelationAttributInterface.php b/application/symfony/src/Attribut/CreatorRelationAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/CreatorRelationAttributInterface.php
rename to application/symfony/src/Attribut/CreatorRelationAttributInterface.php
index 20aa330..3591e5c 100644
--- a/application/symfony/src/Entity/Attribut/CreatorRelationAttributInterface.php
+++ b/application/symfony/src/Attribut/CreatorRelationAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Parent\CreatorRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/CrudAttribut.php b/application/symfony/src/Attribut/CrudAttribut.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/CrudAttribut.php
rename to application/symfony/src/Attribut/CrudAttribut.php
index a6cd421..e45437e 100644
--- a/application/symfony/src/Entity/Attribut/CrudAttribut.php
+++ b/application/symfony/src/Attribut/CrudAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Exception\NoValidChoiceException;
 use App\DBAL\Types\Meta\Right\CRUDType;
diff --git a/application/symfony/src/Entity/Attribut/CrudAttributInterface.php b/application/symfony/src/Attribut/CrudAttributInterface.php
similarity index 84%
rename from application/symfony/src/Entity/Attribut/CrudAttributInterface.php
rename to application/symfony/src/Attribut/CrudAttributInterface.php
index 377e650..3909812 100644
--- a/application/symfony/src/Entity/Attribut/CrudAttributInterface.php
+++ b/application/symfony/src/Attribut/CrudAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/FirstNameSourceAttribut.php b/application/symfony/src/Attribut/FirstNameSourceAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/FirstNameSourceAttribut.php
rename to application/symfony/src/Attribut/FirstNameSourceAttribut.php
index d3dde8d..188d6b5 100644
--- a/application/symfony/src/Entity/Attribut/FirstNameSourceAttribut.php
+++ b/application/symfony/src/Attribut/FirstNameSourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/FirstNameSourceAttributInterface.php b/application/symfony/src/Attribut/FirstNameSourceAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/FirstNameSourceAttributInterface.php
rename to application/symfony/src/Attribut/FirstNameSourceAttributInterface.php
index 7cba291..a7da89f 100644
--- a/application/symfony/src/Entity/Attribut/FirstNameSourceAttributInterface.php
+++ b/application/symfony/src/Attribut/FirstNameSourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/FullPersonNameSourceAttribut.php b/application/symfony/src/Attribut/FullPersonNameSourceAttribut.php
similarity index 94%
rename from application/symfony/src/Entity/Attribut/FullPersonNameSourceAttribut.php
rename to application/symfony/src/Attribut/FullPersonNameSourceAttribut.php
index 8b36a83..440b811 100644
--- a/application/symfony/src/Entity/Attribut/FullPersonNameSourceAttribut.php
+++ b/application/symfony/src/Attribut/FullPersonNameSourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php b/application/symfony/src/Attribut/FullPersonNameSourceAttributInterface.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
rename to application/symfony/src/Attribut/FullPersonNameSourceAttributInterface.php
index 3cd1876..a2c99cb 100644
--- a/application/symfony/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
+++ b/application/symfony/src/Attribut/FullPersonNameSourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/GrantAttribut.php b/application/symfony/src/Attribut/GrantAttribut.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/GrantAttribut.php
rename to application/symfony/src/Attribut/GrantAttribut.php
index d052ae3..fed83a3 100644
--- a/application/symfony/src/Entity/Attribut/GrantAttribut.php
+++ b/application/symfony/src/Attribut/GrantAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/GrantAttributInterface.php b/application/symfony/src/Attribut/GrantAttributInterface.php
similarity index 84%
rename from application/symfony/src/Entity/Attribut/GrantAttributInterface.php
rename to application/symfony/src/Attribut/GrantAttributInterface.php
index ecb8679..14dd511 100644
--- a/application/symfony/src/Entity/Attribut/GrantAttributInterface.php
+++ b/application/symfony/src/Attribut/GrantAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/IdAttribut.php b/application/symfony/src/Attribut/IdAttribut.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/IdAttribut.php
rename to application/symfony/src/Attribut/IdAttribut.php
index a2db666..5469e98 100644
--- a/application/symfony/src/Entity/Attribut/IdAttribut.php
+++ b/application/symfony/src/Attribut/IdAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/IdAttributInterface.php b/application/symfony/src/Attribut/IdAttributInterface.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/IdAttributInterface.php
rename to application/symfony/src/Attribut/IdAttributInterface.php
index 63ee1de..939795c 100644
--- a/application/symfony/src/Entity/Attribut/IdAttributInterface.php
+++ b/application/symfony/src/Attribut/IdAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/LawAttribut.php b/application/symfony/src/Attribut/LawAttribut.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/LawAttribut.php
rename to application/symfony/src/Attribut/LawAttribut.php
index 058e845..ea740cf 100644
--- a/application/symfony/src/Entity/Attribut/LawAttribut.php
+++ b/application/symfony/src/Attribut/LawAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\LawInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/LawAttributInterface.php b/application/symfony/src/Attribut/LawAttributInterface.php
similarity index 86%
rename from application/symfony/src/Entity/Attribut/LawAttributInterface.php
rename to application/symfony/src/Attribut/LawAttributInterface.php
index d42952c..61e4ee7 100644
--- a/application/symfony/src/Entity/Attribut/LawAttributInterface.php
+++ b/application/symfony/src/Attribut/LawAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\LawInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/LayerAttribut.php b/application/symfony/src/Attribut/LayerAttribut.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/LayerAttribut.php
rename to application/symfony/src/Attribut/LayerAttribut.php
index 1bee5a1..e10ee7f 100644
--- a/application/symfony/src/Entity/Attribut/LayerAttribut.php
+++ b/application/symfony/src/Attribut/LayerAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\DBAL\Types\Meta\Right\LayerType;
 use App\Exception\NoValidChoiceException;
diff --git a/application/symfony/src/Entity/Attribut/LayerAttributInterface.php b/application/symfony/src/Attribut/LayerAttributInterface.php
similarity index 84%
rename from application/symfony/src/Entity/Attribut/LayerAttributInterface.php
rename to application/symfony/src/Attribut/LayerAttributInterface.php
index 9c8db65..2a2ed71 100644
--- a/application/symfony/src/Entity/Attribut/LayerAttributInterface.php
+++ b/application/symfony/src/Attribut/LayerAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/MemberRelationAttribut.php b/application/symfony/src/Attribut/MemberRelationAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/MemberRelationAttribut.php
rename to application/symfony/src/Attribut/MemberRelationAttribut.php
index e8bb623..d8ab356 100644
--- a/application/symfony/src/Entity/Attribut/MemberRelationAttribut.php
+++ b/application/symfony/src/Attribut/MemberRelationAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/MemberRelationAttributInterface.php b/application/symfony/src/Attribut/MemberRelationAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/MemberRelationAttributInterface.php
rename to application/symfony/src/Attribut/MemberRelationAttributInterface.php
index 46cb5bc..821fe34 100644
--- a/application/symfony/src/Entity/Attribut/MemberRelationAttributInterface.php
+++ b/application/symfony/src/Attribut/MemberRelationAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/MembersAttribut.php b/application/symfony/src/Attribut/MembersAttribut.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/MembersAttribut.php
rename to application/symfony/src/Attribut/MembersAttribut.php
index 5109cd0..37e3e0d 100644
--- a/application/symfony/src/Entity/Attribut/MembersAttribut.php
+++ b/application/symfony/src/Attribut/MembersAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
diff --git a/application/symfony/src/Entity/Attribut/MembersAttributInterface.php b/application/symfony/src/Attribut/MembersAttributInterface.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/MembersAttributInterface.php
rename to application/symfony/src/Attribut/MembersAttributInterface.php
index 37d16c4..d58e56a 100644
--- a/application/symfony/src/Entity/Attribut/MembersAttributInterface.php
+++ b/application/symfony/src/Attribut/MembersAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
diff --git a/application/symfony/src/Entity/Attribut/MembershipsAttribut.php b/application/symfony/src/Attribut/MembershipsAttribut.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/MembershipsAttribut.php
rename to application/symfony/src/Attribut/MembershipsAttribut.php
index c842db7..60be73a 100644
--- a/application/symfony/src/Entity/Attribut/MembershipsAttribut.php
+++ b/application/symfony/src/Attribut/MembershipsAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
diff --git a/application/symfony/src/Entity/Attribut/MembershipsAttributInterface.php b/application/symfony/src/Attribut/MembershipsAttributInterface.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/MembershipsAttributInterface.php
rename to application/symfony/src/Attribut/MembershipsAttributInterface.php
index b8a2bc9..794ab07 100644
--- a/application/symfony/src/Entity/Attribut/MembershipsAttributInterface.php
+++ b/application/symfony/src/Attribut/MembershipsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
diff --git a/application/symfony/src/Entity/Attribut/NameAttribut.php b/application/symfony/src/Attribut/NameAttribut.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/NameAttribut.php
rename to application/symfony/src/Attribut/NameAttribut.php
index 0d7fa74..4ac5de5 100644
--- a/application/symfony/src/Entity/Attribut/NameAttribut.php
+++ b/application/symfony/src/Attribut/NameAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/NameAttributInterface.php b/application/symfony/src/Attribut/NameAttributInterface.php
similarity index 84%
rename from application/symfony/src/Entity/Attribut/NameAttributInterface.php
rename to application/symfony/src/Attribut/NameAttributInterface.php
index 083527c..4b22e0c 100644
--- a/application/symfony/src/Entity/Attribut/NameAttributInterface.php
+++ b/application/symfony/src/Attribut/NameAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/NameSourceAttribut.php b/application/symfony/src/Attribut/NameSourceAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/NameSourceAttribut.php
rename to application/symfony/src/Attribut/NameSourceAttribut.php
index c3689f2..9e809b9 100644
--- a/application/symfony/src/Entity/Attribut/NameSourceAttribut.php
+++ b/application/symfony/src/Attribut/NameSourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/NameSourceAttributInterface.php b/application/symfony/src/Attribut/NameSourceAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/NameSourceAttributInterface.php
rename to application/symfony/src/Attribut/NameSourceAttributInterface.php
index 2d3ebb9..63e15ca 100644
--- a/application/symfony/src/Entity/Attribut/NameSourceAttributInterface.php
+++ b/application/symfony/src/Attribut/NameSourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/ParentRelationAttribut.php b/application/symfony/src/Attribut/ParentRelationAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/ParentRelationAttribut.php
rename to application/symfony/src/Attribut/ParentRelationAttribut.php
index 52985bf..b8da286 100644
--- a/application/symfony/src/Entity/Attribut/ParentRelationAttribut.php
+++ b/application/symfony/src/Attribut/ParentRelationAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Parent\ParentRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/ParentRelationAttributInterface.php b/application/symfony/src/Attribut/ParentRelationAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/ParentRelationAttributInterface.php
rename to application/symfony/src/Attribut/ParentRelationAttributInterface.php
index b05892c..263693e 100644
--- a/application/symfony/src/Entity/Attribut/ParentRelationAttributInterface.php
+++ b/application/symfony/src/Attribut/ParentRelationAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\Parent\ParentRelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/ParentsAttribut.php b/application/symfony/src/Attribut/ParentsAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/ParentsAttribut.php
rename to application/symfony/src/Attribut/ParentsAttribut.php
index 89e9e88..e61d1da 100644
--- a/application/symfony/src/Entity/Attribut/ParentsAttribut.php
+++ b/application/symfony/src/Attribut/ParentsAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/ParentsAttributInterface.php b/application/symfony/src/Attribut/ParentsAttributInterface.php
similarity index 88%
rename from application/symfony/src/Entity/Attribut/ParentsAttributInterface.php
rename to application/symfony/src/Attribut/ParentsAttributInterface.php
index 1d3632e..9634361 100644
--- a/application/symfony/src/Entity/Attribut/ParentsAttributInterface.php
+++ b/application/symfony/src/Attribut/ParentsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/PersonIdentitySourceAttribut.php b/application/symfony/src/Attribut/PersonIdentitySourceAttribut.php
similarity index 94%
rename from application/symfony/src/Entity/Attribut/PersonIdentitySourceAttribut.php
rename to application/symfony/src/Attribut/PersonIdentitySourceAttribut.php
index 74ae883..563d2cb 100644
--- a/application/symfony/src/Entity/Attribut/PersonIdentitySourceAttribut.php
+++ b/application/symfony/src/Attribut/PersonIdentitySourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php b/application/symfony/src/Attribut/PersonIdentitySourceAttributInterface.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
rename to application/symfony/src/Attribut/PersonIdentitySourceAttributInterface.php
index 9538de0..32bdf31 100644
--- a/application/symfony/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
+++ b/application/symfony/src/Attribut/PersonIdentitySourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/PriorityAttribut.php b/application/symfony/src/Attribut/PriorityAttribut.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/PriorityAttribut.php
rename to application/symfony/src/Attribut/PriorityAttribut.php
index 6e4be76..e581f0c 100644
--- a/application/symfony/src/Entity/Attribut/PriorityAttribut.php
+++ b/application/symfony/src/Attribut/PriorityAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 trait PriorityAttribut
 {
diff --git a/application/symfony/src/Entity/Attribut/PriorityAttributInterface.php b/application/symfony/src/Attribut/PriorityAttributInterface.php
similarity index 82%
rename from application/symfony/src/Entity/Attribut/PriorityAttributInterface.php
rename to application/symfony/src/Attribut/PriorityAttributInterface.php
index 57a052c..cc5b296 100644
--- a/application/symfony/src/Entity/Attribut/PriorityAttributInterface.php
+++ b/application/symfony/src/Attribut/PriorityAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 interface PriorityAttributInterface
 {
diff --git a/application/symfony/src/Entity/Attribut/RecieverAttribut.php b/application/symfony/src/Attribut/RecieverAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/RecieverAttribut.php
rename to application/symfony/src/Attribut/RecieverAttribut.php
index c15dfc8..dca8734 100644
--- a/application/symfony/src/Entity/Attribut/RecieverAttribut.php
+++ b/application/symfony/src/Attribut/RecieverAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\SourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RecieverAttributInterface.php b/application/symfony/src/Attribut/RecieverAttributInterface.php
similarity index 88%
rename from application/symfony/src/Entity/Attribut/RecieverAttributInterface.php
rename to application/symfony/src/Attribut/RecieverAttributInterface.php
index 4c11c8d..58bf31d 100644
--- a/application/symfony/src/Entity/Attribut/RecieverAttributInterface.php
+++ b/application/symfony/src/Attribut/RecieverAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\SourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RelationAttribut.php b/application/symfony/src/Attribut/RelationAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/RelationAttribut.php
rename to application/symfony/src/Attribut/RelationAttribut.php
index dd6cd56..52e6319 100644
--- a/application/symfony/src/Entity/Attribut/RelationAttribut.php
+++ b/application/symfony/src/Attribut/RelationAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\RelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RelationAttributInterface.php b/application/symfony/src/Attribut/RelationAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/RelationAttributInterface.php
rename to application/symfony/src/Attribut/RelationAttributInterface.php
index 7a68f85..8a473ab 100644
--- a/application/symfony/src/Entity/Attribut/RelationAttributInterface.php
+++ b/application/symfony/src/Attribut/RelationAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\Relation\RelationInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RightAttribut.php b/application/symfony/src/Attribut/RightAttribut.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/RightAttribut.php
rename to application/symfony/src/Attribut/RightAttribut.php
index 245970a..ef614cf 100644
--- a/application/symfony/src/Entity/Attribut/RightAttribut.php
+++ b/application/symfony/src/Attribut/RightAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\RightInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RightAttributInterface.php b/application/symfony/src/Attribut/RightAttributInterface.php
similarity index 87%
rename from application/symfony/src/Entity/Attribut/RightAttributInterface.php
rename to application/symfony/src/Attribut/RightAttributInterface.php
index ef418f2..f7b9329 100644
--- a/application/symfony/src/Entity/Attribut/RightAttributInterface.php
+++ b/application/symfony/src/Attribut/RightAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Meta\RightInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/RightsAttributInterface.php b/application/symfony/src/Attribut/RightsAttributInterface.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/RightsAttributInterface.php
rename to application/symfony/src/Attribut/RightsAttributInterface.php
index b3fce83..8423e52 100644
--- a/application/symfony/src/Entity/Attribut/RightsAttributInterface.php
+++ b/application/symfony/src/Attribut/RightsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Meta\RightInterface;
diff --git a/application/symfony/src/Entity/Attribut/RightsAttribute.php b/application/symfony/src/Attribut/RightsAttribute.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/RightsAttribute.php
rename to application/symfony/src/Attribut/RightsAttribute.php
index 35d9561..6f0101d 100644
--- a/application/symfony/src/Entity/Attribut/RightsAttribute.php
+++ b/application/symfony/src/Attribut/RightsAttribute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/symfony/src/Entity/Attribut/SlugAttribut.php b/application/symfony/src/Attribut/SlugAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/SlugAttribut.php
rename to application/symfony/src/Attribut/SlugAttribut.php
index 73dc5fb..40e658b 100644
--- a/application/symfony/src/Entity/Attribut/SlugAttribut.php
+++ b/application/symfony/src/Attribut/SlugAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/SlugAttributInterface.php b/application/symfony/src/Attribut/SlugAttributInterface.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/SlugAttributInterface.php
rename to application/symfony/src/Attribut/SlugAttributInterface.php
index 6b09f31..059c416 100644
--- a/application/symfony/src/Entity/Attribut/SlugAttributInterface.php
+++ b/application/symfony/src/Attribut/SlugAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/SourceAttribut.php b/application/symfony/src/Attribut/SourceAttribut.php
similarity index 92%
rename from application/symfony/src/Entity/Attribut/SourceAttribut.php
rename to application/symfony/src/Attribut/SourceAttribut.php
index db0cb35..d4b0488 100644
--- a/application/symfony/src/Entity/Attribut/SourceAttribut.php
+++ b/application/symfony/src/Attribut/SourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\SourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/SourceAttributInterface.php b/application/symfony/src/Attribut/SourceAttributInterface.php
similarity index 88%
rename from application/symfony/src/Entity/Attribut/SourceAttributInterface.php
rename to application/symfony/src/Attribut/SourceAttributInterface.php
index 7e83412..f51e263 100644
--- a/application/symfony/src/Entity/Attribut/SourceAttributInterface.php
+++ b/application/symfony/src/Attribut/SourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\SourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/SurnameSourceAttribut.php b/application/symfony/src/Attribut/SurnameSourceAttribut.php
similarity index 93%
rename from application/symfony/src/Entity/Attribut/SurnameSourceAttribut.php
rename to application/symfony/src/Attribut/SurnameSourceAttribut.php
index ccd7e4b..6926db3 100644
--- a/application/symfony/src/Entity/Attribut/SurnameSourceAttribut.php
+++ b/application/symfony/src/Attribut/SurnameSourceAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/SurnameSourceAttributInterface.php b/application/symfony/src/Attribut/SurnameSourceAttributInterface.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/SurnameSourceAttributInterface.php
rename to application/symfony/src/Attribut/SurnameSourceAttributInterface.php
index 018653d..5bcaa1c 100644
--- a/application/symfony/src/Entity/Attribut/SurnameSourceAttributInterface.php
+++ b/application/symfony/src/Attribut/SurnameSourceAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/TextAttribut.php b/application/symfony/src/Attribut/TextAttribut.php
similarity index 89%
rename from application/symfony/src/Entity/Attribut/TextAttribut.php
rename to application/symfony/src/Attribut/TextAttribut.php
index eb05481..bf50b3b 100644
--- a/application/symfony/src/Entity/Attribut/TextAttribut.php
+++ b/application/symfony/src/Attribut/TextAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 trait TextAttribut
 {
diff --git a/application/symfony/src/Entity/Attribut/TextAttributInterface.php b/application/symfony/src/Attribut/TextAttributInterface.php
similarity index 81%
rename from application/symfony/src/Entity/Attribut/TextAttributInterface.php
rename to application/symfony/src/Attribut/TextAttributInterface.php
index 216dc90..44c9b55 100644
--- a/application/symfony/src/Entity/Attribut/TextAttributInterface.php
+++ b/application/symfony/src/Attribut/TextAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 interface TextAttributInterface
 {
diff --git a/application/symfony/src/Entity/Attribut/UserAttribut.php b/application/symfony/src/Attribut/UserAttribut.php
similarity index 91%
rename from application/symfony/src/Entity/Attribut/UserAttribut.php
rename to application/symfony/src/Attribut/UserAttribut.php
index 35f4eec..286682e 100644
--- a/application/symfony/src/Entity/Attribut/UserAttribut.php
+++ b/application/symfony/src/Attribut/UserAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\User;
 use App\Entity\UserInterface;
diff --git a/application/symfony/src/Entity/Attribut/UserAttributInterface.php b/application/symfony/src/Attribut/UserAttributInterface.php
similarity index 87%
rename from application/symfony/src/Entity/Attribut/UserAttributInterface.php
rename to application/symfony/src/Attribut/UserAttributInterface.php
index d3200d8..8ff9d0b 100644
--- a/application/symfony/src/Entity/Attribut/UserAttributInterface.php
+++ b/application/symfony/src/Attribut/UserAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use App\Entity\UserInterface;
 
diff --git a/application/symfony/src/Entity/Attribut/VersionAttribut.php b/application/symfony/src/Attribut/VersionAttribut.php
similarity index 90%
rename from application/symfony/src/Entity/Attribut/VersionAttribut.php
rename to application/symfony/src/Attribut/VersionAttribut.php
index 4437fbb..56dbf71 100644
--- a/application/symfony/src/Entity/Attribut/VersionAttribut.php
+++ b/application/symfony/src/Attribut/VersionAttribut.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Attribut/VersionAttributInterface.php b/application/symfony/src/Attribut/VersionAttributInterface.php
similarity index 95%
rename from application/symfony/src/Entity/Attribut/VersionAttributInterface.php
rename to application/symfony/src/Attribut/VersionAttributInterface.php
index 4846cd4..f770070 100644
--- a/application/symfony/src/Entity/Attribut/VersionAttributInterface.php
+++ b/application/symfony/src/Attribut/VersionAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 /**
  * Entities which implement this interface can lock stuff on an optimistic base.
diff --git a/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php b/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php
index d0bf450..511204c 100644
--- a/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php
+++ b/application/symfony/src/Domain/RequestManagement/Action/RequestedAction.php
@@ -2,7 +2,7 @@
 
 namespace App\Domain\RequestManagement\Action;
 
-use App\Entity\Attribut\ActionTypeAttribut;
+use App\Attribut\ActionTypeAttribut;
 use App\DBAL\Types\ActionType;
 use App\DBAL\Types\Meta\Right\CRUDType;
 use App\Domain\RequestManagement\User\RequestedUser;
@@ -42,7 +42,7 @@ class RequestedAction extends RequestedUser implements RequestedActionInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\ActionTypeAttributInterface::setActionType()
+     * @see \App\Attribut\ActionTypeAttributInterface::setActionType()
      */
     public function setActionType(string $actionType): void
     {
diff --git a/application/symfony/src/Domain/RequestManagement/Action/RequestedActionInterface.php b/application/symfony/src/Domain/RequestManagement/Action/RequestedActionInterface.php
index 5b32f29..59107ba 100644
--- a/application/symfony/src/Domain/RequestManagement/Action/RequestedActionInterface.php
+++ b/application/symfony/src/Domain/RequestManagement/Action/RequestedActionInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Domain\RequestManagement\Action;
 
-use App\Entity\Attribut\ActionTypeAttributInterface;
+use App\Attribut\ActionTypeAttributInterface;
 use App\Domain\RequestManagement\User\RequestedUserInterface;
 
 /**
diff --git a/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php b/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
index 89643a8..adfbc1a 100644
--- a/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
+++ b/application/symfony/src/Domain/RequestManagement/Right/RequestedRight.php
@@ -3,9 +3,9 @@
 namespace App\Domain\RequestManagement\Right;
 
 use App\Entity\Source\SourceInterface;
-use App\Entity\Attribut\CrudAttribut;
-use App\Entity\Attribut\LayerAttribut;
-use App\Entity\Attribut\RecieverAttribut;
+use App\Attribut\CrudAttribut;
+use App\Attribut\LayerAttribut;
+use App\Attribut\RecieverAttribut;
 use App\Exception\PreconditionFailedException;
 use App\Exception\NotSetException;
 use App\Repository\Source\SourceRepositoryInterface;
diff --git a/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php b/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php
index 07244ff..f5d5d36 100644
--- a/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php
+++ b/application/symfony/src/Domain/RequestManagement/Right/RequestedRightInterface.php
@@ -2,9 +2,9 @@
 
 namespace App\Domain\RequestManagement\Right;
 
-use App\Entity\Attribut\CrudAttributInterface;
-use App\Entity\Attribut\RecieverAttributInterface;
-use App\Entity\Attribut\LayerAttributInterface;
+use App\Attribut\CrudAttributInterface;
+use App\Attribut\RecieverAttributInterface;
+use App\Attribut\LayerAttributInterface;
 use App\Entity\Source\SourceInterface;
 use App\Domain\RequestManagement\Entity\RequestedEntityInterface;
 
@@ -21,7 +21,7 @@ interface RequestedRightInterface extends CrudAttributInterface, RecieverAttribu
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\SourceAttributInterface::getSource()
+     * @see \App\Attribut\SourceAttributInterface::getSource()
      */
     public function getSource(): SourceInterface;
 }
diff --git a/application/symfony/src/Domain/RequestManagement/User/RequestedUser.php b/application/symfony/src/Domain/RequestManagement/User/RequestedUser.php
index 9332596..b4e7bc0 100644
--- a/application/symfony/src/Domain/RequestManagement/User/RequestedUser.php
+++ b/application/symfony/src/Domain/RequestManagement/User/RequestedUser.php
@@ -35,7 +35,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\RecieverAttributInterface::setReciever()
+     * @see \App\Attribut\RecieverAttributInterface::setReciever()
      */
     public function setReciever(SourceInterface $reciever): void
     {
@@ -45,7 +45,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\RecieverAttributInterface::getReciever()
+     * @see \App\Attribut\RecieverAttributInterface::getReciever()
      */
     public function getReciever(): SourceInterface
     {
@@ -55,7 +55,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\LayerAttributInterface::setLayer()
+     * @see \App\Attribut\LayerAttributInterface::setLayer()
      */
     public function setLayer(string $layer): void
     {
@@ -65,7 +65,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\CrudAttributInterface::getCrud()
+     * @see \App\Attribut\CrudAttributInterface::getCrud()
      */
     public function getCrud(): string
     {
@@ -75,7 +75,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\LayerAttributInterface::getLayer()
+     * @see \App\Attribut\LayerAttributInterface::getLayer()
      */
     public function getLayer(): string
     {
@@ -85,7 +85,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\SourceAttributInterface::getSource()
+     * @see \App\Attribut\SourceAttributInterface::getSource()
      */
     public function getSource(): SourceInterface
     {
@@ -95,7 +95,7 @@ class RequestedUser implements RequestedUserInterface
     /**
      * {@inheritdoc}
      *
-     * @see \App\Entity\Attribut\CrudAttributInterface::setCrud()
+     * @see \App\Attribut\CrudAttributInterface::setCrud()
      */
     public function setCrud(string $type): void
     {
diff --git a/application/symfony/src/Entity/AbstractEntity.php b/application/symfony/src/Entity/AbstractEntity.php
index 4cd1d22..dde3b62 100644
--- a/application/symfony/src/Entity/AbstractEntity.php
+++ b/application/symfony/src/Entity/AbstractEntity.php
@@ -2,10 +2,10 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\IdAttribut;
+use App\Attribut\IdAttribut;
 use Doctrine\ORM\Mapping as ORM;
-use App\Entity\Attribut\VersionAttribut;
-use App\Entity\Attribut\SlugAttribut;
+use App\Attribut\VersionAttribut;
+use App\Attribut\SlugAttribut;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**
diff --git a/application/symfony/src/Entity/EntityInterface.php b/application/symfony/src/Entity/EntityInterface.php
index 975ed52..53ea25b 100644
--- a/application/symfony/src/Entity/EntityInterface.php
+++ b/application/symfony/src/Entity/EntityInterface.php
@@ -2,9 +2,9 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\VersionAttributInterface;
-use App\Entity\Attribut\IdAttributInterface;
-use App\Entity\Attribut\SlugAttributInterface;
+use App\Attribut\VersionAttributInterface;
+use App\Attribut\IdAttributInterface;
+use App\Attribut\SlugAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Meta/AbstractMeta.php b/application/symfony/src/Entity/Meta/AbstractMeta.php
index 8549eaf..4c53591 100644
--- a/application/symfony/src/Entity/Meta/AbstractMeta.php
+++ b/application/symfony/src/Entity/Meta/AbstractMeta.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Meta;
 
 use App\Entity\AbstractEntity;
-use App\Entity\Attribut\SourceAttribut;
+use App\Attribut\SourceAttribut;
 
 /**
  * @todo Implement source attribut
diff --git a/application/symfony/src/Entity/Meta/Law.php b/application/symfony/src/Entity/Meta/Law.php
index f890a7f..e28b669 100644
--- a/application/symfony/src/Entity/Meta/Law.php
+++ b/application/symfony/src/Entity/Meta/Law.php
@@ -3,11 +3,11 @@
 namespace App\Entity\Meta;
 
 use Doctrine\ORM\Mapping as ORM;
-use App\Entity\Attribut\RightsAttribute;
+use App\Attribut\RightsAttribute;
 use Doctrine\Common\Collections\ArrayCollection;
-use App\Entity\Attribut\RelationAttribut;
+use App\Attribut\RelationAttribut;
 use App\Entity\Source\SourceInterface;
-use App\Entity\Attribut\GrantAttribut;
+use App\Attribut\GrantAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Meta/LawInterface.php b/application/symfony/src/Entity/Meta/LawInterface.php
index 03f67c9..a2ad8b1 100644
--- a/application/symfony/src/Entity/Meta/LawInterface.php
+++ b/application/symfony/src/Entity/Meta/LawInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Meta;
 
-use App\Entity\Attribut\RightsAttributInterface;
-use App\Entity\Attribut\GrantAttributInterface;
+use App\Attribut\RightsAttributInterface;
+use App\Attribut\GrantAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Meta/MetaInterface.php b/application/symfony/src/Entity/Meta/MetaInterface.php
index a747647..cf19f14 100644
--- a/application/symfony/src/Entity/Meta/MetaInterface.php
+++ b/application/symfony/src/Entity/Meta/MetaInterface.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Meta;
 
 use App\Entity\EntityInterface;
-use App\Entity\Attribut\SourceAttributInterface;
+use App\Attribut\SourceAttributInterface;
 
 /**
  * Meta entities contain informations which describe sources.
diff --git a/application/symfony/src/Entity/Meta/Relation/Member/MemberRelation.php b/application/symfony/src/Entity/Meta/Relation/Member/MemberRelation.php
index 065f114..60998a0 100644
--- a/application/symfony/src/Entity/Meta/Relation/Member/MemberRelation.php
+++ b/application/symfony/src/Entity/Meta/Relation/Member/MemberRelation.php
@@ -3,8 +3,8 @@
 namespace App\Entity\Meta\Relation\Member;
 
 use App\Entity\Meta\Relation\AbstractRelation;
-use App\Entity\Attribut\MembersAttribut;
-use App\Entity\Attribut\MembershipsAttribut;
+use App\Attribut\MembersAttribut;
+use App\Attribut\MembershipsAttribut;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/application/symfony/src/Entity/Meta/Relation/Member/MemberRelationInterface.php b/application/symfony/src/Entity/Meta/Relation/Member/MemberRelationInterface.php
index 033a1f4..5db51f7 100644
--- a/application/symfony/src/Entity/Meta/Relation/Member/MemberRelationInterface.php
+++ b/application/symfony/src/Entity/Meta/Relation/Member/MemberRelationInterface.php
@@ -3,8 +3,8 @@
 namespace App\Entity\Meta\Relation\Member;
 
 use App\Entity\Meta\Relation\RelationInterface;
-use App\Entity\Attribut\MembersAttributInterface;
-use App\Entity\Attribut\MembershipsAttributInterface;
+use App\Attribut\MembersAttributInterface;
+use App\Attribut\MembershipsAttributInterface;
 
 interface MemberRelationInterface extends RelationInterface, MembersAttributInterface, MembershipsAttributInterface
 {
diff --git a/application/symfony/src/Entity/Meta/Relation/Parent/AbstractParentRelation.php b/application/symfony/src/Entity/Meta/Relation/Parent/AbstractParentRelation.php
index 2fc09b8..17abe0b 100644
--- a/application/symfony/src/Entity/Meta/Relation/Parent/AbstractParentRelation.php
+++ b/application/symfony/src/Entity/Meta/Relation/Parent/AbstractParentRelation.php
@@ -2,9 +2,9 @@
 
 namespace App\Entity\Meta\Relation\Parent;
 
-use App\Entity\Attribut\IdAttribut;
-use App\Entity\Attribut\ParentsAttribut;
-use App\Entity\Attribut\ChildsAttribut;
+use App\Attribut\IdAttribut;
+use App\Attribut\ParentsAttribut;
+use App\Attribut\ChildsAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Meta\Relation\AbstractRelation;
 
diff --git a/application/symfony/src/Entity/Meta/Relation/Parent/ParentRelationInterface.php b/application/symfony/src/Entity/Meta/Relation/Parent/ParentRelationInterface.php
index 3753ba1..cf6940e 100644
--- a/application/symfony/src/Entity/Meta/Relation/Parent/ParentRelationInterface.php
+++ b/application/symfony/src/Entity/Meta/Relation/Parent/ParentRelationInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Meta\Relation\Parent;
 
-use App\Entity\Attribut\ParentsAttributInterface;
-use App\Entity\Attribut\ChildsAttributeInterface;
+use App\Attribut\ParentsAttributInterface;
+use App\Attribut\ChildsAttributeInterface;
 use App\Entity\Meta\Relation\RelationInterface;
 
 interface ParentRelationInterface extends RelationInterface, ParentsAttributInterface, ChildsAttributeInterface
diff --git a/application/symfony/src/Entity/Meta/Right.php b/application/symfony/src/Entity/Meta/Right.php
index 1baec1d..b6f186c 100644
--- a/application/symfony/src/Entity/Meta/Right.php
+++ b/application/symfony/src/Entity/Meta/Right.php
@@ -2,17 +2,17 @@
 
 namespace App\Entity\Meta;
 
-use App\Entity\Attribut\CrudAttribut;
+use App\Attribut\CrudAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
-use App\Entity\Attribut\LawAttribut;
-use App\Entity\Attribut\GrantAttribut;
+use App\Attribut\LawAttribut;
+use App\Attribut\GrantAttribut;
 use App\Logic\Operation\OperationInterface;
-use App\Entity\Attribut\ConditionAttribut;
-use App\Entity\Attribut\RecieverAttribut;
-use App\Entity\Attribut\LayerAttribut;
-use App\Entity\Attribut\RelationAttribut;
-use App\Entity\Attribut\PriorityAttribut;
+use App\Attribut\ConditionAttribut;
+use App\Attribut\RecieverAttribut;
+use App\Attribut\LayerAttribut;
+use App\Attribut\RelationAttribut;
+use App\Attribut\PriorityAttribut;
 use App\Entity\Source\SourceInterface;
 
 /**
diff --git a/application/symfony/src/Entity/Meta/RightInterface.php b/application/symfony/src/Entity/Meta/RightInterface.php
index e0b03a9..08257a1 100644
--- a/application/symfony/src/Entity/Meta/RightInterface.php
+++ b/application/symfony/src/Entity/Meta/RightInterface.php
@@ -2,14 +2,14 @@
 
 namespace App\Entity\Meta;
 
-use App\Entity\Attribut\CrudAttributInterface;
-use App\Entity\Attribut\LawAttributInterface;
-use App\Entity\Attribut\RecieverAttributInterface;
-use App\Entity\Attribut\GrantAttributInterface;
-use App\Entity\Attribut\ConditionAttributInterface;
-use App\Entity\Attribut\LayerAttributInterface;
-use App\Entity\Attribut\RelationAttributInterface;
-use App\Entity\Attribut\PriorityAttributInterface;
+use App\Attribut\CrudAttributInterface;
+use App\Attribut\LawAttributInterface;
+use App\Attribut\RecieverAttributInterface;
+use App\Attribut\GrantAttributInterface;
+use App\Attribut\ConditionAttributInterface;
+use App\Attribut\LayerAttributInterface;
+use App\Attribut\RelationAttributInterface;
+use App\Attribut\PriorityAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Source/AbstractSource.php b/application/symfony/src/Entity/Source/AbstractSource.php
index 136f0c5..4b369a4 100644
--- a/application/symfony/src/Entity/Source/AbstractSource.php
+++ b/application/symfony/src/Entity/Source/AbstractSource.php
@@ -5,14 +5,14 @@ namespace App\Entity\Source;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
 use App\Entity\AbstractEntity;
-use App\Entity\Attribut\LawAttribut;
+use App\Attribut\LawAttribut;
 use App\Entity\Meta\LawInterface;
 use App\Entity\Meta\Law;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use App\Entity\Attribut\CreatorRelationAttribut;
+use App\Attribut\CreatorRelationAttribut;
 use App\Entity\Meta\Relation\Parent\CreatorRelationInterface;
 use App\Entity\Meta\Relation\Parent\CreatorRelation;
-use App\Entity\Attribut\MemberRelationAttribut;
+use App\Attribut\MemberRelationAttribut;
 use App\Entity\Meta\Relation\Member\MemberRelation;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
 
diff --git a/application/symfony/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php b/application/symfony/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
index 56023fe..4ad1b1c 100644
--- a/application/symfony/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
+++ b/application/symfony/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Complex\Collection;
 
 use App\Entity\Source\AbstractSource;
-use App\Entity\Attribut\CollectionAttribut;
+use App\Attribut\CollectionAttribut;
 use Doctrine\Common\Collections\Collection;
 use App\Entity\Source\SourceInterface;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/application/symfony/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php b/application/symfony/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
index 1bddd97..4f43a03 100644
--- a/application/symfony/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
+++ b/application/symfony/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Complex\Collection;
 
 use App\Entity\Source\SourceInterface;
-use App\Entity\Attribut\CollectionAttributInterface;
+use App\Attribut\CollectionAttributInterface;
 
 interface CollectionSourceInterface extends SourceInterface, CollectionAttributInterface
 {
diff --git a/application/symfony/src/Entity/Source/Complex/FullPersonNameSource.php b/application/symfony/src/Entity/Source/Complex/FullPersonNameSource.php
index 66eb55f..32dc777 100644
--- a/application/symfony/src/Entity/Source/Complex/FullPersonNameSource.php
+++ b/application/symfony/src/Entity/Source/Complex/FullPersonNameSource.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Attribut\FirstNameSourceAttribut;
-use App\Entity\Attribut\SurnameSourceAttribut;
+use App\Attribut\FirstNameSourceAttribut;
+use App\Attribut\SurnameSourceAttribut;
 use App\Entity\Source\Primitive\Name\SurnameSource;
 use App\Entity\Source\Primitive\Name\FirstNameSource;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/application/symfony/src/Entity/Source/Complex/FullPersonNameSourceInterface.php b/application/symfony/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
index 5315cff..f9fced7 100644
--- a/application/symfony/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
+++ b/application/symfony/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Attribut\FirstNameSourceAttributInterface;
-use App\Entity\Attribut\SurnameSourceAttributInterface;
+use App\Attribut\FirstNameSourceAttributInterface;
+use App\Attribut\SurnameSourceAttributInterface;
 
 /**
  * @todo Maybe a middle name would be helpfull in the future ;)
diff --git a/application/symfony/src/Entity/Source/Complex/PersonIdentitySource.php b/application/symfony/src/Entity/Source/Complex/PersonIdentitySource.php
index 7c906ab..5fe6184 100644
--- a/application/symfony/src/Entity/Source/Complex/PersonIdentitySource.php
+++ b/application/symfony/src/Entity/Source/Complex/PersonIdentitySource.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Attribut\FullPersonNameSourceAttribut;
+use App\Attribut\FullPersonNameSourceAttribut;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
diff --git a/application/symfony/src/Entity/Source/Complex/PersonIdentitySourceInterface.php b/application/symfony/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
index e018924..a3d77ab 100644
--- a/application/symfony/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
+++ b/application/symfony/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
+use App\Attribut\FullPersonNameSourceAttributInterface;
 
 interface PersonIdentitySourceInterface extends ComplexSourceInterface, FullPersonNameSourceAttributInterface
 {
diff --git a/application/symfony/src/Entity/Source/Complex/UserSource.php b/application/symfony/src/Entity/Source/Complex/UserSource.php
index ed32041..436dfb3 100644
--- a/application/symfony/src/Entity/Source/Complex/UserSource.php
+++ b/application/symfony/src/Entity/Source/Complex/UserSource.php
@@ -3,9 +3,9 @@
 namespace App\Entity\Source\Complex;
 
 use Doctrine\ORM\Mapping as ORM;
-use App\Entity\Attribut\UserAttribut;
+use App\Attribut\UserAttribut;
 use App\Entity\UserInterface;
-use App\Entity\Attribut\PersonIdentitySourceAttribut;
+use App\Attribut\PersonIdentitySourceAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Source/Complex/UserSourceInterface.php b/application/symfony/src/Entity/Source/Complex/UserSourceInterface.php
index cb85b57..098e867 100644
--- a/application/symfony/src/Entity/Source/Complex/UserSourceInterface.php
+++ b/application/symfony/src/Entity/Source/Complex/UserSourceInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Source\Complex;
 
-use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
+use App\Attribut\UserAttributInterface;
+use App\Attribut\PersonIdentitySourceAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/Source/Primitive/Name/AbstractNameSource.php b/application/symfony/src/Entity/Source/Primitive/Name/AbstractNameSource.php
index 08d5120..723304a 100644
--- a/application/symfony/src/Entity/Source/Primitive/Name/AbstractNameSource.php
+++ b/application/symfony/src/Entity/Source/Primitive/Name/AbstractNameSource.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Primitive\Name;
 
 use App\Entity\Source\Primitive\AbstractPrimitiveSource;
-use App\Entity\Attribut\NameAttribut;
+use App\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
diff --git a/application/symfony/src/Entity/Source/Primitive/Name/NameSourceInterface.php b/application/symfony/src/Entity/Source/Primitive/Name/NameSourceInterface.php
index 8f3a10a..d7e9918 100644
--- a/application/symfony/src/Entity/Source/Primitive/Name/NameSourceInterface.php
+++ b/application/symfony/src/Entity/Source/Primitive/Name/NameSourceInterface.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Primitive\Name;
 
 use App\Entity\Source\Primitive\PrimitiveSourceInterface;
-use App\Entity\Attribut\NameAttributInterface;
+use App\Attribut\NameAttributInterface;
 
 interface NameSourceInterface extends PrimitiveSourceInterface, NameAttributInterface
 {
diff --git a/application/symfony/src/Entity/Source/Primitive/Text/TextSource.php b/application/symfony/src/Entity/Source/Primitive/Text/TextSource.php
index 426aa0b..051e6b2 100644
--- a/application/symfony/src/Entity/Source/Primitive/Text/TextSource.php
+++ b/application/symfony/src/Entity/Source/Primitive/Text/TextSource.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Primitive\Text;
 
 use App\Entity\Source\Primitive\AbstractPrimitiveSource;
-use App\Entity\Attribut\TextAttribut;
+use App\Attribut\TextAttribut;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
diff --git a/application/symfony/src/Entity/Source/Primitive/Text/TextSourceInterface.php b/application/symfony/src/Entity/Source/Primitive/Text/TextSourceInterface.php
index 29fc354..cf67bed 100644
--- a/application/symfony/src/Entity/Source/Primitive/Text/TextSourceInterface.php
+++ b/application/symfony/src/Entity/Source/Primitive/Text/TextSourceInterface.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Source\Primitive\Text;
 
 use App\Entity\Source\Primitive\PrimitiveSourceInterface;
-use App\Entity\Attribut\TextAttributInterface;
+use App\Attribut\TextAttributInterface;
 
 interface TextSourceInterface extends PrimitiveSourceInterface, TextAttributInterface
 {
diff --git a/application/symfony/src/Entity/Source/SourceInterface.php b/application/symfony/src/Entity/Source/SourceInterface.php
index 92fab9a..0c3c523 100644
--- a/application/symfony/src/Entity/Source/SourceInterface.php
+++ b/application/symfony/src/Entity/Source/SourceInterface.php
@@ -2,11 +2,11 @@
 
 namespace App\Entity\Source;
 
-use App\Entity\Attribut\IdAttributInterface;
+use App\Attribut\IdAttributInterface;
 use App\Entity\EntityInterface;
-use App\Entity\Attribut\LawAttributInterface;
-use App\Entity\Attribut\CreatorRelationAttributInterface;
-use App\Entity\Attribut\MemberRelationAttributInterface;
+use App\Attribut\LawAttributInterface;
+use App\Attribut\CreatorRelationAttributInterface;
+use App\Attribut\MemberRelationAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/User.php b/application/symfony/src/Entity/User.php
index f56b9fe..ceceb60 100644
--- a/application/symfony/src/Entity/User.php
+++ b/application/symfony/src/Entity/User.php
@@ -4,11 +4,11 @@ namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
-use App\Entity\Attribut\SourceAttribut;
-use App\Entity\Attribut\IdAttribut;
+use App\Attribut\SourceAttribut;
+use App\Attribut\IdAttribut;
 use App\Entity\Source\Complex\UserSourceInterface;
 use App\Entity\Source\Complex\UserSource;
-use App\Entity\Attribut\VersionAttribut;
+use App\Attribut\VersionAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/src/Entity/UserInterface.php b/application/symfony/src/Entity/UserInterface.php
index 110bf56..b024dea 100644
--- a/application/symfony/src/Entity/UserInterface.php
+++ b/application/symfony/src/Entity/UserInterface.php
@@ -3,8 +3,8 @@
 namespace App\Entity;
 
 use FOS\UserBundle\Model\UserInterface as FOSUserInterface;
-use App\Entity\Attribut\SourceAttributInterface;
-use App\Entity\Attribut\VersionAttributInterface;
+use App\Attribut\SourceAttributInterface;
+use App\Attribut\VersionAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/ActionTypeAttributTest.php b/application/symfony/tests/Unit/Attribut/ActionTypeAttributTest.php
similarity index 88%
rename from application/symfony/tests/Unit/Entity/Attribut/ActionTypeAttributTest.php
rename to application/symfony/tests/Unit/Attribut/ActionTypeAttributTest.php
index d8a90fa..afd9a58 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/ActionTypeAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/ActionTypeAttributTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
 use App\Exception\NoValidChoiceException;
-use App\Entity\Attribut\ActionTypeAttributInterface;
-use App\Entity\Attribut\ActionTypeAttribut;
+use App\Attribut\ActionTypeAttributInterface;
+use App\Attribut\ActionTypeAttribut;
 use App\DBAL\Types\ActionType;
 
 /**
diff --git a/application/symfony/tests/Unit/Entity/Attribut/ChildsAttributTest.php b/application/symfony/tests/Unit/Attribut/ChildsAttributTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Entity/Attribut/ChildsAttributTest.php
rename to application/symfony/tests/Unit/Attribut/ChildsAttributTest.php
index 6777300..ad4c1d7 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/ChildsAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/ChildsAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Entity\Attribut;
+namespace Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\ChildsAttributeInterface;
-use App\Entity\Attribut\ChildsAttribut;
+use App\Attribut\ChildsAttributeInterface;
+use App\Attribut\ChildsAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class ChildsAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/CollectionAttributTest.php b/application/symfony/tests/Unit/Attribut/CollectionAttributTest.php
similarity index 89%
rename from application/symfony/tests/Unit/Entity/Attribut/CollectionAttributTest.php
rename to application/symfony/tests/Unit/Attribut/CollectionAttributTest.php
index d89f68a..fe3d832 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/CollectionAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/CollectionAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\CollectionAttributInterface;
-use App\Entity\Attribut\CollectionAttribut;
+use App\Attribut\CollectionAttributInterface;
+use App\Attribut\CollectionAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class CollectionAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/ConditionAttributTest.php b/application/symfony/tests/Unit/Attribut/ConditionAttributTest.php
similarity index 88%
rename from application/symfony/tests/Unit/Entity/Attribut/ConditionAttributTest.php
rename to application/symfony/tests/Unit/Attribut/ConditionAttributTest.php
index 08ac42e..bf35fe7 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/ConditionAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/ConditionAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Entity\Attribut;
+namespace Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\ConditionAttributInterface;
-use App\Entity\Attribut\ConditionAttribut;
+use App\Attribut\ConditionAttributInterface;
+use App\Attribut\ConditionAttribut;
 use App\Logic\Operation\OperationInterface;
 
 class ConditionAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/CreatorRelationAttributTest.php b/application/symfony/tests/Unit/Attribut/CreatorRelationAttributTest.php
similarity index 83%
rename from application/symfony/tests/Unit/Entity/Attribut/CreatorRelationAttributTest.php
rename to application/symfony/tests/Unit/Attribut/CreatorRelationAttributTest.php
index d0a3d58..8d38cf5 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/CreatorRelationAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/CreatorRelationAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Tests\Unit\Entity\Attribut;
+namespace App\Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\CreatorRelationAttributInterface;
-use App\Entity\Attribut\CreatorRelationAttribut;
+use App\Attribut\CreatorRelationAttributInterface;
+use App\Attribut\CreatorRelationAttribut;
 use App\Entity\Meta\Relation\Parent\CreatorRelationInterface;
 
 class CreatorRelationAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/CrudAttributTest.php b/application/symfony/tests/Unit/Attribut/CrudAttributTest.php
similarity index 88%
rename from application/symfony/tests/Unit/Entity/Attribut/CrudAttributTest.php
rename to application/symfony/tests/Unit/Attribut/CrudAttributTest.php
index 4792be3..84cc48a 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/CrudAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/CrudAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\CrudAttributInterface;
-use App\Entity\Attribut\CrudAttribut;
+use App\Attribut\CrudAttributInterface;
+use App\Attribut\CrudAttribut;
 use App\DBAL\Types\Meta\Right\CRUDType;
 use App\Exception\NoValidChoiceException;
 
diff --git a/application/symfony/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php b/application/symfony/tests/Unit/Attribut/FirstNameSourceAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
rename to application/symfony/tests/Unit/Attribut/FirstNameSourceAttributTest.php
index 2fee90c..1733e56 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/FirstNameSourceAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\FirstNameSourceAttribut;
-use App\Entity\Attribut\FirstNameSourceAttributInterface;
+use App\Attribut\FirstNameSourceAttribut;
+use App\Attribut\FirstNameSourceAttributInterface;
 use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 /**
diff --git a/application/symfony/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php b/application/symfony/tests/Unit/Attribut/FullPersonNameSourceAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
rename to application/symfony/tests/Unit/Attribut/FullPersonNameSourceAttributTest.php
index 74131fb..f8ad418 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/FullPersonNameSourceAttributTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\Source\Complex\FullPersonNameSourceInterface;
-use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
-use App\Entity\Attribut\FullPersonNameSourceAttribut;
+use App\Attribut\FullPersonNameSourceAttributInterface;
+use App\Attribut\FullPersonNameSourceAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/GrantAttributTest.php b/application/symfony/tests/Unit/Attribut/GrantAttributTest.php
similarity index 84%
rename from application/symfony/tests/Unit/Entity/Attribut/GrantAttributTest.php
rename to application/symfony/tests/Unit/Attribut/GrantAttributTest.php
index 24ab05e..fd786b1 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/GrantAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/GrantAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\GrantAttribut;
-use App\Entity\Attribut\GrantAttributInterface;
+use App\Attribut\GrantAttribut;
+use App\Attribut\GrantAttributInterface;
 
 class GrantAttributTest extends TestCase
 {
diff --git a/application/symfony/tests/Unit/Entity/Attribut/IdAttributTest.php b/application/symfony/tests/Unit/Attribut/IdAttributTest.php
similarity index 87%
rename from application/symfony/tests/Unit/Entity/Attribut/IdAttributTest.php
rename to application/symfony/tests/Unit/Attribut/IdAttributTest.php
index 2cd7a0b..a877e04 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/IdAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/IdAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\IdAttribut;
-use App\Entity\Attribut\IdAttributInterface;
+use App\Attribut\IdAttribut;
+use App\Attribut\IdAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/LayerAttributTest.php b/application/symfony/tests/Unit/Attribut/LayerAttributTest.php
similarity index 88%
rename from application/symfony/tests/Unit/Entity/Attribut/LayerAttributTest.php
rename to application/symfony/tests/Unit/Attribut/LayerAttributTest.php
index b18a010..2447bbf 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/LayerAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/LayerAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\LayerAttributInterface;
-use App\Entity\Attribut\LayerAttribut;
+use App\Attribut\LayerAttributInterface;
+use App\Attribut\LayerAttribut;
 use App\DBAL\Types\Meta\Right\LayerType;
 use App\Exception\NoValidChoiceException;
 
diff --git a/application/symfony/tests/Unit/Entity/Attribut/MemberRelationAttributTest.php b/application/symfony/tests/Unit/Attribut/MemberRelationAttributTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Entity/Attribut/MemberRelationAttributTest.php
rename to application/symfony/tests/Unit/Attribut/MemberRelationAttributTest.php
index dc47a25..5142da7 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/MemberRelationAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/MemberRelationAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\MemberRelationAttributInterface;
-use App\Entity\Attribut\MemberRelationAttribut;
+use App\Attribut\MemberRelationAttributInterface;
+use App\Attribut\MemberRelationAttribut;
 use App\Entity\Meta\Relation\Member\MemberRelationInterface;
 
 class MemberRelationAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/MembersAttributTest.php b/application/symfony/tests/Unit/Attribut/MembersAttributTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Entity/Attribut/MembersAttributTest.php
rename to application/symfony/tests/Unit/Attribut/MembersAttributTest.php
index e5dd68d..e546c40 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/MembersAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/MembersAttributTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
 use Doctrine\Common\Collections\ArrayCollection;
-use App\Entity\Attribut\MembersAttributInterface;
+use App\Attribut\MembersAttributInterface;
 use App\Entity\Source\SourceInterface;
-use App\Entity\Attribut\MembersAttribut;
+use App\Attribut\MembersAttribut;
 
 class MembersAttributTest extends TestCase
 {
diff --git a/application/symfony/tests/Unit/Entity/Attribut/MembershipsAttributTest.php b/application/symfony/tests/Unit/Attribut/MembershipsAttributTest.php
similarity index 87%
rename from application/symfony/tests/Unit/Entity/Attribut/MembershipsAttributTest.php
rename to application/symfony/tests/Unit/Attribut/MembershipsAttributTest.php
index 5b40c2a..5101aaa 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/MembershipsAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/MembershipsAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\MembershipsAttributInterface;
-use App\Entity\Attribut\MembershipsAttribut;
+use App\Attribut\MembershipsAttributInterface;
+use App\Attribut\MembershipsAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
 
diff --git a/application/symfony/tests/Unit/Entity/Attribut/NameAttributTest.php b/application/symfony/tests/Unit/Attribut/NameAttributTest.php
similarity index 95%
rename from application/symfony/tests/Unit/Entity/Attribut/NameAttributTest.php
rename to application/symfony/tests/Unit/Attribut/NameAttributTest.php
index a27d420..869fb5f 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/NameAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/NameAttributTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Attribut;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/application/symfony/tests/Unit/Entity/Attribut/NameSourceAttributTest.php b/application/symfony/tests/Unit/Attribut/NameSourceAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/NameSourceAttributTest.php
rename to application/symfony/tests/Unit/Attribut/NameSourceAttributTest.php
index a0a2491..3e790b1 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/NameSourceAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/NameSourceAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace tests\unit\Entity\Attribut;
+namespace tests\unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\NameSourceAttributInterface;
-use App\Entity\Attribut\NameSourceAttribut;
+use App\Attribut\NameSourceAttributInterface;
+use App\Attribut\NameSourceAttribut;
 use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
 class NameSourceAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/ParentRelationAttributTest.php b/application/symfony/tests/Unit/Attribut/ParentRelationAttributTest.php
similarity index 83%
rename from application/symfony/tests/Unit/Entity/Attribut/ParentRelationAttributTest.php
rename to application/symfony/tests/Unit/Attribut/ParentRelationAttributTest.php
index 8240f60..798eaf4 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/ParentRelationAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/ParentRelationAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Tests\Unit\Entity\Attribut;
+namespace App\Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\ParentRelationAttributInterface;
-use App\Entity\Attribut\ParentRelationAttribut;
+use App\Attribut\ParentRelationAttributInterface;
+use App\Attribut\ParentRelationAttribut;
 use App\Entity\Meta\Relation\Parent\ParentRelationInterface;
 
 class ParentRelationAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/ParentsAttributTest.php b/application/symfony/tests/Unit/Attribut/ParentsAttributTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Entity/Attribut/ParentsAttributTest.php
rename to application/symfony/tests/Unit/Attribut/ParentsAttributTest.php
index e37495b..bfd95d0 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/ParentsAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/ParentsAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Entity\Attribut;
+namespace Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\ParentsAttributInterface;
-use App\Entity\Attribut\ParentsAttribut;
+use App\Attribut\ParentsAttributInterface;
+use App\Attribut\ParentsAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class ParentsAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php b/application/symfony/tests/Unit/Attribut/PersonIdentitySourceAttributTest.php
similarity index 86%
rename from application/symfony/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
rename to application/symfony/tests/Unit/Attribut/PersonIdentitySourceAttributTest.php
index 7abe9d5..b61f17e 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/PersonIdentitySourceAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
-use App\Entity\Attribut\PersonIdentitySourceAttribut;
+use App\Attribut\PersonIdentitySourceAttributInterface;
+use App\Attribut\PersonIdentitySourceAttribut;
 use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
 /**
diff --git a/application/symfony/tests/Unit/Entity/Attribut/PriorityAttributTest.php b/application/symfony/tests/Unit/Attribut/PriorityAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/PriorityAttributTest.php
rename to application/symfony/tests/Unit/Attribut/PriorityAttributTest.php
index 867a8ef..6ea3721 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/PriorityAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/PriorityAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\PriorityAttributInterface;
-use App\Entity\Attribut\PriorityAttribut;
+use App\Attribut\PriorityAttributInterface;
+use App\Attribut\PriorityAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/RecieverAttributTest.php b/application/symfony/tests/Unit/Attribut/RecieverAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/RecieverAttributTest.php
rename to application/symfony/tests/Unit/Attribut/RecieverAttributTest.php
index 59a5f65..20a03d3 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/RecieverAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/RecieverAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\RecieverAttributInterface;
-use App\Entity\Attribut\RecieverAttribut;
+use App\Attribut\RecieverAttributInterface;
+use App\Attribut\RecieverAttribut;
 use App\Entity\Source\AbstractSource;
 
 class RecieverAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/RelationAttributTest.php b/application/symfony/tests/Unit/Attribut/RelationAttributTest.php
similarity index 83%
rename from application/symfony/tests/Unit/Entity/Attribut/RelationAttributTest.php
rename to application/symfony/tests/Unit/Attribut/RelationAttributTest.php
index bcd3211..aea1722 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/RelationAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/RelationAttributTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Tests\Unit\Entity\Attribut;
+namespace App\Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\Meta\Relation\RelationInterface;
-use App\Entity\Attribut\RelationAttributInterface;
-use App\Entity\Attribut\RelationAttribut;
+use App\Attribut\RelationAttributInterface;
+use App\Attribut\RelationAttribut;
 
 class RelationAttributTest extends TestCase
 {
diff --git a/application/symfony/tests/Unit/Entity/Attribut/RightAttributTest.php b/application/symfony/tests/Unit/Attribut/RightAttributTest.php
similarity index 82%
rename from application/symfony/tests/Unit/Entity/Attribut/RightAttributTest.php
rename to application/symfony/tests/Unit/Attribut/RightAttributTest.php
index ac9061f..08f28fa 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/RightAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/RightAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Tests\Unit\Entity\Attribut;
+namespace App\Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\RightAttributInterface;
-use App\Entity\Attribut\RightAttribut;
+use App\Attribut\RightAttributInterface;
+use App\Attribut\RightAttribut;
 use App\Entity\Meta\RightInterface;
 
 class RightAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Entity/Attribut/SlugAttributTest.php b/application/symfony/tests/Unit/Attribut/SlugAttributTest.php
similarity index 89%
rename from application/symfony/tests/Unit/Entity/Attribut/SlugAttributTest.php
rename to application/symfony/tests/Unit/Attribut/SlugAttributTest.php
index b96d690..6b8b4a1 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/SlugAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/SlugAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Entity\Attribut;
+namespace Tests\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\SlugAttributInterface;
-use App\Entity\Attribut\SlugAttribut;
+use App\Attribut\SlugAttributInterface;
+use App\Attribut\SlugAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/TextAttributTest.php b/application/symfony/tests/Unit/Attribut/TextAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/TextAttributTest.php
rename to application/symfony/tests/Unit/Attribut/TextAttributTest.php
index 60073a3..64fa52f 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/TextAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/TextAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\TextAttributInterface;
-use App\Entity\Attribut\TextAttribut;
+use App\Attribut\TextAttributInterface;
+use App\Attribut\TextAttribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/symfony/tests/Unit/Entity/Attribut/UserAttributTest.php b/application/symfony/tests/Unit/Attribut/UserAttributTest.php
similarity index 85%
rename from application/symfony/tests/Unit/Entity/Attribut/UserAttributTest.php
rename to application/symfony/tests/Unit/Attribut/UserAttributTest.php
index 4236080..f64572f 100644
--- a/application/symfony/tests/Unit/Entity/Attribut/UserAttributTest.php
+++ b/application/symfony/tests/Unit/Attribut/UserAttributTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Unit\Entity\Attribut;
+namespace Tests\Unit\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\UserAttribut;
+use App\Attribut\UserAttributInterface;
+use App\Attribut\UserAttribut;
 use App\Entity\UserInterface;
 
 class UserAttributTest extends TestCase
diff --git a/application/symfony/tests/Unit/Domain/SecureSourceManagement/SecureSourceCheckerTest.php b/application/symfony/tests/Unit/Domain/SecureSourceManagement/SecureSourceCheckerTest.php
index 51c7baf..08ad6f4 100644
--- a/application/symfony/tests/Unit/Domain/SecureSourceManagement/SecureSourceCheckerTest.php
+++ b/application/symfony/tests/Unit/Domain/SecureSourceManagement/SecureSourceCheckerTest.php
@@ -10,8 +10,8 @@ use App\Domain\SecureManagement\SecureSourceChecker;
 use App\Entity\Meta\Right;
 use App\DBAL\Types\Meta\Right\LayerType;
 use App\DBAL\Types\Meta\Right\CRUDType;
-use App\Entity\Attribut\SourceAttribut;
-use App\Entity\Attribut\SourceAttributInterface;
+use App\Attribut\SourceAttribut;
+use App\Attribut\SourceAttributInterface;
 use App\Exception\SourceAccessDenied;
 
 /**