diff --git a/application/src/Creator/Modificator/Entity/LawModificator.php b/application/src/Creator/Modificator/Entity/LawModificator.php
index 597a8b8..573ca79 100644
--- a/application/src/Creator/Modificator/Entity/LawModificator.php
+++ b/application/src/Creator/Modificator/Entity/LawModificator.php
@@ -4,12 +4,12 @@ namespace App\Creator\Modificator\Entity;
 
 use App\DBAL\Types\LayerType;
 use App\DBAL\Types\RightType;
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use App\Entity\Right;
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 use App\DBAL\Types\RecieverType;
-use App\Entity\RightInterface;
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RightInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 use App\Entity\RecieverGroup;
 
 /**
diff --git a/application/src/Entity/AbstractSource.php b/application/src/Entity/AbstractSource.php
index fe4c460..05f713e 100644
--- a/application/src/Entity/AbstractSource.php
+++ b/application/src/Entity/AbstractSource.php
@@ -5,6 +5,8 @@ namespace App\Entity;
 use App\Entity\Attribut\NodeAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
+use App\Entity\Interfaces\SourceInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ChildsAttribut.php b/application/src/Entity/Attribut/ChildsAttribut.php
index 770f907..05c169a 100644
--- a/application/src/Entity/Attribut/ChildsAttribut.php
+++ b/application/src/Entity/Attribut/ChildsAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use Doctrine\Common\Collections\Collection;
 
 /**
diff --git a/application/src/Entity/Attribut/BlacklistAttributInterface.php b/application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php
similarity index 80%
rename from application/src/Entity/Attribut/BlacklistAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php
index 1ca7497..e26a198 100644
--- a/application/src/Entity/Attribut/BlacklistAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ChildsAttributeInterface.php b/application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php
similarity index 84%
rename from application/src/Entity/Attribut/ChildsAttributeInterface.php
rename to application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php
index d22984c..a6536f0 100644
--- a/application/src/Entity/Attribut/ChildsAttributeInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/ConditionAttributInterface.php b/application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php
similarity index 87%
rename from application/src/Entity/Attribut/ConditionAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php
index 1c60971..4afdff9 100644
--- a/application/src/Entity/Attribut/ConditionAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use App\Logic\Operation\OperationInterface;
 
diff --git a/application/src/Entity/Attribut/GrantAttributInterface.php b/application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php
similarity index 79%
rename from application/src/Entity/Attribut/GrantAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php
index ecb8679..5941ddd 100644
--- a/application/src/Entity/Attribut/GrantAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/IdAttributInterface.php b/application/src/Entity/Attribut/Interfaces/IdAttributInterface.php
similarity index 78%
rename from application/src/Entity/Attribut/IdAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/IdAttributInterface.php
index 6af8838..4a8311a 100644
--- a/application/src/Entity/Attribut/IdAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/IdAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/LawAttributInterface.php b/application/src/Entity/Attribut/Interfaces/LawAttributInterface.php
similarity index 67%
rename from application/src/Entity/Attribut/LawAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/LawAttributInterface.php
index 3926b55..d50ce3a 100644
--- a/application/src/Entity/Attribut/LawAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/LawAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/LayerAttributInterface.php b/application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php
similarity index 80%
rename from application/src/Entity/Attribut/LayerAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php
index 9c8db65..f791a12 100644
--- a/application/src/Entity/Attribut/LayerAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameAttributInterface.php b/application/src/Entity/Attribut/Interfaces/NameAttributInterface.php
similarity index 79%
rename from application/src/Entity/Attribut/NameAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/NameAttributInterface.php
index 083527c..c660492 100644
--- a/application/src/Entity/Attribut/NameAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/NameAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttributInterface.php b/application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php
similarity index 70%
rename from application/src/Entity/Attribut/NameSourceAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php
index 22ddae5..5c53025 100644
--- a/application/src/Entity/Attribut/NameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\NameSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NodeAttributInterface.php b/application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php
similarity index 68%
rename from application/src/Entity/Attribut/NodeAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php
index 46217e6..7e6c6d8 100644
--- a/application/src/Entity/Attribut/NodeAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ParentAttributInterface.php b/application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php
similarity index 83%
rename from application/src/Entity/Attribut/ParentAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php
index f13b630..c34be8c 100644
--- a/application/src/Entity/Attribut/ParentAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ParentsAttributInterface.php b/application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php
similarity index 84%
rename from application/src/Entity/Attribut/ParentsAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php
index 1d3632e..e19e0d1 100644
--- a/application/src/Entity/Attribut/ParentsAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/RecieverAttributInterface.php b/application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php
similarity index 80%
rename from application/src/Entity/Attribut/RecieverAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php
index 0085ea9..83432ed 100644
--- a/application/src/Entity/Attribut/RecieverAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php b/application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php
similarity index 71%
rename from application/src/Entity/Attribut/RecieverGroupAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php
index 6027fcc..83d7900 100644
--- a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RightAttributInterface.php b/application/src/Entity/Attribut/Interfaces/RightAttributInterface.php
similarity index 68%
rename from application/src/Entity/Attribut/RightAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/RightAttributInterface.php
index cd9970b..ad62dc2 100644
--- a/application/src/Entity/Attribut/RightAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/RightAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\RightInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RightsAttributInterface.php b/application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php
similarity index 84%
rename from application/src/Entity/Attribut/RightsAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php
index 5ec968c..f89a74c 100644
--- a/application/src/Entity/Attribut/RightsAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/SourceAttributInterface.php b/application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php
similarity index 69%
rename from application/src/Entity/Attribut/SourceAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php
index a0b72a0..9fdd960 100644
--- a/application/src/Entity/Attribut/SourceAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\SourceInterface;
+use App\Entity\Interfaces\SourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/TypeAttributInterface.php b/application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php
similarity index 79%
rename from application/src/Entity/Attribut/TypeAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php
index 708ea9d..d6d875e 100644
--- a/application/src/Entity/Attribut/TypeAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/Interfaces/UserAttributInterface.php b/application/src/Entity/Attribut/Interfaces/UserAttributInterface.php
new file mode 100644
index 0000000..36cbf98
--- /dev/null
+++ b/application/src/Entity/Attribut/Interfaces/UserAttributInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Entity\Attribut\Interfaces;
+
+use App\Entity\Interfaces\UserInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface UserAttributInterface
+{
+    public function setUser(UserInterface $user): void;
+
+    public function getUser(): UserInterface;
+}
diff --git a/application/src/Entity/Attribut/UserSourceAttributInterface.php b/application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php
similarity index 70%
rename from application/src/Entity/Attribut/UserSourceAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php
index 3d5da53..0a27b64 100644
--- a/application/src/Entity/Attribut/UserSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
-use App\Entity\UserSourceInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/WhitelistAttributInterface.php b/application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php
similarity index 80%
rename from application/src/Entity/Attribut/WhitelistAttributInterface.php
rename to application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php
index 66067f6..eaba5fc 100644
--- a/application/src/Entity/Attribut/WhitelistAttributInterface.php
+++ b/application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut;
+namespace App\Entity\Attribut\Interfaces;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/LawAttribut.php b/application/src/Entity/Attribut/LawAttribut.php
index ed634b0..089eee4 100644
--- a/application/src/Entity/Attribut/LawAttribut.php
+++ b/application/src/Entity/Attribut/LawAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\LawInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttribut.php b/application/src/Entity/Attribut/NameSourceAttribut.php
index 17c1ee0..c7f473f 100644
--- a/application/src/Entity/Attribut/NameSourceAttribut.php
+++ b/application/src/Entity/Attribut/NameSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NameSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NodeAttribut.php b/application/src/Entity/Attribut/NodeAttribut.php
index ce3b354..79655f9 100644
--- a/application/src/Entity/Attribut/NodeAttribut.php
+++ b/application/src/Entity/Attribut/NodeAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ParentAttribut.php b/application/src/Entity/Attribut/ParentAttribut.php
index be0ede3..fed3787 100644
--- a/application/src/Entity/Attribut/ParentAttribut.php
+++ b/application/src/Entity/Attribut/ParentAttribut.php
@@ -2,6 +2,8 @@
 
 namespace Entity\Attribut;
 
+use App\Entity\Attribut\Interfaces\ParentAttributInterface;
+
 /**
  * @author kevinfrantz
  */
