diff --git a/application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php b/application/src/Entity/Attribut/BlacklistAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/BlacklistAttributInterface.php
rename to application/src/Entity/Attribut/BlacklistAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php b/application/src/Entity/Attribut/ChildsAttributeInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/ChildsAttributeInterface.php
rename to application/src/Entity/Attribut/ChildsAttributeInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php b/application/src/Entity/Attribut/ConditionAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/ConditionAttributInterface.php
rename to application/src/Entity/Attribut/ConditionAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php b/application/src/Entity/Attribut/GrantAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/GrantAttributInterface.php
rename to application/src/Entity/Attribut/GrantAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/IdAttributInterface.php b/application/src/Entity/Attribut/IdAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/IdAttributInterface.php
rename to application/src/Entity/Attribut/IdAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/LawAttributInterface.php b/application/src/Entity/Attribut/LawAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/LawAttributInterface.php
rename to application/src/Entity/Attribut/LawAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php b/application/src/Entity/Attribut/LayerAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/LayerAttributInterface.php
rename to application/src/Entity/Attribut/LayerAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/NameAttributInterface.php b/application/src/Entity/Attribut/NameAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/NameAttributInterface.php
rename to application/src/Entity/Attribut/NameAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php b/application/src/Entity/Attribut/NameSourceAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/NameSourceAttributInterface.php
rename to application/src/Entity/Attribut/NameSourceAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php b/application/src/Entity/Attribut/NodeAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/NodeAttributInterface.php
rename to application/src/Entity/Attribut/NodeAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php b/application/src/Entity/Attribut/ParentAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/ParentAttributInterface.php
rename to application/src/Entity/Attribut/ParentAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php b/application/src/Entity/Attribut/ParentsAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/ParentsAttributInterface.php
rename to application/src/Entity/Attribut/ParentsAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php b/application/src/Entity/Attribut/RecieverAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/RecieverAttributInterface.php
rename to application/src/Entity/Attribut/RecieverAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php b/application/src/Entity/Attribut/RecieverGroupAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/RecieverGroupAttributInterface.php
rename to application/src/Entity/Attribut/RecieverGroupAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/RightAttributInterface.php b/application/src/Entity/Attribut/RightAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/RightAttributInterface.php
rename to application/src/Entity/Attribut/RightAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php b/application/src/Entity/Attribut/RightsAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/RightsAttributInterface.php
rename to application/src/Entity/Attribut/RightsAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php b/application/src/Entity/Attribut/SourceAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/SourceAttributInterface.php
rename to application/src/Entity/Attribut/SourceAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php b/application/src/Entity/Attribut/TypeAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/TypeAttributInterface.php
rename to application/src/Entity/Attribut/TypeAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/UserAttributInterface.php b/application/src/Entity/Attribut/UserAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/UserAttributInterface.php
rename to application/src/Entity/Attribut/UserAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php b/application/src/Entity/Attribut/UserSourceAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/UserSourceAttributInterface.php
rename to application/src/Entity/Attribut/UserSourceAttributInterface.php
diff --git a/application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php b/application/src/Entity/Attribut/WhitelistAttributInterface.php
similarity index 100%
rename from application/src/Entity/Attribut/Interfaces/WhitelistAttributInterface.php
rename to application/src/Entity/Attribut/WhitelistAttributInterface.php
diff --git a/application/src/Entity/Interfaces/LawInterface.php b/application/src/Entity/LawInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/LawInterface.php
rename to application/src/Entity/LawInterface.php
diff --git a/application/src/Entity/Method/Interfaces/NodeGrantedInterface.php b/application/src/Entity/Method/NodeGrantedInterface.php
similarity index 100%
rename from application/src/Entity/Method/Interfaces/NodeGrantedInterface.php
rename to application/src/Entity/Method/NodeGrantedInterface.php
diff --git a/application/src/Entity/Interfaces/NodeInterface.php b/application/src/Entity/NodeInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/NodeInterface.php
rename to application/src/Entity/NodeInterface.php
diff --git a/application/src/Entity/Interfaces/RightInterface.php b/application/src/Entity/RightInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/RightInterface.php
rename to application/src/Entity/RightInterface.php
diff --git a/application/src/Entity/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
similarity index 100%
rename from application/src/Entity/AbstractSource.php
rename to application/src/Entity/Source/AbstractSource.php
diff --git a/application/src/Entity/NameSource.php b/application/src/Entity/Source/NameSource.php
similarity index 100%
rename from application/src/Entity/NameSource.php
rename to application/src/Entity/Source/NameSource.php
diff --git a/application/src/Entity/Interfaces/NameSourceInterface.php b/application/src/Entity/Source/NameSourceInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/NameSourceInterface.php
rename to application/src/Entity/Source/NameSourceInterface.php
diff --git a/application/src/Entity/AbstractOperation.php b/application/src/Entity/Source/Operation/AbstractOperation.php
similarity index 100%
rename from application/src/Entity/AbstractOperation.php
rename to application/src/Entity/Source/Operation/AbstractOperation.php
diff --git a/application/src/Entity/AndOperation.php b/application/src/Entity/Source/Operation/AndOperation.php
similarity index 100%
rename from application/src/Entity/AndOperation.php
rename to application/src/Entity/Source/Operation/AndOperation.php
diff --git a/application/src/Entity/Interfaces/RecieverGroupInterface.php b/application/src/Entity/Source/RecieverGroupInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/RecieverGroupInterface.php
rename to application/src/Entity/Source/RecieverGroupInterface.php
diff --git a/application/src/Entity/UserSource.php b/application/src/Entity/Source/UserSource.php
similarity index 100%
rename from application/src/Entity/UserSource.php
rename to application/src/Entity/Source/UserSource.php
diff --git a/application/src/Entity/Interfaces/UserSourceInterface.php b/application/src/Entity/Source/UserSourceInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/UserSourceInterface.php
rename to application/src/Entity/Source/UserSourceInterface.php
diff --git a/application/src/Entity/Interfaces/SourceInterface.php b/application/src/Entity/SourceInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/SourceInterface.php
rename to application/src/Entity/SourceInterface.php
diff --git a/application/src/Entity/Interfaces/UserInterface.php b/application/src/Entity/UserInterface.php
similarity index 100%
rename from application/src/Entity/Interfaces/UserInterface.php
rename to application/src/Entity/UserInterface.php
diff --git a/application/src/Structur/Facade/Security/Source/interfaces/SourceFacadeInterface.php b/application/src/Structur/Facade/Security/Source/SourceFacadeInterface.php
similarity index 100%
rename from application/src/Structur/Facade/Security/Source/interfaces/SourceFacadeInterface.php
rename to application/src/Structur/Facade/Security/Source/SourceFacadeInterface.php