diff --git a/application/src/Controller/SourceController.php b/application/src/Controller/SourceController.php
index 7c72343..a919c77 100644
--- a/application/src/Controller/SourceController.php
+++ b/application/src/Controller/SourceController.php
@@ -3,12 +3,12 @@
 namespace App\Controller;
 
 use Symfony\Component\HttpFoundation\Response;
-use App\Entity\AbstractSource;
+use App\Entity\Method;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
 use App\Creator\Factory\Template\Source\SourceTemplateFactory;
 use FOS\RestBundle\Controller\FOSRestController;
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\Creator\Factory\Template\Source\SourceTemplateFormFactory;
 use App\Creator\Factory\Form\Source\SourceFormFactory;
 use Symfony\Component\HttpFoundation\RedirectResponse;
diff --git a/application/src/Creator/Factory/AbstractSourceFactory.php b/application/src/Creator/Factory/AbstractSourceFactory.php
index 864e430..36d9167 100644
--- a/application/src/Creator/Factory/AbstractSourceFactory.php
+++ b/application/src/Creator/Factory/AbstractSourceFactory.php
@@ -2,7 +2,7 @@
 
 namespace App\Creator\Factory;
 
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Creator/Factory/Template/Source/SourceTemplateFactory.php b/application/src/Creator/Factory/Template/Source/SourceTemplateFactory.php
index 19f0cb3..af2b39a 100644
--- a/application/src/Creator/Factory/Template/Source/SourceTemplateFactory.php
+++ b/application/src/Creator/Factory/Template/Source/SourceTemplateFactory.php
@@ -2,7 +2,7 @@
 
 namespace App\Creator\Factory\Template\Source;
 
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Creator\Factory\AbstractSourceFactory;
 
diff --git a/application/src/Entity/Attribut/BlacklistAttributInterface.php b/application/src/Entity/Attribut/BlacklistAttributInterface.php
index e26a198..1ca7497 100644
--- a/application/src/Entity/Attribut/BlacklistAttributInterface.php
+++ b/application/src/Entity/Attribut/BlacklistAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ChildsAttributeInterface.php b/application/src/Entity/Attribut/ChildsAttributeInterface.php
index a6536f0..d22984c 100644
--- a/application/src/Entity/Attribut/ChildsAttributeInterface.php
+++ b/application/src/Entity/Attribut/ChildsAttributeInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/ConditionAttributInterface.php b/application/src/Entity/Attribut/ConditionAttributInterface.php
index 4afdff9..1c60971 100644
--- a/application/src/Entity/Attribut/ConditionAttributInterface.php
+++ b/application/src/Entity/Attribut/ConditionAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Logic\Operation\OperationInterface;
 
diff --git a/application/src/Entity/Attribut/GrantAttributInterface.php b/application/src/Entity/Attribut/GrantAttributInterface.php
index 5941ddd..ecb8679 100644
--- a/application/src/Entity/Attribut/GrantAttributInterface.php
+++ b/application/src/Entity/Attribut/GrantAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/IdAttributInterface.php b/application/src/Entity/Attribut/IdAttributInterface.php
index 4a8311a..6af8838 100644
--- a/application/src/Entity/Attribut/IdAttributInterface.php
+++ b/application/src/Entity/Attribut/IdAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/LawAttributInterface.php b/application/src/Entity/Attribut/LawAttributInterface.php
index d89add4..3926b55 100644
--- a/application/src/Entity/Attribut/LawAttributInterface.php
+++ b/application/src/Entity/Attribut/LawAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Entity\LawInterface;
 