diff --git a/application/src/Entity/Attribut/ParentsAttribut.php b/application/src/Entity/Attribut/ParentsAttribut.php
index 96291b4..c7418cd 100644
--- a/application/src/Entity/Attribut/ParentsAttribut.php
+++ b/application/src/Entity/Attribut/ParentsAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 use Doctrine\Common\Collections\Collection;
 
 /**
diff --git a/application/src/Entity/Attribut/RecieverGroupAttribut.php b/application/src/Entity/Attribut/RecieverGroupAttribut.php
index ead37d6..99c056b 100644
--- a/application/src/Entity/Attribut/RecieverGroupAttribut.php
+++ b/application/src/Entity/Attribut/RecieverGroupAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RecieverGroupInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RightAttribut.php b/application/src/Entity/Attribut/RightAttribut.php
index 564695b..ba9c505 100644
--- a/application/src/Entity/Attribut/RightAttribut.php
+++ b/application/src/Entity/Attribut/RightAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\RightInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/SourceAttribut.php b/application/src/Entity/Attribut/SourceAttribut.php
index 5d6f5c7..436ac2d 100644
--- a/application/src/Entity/Attribut/SourceAttribut.php
+++ b/application/src/Entity/Attribut/SourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\SourceInterface;
+use App\Entity\Interfaces\SourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/UserAttribut.php b/application/src/Entity/Attribut/UserAttribut.php
index d899030..d17509a 100644
--- a/application/src/Entity/Attribut/UserAttribut.php
+++ b/application/src/Entity/Attribut/UserAttribut.php
@@ -3,6 +3,7 @@
 namespace App\Entity\Attribut;
 
 use App\Entity\User;
+use App\Entity\Interfaces\UserInterface;
 
 /**
  * @author kevinfrantz
@@ -14,12 +15,12 @@ trait UserAttribut
      */
     protected $user;
 
