diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/Upsert/Handler/PersonUpsertHandler.php b/src/Bundle/ChillPersonBundle/Actions/Upsert/Handler/PersonUpsertHandler.php
similarity index 98%
rename from src/Bundle/ChillPersonBundle/Entity/Person/Upsert/Handler/PersonUpsertHandler.php
rename to src/Bundle/ChillPersonBundle/Actions/Upsert/Handler/PersonUpsertHandler.php
index 2ad827789..04d593851 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/Upsert/Handler/PersonUpsertHandler.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Upsert/Handler/PersonUpsertHandler.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\PersonBundle\Entity\Person\Upsert\Handler;
+namespace Chill\PersonBundle\Actions\Upsert\Handler;
 
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\Identifier\PersonIdentifierDefinitionRepository;
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person/Upsert/UpsertMessage.php b/src/Bundle/ChillPersonBundle/Actions/Upsert/UpsertMessage.php
similarity index 88%
rename from src/Bundle/ChillPersonBundle/Entity/Person/Upsert/UpsertMessage.php
rename to src/Bundle/ChillPersonBundle/Actions/Upsert/UpsertMessage.php
index 81e9d6eb2..998abe1aa 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person/Upsert/UpsertMessage.php
+++ b/src/Bundle/ChillPersonBundle/Actions/Upsert/UpsertMessage.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\PersonBundle\Entity\Person\Upsert;
+namespace Chill\PersonBundle\Actions\Upsert;
 
 class UpsertMessage
 {
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Person/Upsert/PersonUpsertHandlerTest.php b/src/Bundle/ChillPersonBundle/Tests/Action/Upsert/Handler/PersonUpsertHandlerTest.php
similarity index 100%
rename from src/Bundle/ChillPersonBundle/Tests/Entity/Person/Upsert/PersonUpsertHandlerTest.php
rename to src/Bundle/ChillPersonBundle/Tests/Action/Upsert/Handler/PersonUpsertHandlerTest.php