diff --git a/composer.json b/composer.json
index d144946..0d72561 100644
--- a/composer.json
+++ b/composer.json
@@ -25,10 +25,10 @@
     "prefer-stable": true,
     "autoload": {
         "files": ["src/functions.php"],
-        "psr-4": {"Pipeline\\": "src/Pipeline/"}
+        "psr-4": {"Pipeline\\": "src/"}
     },
     "autoload-dev": {
-        "psr-4": {"Tests\\Pipeline\\": "tests/Pipeline/"}
+        "psr-4": {"Tests\\Pipeline\\": "tests/"}
     },
     "require": {
         "php": ">=7",
diff --git a/src/Pipeline/Interfaces/PrincipalPipeline.php b/src/Interfaces/PrincipalPipeline.php
similarity index 100%
rename from src/Pipeline/Interfaces/PrincipalPipeline.php
rename to src/Interfaces/PrincipalPipeline.php
diff --git a/src/Pipeline/Interfaces/StandardPipeline.php b/src/Interfaces/StandardPipeline.php
similarity index 100%
rename from src/Pipeline/Interfaces/StandardPipeline.php
rename to src/Interfaces/StandardPipeline.php
diff --git a/src/Pipeline/Principal.php b/src/Principal.php
similarity index 100%
rename from src/Pipeline/Principal.php
rename to src/Principal.php
diff --git a/src/Pipeline/Standard.php b/src/Standard.php
similarity index 100%
rename from src/Pipeline/Standard.php
rename to src/Standard.php
diff --git a/tests/Pipeline/ArraysTest.php b/tests/ArraysTest.php
similarity index 100%
rename from tests/Pipeline/ArraysTest.php
rename to tests/ArraysTest.php
diff --git a/tests/Pipeline/EdgeCasesTest.php b/tests/EdgeCasesTest.php
similarity index 100%
rename from tests/Pipeline/EdgeCasesTest.php
rename to tests/EdgeCasesTest.php
diff --git a/tests/Pipeline/ErrorsTest.php b/tests/ErrorsTest.php
similarity index 100%
rename from tests/Pipeline/ErrorsTest.php
rename to tests/ErrorsTest.php
diff --git a/tests/Pipeline/ExampleTest.php b/tests/ExampleTest.php
similarity index 100%
rename from tests/Pipeline/ExampleTest.php
rename to tests/ExampleTest.php
diff --git a/tests/Pipeline/FunctionsTest.php b/tests/FunctionsTest.php
similarity index 100%
rename from tests/Pipeline/FunctionsTest.php
rename to tests/FunctionsTest.php
diff --git a/tests/Pipeline/InterfaceTest.php b/tests/InterfaceTest.php
similarity index 100%
rename from tests/Pipeline/InterfaceTest.php
rename to tests/InterfaceTest.php
diff --git a/tests/Pipeline/IterableTest.php b/tests/IterableTest.php
similarity index 100%
rename from tests/Pipeline/IterableTest.php
rename to tests/IterableTest.php
diff --git a/tests/Pipeline/LazinessTest.php b/tests/LazinessTest.php
similarity index 100%
rename from tests/Pipeline/LazinessTest.php
rename to tests/LazinessTest.php
diff --git a/tests/Pipeline/LeaguePipelineTest.php b/tests/LeaguePipelineTest.php
similarity index 100%
rename from tests/Pipeline/LeaguePipelineTest.php
rename to tests/LeaguePipelineTest.php
diff --git a/tests/Pipeline/StandardTest.php b/tests/StandardTest.php
similarity index 100%
rename from tests/Pipeline/StandardTest.php
rename to tests/StandardTest.php
diff --git a/tests/Pipeline/UnpackTest.php b/tests/UnpackTest.php
similarity index 100%
rename from tests/Pipeline/UnpackTest.php
rename to tests/UnpackTest.php