-    public function setUser(User $user): void
+    public function setUser(UserInterface $user): void
     {
         $this->user = $user;
     }
 
-    public function getUser(): User
+    public function getUser(): UserInterface
     {
         return $this->user;
     }
diff --git a/application/src/Entity/Attribut/UserAttributInterface.php b/application/src/Entity/Attribut/UserAttributInterface.php
deleted file mode 100644
index 0731341..0000000
--- a/application/src/Entity/Attribut/UserAttributInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-use App\Entity\User;
-
-/**
- * @author kevinfrantz
- */
-interface UserAttributInterface
-{
-    public function setUser(User $user): void;
-
-    public function getUser(): User;
-}
diff --git a/application/src/Entity/Attribut/UserSourceAttribut.php b/application/src/Entity/Attribut/UserSourceAttribut.php
index 2c10908..8854da5 100644
--- a/application/src/Entity/Attribut/UserSourceAttribut.php
+++ b/application/src/Entity/Attribut/UserSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace Entity\Attribut;
 
-use App\Entity\UserSourceInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Interfaces/LawInterface.php b/application/src/Entity/Interfaces/LawInterface.php
new file mode 100644
index 0000000..8d10495
--- /dev/null
+++ b/application/src/Entity/Interfaces/LawInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\RightsAttributInterface;
+use App\Entity\Method\Interfaces\NodeGrantedInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface LawInterface extends RightsAttributInterface, NodeGrantedInterface, NodeAttributInterface
+{
+}
diff --git a/application/src/Entity/NameSourceInterface.php b/application/src/Entity/Interfaces/NameSourceInterface.php
similarity index 57%
rename from application/src/Entity/NameSourceInterface.php
rename to application/src/Entity/Interfaces/NameSourceInterface.php
index f85d6ab..07f4e90 100644
--- a/application/src/Entity/NameSourceInterface.php
+++ b/application/src/Entity/Interfaces/NameSourceInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Interfaces;
 
