diff --git a/Content/Alternative.php b/Source/Content/Alternative.php
similarity index 100%
rename from Content/Alternative.php
rename to Source/Content/Alternative.php
diff --git a/Content/Attachment.php b/Source/Content/Attachment.php
similarity index 100%
rename from Content/Attachment.php
rename to Source/Content/Attachment.php
diff --git a/Content/Content.php b/Source/Content/Content.php
similarity index 100%
rename from Content/Content.php
rename to Source/Content/Content.php
diff --git a/Content/Encoder/Base64.php b/Source/Content/Encoder/Base64.php
similarity index 100%
rename from Content/Encoder/Base64.php
rename to Source/Content/Encoder/Base64.php
diff --git a/Content/Encoder/Encoder.php b/Source/Content/Encoder/Encoder.php
similarity index 100%
rename from Content/Encoder/Encoder.php
rename to Source/Content/Encoder/Encoder.php
diff --git a/Content/Encoder/QuotedPrintable.php b/Source/Content/Encoder/QuotedPrintable.php
similarity index 100%
rename from Content/Encoder/QuotedPrintable.php
rename to Source/Content/Encoder/QuotedPrintable.php
diff --git a/Content/Html.php b/Source/Content/Html.php
similarity index 100%
rename from Content/Html.php
rename to Source/Content/Html.php
diff --git a/Content/Message.php b/Source/Content/Message.php
similarity index 100%
rename from Content/Message.php
rename to Source/Content/Message.php
diff --git a/Content/Related.php b/Source/Content/Related.php
similarity index 100%
rename from Content/Related.php
rename to Source/Content/Related.php
diff --git a/Content/Text.php b/Source/Content/Text.php
similarity index 100%
rename from Content/Text.php
rename to Source/Content/Text.php
diff --git a/Exception/Exception.php b/Source/Exception/Exception.php
similarity index 100%
rename from Exception/Exception.php
rename to Source/Exception/Exception.php
diff --git a/Exception/Security.php b/Source/Exception/Security.php
similarity index 100%
rename from Exception/Security.php
rename to Source/Exception/Security.php
diff --git a/Exception/Transport.php b/Source/Exception/Transport.php
similarity index 100%
rename from Exception/Transport.php
rename to Source/Exception/Transport.php
diff --git a/Inbox/Inbox.php b/Source/Inbox/Inbox.php
similarity index 100%
rename from Inbox/Inbox.php
rename to Source/Inbox/Inbox.php
diff --git a/Inbox/Message.php b/Source/Inbox/Message.php
similarity index 100%
rename from Inbox/Message.php
rename to Source/Inbox/Message.php
diff --git a/Message.php b/Source/Message.php
similarity index 100%
rename from Message.php
rename to Source/Message.php
diff --git a/Transport/ITransport/Out.php b/Source/Transport/ITransport/Out.php
similarity index 100%
rename from Transport/ITransport/Out.php
rename to Source/Transport/ITransport/Out.php
diff --git a/Transport/ITransport/Transport.php b/Source/Transport/ITransport/Transport.php
similarity index 100%
rename from Transport/ITransport/Transport.php
rename to Source/Transport/ITransport/Transport.php
diff --git a/Transport/Sendmail.php b/Source/Transport/Sendmail.php
similarity index 100%
rename from Transport/Sendmail.php
rename to Source/Transport/Sendmail.php
diff --git a/Transport/Smtp.php b/Source/Transport/Smtp.php
similarity index 100%
rename from Transport/Smtp.php
rename to Source/Transport/Smtp.php
diff --git a/composer.json b/composer.json
index fae0fa2..e0400da 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "source": "https://central.hoa-project.net/Resource/Library/Mail"
     },
     "require": {
-        "php"            : ">=5.5.0",
+        "php"            : ">=7.1",
         "hoa/consistency": "~1.0",
         "hoa/exception"  : "~1.0",
         "hoa/mime"       : "~3.0",
@@ -37,7 +37,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Hoa\\Mail\\": "."
+            "Hoa\\Mail\\"      : "Source",
+            "Hoa\\Mail\\Test\\": "Test"
         }
     },
     "extra": {