diff --git a/composer.json b/composer.json
index a8ec421..7ac7cc8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
         "bin-dir": "bin"
     },
     "autoload": {
-        "psr-0": {
-            "ETNA\\Doctrine\\Extensions": "src"
+        "psr-4": {
+            "ETNA\\Doctrine\\Extensions\\": "src"
         }
     },
     "extra": {
diff --git a/composer.lock b/composer.lock
index 454d2bb..2f15852 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,9 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
     ],
-    "hash": "dabf1bbc6af87b0d1592b9366378f045",
+    "hash": "36f6ff41248d7105f9e084d8f2c20811",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -1117,8 +1118,9 @@
         "doctrine/orm": 0,
         "behat/behat": 0
     },
+    "prefer-stable": false,
     "platform": {
-        "php": ">=5.4"
+        "php": ">=5.5"
     },
     "platform-dev": []
 }
diff --git a/src/ETNA/Doctrine/Extensions/AutoIncrementID.php b/src/AutoIncrementID.php
similarity index 100%
rename from src/ETNA/Doctrine/Extensions/AutoIncrementID.php
rename to src/AutoIncrementID.php
diff --git a/src/ETNA/Doctrine/Extensions/CreatedAt.php b/src/CreatedAt.php
similarity index 100%
rename from src/ETNA/Doctrine/Extensions/CreatedAt.php
rename to src/CreatedAt.php
diff --git a/src/ETNA/Doctrine/Extensions/DoNotDelete.php b/src/DoNotDelete.php
similarity index 100%
rename from src/ETNA/Doctrine/Extensions/DoNotDelete.php
rename to src/DoNotDelete.php
diff --git a/src/ETNA/Doctrine/Extensions/UpdatedAt.php b/src/UpdatedAt.php
similarity index 100%
rename from src/ETNA/Doctrine/Extensions/UpdatedAt.php
rename to src/UpdatedAt.php