diff --git a/composer.json b/composer.json
index 90b3772..3a90d3e 100644
--- a/composer.json
+++ b/composer.json
@@ -5,11 +5,13 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "Ns3777k\\PrometheusBundle\\": "src/Ns3777k/PrometheusBundle/"
-        },
-        "exclude-from-classmap": [
-            "**/Tests/"
-        ]
+            "Ns3777k\\PrometheusBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Ns3777k\\PrometheusBundle\\Tests\\": "tests/"
+        }
     },
     "authors": [
         {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ec2cd79..2ab5af4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,14 +4,13 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php">
-
     <php>
         <ini name="error_reporting" value="-1" />
     </php>
 
     <testsuites>
         <testsuite name="Ns3777kPrometheusBundle Test Suite">
-            <directory>./src/Ns3777k/PrometheusBundle/Tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
@@ -22,11 +21,7 @@
 
     <filter>
         <whitelist>
-            <directory>.</directory>
-            <exclude>
-                <directory>./src/Ns3777k/PrometheusBundle/Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
+            <directory>src/</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Ns3777k/PrometheusBundle/Controller/MetricsController.php b/src/Controller/MetricsController.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Controller/MetricsController.php
rename to src/Controller/MetricsController.php
diff --git a/src/Ns3777k/PrometheusBundle/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/DependencyInjection/Configuration.php
rename to src/DependencyInjection/Configuration.php
diff --git a/src/Ns3777k/PrometheusBundle/DependencyInjection/Ns3777kPrometheusExtension.php b/src/DependencyInjection/Ns3777kPrometheusExtension.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/DependencyInjection/Ns3777kPrometheusExtension.php
rename to src/DependencyInjection/Ns3777kPrometheusExtension.php
diff --git a/src/Ns3777k/PrometheusBundle/EventListener/MetricsListener.php b/src/EventListener/MetricsListener.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/EventListener/MetricsListener.php
rename to src/EventListener/MetricsListener.php
diff --git a/src/Ns3777k/PrometheusBundle/Metrics/CollectorRegistryInterface.php b/src/Metrics/CollectorRegistryInterface.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Metrics/CollectorRegistryInterface.php
rename to src/Metrics/CollectorRegistryInterface.php
diff --git a/src/Ns3777k/PrometheusBundle/Metrics/NamespacedCollectorRegistry.php b/src/Metrics/NamespacedCollectorRegistry.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Metrics/NamespacedCollectorRegistry.php
rename to src/Metrics/NamespacedCollectorRegistry.php
diff --git a/src/Ns3777k/PrometheusBundle/Metrics/RenderTextFormat.php b/src/Metrics/RenderTextFormat.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Metrics/RenderTextFormat.php
rename to src/Metrics/RenderTextFormat.php
diff --git a/src/Ns3777k/PrometheusBundle/Metrics/RendererInterface.php b/src/Metrics/RendererInterface.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Metrics/RendererInterface.php
rename to src/Metrics/RendererInterface.php
diff --git a/src/Ns3777k/PrometheusBundle/Ns3777kPrometheusBundle.php b/src/Ns3777kPrometheusBundle.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Ns3777kPrometheusBundle.php
rename to src/Ns3777kPrometheusBundle.php
diff --git a/src/Ns3777k/PrometheusBundle/Resources/config/prometheus.xml b/src/Resources/config/prometheus.xml
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Resources/config/prometheus.xml
rename to src/Resources/config/prometheus.xml
diff --git a/src/Ns3777k/PrometheusBundle/Resources/config/routing.xml b/src/Resources/config/routing.xml
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Resources/config/routing.xml
rename to src/Resources/config/routing.xml
diff --git a/src/Ns3777k/PrometheusBundle/Tests/Controller/MetricsControllerTest.php b/tests/Controller/MetricsControllerTest.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Tests/Controller/MetricsControllerTest.php
rename to tests/Controller/MetricsControllerTest.php
diff --git a/src/Ns3777k/PrometheusBundle/Tests/DependencyInjection/Ns3777kPrometheusExtensionTest.php b/tests/DependencyInjection/Ns3777kPrometheusExtensionTest.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Tests/DependencyInjection/Ns3777kPrometheusExtensionTest.php
rename to tests/DependencyInjection/Ns3777kPrometheusExtensionTest.php
diff --git a/src/Ns3777k/PrometheusBundle/Tests/EventListener/MetricsListenerTest.php b/tests/EventListener/MetricsListenerTest.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Tests/EventListener/MetricsListenerTest.php
rename to tests/EventListener/MetricsListenerTest.php
diff --git a/src/Ns3777k/PrometheusBundle/Tests/Metrics/NamespacedCollectorRegistryTest.php b/tests/Metrics/NamespacedCollectorRegistryTest.php
similarity index 100%
rename from src/Ns3777k/PrometheusBundle/Tests/Metrics/NamespacedCollectorRegistryTest.php
rename to tests/Metrics/NamespacedCollectorRegistryTest.php