diff --git a/src/engine/Type/Boolean.php b/src/engine/Types/Boolean.php
similarity index 95%
rename from src/engine/Type/Boolean.php
rename to src/engine/Types/Boolean.php
index b4f2c351..ed30409a 100644
--- a/src/engine/Type/Boolean.php
+++ b/src/engine/Types/Boolean.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Boolean extends Type {
     protected function _validate($value)
diff --git a/src/engine/Type/Decimal.php b/src/engine/Types/Decimal.php
similarity index 95%
rename from src/engine/Type/Decimal.php
rename to src/engine/Types/Decimal.php
index a4d586d2..b03b6f41 100644
--- a/src/engine/Type/Decimal.php
+++ b/src/engine/Types/Decimal.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Decimal extends Type {
     protected function _validate($value)
diff --git a/src/engine/Type/Email.php b/src/engine/Types/Email.php
similarity index 96%
rename from src/engine/Type/Email.php
rename to src/engine/Types/Email.php
index 5a414b7a..140ed39b 100644
--- a/src/engine/Type/Email.php
+++ b/src/engine/Types/Email.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Email extends NonEmptyText {
     protected function _validate($value)
diff --git a/src/engine/Type/Integer.php b/src/engine/Types/Integer.php
similarity index 95%
rename from src/engine/Type/Integer.php
rename to src/engine/Types/Integer.php
index 2c6e7875..5f0158b9 100644
--- a/src/engine/Type/Integer.php
+++ b/src/engine/Types/Integer.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Integer extends Type {
     protected function _validate($value)
diff --git a/src/engine/Type/NonEmptyText.php b/src/engine/Types/NonEmptyText.php
similarity index 96%
rename from src/engine/Type/NonEmptyText.php
rename to src/engine/Types/NonEmptyText.php
index ffbcb035..fcf719a5 100644
--- a/src/engine/Type/NonEmptyText.php
+++ b/src/engine/Types/NonEmptyText.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class NonEmptyText extends Text {
     protected function _validate($value)
diff --git a/src/engine/Type/Text.php b/src/engine/Types/Text.php
similarity index 95%
rename from src/engine/Type/Text.php
rename to src/engine/Types/Text.php
index b278e057..dcc80888 100644
--- a/src/engine/Type/Text.php
+++ b/src/engine/Types/Text.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Text extends Type {
     protected function _validate($value)
diff --git a/src/engine/Type/Type.php b/src/engine/Types/Type.php
similarity index 98%
rename from src/engine/Type/Type.php
rename to src/engine/Types/Type.php
index 4ff10286..d979e38c 100644
--- a/src/engine/Type/Type.php
+++ b/src/engine/Types/Type.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 /**
  * Abstract Type Class
diff --git a/src/engine/Type/UnsignedInteger.php b/src/engine/Types/UnsignedInteger.php
similarity index 96%
rename from src/engine/Type/UnsignedInteger.php
rename to src/engine/Types/UnsignedInteger.php
index 1deeab20..b2deea32 100644
--- a/src/engine/Type/UnsignedInteger.php
+++ b/src/engine/Types/UnsignedInteger.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class UnsignedInteger extends Integer {
     protected function _validate($value)
diff --git a/src/engine/Type/Url.php b/src/engine/Types/Url.php
similarity index 96%
rename from src/engine/Type/Url.php
rename to src/engine/Types/Url.php
index 58ff6a3d..cd4198f7 100644
--- a/src/engine/Type/Url.php
+++ b/src/engine/Types/Url.php
@@ -11,7 +11,7 @@
  * @since       v1.2.0
  * ---------------------------------------------------------------------------- */
 
-namespace EA\Engine\Type;
+namespace EA\Engine\Types;
 
 class Url extends NonEmptyText {
     protected function _validate($value)