diff --git a/application/src/Entity/Attribut/NameSourceAttribut.php b/application/src/Entity/Attribut/NameSourceAttribut.php
index 4f493e7..4e5de3e 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\Source\NameSourceInterface;
+use App\Entity\Source\Data\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttributInterface.php b/application/src/Entity/Attribut/NameSourceAttributInterface.php
index a7d0a8e..5debcaa 100644
--- a/application/src/Entity/Attribut/NameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/NameSourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\NameSourceInterface;
+use App\Entity\Source\Data\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/UserSourceAttribut.php b/application/src/Entity/Attribut/UserSourceAttribut.php
deleted file mode 100644
index e66f2ff..0000000
--- a/application/src/Entity/Attribut/UserSourceAttribut.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Entity\Attribut;
-
-use App\Entity\Source\UserSourceInterface;
-
-/**
- * @author kevinfrantz
- */
-trait UserSource
-{
-    /**
-     * @var UserSourceInterface
-     * @ORM\OneToOne(targetEntity="UserSource",cascade={"persist", "remove"})
-     * @ORM\JoinColumn(name="source_user_id", referencedColumnName="id")
-     */
-    protected $userSource;
-
-    public function setUserSource(UserSourceInterface $userSource): void
-    {
-        $this->user = $userSource;
-    }
-
-    public function getUserSource(): UserSourceInterface
-    {
-        return $this->userSource;
-    }
-}
diff --git a/application/src/Entity/Attribut/UserSourceAttributInterface.php b/application/src/Entity/Attribut/UserSourceAttributInterface.php
deleted file mode 100644
index e543cad..0000000
--- a/application/src/Entity/Attribut/UserSourceAttributInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-use App\Entity\Source\UserSourceInterface;
-
-/**
- * @author kevinfrantz
- */
-interface UserSourceAttributInterface
-{
-    public function setUserSource(UserSourceInterface $user): void;
-
-    public function getUserSource(): UserSourceInterface;
-}
diff --git a/application/src/Entity/Attribut/UsernameAttribut.php b/application/src/Entity/Attribut/UsernameAttribut.php
deleted file mode 100644
index 63cf346..0000000
--- a/application/src/Entity/Attribut/UsernameAttribut.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Entity\Attribut;
-
-/**
- * This trait doesn't need an own interface because it's covered by symfony.
- *
- * @author kevinfrantz
- */
-trait UsernameAttribut
-{
-    /**
-     * @ORM\Column(type="string", length=25, unique=true)
-     */
-    protected $username;
-
-    public function getUsername(): ?string
-    {
-        return $this->username;
-    }
-
-    public function setUsername(string $username): void
-    {
-        $this->username = \trim($username);
-    }
-}
diff --git a/application/tests/Unit/Entity/Source/Data/UserSourceTest.php b/application/tests/Unit/Entity/Source/Data/UserSourceTest.php
new file mode 100644
index 0000000..8fa4324
--- /dev/null
+++ b/application/tests/Unit/Entity/Source/Data/UserSourceTest.php
@@ -0,0 +1,27 @@
+<?php
+namespace tests\unit\Entity\Source\Data;
+
+use PHPUnit\Framework\TestCase;
+use App\Entity\Source\Data\UserSourceInterface;
+use App\Entity\Source\Data\UserSource;
+use Doctrine\Common\Collections\Collection;
+use App\Entity\Source\Data\NameSourceInterface;
+
+class UserSourceTest extends TestCase
+{
+    /**
+     * 
+     * @var UserSourceInterface
+     */
+    public $userSource;
+    
+    public function setUp():void{
+        $this->userSource = new UserSource();
+    }
+    
+    public function testConstructor():void {
+        $this->assertInstanceOf(Collection::class, $this->userSource->getMemberships());
+        $this->assertInstanceOf(NameSourceInterface::class, $this->userSource->getNameSource());
+    }
+}
+