diff --git a/tests/Feature/Generator/ControllerGeneratorTest.php b/tests/Feature/Generators/ControllerGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/ControllerGeneratorTest.php
rename to tests/Feature/Generators/ControllerGeneratorTest.php
diff --git a/tests/Feature/Generator/FactoryGeneratorTest.php b/tests/Feature/Generators/FactoryGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/FactoryGeneratorTest.php
rename to tests/Feature/Generators/FactoryGeneratorTest.php
diff --git a/tests/Feature/Generator/MigrationGeneratorTest.php b/tests/Feature/Generators/MigrationGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/MigrationGeneratorTest.php
rename to tests/Feature/Generators/MigrationGeneratorTest.php
diff --git a/tests/Feature/Generator/ModelGeneratorTest.php b/tests/Feature/Generators/ModelGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/ModelGeneratorTest.php
rename to tests/Feature/Generators/ModelGeneratorTest.php
diff --git a/tests/Feature/Generator/RouteGeneratorTest.php b/tests/Feature/Generators/RouteGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/RouteGeneratorTest.php
rename to tests/Feature/Generators/RouteGeneratorTest.php
diff --git a/tests/Feature/Generator/SeederGeneratorTest.php b/tests/Feature/Generators/SeederGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/SeederGeneratorTest.php
rename to tests/Feature/Generators/SeederGeneratorTest.php
diff --git a/tests/Feature/Generator/Statements/EventGeneratorTest.php b/tests/Feature/Generators/Statements/EventGeneratorTest.php
similarity index 99%
rename from tests/Feature/Generator/Statements/EventGeneratorTest.php
rename to tests/Feature/Generators/Statements/EventGeneratorTest.php
index cb756105..30fdf895 100644
--- a/tests/Feature/Generator/Statements/EventGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/EventGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\EventGenerator;
diff --git a/tests/Feature/Generator/Statements/FormRequestGeneratorTest.php b/tests/Feature/Generators/Statements/FormRequestGeneratorTest.php
similarity index 99%
rename from tests/Feature/Generator/Statements/FormRequestGeneratorTest.php
rename to tests/Feature/Generators/Statements/FormRequestGeneratorTest.php
index c3c51e23..d2d3fbbf 100644
--- a/tests/Feature/Generator/Statements/FormRequestGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/FormRequestGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\FormRequestGenerator;
diff --git a/tests/Feature/Generator/Statements/JobGeneratorTest.php b/tests/Feature/Generators/Statements/JobGeneratorTest.php
similarity index 98%
rename from tests/Feature/Generator/Statements/JobGeneratorTest.php
rename to tests/Feature/Generators/Statements/JobGeneratorTest.php
index 14ab75b3..7ec197ec 100644
--- a/tests/Feature/Generator/Statements/JobGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/JobGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\JobGenerator;
diff --git a/tests/Feature/Generator/Statements/MailGeneratorTest.php b/tests/Feature/Generators/Statements/MailGeneratorTest.php
similarity index 99%
rename from tests/Feature/Generator/Statements/MailGeneratorTest.php
rename to tests/Feature/Generators/Statements/MailGeneratorTest.php
index b1b70b95..d08fd206 100644
--- a/tests/Feature/Generator/Statements/MailGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/MailGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\MailGenerator;
diff --git a/tests/Feature/Generator/Statements/NotificationGeneratorTest.php b/tests/Feature/Generators/Statements/NotificationGeneratorTest.php
similarity index 99%
rename from tests/Feature/Generator/Statements/NotificationGeneratorTest.php
rename to tests/Feature/Generators/Statements/NotificationGeneratorTest.php
index ac178e2f..c63948f2 100644
--- a/tests/Feature/Generator/Statements/NotificationGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/NotificationGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\NotificationGenerator;
diff --git a/tests/Feature/Generator/Statements/ResourceGeneratorTest.php b/tests/Feature/Generators/Statements/ResourceGeneratorTest.php
similarity index 98%
rename from tests/Feature/Generator/Statements/ResourceGeneratorTest.php
rename to tests/Feature/Generators/Statements/ResourceGeneratorTest.php
index 17febe65..4651028b 100644
--- a/tests/Feature/Generator/Statements/ResourceGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/ResourceGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\ResourceGenerator;
diff --git a/tests/Feature/Generator/Statements/ViewGeneratorTest.php b/tests/Feature/Generators/Statements/ViewGeneratorTest.php
similarity index 98%
rename from tests/Feature/Generator/Statements/ViewGeneratorTest.php
rename to tests/Feature/Generators/Statements/ViewGeneratorTest.php
index a9fec5f9..c6e9fa39 100644
--- a/tests/Feature/Generator/Statements/ViewGeneratorTest.php
+++ b/tests/Feature/Generators/Statements/ViewGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Generator\Statements;
+namespace Tests\Feature\Generators\Statements;
 
 use Blueprint\Blueprint;
 use Blueprint\Generators\Statements\ViewGenerator;
diff --git a/tests/Feature/Generator/TestGeneratorTest.php b/tests/Feature/Generators/TestGeneratorTest.php
similarity index 100%
rename from tests/Feature/Generator/TestGeneratorTest.php
rename to tests/Feature/Generators/TestGeneratorTest.php