diff --git a/src/Generator/Generator/FromArrayGenerator.php b/src/Generator/Generator/Arrays/FromArrayGenerator.php
similarity index 85%
rename from src/Generator/Generator/FromArrayGenerator.php
rename to src/Generator/Generator/Arrays/FromArrayGenerator.php
index 4172a10..85ab748 100644
--- a/src/Generator/Generator/FromArrayGenerator.php
+++ b/src/Generator/Generator/Arrays/FromArrayGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Arrays;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Arrays\FromArrayType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
diff --git a/src/Generator/Generator/VectorGenerator.php b/src/Generator/Generator/Arrays/VectorGenerator.php
similarity index 86%
rename from src/Generator/Generator/VectorGenerator.php
rename to src/Generator/Generator/Arrays/VectorGenerator.php
index fb2dd57..b107fbc 100644
--- a/src/Generator/Generator/VectorGenerator.php
+++ b/src/Generator/Generator/Arrays/VectorGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Arrays;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\GeneratorFactory;
 use PhpInvariant\Generator\Type\Arrays\VectorType;
 use PhpInvariant\Generator\TypeInterface;
diff --git a/src/Generator/Generator/DateTimeGenerator.php b/src/Generator/Generator/DateTime/DateTimeGenerator.php
similarity index 86%
rename from src/Generator/Generator/DateTimeGenerator.php
rename to src/Generator/Generator/DateTime/DateTimeGenerator.php
index d63b334..7eaa906 100644
--- a/src/Generator/Generator/DateTimeGenerator.php
+++ b/src/Generator/Generator/DateTime/DateTimeGenerator.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\DateTime;
 
+use DateTimeImmutable;
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\DateTime\DateTimeType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
-use DateTimeImmutable;
 
 class DateTimeGenerator implements GeneratorInterface
 {
diff --git a/src/Generator/Generator/BooleanGenerator.php b/src/Generator/Generator/Scalar/BooleanGenerator.php
similarity index 80%
rename from src/Generator/Generator/BooleanGenerator.php
rename to src/Generator/Generator/Scalar/BooleanGenerator.php
index be02f76..e4c6560 100644
--- a/src/Generator/Generator/BooleanGenerator.php
+++ b/src/Generator/Generator/Scalar/BooleanGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\BooleanType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
diff --git a/src/Generator/Generator/FloatGenerator.php b/src/Generator/Generator/Scalar/FloatGenerator.php
similarity index 89%
rename from src/Generator/Generator/FloatGenerator.php
rename to src/Generator/Generator/Scalar/FloatGenerator.php
index cee8ddf..b661591 100644
--- a/src/Generator/Generator/FloatGenerator.php
+++ b/src/Generator/Generator/Scalar/FloatGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\FloatType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
diff --git a/src/Generator/Generator/IntegerGenerator.php b/src/Generator/Generator/Scalar/IntegerGenerator.php
similarity index 80%
rename from src/Generator/Generator/IntegerGenerator.php
rename to src/Generator/Generator/Scalar/IntegerGenerator.php
index 848b2df..be28aed 100644
--- a/src/Generator/Generator/IntegerGenerator.php
+++ b/src/Generator/Generator/Scalar/IntegerGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\IntegerType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
diff --git a/src/Generator/Generator/StringGenerator.php b/src/Generator/Generator/Scalar/StringGenerator.php
similarity index 87%
rename from src/Generator/Generator/StringGenerator.php
rename to src/Generator/Generator/Scalar/StringGenerator.php
index 7c236ba..dbab77a 100644
--- a/src/Generator/Generator/StringGenerator.php
+++ b/src/Generator/Generator/Scalar/StringGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\StringType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
diff --git a/src/Generator/GeneratorFactory.php b/src/Generator/GeneratorFactory.php
index 77dbf59..f3af354 100644
--- a/src/Generator/GeneratorFactory.php
+++ b/src/Generator/GeneratorFactory.php
@@ -3,14 +3,10 @@
 namespace PhpInvariant\Generator;
 
 use PhpInvariant\Exception\PhpInvariantException;
-use PhpInvariant\Generator\Generator\FromArrayGenerator;
-use PhpInvariant\Generator\Generator\BooleanGenerator;
-use PhpInvariant\Generator\Generator\DateTimeGenerator;
-use PhpInvariant\Generator\Generator\FloatGenerator;
+use PhpInvariant\Generator\Generator\Arrays\FromArrayGenerator;
+use PhpInvariant\Generator\Generator\DateTime\DateTimeGenerator;
 use PhpInvariant\Generator\Generator\GeneratorInterface;
-use PhpInvariant\Generator\Generator\IntegerGenerator;
-use PhpInvariant\Generator\Generator\StringGenerator;
-use PhpInvariant\Generator\Generator\VectorGenerator;
+use PhpInvariant\Generator\Generator\Scalar\IntegerGenerator;
 use PhpInvariant\Generator\Type\Arrays\FromArrayType;
 use PhpInvariant\Generator\Type\Arrays\VectorType;
 use PhpInvariant\Generator\Type\DateTime\DateTimeType;
@@ -27,12 +23,12 @@ class GeneratorFactory
      */
     private array $mapping = [
         IntegerType::class => IntegerGenerator::class,
-        FloatType::class => FloatGenerator::class,
-        BooleanType::class => BooleanGenerator::class,
-        StringType::class => StringGenerator::class,
+        FloatType::class => Generator\Scalar\FloatGenerator::class,
+        BooleanType::class => Generator\Scalar\BooleanGenerator::class,
+        StringType::class => Generator\Scalar\StringGenerator::class,
         DateTimeType::class => DateTimeGenerator::class,
         FromArrayType::class => FromArrayGenerator::class,
-        VectorType::class => VectorGenerator::class
+        VectorType::class => Generator\Arrays\VectorGenerator::class
 
     ];