diff --git a/.scenarios.lock/symfony3/composer.json b/.scenarios.lock/symfony3/composer.json
index c69a774..4fcd625 100644
--- a/.scenarios.lock/symfony3/composer.json
+++ b/.scenarios.lock/symfony3/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "\\": "../../src/"
+            "Robertfausk\\Behat\\PantherExtension\\": "../../src/"
         }
     },
     "autoload-dev": {
diff --git a/.scenarios.lock/symfony4/composer.json b/.scenarios.lock/symfony4/composer.json
index 2b04e49..02d0c51 100644
--- a/.scenarios.lock/symfony4/composer.json
+++ b/.scenarios.lock/symfony4/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "\\": "../../src/"
+            "Robertfausk\\Behat\\PantherExtension\\": "../../src/"
         }
     },
     "autoload-dev": {
diff --git a/composer.json b/composer.json
index 49aa810..8b23b2d 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "\\": "src/"
+            "Robertfausk\\Behat\\PantherExtension\\": "src/"
         }
     },
     "autoload-dev": {
diff --git a/src/Robertfausk/Behat/PantherExtension/ServiceContainer/Driver/PantherFactory.php b/src/ServiceContainer/Driver/PantherFactory.php
similarity index 100%
rename from src/Robertfausk/Behat/PantherExtension/ServiceContainer/Driver/PantherFactory.php
rename to src/ServiceContainer/Driver/PantherFactory.php
diff --git a/src/Robertfausk/Behat/PantherExtension/ServiceContainer/PantherConfiguration.php b/src/ServiceContainer/PantherConfiguration.php
similarity index 100%
rename from src/Robertfausk/Behat/PantherExtension/ServiceContainer/PantherConfiguration.php
rename to src/ServiceContainer/PantherConfiguration.php
diff --git a/src/Robertfausk/Behat/PantherExtension/ServiceContainer/PantherExtension.php b/src/ServiceContainer/PantherExtension.php
similarity index 100%
rename from src/Robertfausk/Behat/PantherExtension/ServiceContainer/PantherExtension.php
rename to src/ServiceContainer/PantherExtension.php