diff --git a/application/src/Entity/Attribut/LayerAttributInterface.php b/application/src/Entity/Attribut/LayerAttributInterface.php
index f791a12..9c8db65 100644
--- a/application/src/Entity/Attribut/LayerAttributInterface.php
+++ b/application/src/Entity/Attribut/LayerAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameAttributInterface.php b/application/src/Entity/Attribut/NameAttributInterface.php
index c660492..083527c 100644
--- a/application/src/Entity/Attribut/NameAttributInterface.php
+++ b/application/src/Entity/Attribut/NameAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttribut.php b/application/src/Entity/Attribut/NameSourceAttribut.php
index 17c1ee0..4f493e7 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\Source\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttributInterface.php b/application/src/Entity/Attribut/NameSourceAttributInterface.php
index 071087e..a7d0a8e 100644
--- a/application/src/Entity/Attribut/NameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/NameSourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
-use App\Entity\NameSourceInterface;
+use App\Entity\Source\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NodeAttributInterface.php b/application/src/Entity/Attribut/NodeAttributInterface.php
index 6f26e9d..46217e6 100644
--- a/application/src/Entity/Attribut/NodeAttributInterface.php
+++ b/application/src/Entity/Attribut/NodeAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Entity\NodeInterface;
 
diff --git a/application/src/Entity/Attribut/ParentAttribut.php b/application/src/Entity/Attribut/ParentAttribut.php
index fed3787..8126b61 100644
--- a/application/src/Entity/Attribut/ParentAttribut.php
+++ b/application/src/Entity/Attribut/ParentAttribut.php
@@ -2,7 +2,7 @@
 
 namespace Entity\Attribut;
 
-use App\Entity\Attribut\Interfaces\ParentAttributInterface;
+use App\Entity\Attribut\ParentAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ParentAttributInterface.php b/application/src/Entity/Attribut/ParentAttributInterface.php
index c34be8c..32d0d27 100644
--- a/application/src/Entity/Attribut/ParentAttributInterface.php
+++ b/application/src/Entity/Attribut/ParentAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/ParentsAttributInterface.php b/application/src/Entity/Attribut/ParentsAttributInterface.php
index e19e0d1..1d3632e 100644
--- a/application/src/Entity/Attribut/ParentsAttributInterface.php
+++ b/application/src/Entity/Attribut/ParentsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/RecieverAttributInterface.php b/application/src/Entity/Attribut/RecieverAttributInterface.php
index 83432ed..0085ea9 100644
--- a/application/src/Entity/Attribut/RecieverAttributInterface.php
+++ b/application/src/Entity/Attribut/RecieverAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php b/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
index b555719..6027fcc 100644
--- a/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
+++ b/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Entity\RecieverGroupInterface;
 
diff --git a/application/src/Entity/Attribut/RightAttributInterface.php b/application/src/Entity/Attribut/RightAttributInterface.php
index 29da8c1..cd9970b 100644
--- a/application/src/Entity/Attribut/RightAttributInterface.php
+++ b/application/src/Entity/Attribut/RightAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Entity\RightInterface;
 
diff --git a/application/src/Entity/Attribut/RightsAttributInterface.php b/application/src/Entity/Attribut/RightsAttributInterface.php
index f89a74c..5ec968c 100644
--- a/application/src/Entity/Attribut/RightsAttributInterface.php
+++ b/application/src/Entity/Attribut/RightsAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\Collection;
 
diff --git a/application/src/Entity/Attribut/SourceAttribut.php b/application/src/Entity/Attribut/SourceAttribut.php
index 5d6f5c7..56ac954 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\Source\SourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/SourceAttributInterface.php b/application/src/Entity/Attribut/SourceAttributInterface.php
index e4d9c0c..7e83412 100644
--- a/application/src/Entity/Attribut/SourceAttributInterface.php
+++ b/application/src/Entity/Attribut/SourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/TypeAttributInterface.php b/application/src/Entity/Attribut/TypeAttributInterface.php
index d6d875e..708ea9d 100644
--- a/application/src/Entity/Attribut/TypeAttributInterface.php
+++ b/application/src/Entity/Attribut/TypeAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/UserAttributInterface.php b/application/src/Entity/Attribut/UserAttributInterface.php
index 1e30410..d3200d8 100644
--- a/application/src/Entity/Attribut/UserAttributInterface.php
+++ b/application/src/Entity/Attribut/UserAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 use App\Entity\UserInterface;
 
