diff --git a/src/Interface/MappableInterface.php b/src/Entity/Interface/MappableInterface.php
similarity index 86%
rename from src/Interface/MappableInterface.php
rename to src/Entity/Interface/MappableInterface.php
index e1f6596..99d2d73 100644
--- a/src/Interface/MappableInterface.php
+++ b/src/Entity/Interface/MappableInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Pcm\GeocodeBundle\Interface;
+namespace Pcm\GeocodeBundle\Entity\Interface;
 
 interface MappableInterface
 {
diff --git a/src/Trait/MappableTrait.php b/src/Entity/Trait/MappableTrait.php
similarity index 95%
rename from src/Trait/MappableTrait.php
rename to src/Entity/Trait/MappableTrait.php
index 6569374..4a1d59c 100644
--- a/src/Trait/MappableTrait.php
+++ b/src/Entity/Trait/MappableTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Pcm\GeocodeBundle\Trait;
+namespace Pcm\GeocodeBundle\Entity\Trait;
 
 /**
  * Allows an entity to be mapped via latitude and longitude coordinates