diff --git a/composer.json b/composer.json
index 3c3a79c..72bfb42 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 
 	"autoload": {
 		"psr-4": {
-			"Fuko\\Masked\\": "src/"
+			"Fuko\\Masked\\": "src/Masked/"
 		}
 	},
 
@@ -28,7 +28,7 @@
 
         "autoload-dev": {
 		"psr-4": {
-			"Fuko\\Masked\\Tests\\": "tests/"
+			"Fuko\\Masked\\Tests\\": "tests/Masked/"
 		}
         }
 }
diff --git a/src/InputCollection.php b/src/Masked/InputCollection.php
similarity index 100%
rename from src/InputCollection.php
rename to src/Masked/InputCollection.php
diff --git a/src/Protect.php b/src/Masked/Protect.php
similarity index 100%
rename from src/Protect.php
rename to src/Masked/Protect.php
diff --git a/src/Redact.php b/src/Masked/Redact.php
similarity index 100%
rename from src/Redact.php
rename to src/Masked/Redact.php
diff --git a/src/ValueCollection.php b/src/Masked/ValueCollection.php
similarity index 100%
rename from src/ValueCollection.php
rename to src/Masked/ValueCollection.php
diff --git a/tests/ProtectHideInputsTest.php b/tests/Masked/ProtectHideInputsTest.php
similarity index 100%
rename from tests/ProtectHideInputsTest.php
rename to tests/Masked/ProtectHideInputsTest.php
diff --git a/tests/ProtectHideValuesTest.php b/tests/Masked/ProtectHideValuesTest.php
similarity index 100%
rename from tests/ProtectHideValuesTest.php
rename to tests/Masked/ProtectHideValuesTest.php
diff --git a/tests/ProtectInputTest.php b/tests/Masked/ProtectInputTest.php
similarity index 100%
rename from tests/ProtectInputTest.php
rename to tests/Masked/ProtectInputTest.php
diff --git a/tests/ProtectValueTest.php b/tests/Masked/ProtectValueTest.php
similarity index 100%
rename from tests/ProtectValueTest.php
rename to tests/Masked/ProtectValueTest.php
diff --git a/tests/RedactDisguiseTest.php b/tests/Masked/RedactDisguiseTest.php
similarity index 100%
rename from tests/RedactDisguiseTest.php
rename to tests/Masked/RedactDisguiseTest.php
diff --git a/tests/RedactTest.php b/tests/Masked/RedactTest.php
similarity index 100%
rename from tests/RedactTest.php
rename to tests/Masked/RedactTest.php
diff --git a/tests/setRedactCallbackTest.php b/tests/Masked/setRedactCallbackTest.php
similarity index 100%
rename from tests/setRedactCallbackTest.php
rename to tests/Masked/setRedactCallbackTest.php