diff --git a/application/src/Entity/Attribut/UserSourceAttribut.php b/application/src/Entity/Attribut/UserSourceAttribut.php
index 2c10908..e66f2ff 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\Source\UserSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/UserSourceAttributInterface.php b/application/src/Entity/Attribut/UserSourceAttributInterface.php
index 3920326..e543cad 100644
--- a/application/src/Entity/Attribut/UserSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/UserSourceAttributInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
-use App\Entity\UserSourceInterface;
+use App\Entity\Source\UserSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/WhitelistAttributInterface.php b/application/src/Entity/Attribut/WhitelistAttributInterface.php
index eaba5fc..66067f6 100644
--- a/application/src/Entity/Attribut/WhitelistAttributInterface.php
+++ b/application/src/Entity/Attribut/WhitelistAttributInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Attribut\Interfaces;
+namespace App\Entity\Attribut;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/LawInterface.php b/application/src/Entity/LawInterface.php
index fd972b9..8ade9fe 100644
--- a/application/src/Entity/LawInterface.php
+++ b/application/src/Entity/LawInterface.php
@@ -2,9 +2,9 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\Interfaces\RightsAttributInterface;
-use App\Entity\Method\Interfaces\NodeGrantedInterface;
-use App\Entity\Attribut\Interfaces\NodeAttributInterface;
+use App\Entity\Attribut\RightsAttributInterface;
+use App\Entity\Method\NodeGrantedInterface;
+use App\Entity\Attribut\NodeAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Method/NodeGrantedInterface.php b/application/src/Entity/Method/NodeGrantedInterface.php
index db743b2..b89bdc5 100644
--- a/application/src/Entity/Method/NodeGrantedInterface.php
+++ b/application/src/Entity/Method/NodeGrantedInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Method\Interfaces;
+namespace App\Entity\Method;
 
 use App\Entity\NodeInterface;
 