-use App\Entity\Attribut\NameAttributInterface;
+use App\Entity\Attribut\Interfaces\NameAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Interfaces/NodeInterface.php b/application/src/Entity/Interfaces/NodeInterface.php
new file mode 100644
index 0000000..372bb49
--- /dev/null
+++ b/application/src/Entity/Interfaces/NodeInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
+use App\Entity\Attribut\Interfaces\IdAttributInterface;
+use App\Entity\Attribut\Interfaces\ParentsAttributInterface;
+use App\Entity\Attribut\Interfaces\ChildsAttributeInterface;
+use App\Entity\Attribut\Interfaces\LawAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
+{
+}
diff --git a/application/src/Entity/RecieverGroupInterface.php b/application/src/Entity/Interfaces/RecieverGroupInterface.php
similarity index 60%
rename from application/src/Entity/RecieverGroupInterface.php
rename to application/src/Entity/Interfaces/RecieverGroupInterface.php
index 532d1c3..ba64d8c 100644
--- a/application/src/Entity/RecieverGroupInterface.php
+++ b/application/src/Entity/Interfaces/RecieverGroupInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Interfaces;
 
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\RecieverAttributInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\RecieverAttributInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
diff --git a/application/src/Entity/Interfaces/RightInterface.php b/application/src/Entity/Interfaces/RightInterface.php
new file mode 100644
index 0000000..607f77c
--- /dev/null
+++ b/application/src/Entity/Interfaces/RightInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\TypeAttributInterface;
+use App\Entity\Attribut\Interfaces\LawAttributInterface;
+use App\Entity\Method\Interfaces\NodeGrantedInterface;
+use App\Entity\Attribut\Interfaces\RecieverGroupAttributInterface;
+use App\Entity\Attribut\Interfaces\GrantAttributInterface;
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\ConditionAttributInterface;
+use App\Entity\Attribut\Interfaces\LayerAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface RightInterface extends TypeAttributInterface, LawAttributInterface, NodeGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, NodeAttributInterface, ConditionAttributInterface, LayerAttributInterface
+{
+}
diff --git a/application/src/Entity/Interfaces/SourceInterface.php b/application/src/Entity/Interfaces/SourceInterface.php
new file mode 100644
index 0000000..bef4697
--- /dev/null
+++ b/application/src/Entity/Interfaces/SourceInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\Interfaces\IdAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface SourceInterface extends IdAttributInterface, NodeAttributInterface
+{
+}
diff --git a/application/src/Entity/Interfaces/UserInterface.php b/application/src/Entity/Interfaces/UserInterface.php
new file mode 100644
index 0000000..e8f4d6d
--- /dev/null
+++ b/application/src/Entity/Interfaces/UserInterface.php
@@ -0,0 +1,15 @@
+<?php
+namespace App\Entity\Interfaces;
+
+use FOS\UserBundle\Model\UserInterface as FOSUserInterface;
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
+
+/**
+ *
+ * @author kevinfrantz
+ *        
+ */
+interface UserInterface extends FOSUserInterface, SourceAttributInterface
+{
+    
+}
\ No newline at end of file
diff --git a/application/src/Entity/Interfaces/UserSourceInterface.php b/application/src/Entity/Interfaces/UserSourceInterface.php
new file mode 100644
index 0000000..c299afe
--- /dev/null
+++ b/application/src/Entity/Interfaces/UserSourceInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entity\Interfaces;
+
+use App\Entity\Attribut\Interfaces\UserAttributInterface;
+use App\Entity\Attribut\Interfaces\NameSourceAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface UserSourceInterface extends SourceInterface, UserAttributInterface, NameSourceAttributInterface
+{
+}
diff --git a/application/src/Entity/Law.php b/application/src/Entity/Law.php
index ca29369..4082a37 100644
--- a/application/src/Entity/Law.php
+++ b/application/src/Entity/Law.php
@@ -6,6 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\RightsAttribute;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Attribut\NodeAttribut;
+use App\Entity\Interfaces\LawInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/LawInterface.php b/application/src/Entity/LawInterface.php
deleted file mode 100644
index 8ade9fe..0000000
--- a/application/src/Entity/LawInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\RightsAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
-use App\Entity\Attribut\NodeAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface LawInterface extends RightsAttributInterface, NodeGrantedInterface, NodeAttributInterface
-{
-}
diff --git a/application/src/Entity/Method/NodeGrantedInterface.php b/application/src/Entity/Method/Interfaces/NodeGrantedInterface.php
similarity index 66%
rename from application/src/Entity/Method/NodeGrantedInterface.php
rename to application/src/Entity/Method/Interfaces/NodeGrantedInterface.php
index b89bdc5..037b231 100644
--- a/application/src/Entity/Method/NodeGrantedInterface.php
+++ b/application/src/Entity/Method/Interfaces/NodeGrantedInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Method;
+namespace App\Entity\Method\Interfaces;
 
-use App\Entity\NodeInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/NameSource.php b/application/src/Entity/NameSource.php
index fdd538c..5a82b12 100644
--- a/application/src/Entity/NameSource.php
+++ b/application/src/Entity/NameSource.php
@@ -5,6 +5,7 @@ namespace App\Entity;
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Node.php b/application/src/Entity/Node.php
index 2a63e78..96abbfd 100644
--- a/application/src/Entity/Node.php
+++ b/application/src/Entity/Node.php
@@ -9,6 +9,9 @@ use App\Entity\Attribut\ParentsAttribut;
 use App\Entity\Attribut\ChildsAttribut;
 use App\Entity\Attribut\LawAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
