diff --git a/composer.json b/composer.json
index b668b44..159c70f 100644
--- a/composer.json
+++ b/composer.json
@@ -50,12 +50,12 @@
         "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
             "LmcCors\\": "src/"
         }
     },
     "autoload-dev": {
-        "psr-0": {
+        "psr-4": {
             "LmcCorsTest\\": "tests/"
         }
     },
diff --git a/src/LmcCors/Exception/DisallowedOriginException.php b/src/Exception/DisallowedOriginException.php
similarity index 100%
rename from src/LmcCors/Exception/DisallowedOriginException.php
rename to src/Exception/DisallowedOriginException.php
diff --git a/src/LmcCors/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
similarity index 100%
rename from src/LmcCors/Exception/ExceptionInterface.php
rename to src/Exception/ExceptionInterface.php
diff --git a/src/LmcCors/Exception/InvalidOriginException.php b/src/Exception/InvalidOriginException.php
similarity index 100%
rename from src/LmcCors/Exception/InvalidOriginException.php
rename to src/Exception/InvalidOriginException.php
diff --git a/src/LmcCors/Factory/CorsOptionsFactory.php b/src/Factory/CorsOptionsFactory.php
similarity index 100%
rename from src/LmcCors/Factory/CorsOptionsFactory.php
rename to src/Factory/CorsOptionsFactory.php
diff --git a/src/LmcCors/Factory/CorsRequestListenerFactory.php b/src/Factory/CorsRequestListenerFactory.php
similarity index 100%
rename from src/LmcCors/Factory/CorsRequestListenerFactory.php
rename to src/Factory/CorsRequestListenerFactory.php
diff --git a/src/LmcCors/Factory/CorsServiceFactory.php b/src/Factory/CorsServiceFactory.php
similarity index 100%
rename from src/LmcCors/Factory/CorsServiceFactory.php
rename to src/Factory/CorsServiceFactory.php
diff --git a/src/LmcCors/Module.php b/src/Module.php
similarity index 96%
rename from src/LmcCors/Module.php
rename to src/Module.php
index e26812c..a524436 100644
--- a/src/LmcCors/Module.php
+++ b/src/Module.php
@@ -49,6 +49,6 @@ public function onBootstrap(EventInterface $event)
      */
     public function getConfig()
     {
-        return include __DIR__ . '/../../config/module.config.php';
+        return include __DIR__ . '/../config/module.config.php';
     }
 }
diff --git a/src/LmcCors/Mvc/CorsRequestListener.php b/src/Mvc/CorsRequestListener.php
similarity index 100%
rename from src/LmcCors/Mvc/CorsRequestListener.php
rename to src/Mvc/CorsRequestListener.php
diff --git a/src/LmcCors/Options/CorsOptions.php b/src/Options/CorsOptions.php
similarity index 100%
rename from src/LmcCors/Options/CorsOptions.php
rename to src/Options/CorsOptions.php
diff --git a/src/LmcCors/Service/CorsService.php b/src/Service/CorsService.php
similarity index 100%
rename from src/LmcCors/Service/CorsService.php
rename to src/Service/CorsService.php
diff --git a/tests/LmcCorsTest/Factory/CorsOptionsFactoryTest.php b/tests/Factory/CorsOptionsFactoryTest.php
similarity index 100%
rename from tests/LmcCorsTest/Factory/CorsOptionsFactoryTest.php
rename to tests/Factory/CorsOptionsFactoryTest.php
diff --git a/tests/LmcCorsTest/Factory/CorsRequestListenerFactoryTest.php b/tests/Factory/CorsRequestListenerFactoryTest.php
similarity index 100%
rename from tests/LmcCorsTest/Factory/CorsRequestListenerFactoryTest.php
rename to tests/Factory/CorsRequestListenerFactoryTest.php
diff --git a/tests/LmcCorsTest/Factory/CorsServiceFactoryTest.php b/tests/Factory/CorsServiceFactoryTest.php
similarity index 100%
rename from tests/LmcCorsTest/Factory/CorsServiceFactoryTest.php
rename to tests/Factory/CorsServiceFactoryTest.php
diff --git a/tests/LmcCorsTest/ModuleTest.php b/tests/ModuleTest.php
similarity index 100%
rename from tests/LmcCorsTest/ModuleTest.php
rename to tests/ModuleTest.php
diff --git a/tests/LmcCorsTest/Mvc/CorsRequestListenerTest.php b/tests/Mvc/CorsRequestListenerTest.php
similarity index 100%
rename from tests/LmcCorsTest/Mvc/CorsRequestListenerTest.php
rename to tests/Mvc/CorsRequestListenerTest.php
diff --git a/tests/LmcCorsTest/Options/CorsOptionsTest.php b/tests/Options/CorsOptionsTest.php
similarity index 100%
rename from tests/LmcCorsTest/Options/CorsOptionsTest.php
rename to tests/Options/CorsOptionsTest.php
diff --git a/tests/LmcCorsTest/Service/CorsServiceTest.php b/tests/Service/CorsServiceTest.php
similarity index 100%
rename from tests/LmcCorsTest/Service/CorsServiceTest.php
rename to tests/Service/CorsServiceTest.php
diff --git a/tests/LmcCorsTest/Util/ServiceManagerFactory.php b/tests/Util/ServiceManagerFactory.php
similarity index 100%
rename from tests/LmcCorsTest/Util/ServiceManagerFactory.php
rename to tests/Util/ServiceManagerFactory.php