diff --git a/application/src/Entity/Node.php b/application/src/Entity/Node.php
index 02ca332..ddbcc3b 100644
--- a/application/src/Entity/Node.php
+++ b/application/src/Entity/Node.php
@@ -10,7 +10,7 @@ use App\Entity\Attribut\ChildsAttribut;
 use App\Entity\Attribut\LawAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\NodeInterface;
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\Entity\LawInterface;
 
 /**
diff --git a/application/src/Entity/NodeInterface.php b/application/src/Entity/NodeInterface.php
index e16526f..af04bdc 100644
--- a/application/src/Entity/NodeInterface.php
+++ b/application/src/Entity/NodeInterface.php
@@ -2,11 +2,11 @@
 
 namespace App\Entity;
 
-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;
+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
diff --git a/application/src/Entity/Source/RecieverGroupInterface.php b/application/src/Entity/RecieverGroupInterface.php
similarity index 68%
rename from application/src/Entity/Source/RecieverGroupInterface.php
rename to application/src/Entity/RecieverGroupInterface.php
index 94634bf..532d1c3 100644
--- a/application/src/Entity/Source/RecieverGroupInterface.php
+++ b/application/src/Entity/RecieverGroupInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity;
 
-use App\Entity\Attribut\Interfaces\NodeAttributInterface;
-use App\Entity\Attribut\Interfaces\RecieverAttributInterface;
+use App\Entity\Attribut\NodeAttributInterface;
+use App\Entity\Attribut\RecieverAttributInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
diff --git a/application/src/Entity/RightInterface.php b/application/src/Entity/RightInterface.php
index 66e9706..db106db 100644
--- a/application/src/Entity/RightInterface.php
+++ b/application/src/Entity/RightInterface.php
@@ -2,14 +2,14 @@
 
 namespace App\Entity;
 
-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;
+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
diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index 89f64f4..74c4895 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source;
 
 use App\Entity\Attribut\NodeAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\Entity\NodeInterface;
+use App\Entity\AbstractEntity;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/NameSource.php b/application/src/Entity/Source/NameSource.php
index fbaf6ec..f4bbe99 100644
--- a/application/src/Entity/Source/NameSource.php
+++ b/application/src/Entity/Source/NameSource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source;
 
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
-use App\Entity\NameSourceInterface;
+use App\Entity\Source\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/NameSourceInterface.php b/application/src/Entity/Source/NameSourceInterface.php
index a6a2671..dbd85c1 100644
--- a/application/src/Entity/Source/NameSourceInterface.php
+++ b/application/src/Entity/Source/NameSourceInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source;
 
-use App\Entity\Attribut\Interfaces\NameAttributInterface;
+use App\Entity\Attribut\NameAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/Operation/AbstractOperation.php b/application/src/Entity/Source/Operation/AbstractOperation.php
index 782a640..d8c8060 100644
--- a/application/src/Entity/Source/Operation/AbstractOperation.php
+++ b/application/src/Entity/Source/Operation/AbstractOperation.php
@@ -1,14 +1,15 @@
 <?php
-
-namespace App\Entity;
+namespace App\Entity\Source\Operation;
 
 use App\Logic\Result\ResultInterface;
 use App\Logic\Operation\OperationInterface;
 use App\Logic\Operation\OperandInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use App\Entity\Source\AbstractSource;
 
 /**
+ *
  * @author kevinfrantz
  * @ORM\Entity
  * @ORM\Table(name="source_operation")
@@ -18,6 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  */
 abstract class AbstractOperation extends AbstractSource implements OperationInterface
 {
+
     /**
      * The result MUST NOT be saved via Doctrine!
      *
@@ -26,6 +28,7 @@ abstract class AbstractOperation extends AbstractSource implements OperationInte
     protected $result;
 
     /**
+     *
      * @var ArrayCollection|OperandInterface[]
      */
     protected $operands;
diff --git a/application/src/Entity/Source/Operation/AndOperation.php b/application/src/Entity/Source/Operation/AndOperation.php
index a0bb3e2..b3534bf 100644
--- a/application/src/Entity/Source/Operation/AndOperation.php
+++ b/application/src/Entity/Source/Operation/AndOperation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source\Operation;
 
 use App\Logic\Operation\OperandInterface;
 use App\Logic\Result\Result;
diff --git a/application/src/Entity/Source/SourceInterface.php b/application/src/Entity/Source/SourceInterface.php
new file mode 100644
index 0000000..d993c99
--- /dev/null
+++ b/application/src/Entity/Source/SourceInterface.php
@@ -0,0 +1,13 @@
+<?php
+namespace App\Entity\Source;
+
+use App\Entity\Attribut\NodeAttributInterface;
+use App\Entity\Attribut\IdAttributInterface;
+
+/**
+ *
+ * @author kevinfrantz
+ */
+interface SourceInterface extends IdAttributInterface, NodeAttributInterface
+{
+}
diff --git a/application/src/Entity/Source/UserSource.php b/application/src/Entity/Source/UserSource.php
index c20775a..3568a43 100644
--- a/application/src/Entity/Source/UserSource.php
+++ b/application/src/Entity/Source/UserSource.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source;
 
 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\UserSourceInterface;
-use App\Entity\NameSourceInterface;
+use App\Entity\Source\UserSourceInterface;
+use App\Entity\Source\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/UserSourceInterface.php b/application/src/Entity/Source/UserSourceInterface.php
index aad0397..af028c4 100644
--- a/application/src/Entity/Source/UserSourceInterface.php
+++ b/application/src/Entity/Source/UserSourceInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Entity;
+namespace App\Entity\Source;
 
-use App\Entity\Attribut\Interfaces\UserAttributInterface;
-use App\Entity\Attribut\Interfaces\NameSourceAttributInterface;
+use App\Entity\Attribut\UserAttributInterface;
+use App\Entity\Attribut\NameSourceAttributInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/SourceInterface.php b/application/src/Entity/SourceInterface.php
deleted file mode 100644
index 62238a7..0000000
--- a/application/src/Entity/SourceInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-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/User.php b/application/src/Entity/User.php
index 865005c..88f248e 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -4,12 +4,11 @@ namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
-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\UserInterface;
-use App\Entity\UserSourceInterface;
+use App\Entity\Source\UserSourceInterface;
+use App\Entity\Source\UserSource;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/UserInterface.php b/application/src/Entity/UserInterface.php
index 0e3a975..919f5e5 100644
--- a/application/src/Entity/UserInterface.php
+++ b/application/src/Entity/UserInterface.php
@@ -2,7 +2,7 @@
 namespace App\Entity;
 
 use FOS\UserBundle\Model\UserInterface as FOSUserInterface;
-use App\Entity\Attribut\Interfaces\SourceAttributInterface;
+use App\Entity\Attribut\SourceAttributInterface;
 
 /**
  *
diff --git a/application/src/Security/SourceVoter.php b/application/src/Security/SourceVoter.php
index 1f0858b..67eea17 100644
--- a/application/src/Security/SourceVoter.php
+++ b/application/src/Security/SourceVoter.php
@@ -4,7 +4,7 @@ namespace App\Security;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use App\DBAL\Types\RightType;
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\DBAL\Types\LayerType;
 use App\Entity\UserInterface;
 
diff --git a/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php b/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php
index 1721829..1e3fd5f 100644
--- a/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php
+++ b/application/src/Structur/Facade/Security/Source/AbstractSourceFacade.php
@@ -3,7 +3,7 @@
 namespace App\Structur\Facade\Security\Source;
 
 use App\Entity\NodeInterface;
-use App\Entity\SourceInterface;
+use App\Entity\Source\SourceInterface;
 use App\Entity\User;
 use App\DBAL\Types\RightType;
 use App\DBAL\Types\LayerType;
diff --git a/application/src/Structur/Facade/Security/Source/UserSourceFacade.php b/application/src/Structur/Facade/Security/Source/UserSourceFacade.php
index 0b04ca7..ba5fee8 100644
--- a/application/src/Structur/Facade/Security/Source/UserSourceFacade.php
+++ b/application/src/Structur/Facade/Security/Source/UserSourceFacade.php
@@ -2,9 +2,9 @@
 
 namespace App\Structur\Facade\Security\Source;
 
-use App\Entity\NameSourceInterface;
-use App\Entity\User;
-use App\Entity\UserSourceInterface;
+use App\Entity\Source\NameSourceInterface;
+use App\Entity\UserInterface;
+use App\Entity\Source\UserSourceInterface;
 use App\DBAL\Types\RightType;
 use App\DBAL\Types\LayerType;
 
@@ -38,14 +38,10 @@ class UserSourceFacade extends AbstractSourceFacade implements UserSourceInterfa
 
         return $this->isGranted($right, $layer) && $law->isGranted($userSourceNode, $layer, $right);
     }
+    public function getUser(): UserInterface
+    {}
 
-    public function getUser(): User
-    {
-        //FILL
-    }
-    public function setUser(User $user): void
-    {
-        //FILL
-    }
+    public function setUser(UserInterface $user): void
+    {}
 
 }
diff --git a/application/tests/unit/Entity/UserTest.php b/application/tests/unit/Entity/UserTest.php
index 8db4a8e..347f96a 100644
--- a/application/tests/unit/Entity/UserTest.php
+++ b/application/tests/unit/Entity/UserTest.php
@@ -5,7 +5,7 @@ namespace tests\unit\Entity;
 use PHPUnit\Framework\TestCase;
 use App\Entity\User;
 use App\Entity\Law;
-use App\Entity\UserSource;
+use App\Entity\Source\UserSource;
 use App\Entity\Node;
 
 /**