diff --git a/application/src/Entity/Source/Combination/AbstractCombinationSource.php b/application/src/Entity/Source/Combination/AbstractCombinationSource.php
new file mode 100644
index 0000000..c0816d2
--- /dev/null
+++ b/application/src/Entity/Source/Combination/AbstractCombinationSource.php
@@ -0,0 +1,8 @@
+<?php
+namespace App\Entity\Source\Combination;
+
+use App\Entity\Source\AbstractSource;
+
+abstract class AbstractCombinationSource extends AbstractSource implements CombinationSourceInterface 
+{
+}
\ No newline at end of file
diff --git a/application/src/Entity/Source/Combination/CombinationSourceInterface.php b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
new file mode 100644
index 0000000..8f889f8
--- /dev/null
+++ b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Entity\Source\Combination;
+
+use App\Entity\Source\Data\DataSourceInterface;
+
+interface CombinationSourceInterface extends DataSourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
new file mode 100644
index 0000000..9567c75
--- /dev/null
+++ b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
@@ -0,0 +1,21 @@
+<?php
+namespace App\Entity\Source\Combination;
+
+use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Data\Name\SurnameSourceInterface;
+
+/**
+ * @todo Maybe a middle name would be helpfull in the future ;) 
+ * @author kevinfrantz
+ *
+ */
+interface FullPersonNameSourceInterface extends CombinationSourceInterface
+{
+    public function getFirstName():FirstNameSourceInterface;
+    
+    public function setFirstName(FirstNameSourceInterface $name):void;
+    
+    public function getSurname():SurnameSourceInterface;
+    
+    public function setSurname(SurnameSourceInterface $name):void;
+}
\ No newline at end of file
diff --git a/application/src/Entity/Source/Combination/IdentityInterface.php b/application/src/Entity/Source/Combination/IdentityInterface.php
new file mode 100644
index 0000000..400e47a
--- /dev/null
+++ b/application/src/Entity/Source/Combination/IdentityInterface.php
@@ -0,0 +1,8 @@
+<?php
+namespace App\Entity\Source\Data;
+
+use App\Entity\Attribut\NameAttributInterface;
+
+interface IdentityInterface extends DataSourceInterface, NameAttributInterface
+{
+}
diff --git a/application/src/Entity/Source/Combination/IdentitySource.php b/application/src/Entity/Source/Combination/IdentitySource.php
new file mode 100644
index 0000000..7ac03bd
--- /dev/null
+++ b/application/src/Entity/Source/Combination/IdentitySource.php
@@ -0,0 +1,8 @@
+<?php
+namespace App\Entity\Source\Data;
+
+class IdentitySource extends AbstractDataSource implements IdentityInterface
+{
+    
+}
+
diff --git a/application/src/Entity/Source/Data/UserSource.php b/application/src/Entity/Source/Combination/UserSource.php
similarity index 100%
rename from application/src/Entity/Source/Data/UserSource.php
rename to application/src/Entity/Source/Combination/UserSource.php
diff --git a/application/src/Entity/Source/Data/UserSourceInterface.php b/application/src/Entity/Source/Combination/UserSourceInterface.php
similarity index 100%
rename from application/src/Entity/Source/Data/UserSourceInterface.php
rename to application/src/Entity/Source/Combination/UserSourceInterface.php
diff --git a/application/src/Entity/Source/Data/Name/AbstractNameSource.php b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
new file mode 100644
index 0000000..864bfc2
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Entity\Source\Data\Name;
+
+use App\Entity\Source\Data\AbstractDataSource;
+
+class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php b/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
new file mode 100644
index 0000000..b8644eb
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
@@ -0,0 +1,7 @@
+<?php
+namespace App\Entity\Source\Data\Name;
+
+interface FirstNameSourceInterface extends NameSourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/Data/Name/NameSourceInterface.php b/application/src/Entity/Source/Data/Name/NameSourceInterface.php
new file mode 100644
index 0000000..fe95063
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/NameSourceInterface.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Entity\Source\Data\Name;
+
+use App\Entity\Source\Data\DataSourceInterface;
+use App\Entity\Attribut\NameAttributInterface;
+
+interface NameSourceInterface extends DataSourceInterface, NameAttributInterface
+{
+}
\ No newline at end of file
diff --git a/application/src/Entity/Source/Data/NameSource.php b/application/src/Entity/Source/Data/Name/NicknameSource.php
similarity index 74%
rename from application/src/Entity/Source/Data/NameSource.php
rename to application/src/Entity/Source/Data/Name/NicknameSource.php
index 05c3546..61f6df8 100644
--- a/application/src/Entity/Source/Data/NameSource.php
+++ b/application/src/Entity/Source/Data/Name/NicknameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data;
+namespace App\Entity\Source\Data\Name;
 
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
@@ -11,14 +11,14 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(name="source_data_name")
  * @ORM\Entity(repositoryClass="App\Repository\NameSourceRepository")
  */
-final class NameSource extends AbstractDataSource implements NameSourceInterface
+final class NicknameSource extends AbstractNameSource implements NicknameSourceInterface
 {
     use NameAttribut;
 
     /**
+     * @todo Implement an extra assert Layer!
      * @ORM\Column(type="string",length=255)
      * @Assert\NotBlank()
-     *
      * @var string
      */
     protected $name;
diff --git a/application/src/Entity/Source/Data/Name/NicknameSourceInterface.php b/application/src/Entity/Source/Data/Name/NicknameSourceInterface.php
new file mode 100644
index 0000000..12b1b89
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/NicknameSourceInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Entity\Source\Data\Name;
+
+/**
+ * @author kevinfrantz
+ */
+interface NicknameSourceInterface extends NameSourceInterface
+{
+}
diff --git a/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php b/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
new file mode 100644
index 0000000..389b06d
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
@@ -0,0 +1,7 @@
+<?php
+namespace App\Entity\Source\Data\Name;
+
+interface SurnameSourceInterface extends NameSourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/Data/NameSourceInterface.php b/application/src/Entity/Source/Data/NameSourceInterface.php
deleted file mode 100644
index 8643dcf..0000000
--- a/application/src/Entity/Source/Data/NameSourceInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Entity\Source\Data;
-
-use App\Entity\Attribut\NameAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NameSourceInterface extends NameAttributInterface, DataSourceInterface
-{
-}
diff --git a/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php b/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php
new file mode 100644
index 0000000..04dd4f3
--- /dev/null
+++ b/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php
@@ -0,0 +1,30 @@
+<?php
+namespace tests\unit\Entity\Source\Data;
+
+use PHPUnit\Framework\TestCase;
+use App\Entity\Source\Data\IdentityInterface;
+use App\Entity\Source\Data\IdentitySource;
+use App\Entity\Source\Data\FullPersonNameSourceInterface;
+
+class IdentitySourceTest extends TestCase
+{
+    /**
+     * @var IdentityInterface
+     */
+    protected $identity;
+    
+    public function setUp():void{
+        $this->identity = new IdentitySource();
+    }
+    
+    public function testConstructor():void{
+        $this->assertInstanceOf(FullPersonNameSourceInterface::class, $this->identity->getName());
+    }
+    
+    public function testName():void{
+        $name = $this->createMock(FullPersonNameSourceInterface::class);
+        $this->assertNull($this->identity->setName($name));
+        $this->assertEquals($name, $this->identity->getName());
+    }
+}
+