diff --git a/composer.json b/composer.json
index 3126fd3..9f24b6c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,13 +16,13 @@
     "symfony/http-kernel": "^4.4|^5.0"
   },
   "autoload": {
-    "psr-0": {
-      "Qandidate\\Common\\Symfony\\HttpKernel\\EventListener": "src/"
+    "psr-4": {
+      "Qandidate\\Common\\Symfony\\HttpKernel\\EventListener\\": "src/"
     }
   },
   "autoload-dev": {
-    "psr-0": {
-      "Qandidate\\Common\\Symfony\\HttpKernel\\EventListener": "test/"
+    "psr-4": {
+      "Qandidate\\Common\\Symfony\\HttpKernel\\EventListener\\": "test/"
     }
   },
   "require-dev": {
diff --git a/src/Qandidate/Common/Symfony/HttpKernel/EventListener/JsonRequestTransformerListener.php b/src/JsonRequestTransformerListener.php
similarity index 100%
rename from src/Qandidate/Common/Symfony/HttpKernel/EventListener/JsonRequestTransformerListener.php
rename to src/JsonRequestTransformerListener.php
diff --git a/test/Qandidate/Common/Symfony/HttpKernel/EventListener/JsonRequestTransformerListenerTest.php b/test/JsonRequestTransformerListenerTest.php
similarity index 100%
rename from test/Qandidate/Common/Symfony/HttpKernel/EventListener/JsonRequestTransformerListenerTest.php
rename to test/JsonRequestTransformerListenerTest.php