diff --git a/mailpoet/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php b/mailpoet/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
index 3b3014f09a..6c7abc165c 100644
--- a/mailpoet/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
+++ b/mailpoet/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
@@ -6,7 +6,7 @@ use MailPoet\Cron\Workers\SendingQueue\Tasks\Links as LinksTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes as ShortcodesTask;
 use MailPoet\DI\ContainerWrapper;
-use MailPoet\EmailEditor\Engine\PersonalizationTags\Personalizer;
+use MailPoet\EmailEditor\Engine\Personalizer;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\ScheduledTaskEntity;
 use MailPoet\Entities\SegmentEntity;
diff --git a/mailpoet/lib/DI/ContainerConfigurator.php b/mailpoet/lib/DI/ContainerConfigurator.php
index 8c2ba335f0..a7b16a63e0 100644
--- a/mailpoet/lib/DI/ContainerConfigurator.php
+++ b/mailpoet/lib/DI/ContainerConfigurator.php
@@ -365,7 +365,7 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\EmailEditor\Integrations\MailPoet\Blocks\BlockTypes\PoweredByMailpoet::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Integrations\MailPoet\Patterns\PatternsController::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\PersonalizationTags\Personalization_Tags_Registry::class)->setPublic(true);
-    $container->autowire(\MailPoet\EmailEditor\Engine\PersonalizationTags\Personalizer::class)->setPublic(true);
+    $container->autowire(\MailPoet\EmailEditor\Engine\Personalizer::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Integrations\MailPoet\PersonalizationTags\Subscriber::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Integrations\MailPoet\PersonalizationTagManager::class)->setPublic(true);
     // Features
diff --git a/mailpoet/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php b/mailpoet/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
index 97fd1dabbc..b318360cf9 100644
--- a/mailpoet/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
+++ b/mailpoet/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
@@ -2,7 +2,7 @@
 
 namespace MailPoet\Newsletter\ViewInBrowser;
 
-use MailPoet\EmailEditor\Engine\PersonalizationTags\Personalizer;
+use MailPoet\EmailEditor\Engine\Personalizer;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\SendingQueueEntity;
 use MailPoet\Entities\SubscriberEntity;
diff --git a/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserRendererTest.php b/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserRendererTest.php
index f5af938ede..f96d2b96ef 100644
--- a/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserRendererTest.php
+++ b/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserRendererTest.php
@@ -4,7 +4,7 @@ namespace MailPoet\Newsletter\ViewInBrowser;
 
 use Codeception\Stub\Expected;
 use MailPoet\Cron\Workers\SendingQueue\SendingQueue;
-use MailPoet\EmailEditor\Engine\PersonalizationTags\Personalizer;
+use MailPoet\EmailEditor\Engine\Personalizer;
 use MailPoet\Entities\NewsletterEntity;
 use MailPoet\Entities\ScheduledTaskEntity;
 use MailPoet\Entities\SendingQueueEntity;
diff --git a/packages/php/email-editor/src/Engine/PersonalizationTags/class-personalizer.php b/packages/php/email-editor/src/Engine/class-personalizer.php
similarity index 94%
rename from packages/php/email-editor/src/Engine/PersonalizationTags/class-personalizer.php
rename to packages/php/email-editor/src/Engine/class-personalizer.php
index 0ccb6286bb..fa2de6a90e 100644
--- a/packages/php/email-editor/src/Engine/PersonalizationTags/class-personalizer.php
+++ b/packages/php/email-editor/src/Engine/class-personalizer.php
@@ -7,7 +7,10 @@
 
 declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\PersonalizationTags;
+namespace MailPoet\EmailEditor\Engine;
+
+use MailPoet\EmailEditor\Engine\PersonalizationTags\HTML_Tag_Processor;
+use MailPoet\EmailEditor\Engine\PersonalizationTags\Personalization_Tags_Registry;
 
 /**
  * Class for replacing personalization tags with their values in the email content.
diff --git a/packages/php/email-editor/tests/integration/Engine/PersonalizationTags/Personalizer_Test.php b/packages/php/email-editor/tests/integration/Engine/Personalizer_Test.php
similarity index 96%
rename from packages/php/email-editor/tests/integration/Engine/PersonalizationTags/Personalizer_Test.php
rename to packages/php/email-editor/tests/integration/Engine/Personalizer_Test.php
index 096b694c86..08e688205b 100644
--- a/packages/php/email-editor/tests/integration/Engine/PersonalizationTags/Personalizer_Test.php
+++ b/packages/php/email-editor/tests/integration/Engine/Personalizer_Test.php
@@ -6,13 +6,15 @@
  */
 
 declare(strict_types = 1);
-namespace MailPoet\EmailEditor\Engine\PersonalizationTags;
+namespace MailPoet\EmailEditor\Engine;
+
+use MailPoet\EmailEditor\Engine\PersonalizationTags\Personalization_Tags_Registry;
 
 /**
  * Integration test for Personalizer class which validate the functionality
  * of Personalizer using Personalization_Tags_Registry.
  */
-class PersonalizerIntegrationTest extends \MailPoetTest {
+class Personalizer_Test extends \MailPoetTest {
 	/**
 	 * Instance of Personalizer created before each test.
 	 *