diff --git a/composer.json b/composer.json
index d4551ff..86dcb06 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,12 @@
     ],
     "autoload" : {
         "psr-4" : {
-            "" : "src/"
+            "CodiceFiscale\\" : "src/"
+        }
+    },
+    "autoload-dev" : {
+        "psr-4" : {
+            "CodiceFiscale\\" : "test/"
         }
     },
     "require": {
diff --git a/src/CodiceFiscale/AbstractCalculator.php b/src/AbstractCalculator.php
similarity index 100%
rename from src/CodiceFiscale/AbstractCalculator.php
rename to src/AbstractCalculator.php
diff --git a/src/CodiceFiscale/Calculator.php b/src/Calculator.php
similarity index 100%
rename from src/CodiceFiscale/Calculator.php
rename to src/Calculator.php
diff --git a/src/CodiceFiscale/Checker.php b/src/Checker.php
similarity index 100%
rename from src/CodiceFiscale/Checker.php
rename to src/Checker.php
diff --git a/src/CodiceFiscale/InverseCalculator.php b/src/InverseCalculator.php
similarity index 100%
rename from src/CodiceFiscale/InverseCalculator.php
rename to src/InverseCalculator.php
diff --git a/src/CodiceFiscale/Subject.php b/src/Subject.php
similarity index 100%
rename from src/CodiceFiscale/Subject.php
rename to src/Subject.php
diff --git a/src/CodiceFiscale/Validator.php b/src/Validator.php
similarity index 100%
rename from src/CodiceFiscale/Validator.php
rename to src/Validator.php
diff --git a/test/CodiceFiscale/CalculatorTest.php b/test/CalculatorTest.php
similarity index 100%
rename from test/CodiceFiscale/CalculatorTest.php
rename to test/CalculatorTest.php
diff --git a/test/CodiceFiscale/CheckerTest.php b/test/CheckerTest.php
similarity index 100%
rename from test/CodiceFiscale/CheckerTest.php
rename to test/CheckerTest.php
diff --git a/test/CodiceFiscale/InverseCalculatorTest.php b/test/InverseCalculatorTest.php
similarity index 100%
rename from test/CodiceFiscale/InverseCalculatorTest.php
rename to test/InverseCalculatorTest.php
diff --git a/test/CodiceFiscale/SubjectTest.php b/test/SubjectTest.php
similarity index 100%
rename from test/CodiceFiscale/SubjectTest.php
rename to test/SubjectTest.php
diff --git a/test/CodiceFiscale/ValidatorTest.php b/test/ValidatorTest.php
similarity index 100%
rename from test/CodiceFiscale/ValidatorTest.php
rename to test/ValidatorTest.php