diff --git a/application/src/DataFixtures/UsersFixtures.php b/application/src/DataFixtures/DummyFixtures.php
similarity index 64%
rename from application/src/DataFixtures/UsersFixtures.php
rename to application/src/DataFixtures/DummyFixtures.php
index acb7588..9e190c4 100644
--- a/application/src/DataFixtures/UsersFixtures.php
+++ b/application/src/DataFixtures/DummyFixtures.php
@@ -6,7 +6,12 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\Persistence\ObjectManager;
 use App\Entity\User;
 
-class UsersFixtures extends Fixture
+/**
+ * Never execute this fixture on a livesystem!
+ * @author kevinfrantz
+ *
+ */
+class DummyFixtures extends Fixture
 {
     public function load(ObjectManager $manager)
     {
@@ -15,6 +20,6 @@ class UsersFixtures extends Fixture
     public function adminUser()
     {
         $admin = new User();
-        $admin->getSource();
+        $source = $admin->getSource();
     }
 }
diff --git a/application/src/Entity/Source/Data/AbstractDataSource.php b/application/src/Entity/Source/Data/AbstractDataSource.php
new file mode 100644
index 0000000..176ca44
--- /dev/null
+++ b/application/src/Entity/Source/Data/AbstractDataSource.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Entity\Source\Data;
+
+use App\Entity\Source\AbstractSource; 
+
+abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/Data/DataSourceInterface.php b/application/src/Entity/Source/Data/DataSourceInterface.php
new file mode 100644
index 0000000..fd51b41
--- /dev/null
+++ b/application/src/Entity/Source/Data/DataSourceInterface.php
@@ -0,0 +1,9 @@
+<?php
+namespace App\Entity\Source\Data;
+
+use App\Entity\Source\SourceInterface;
+
+interface DataSourceInterface extends SourceInterface
+{
+}
+
diff --git a/application/src/Entity/Source/NameSource.php b/application/src/Entity/Source/Data/NameSource.php
similarity index 82%
rename from application/src/Entity/Source/NameSource.php
rename to application/src/Entity/Source/Data/NameSource.php
index 4d85c7f..fba8a54 100644
--- a/application/src/Entity/Source/NameSource.php
+++ b/application/src/Entity/Source/Data/NameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source;
+namespace App\Entity\Source\Data;
 
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
@@ -11,7 +11,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(name="source_name")
  * @ORM\Entity(repositoryClass="App\Repository\NameSourceRepository")
  */
-final class NameSource extends AbstractSource implements NameSourceInterface
+final class NameSource extends AbstractDataSource implements NameSourceInterface 
 {
     use NameAttribut;
 
diff --git a/application/src/Entity/Source/Data/NameSourceInterface.php b/application/src/Entity/Source/Data/NameSourceInterface.php
new file mode 100644
index 0000000..8643dcf
--- /dev/null
+++ b/application/src/Entity/Source/Data/NameSourceInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Entity\Source\Data;
+
+use App\Entity\Attribut\NameAttributInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface NameSourceInterface extends NameAttributInterface, DataSourceInterface
+{
+}
diff --git a/application/src/Entity/Source/UserSource.php b/application/src/Entity/Source/Data/UserSource.php
similarity index 90%
rename from application/src/Entity/Source/UserSource.php
rename to application/src/Entity/Source/Data/UserSource.php
index 8ea7a6f..19e4bca 100644
--- a/application/src/Entity/Source/UserSource.php
+++ b/application/src/Entity/Source/Data/UserSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source;
+namespace App\Entity\Source\Data;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -13,7 +13,7 @@ use App\Entity\UserInterface;
  * @ORM\Table(name="source_user")
  * @ORM\Entity(repositoryClass="App\Repository\UserSourceRepository")
  */
-final class UserSource extends AbstractSource implements UserSourceInterface
+final class UserSource extends AbstractDataSource implements UserSourceInterface
 {
     use UserAttribut,NameSourceAttribut;
 
diff --git a/application/src/Entity/Source/Data/UserSourceInterface.php b/application/src/Entity/Source/Data/UserSourceInterface.php
new file mode 100644
index 0000000..73f6a2b
--- /dev/null
+++ b/application/src/Entity/Source/Data/UserSourceInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entity\Source\Data;
+
+use App\Entity\Attribut\UserAttributInterface;
+use App\Entity\Attribut\NameSourceAttributInterface;
+use App\Entity\Source\SourceInterface;
+
+/**
+ * @author kevinfrantz
+ */
+interface UserSourceInterface extends DataSourceInterface, UserAttributInterface, NameSourceAttributInterface
+{
+}
diff --git a/application/src/Entity/Source/NameSourceInterface.php b/application/src/Entity/Source/NameSourceInterface.php
deleted file mode 100644
index dbd85c1..0000000
--- a/application/src/Entity/Source/NameSourceInterface.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Entity\Source;
-
-use App\Entity\Attribut\NameAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface NameSourceInterface extends NameAttributInterface, SourceInterface
-{
-}
diff --git a/application/src/Entity/Source/UserSourceInterface.php b/application/src/Entity/Source/UserSourceInterface.php
deleted file mode 100644
index af028c4..0000000
--- a/application/src/Entity/Source/UserSourceInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Entity\Source;
-
-use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\NameSourceAttributInterface;
-
-/**
- * @author kevinfrantz
- */
-interface UserSourceInterface extends SourceInterface, UserAttributInterface, NameSourceAttributInterface
-{
-}