diff --git a/lib/Form/Templates/TemplateRepository.php b/lib/Form/Templates/TemplateRepository.php
index 3736fdf407..f11ca4df21 100644
--- a/lib/Form/Templates/TemplateRepository.php
+++ b/lib/Form/Templates/TemplateRepository.php
@@ -3,6 +3,9 @@
 namespace MailPoet\Form\Templates;
 
 use MailPoet\Entities\FormEntity;
+use MailPoet\Form\Templates\Templates\DefaultForm;
+use MailPoet\Form\Templates\Templates\DemoForm;
+use MailPoet\Form\Templates\Templates\InitialForm;
 use MailPoet\Settings\SettingsController;
 use MailPoet\UnexpectedValueException;
 
diff --git a/lib/Form/Templates/DefaultForm.php b/lib/Form/Templates/Templates/DefaultForm.php
similarity index 93%
rename from lib/Form/Templates/DefaultForm.php
rename to lib/Form/Templates/Templates/DefaultForm.php
index d259c9c875..fb5a372ab2 100644
--- a/lib/Form/Templates/DefaultForm.php
+++ b/lib/Form/Templates/Templates/DefaultForm.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace MailPoet\Form\Templates;
+namespace MailPoet\Form\Templates\Templates;
+
+use MailPoet\Form\Templates\Template;
 
 /**
  * Template for default form created on plugin activation
diff --git a/lib/Form/Templates/DemoForm.php b/lib/Form/Templates/Templates/DemoForm.php
similarity index 98%
rename from lib/Form/Templates/DemoForm.php
rename to lib/Form/Templates/Templates/DemoForm.php
index 8da05b0909..c11e65043e 100644
--- a/lib/Form/Templates/DemoForm.php
+++ b/lib/Form/Templates/Templates/DemoForm.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace MailPoet\Form\Templates;
+namespace MailPoet\Form\Templates\Templates;
+
+use MailPoet\Form\Templates\Template;
 
 /**
  * Temporary form template. Remove after we get real data from designer
diff --git a/lib/Form/Templates/InitialForm.php b/lib/Form/Templates/Templates/InitialForm.php
similarity index 96%
rename from lib/Form/Templates/InitialForm.php
rename to lib/Form/Templates/Templates/InitialForm.php
index 7f8e7434d1..07377c4d3a 100644
--- a/lib/Form/Templates/InitialForm.php
+++ b/lib/Form/Templates/Templates/InitialForm.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace MailPoet\Form\Templates;
+namespace MailPoet\Form\Templates\Templates;
+
+use MailPoet\Form\Templates\Template;
 
 class InitialForm implements Template {
   public function getName(): string {
diff --git a/lib/Form/Util/Styles.php b/lib/Form/Util/Styles.php
index 702e97b90c..741b0ac7cc 100644
--- a/lib/Form/Util/Styles.php
+++ b/lib/Form/Util/Styles.php
@@ -3,7 +3,7 @@
 namespace MailPoet\Form\Util;
 
 use MailPoet\Entities\FormEntity;
-use MailPoet\Form\Templates\InitialForm;
+use MailPoet\Form\Templates\Templates\InitialForm;
 use MailPoetVendor\Sabberworm\CSS\Parser as CSSParser;
 
 class Styles {