diff --git a/composer.json b/composer.json
index 781a351..bf2884a 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "bsr/conf" : "self.version"
     },
     "autoload": {
-        "psr-4": {"BSR\\Db\\" : "src/"}
+        "psr-4": {"BSR\\" : "src/"}
     },
     "require-dev": {
         "pds/skeleton": "^1.0",
diff --git a/src/Connection.php b/src/Db/Connection.php
similarity index 100%
rename from src/Connection.php
rename to src/Db/Connection.php
diff --git a/src/DbHelper.php b/src/Db/DbHelper.php
similarity index 100%
rename from src/DbHelper.php
rename to src/Db/DbHelper.php
diff --git a/src/DbMapping.php b/src/Db/DbMapping.php
similarity index 100%
rename from src/DbMapping.php
rename to src/Db/DbMapping.php
diff --git a/src/Exception/InvalidAttributeException.php b/src/Db/Exception/InvalidAttributeException.php
similarity index 100%
rename from src/Exception/InvalidAttributeException.php
rename to src/Db/Exception/InvalidAttributeException.php