diff --git a/composer.json b/composer.json
index eb4e272..c0a327c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,9 +5,9 @@
     "homepage": "https://github.com/carlosbuenosvinos/php-kata",
     "type": "library",
     "require-dev": {
-        "phpunit/phpunit": "3.7.*@dev",
+        "phpunit/phpunit": "5.5.*@dev",
         "mockery/mockery": "dev-master@dev",
-        "phpspec/phpspec": "2.0.*@dev"
+        "phpspec/phpspec": "3.0.*@dev"
     },
     "license": "MIT",
     "authors": [
@@ -17,8 +17,8 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "Kata": "src/"
+        "psr-4": {
+            "Kata\\": "src/"
         }
     },
     "config": {
diff --git a/phpunit.xml b/phpunit.xml
index a2bc6ce..b87d5b5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -19,16 +19,13 @@
 
     <testsuites>
         <testsuite name="Kata Test Suite">
-            <directory>./src/Kata/Tests/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/Kata/</directory>
-            <exclude>
-                <directory>./src/Kata/*/Tests</directory>
-            </exclude>
+            <directory>./src/</directory>
         </whitelist>
     </filter>
 </phpunit>
\ No newline at end of file
diff --git a/src/Kata/Adder.php b/src/Adder.php
similarity index 100%
rename from src/Kata/Adder.php
rename to src/Adder.php
diff --git a/src/Kata/Tests/AdderTest.php b/tests/AdderTest.php
similarity index 100%
rename from src/Kata/Tests/AdderTest.php
rename to tests/AdderTest.php