diff --git a/application/src/Domain/SourceManagement/TreeSourceService.php b/application/src/Domain/SourceManagement/TreeSourceService.php
index 60d4ae3..3283cfa 100644
--- a/application/src/Domain/SourceManagement/TreeSourceService.php
+++ b/application/src/Domain/SourceManagement/TreeSourceService.php
@@ -2,8 +2,8 @@
 
 namespace App\Domain\SourceManagement;
 
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
-use App\Entity\Source\Collection\TreeCollectionSource;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSource;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Source\SourceInterface;
diff --git a/application/src/Entity/Attribut/MembershipsAttribut.php b/application/src/Entity/Attribut/MembershipsAttribut.php
index 281938d..1403f9e 100644
--- a/application/src/Entity/Attribut/MembershipsAttribut.php
+++ b/application/src/Entity/Attribut/MembershipsAttribut.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\Collection;
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/MembershipsAttributInterface.php b/application/src/Entity/Attribut/MembershipsAttributInterface.php
index c0bfa70..83d6080 100644
--- a/application/src/Entity/Attribut/MembershipsAttributInterface.php
+++ b/application/src/Entity/Attribut/MembershipsAttributInterface.php
@@ -3,7 +3,7 @@
 namespace App\Entity\Attribut;
 
 use Doctrine\Common\Collections\Collection;
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index 96b7556..51458b7 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -14,7 +14,7 @@ use App\Entity\Meta\LawInterface;
 use App\Entity\Meta\Law;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Attribut\MembershipsAttribut;
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
 
 /**
  * @author kevinfrantz
@@ -23,7 +23,7 @@ use App\Entity\Source\Collection\TreeCollectionSourceInterface;
  * @ORM\Table(name="source")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"primitive" = "App\Entity\Source\Primitive\AbstractPrimitiveSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
+ * @ORM\DiscriminatorMap({"primitive" = "App\Entity\Source\Primitive\AbstractPrimitiveSource", "collection" = "App\Entity\Source\Complex\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
  */
 abstract class AbstractSource extends AbstractEntity implements SourceInterface
 {
@@ -42,7 +42,7 @@ abstract class AbstractSource extends AbstractEntity implements SourceInterface
      * @todo Rename table to use the right schema
      *
      * @var Collection|TreeCollectionSourceInterface[]
-     * @ORM\ManyToMany(targetEntity="App\Entity\Source\Collection\TreeCollectionSource",mappedBy="collection")
+     * @ORM\ManyToMany(targetEntity="App\Entity\Source\Complex\Collection\TreeCollectionSource",mappedBy="collection")
      */
     protected $memberships;
 
diff --git a/application/src/Entity/Source/Collection/AbstractCollectionSource.php b/application/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
similarity index 95%
rename from application/src/Entity/Source/Collection/AbstractCollectionSource.php
rename to application/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
index dfafae4..e4a19a1 100644
--- a/application/src/Entity/Source/Collection/AbstractCollectionSource.php
+++ b/application/src/Entity/Source/Complex/Collection/AbstractCollectionSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Collection;
+namespace App\Entity\Source\Complex\Collection;
 
 use App\Entity\Source\AbstractSource;
 use App\Entity\Attribut\CollectionAttribut;
diff --git a/application/src/Entity/Source/Collection/CollectionSourceInterface.php b/application/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
similarity index 80%
rename from application/src/Entity/Source/Collection/CollectionSourceInterface.php
rename to application/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
index 00deb24..1bddd97 100644
--- a/application/src/Entity/Source/Collection/CollectionSourceInterface.php
+++ b/application/src/Entity/Source/Complex/Collection/CollectionSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Collection;
+namespace App\Entity\Source\Complex\Collection;
 
 use App\Entity\Source\SourceInterface;
 use App\Entity\Attribut\CollectionAttributInterface;
diff --git a/application/src/Entity/Source/Collection/TreeCollectionSource.php b/application/src/Entity/Source/Complex/Collection/TreeCollectionSource.php
similarity index 88%
rename from application/src/Entity/Source/Collection/TreeCollectionSource.php
rename to application/src/Entity/Source/Complex/Collection/TreeCollectionSource.php
index 59c5957..ed93f05 100644
--- a/application/src/Entity/Source/Collection/TreeCollectionSource.php
+++ b/application/src/Entity/Source/Complex/Collection/TreeCollectionSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Collection;
+namespace App\Entity\Source\Complex\Collection;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\CollectionAttribut;
diff --git a/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php b/application/src/Entity/Source/Complex/Collection/TreeCollectionSourceInterface.php
similarity index 70%
rename from application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php
rename to application/src/Entity/Source/Complex/Collection/TreeCollectionSourceInterface.php
index 786fb5f..ec87fa1 100644
--- a/application/src/Entity/Source/Collection/TreeCollectionSourceInterface.php
+++ b/application/src/Entity/Source/Complex/Collection/TreeCollectionSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Collection;
+namespace App\Entity\Source\Complex\Collection;
 
 /**
  * @author kevinfrantz
diff --git a/application/tests/Unit/Domain/SourceManagement/TreeSourceServiceTest.php b/application/tests/Unit/Domain/SourceManagement/TreeSourceServiceTest.php
index 8550efa..8b726d7 100644
--- a/application/tests/Unit/Domain/SourceManagement/TreeSourceServiceTest.php
+++ b/application/tests/Unit/Domain/SourceManagement/TreeSourceServiceTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Domain\SourceManagement;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Collection\TreeCollectionSource;
+use App\Entity\Source\Complex\Collection\TreeCollectionSource;
 use App\Entity\Source\SourceInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Domain\SourceManagement\TreeSourceServiceInterface;
diff --git a/application/tests/Unit/Entity/Attribut/MembershipsAttributTest.php b/application/tests/Unit/Entity/Attribut/MembershipsAttributTest.php
index c5fb364..5b40c2a 100644
--- a/application/tests/Unit/Entity/Attribut/MembershipsAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/MembershipsAttributTest.php
@@ -6,7 +6,7 @@ use PHPUnit\Framework\TestCase;
 use App\Entity\Attribut\MembershipsAttributInterface;
 use App\Entity\Attribut\MembershipsAttribut;
 use Doctrine\Common\Collections\ArrayCollection;
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
 
 class MembershipsAttributTest extends TestCase
 {
diff --git a/application/tests/Unit/Entity/Source/Collection/AbstractCollectionSourceTest.php b/application/tests/Unit/Entity/Source/Collection/AbstractCollectionSourceTest.php
index b16484a..29e92a0 100644
--- a/application/tests/Unit/Entity/Source/Collection/AbstractCollectionSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Collection/AbstractCollectionSourceTest.php
@@ -3,8 +3,8 @@
 namespace Tests\Unit\Entity\Source\Collection;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Collection\CollectionSourceInterface;
-use App\Entity\Source\Collection\AbstractCollectionSource;
+use App\Entity\Source\Complex\Collection\CollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\AbstractCollectionSource;
 use Doctrine\Common\Collections\Collection;
 
 class AbstractCollectionSourceTest extends TestCase
diff --git a/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php b/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php
index 0ebf591..a7d1779 100644
--- a/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Collection/TreeCollectionSourceTest.php
@@ -6,8 +6,8 @@ use PHPUnit\Framework\TestCase;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use App\Entity\Source\AbstractSource;
-use App\Entity\Source\Collection\TreeCollectionSourceInterface;
-use App\Entity\Source\Collection\TreeCollectionSource;
+use App\Entity\Source\Complex\Collection\TreeCollectionSourceInterface;
+use App\Entity\Source\Complex\Collection\TreeCollectionSource;
 
 /**
  * @author kevinfrantz