+use App\Entity\Interfaces\NodeInterface;
+use App\Entity\Interfaces\SourceInterface;
+use App\Entity\Interfaces\LawInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/NodeInterface.php b/application/src/Entity/NodeInterface.php
deleted file mode 100644
index af04bdc..0000000
--- a/application/src/Entity/NodeInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\SourceAttributInterface;
-use App\Entity\Attribut\IdAttributInterface;
-use App\Entity\Attribut\ParentsAttributInterface;
-use App\Entity\Attribut\ChildsAttributeInterface;
-use App\Entity\Attribut\LawAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NodeInterface extends SourceAttributInterface, IdAttributInterface, ParentsAttributInterface, ChildsAttributeInterface, LawAttributInterface
-{
-}
diff --git a/application/src/Entity/RecieverGroup.php b/application/src/Entity/RecieverGroup.php
index 5bcdb15..2c556e0 100644
--- a/application/src/Entity/RecieverGroup.php
+++ b/application/src/Entity/RecieverGroup.php
@@ -9,6 +9,8 @@ use App\DBAL\Types\RecieverType;
 use Symfony\Component\Intl\Exception\NotImplementedException;
 use Doctrine\ORM\Mapping as ORM;
 use Fresh\DoctrineEnumBundle\Validator\Constraints as DoctrineAssert;
+use App\Entity\Interfaces\RecieverGroupInterface;
+use App\Entity\Interfaces\NodeInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Right.php b/application/src/Entity/Right.php
index 6691e57..245f2a9 100644
--- a/application/src/Entity/Right.php
+++ b/application/src/Entity/Right.php
@@ -14,6 +14,10 @@ use App\Logic\Operation\OperationInterface;
 use App\Entity\Attribut\ConditionAttribut;
 use App\Entity\Attribut\RecieverGroupAttribut;
 use App\Entity\Attribut\LayerAttribut;
+use App\Entity\Interfaces\LawInterface;
+use App\Entity\Interfaces\RecieverGroupInterface;
+use App\Entity\Interfaces\NodeInterface;
+use App\Entity\Interfaces\RightInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/RightInterface.php b/application/src/Entity/RightInterface.php
deleted file mode 100644
index db106db..0000000
--- a/application/src/Entity/RightInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\TypeAttributInterface;
-use App\Entity\Attribut\LawAttributInterface;
-use App\Entity\Method\NodeGrantedInterface;
-use App\Entity\Attribut\RecieverGroupAttributInterface;
-use App\Entity\Attribut\GrantAttributInterface;
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\ConditionAttributInterface;
-use App\Entity\Attribut\LayerAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface RightInterface extends TypeAttributInterface, LawAttributInterface, NodeGrantedInterface, GrantAttributInterface, RecieverGroupAttributInterface, NodeAttributInterface, ConditionAttributInterface, LayerAttributInterface
-{
-}
diff --git a/application/src/Entity/SourceInterface.php b/application/src/Entity/SourceInterface.php
deleted file mode 100644
index 794175e..0000000
--- a/application/src/Entity/SourceInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\NodeAttributInterface;
-use App\Entity\Attribut\IdAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface SourceInterface extends IdAttributInterface, NodeAttributInterface
-{
-}
diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
index 0fd8b77..29cedad 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -4,17 +4,19 @@ namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
-use App\Entity\Attribut\SourceAttributInterface;
+use App\Entity\Attribut\Interfaces\SourceAttributInterface;
 use App\Entity\Attribut\SourceAttribut;
 use App\Entity\Attribut\IdAttribut;
 use App\Creator\Modificator\Entity\LawModificator;
+use App\Entity\Interfaces\UserInterface;
+use App\Entity\Interfaces\UserSourceInterface;
 
 /**
  * @author kevinfrantz
  * @ORM\Table(name="user")
  * @ORM\Entity(repositoryClass="App\Repository\UserRepository")
  */
-class User extends BaseUser implements SourceAttributInterface
+class User extends BaseUser implements UserInterface
 {
     use SourceAttribut,IdAttribut;
 
diff --git a/application/src/Entity/UserSource.php b/application/src/Entity/UserSource.php
index 15dfe45..8ac926f 100644
--- a/application/src/Entity/UserSource.php
+++ b/application/src/Entity/UserSource.php
@@ -6,6 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 use App\Entity\Attribut\UserAttribut;
 use App\Entity\Attribut\NameSourceAttribut;
+use App\Entity\Interfaces\UserSourceInterface;
+use App\Entity\Interfaces\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/UserSourceInterface.php b/application/src/Entity/UserSourceInterface.php
deleted file mode 100644
index 2a3b87a..0000000
--- a/application/src/Entity/UserSourceInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\NameSourceAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface UserSourceInterface extends SourceInterface, UserAttributInterface, NameSourceAttributInterface
-{
-}