diff --git a/packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypes/AbstractBlock.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/AbstractBlock.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypes/AbstractBlock.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/AbstractBlock.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypes/PoweredByMailpoet.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypesController.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypesController.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/Blocks/BlockTypesController.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/Blocks/BlockTypesController.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/Cli.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/Cli.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/Cli.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/Cli.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/EmailApiController.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/EmailApiController.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/EmailApiController.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/EmailApiController.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/EmailEditor.php b/mailpoet/lib/EmailEditor/Integrations/MailPoet/EmailEditor.php
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/EmailEditor.php
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/EmailEditor.php
diff --git a/packages/php/email-editor/src/Integrations/MailPoet/Templates/testing-email-with-core-blocks.html b/mailpoet/lib/EmailEditor/Integrations/MailPoet/Templates/testing-email-with-core-blocks.html
similarity index 100%
rename from packages/php/email-editor/src/Integrations/MailPoet/Templates/testing-email-with-core-blocks.html
rename to mailpoet/lib/EmailEditor/Integrations/MailPoet/Templates/testing-email-with-core-blocks.html
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php b/mailpoet/tests/integration/EmailEditor/Integrations/MailPoet/EmailApiControllerTest.php
similarity index 100%
rename from mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php
rename to mailpoet/tests/integration/EmailEditor/Integrations/MailPoet/EmailApiControllerTest.php
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php b/mailpoet/tests/integration/EmailEditor/Integrations/MailPoet/EmailEditorTest.php
similarity index 99%
rename from mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php
rename to mailpoet/tests/integration/EmailEditor/Integrations/MailPoet/EmailEditorTest.php
index 008fe5c362..235b347738 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php
+++ b/mailpoet/tests/integration/EmailEditor/Integrations/MailPoet/EmailEditorTest.php
@@ -12,7 +12,7 @@ class EmailEditorTest extends \MailPoetTest {
 
   /** @var FeatureFlagsController */
   private $featureFlagsController;
-  
+
   public function _before() {
     $this->emailEditor = $this->diContainer->get(EmailEditor::class);
     $this->featureFlagsController = $this->diContainer->get(FeatureFlagsController::class);
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/EmailEditorTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/EmailEditorTest.php
similarity index 92%
rename from mailpoet/tests/integration/EmailEditor/Engine/EmailEditorTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/EmailEditorTest.php
index 75049698cc..fa9e8dec49 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/EmailEditorTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/EmailEditorTest.php
@@ -1,6 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine;
+namespace EmailEditor\Engine;
+
+use MailPoet\EmailEditor\Engine\EmailEditor;
 
 class EmailEditorTest extends \MailPoetTest {
   /** @var EmailEditor */
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php
similarity index 89%
rename from mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php
index f93ee25768..fcaa5b6cef 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/BlocksRegistryTest.php
@@ -1,7 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\Renderer\ContentRenderer;
+namespace EmailEditor\Engine\Renderer\ContentRenderer;
 
+use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\BlocksRegistry;
 use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Text;
 
 require_once __DIR__ . '/DummyBlockRenderer.php';
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php
similarity index 93%
rename from mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php
index 6d42dbea08..11a7b86c16 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/ContentRendererTest.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\Renderer\ContentRenderer;
+namespace EmailEditor\Engine\Renderer\ContentRenderer;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
+use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\ContentRenderer;
 use MailPoet\EmailEditor\Integrations\MailPoet\Blocks\BlockTypesController;
 
 require_once __DIR__ . '/DummyBlockRenderer.php';
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php
similarity index 70%
rename from mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php
index 34ae8dcbf9..271f784cfc 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/DummyBlockRenderer.php
@@ -1,7 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\Renderer\ContentRenderer;
+namespace EmailEditor\Engine\Renderer\ContentRenderer;
 
+use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\BlockRenderer;
 use MailPoet\EmailEditor\Engine\SettingsController;
 
 class DummyBlockRenderer implements BlockRenderer {
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php
similarity index 97%
rename from mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php
index 9323b10fc6..d55e4b2779 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/ContentRenderer/Layout/FlexLayoutRendererTest.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\Layout;
+namespace EmailEditor\Engine\Renderer\ContentRenderer\Layout;
 
-use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\DummyBlockRenderer;
+use EmailEditor\Engine\Renderer\ContentRenderer\DummyBlockRenderer;
+use MailPoet\EmailEditor\Engine\Renderer\ContentRenderer\Layout\FlexLayoutRenderer;
 use MailPoet\EmailEditor\Engine\SettingsController;
 
 require_once __DIR__ . '/../DummyBlockRenderer.php';
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php
similarity index 97%
rename from mailpoet/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php
index b4f8539fdd..5b65295643 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/Renderer/RendererTest.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine\Renderer;
+namespace EmailEditor\Engine\Renderer;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
+use MailPoet\EmailEditor\Engine\Renderer\Renderer;
 use MailPoet\EmailEditor\Engine\SettingsController;
 use MailPoet\EmailEditor\Engine\ThemeController;
 
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/ThemeControllerTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Engine/ThemeControllerTest.php
similarity index 98%
rename from mailpoet/tests/integration/EmailEditor/Engine/ThemeControllerTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Engine/ThemeControllerTest.php
index 5e4855659e..626864a785 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/ThemeControllerTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Engine/ThemeControllerTest.php
@@ -1,6 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Engine;
+namespace EmailEditor\Engine;
+
+use MailPoet\EmailEditor\Engine\ThemeController;
 
 class ThemeControllerTest extends \MailPoetTest {
   private ThemeController $themeController;
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php
similarity index 98%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php
index cb4db30625..0b4599ca45 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ButtonTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Button;
 
 class ButtonTest extends \MailPoetTest {
   /** @var Button */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php
similarity index 97%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php
index ca2b5e71f0..95e376b4fb 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Column;
 
 class ColumnTest extends \MailPoetTest {
   /** @var Column */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php
similarity index 96%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php
index a637e241a2..c872417866 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ColumnsTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Columns;
 
 class ColumnsTest extends \MailPoetTest {
   /** @var Columns */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php
similarity index 95%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php
index c1503b9d8e..f2b11e7426 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/HeadingTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Text;
 
 class HeadingTest extends \MailPoetTest {
   /** @var Text */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php
similarity index 97%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php
index a799ca2c88..504b20b7cc 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ImageTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Image;
 
 class ImageTest extends \MailPoetTest {
   /** @var Image */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php
similarity index 95%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php
index 44bedf1cc5..6b393cfa7c 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ListBlockTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\ListBlock;
 
 class ListBlockTest extends \MailPoetTest {
   /** @var ListBlock */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php
similarity index 96%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php
index 45d5a3179c..1efcae2fb8 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/Blocks/ParagraphTest.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks;
+namespace EmailEditor\Integration\Core\Renderer\Blocks;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\SettingsController;
+use MailPoet\EmailEditor\Integrations\Core\Renderer\Blocks\Text;
 
 class ParagraphTest extends \MailPoetTest {
   /** @var Text */
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php
similarity index 99%
rename from mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php
rename to packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php
index 7d321bd01f..5fa69e2520 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php
+++ b/packages/php/email-editor/tests/integration/EmailEditor/Integration/Core/Renderer/RendererTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\EmailEditor\Integrations\Core\Renderer;
+namespace EmailEditor\Integration\Core\Renderer;
 
 use MailPoet\EmailEditor\Engine\EmailEditor;
 use MailPoet\EmailEditor\Engine\Renderer\Renderer;