diff --git a/composer.json b/composer.json
index 3fc9a043f..7a8723f07 100644
--- a/composer.json
+++ b/composer.json
@@ -27,8 +27,8 @@
     },
 
     "autoload": {
-        "psr-0": {
-            "Behat\\Mink": "src/"
+        "psr-4": {
+            "Behat\\Mink\\": "src/"
         }
     },
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bf73a6958..6695433a0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
 
     <filter>
         <whitelist>
-            <directory>./src/Behat/Mink/</directory>
+            <directory>./src</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Behat/Mink/Driver/CoreDriver.php b/src/Driver/CoreDriver.php
similarity index 100%
rename from src/Behat/Mink/Driver/CoreDriver.php
rename to src/Driver/CoreDriver.php
diff --git a/src/Behat/Mink/Driver/DriverInterface.php b/src/Driver/DriverInterface.php
similarity index 100%
rename from src/Behat/Mink/Driver/DriverInterface.php
rename to src/Driver/DriverInterface.php
diff --git a/src/Behat/Mink/Element/DocumentElement.php b/src/Element/DocumentElement.php
similarity index 100%
rename from src/Behat/Mink/Element/DocumentElement.php
rename to src/Element/DocumentElement.php
diff --git a/src/Behat/Mink/Element/Element.php b/src/Element/Element.php
similarity index 100%
rename from src/Behat/Mink/Element/Element.php
rename to src/Element/Element.php
diff --git a/src/Behat/Mink/Element/ElementInterface.php b/src/Element/ElementInterface.php
similarity index 100%
rename from src/Behat/Mink/Element/ElementInterface.php
rename to src/Element/ElementInterface.php
diff --git a/src/Behat/Mink/Element/NodeElement.php b/src/Element/NodeElement.php
similarity index 100%
rename from src/Behat/Mink/Element/NodeElement.php
rename to src/Element/NodeElement.php
diff --git a/src/Behat/Mink/Element/TraversableElement.php b/src/Element/TraversableElement.php
similarity index 100%
rename from src/Behat/Mink/Element/TraversableElement.php
rename to src/Element/TraversableElement.php
diff --git a/src/Behat/Mink/Exception/DriverException.php b/src/Exception/DriverException.php
similarity index 100%
rename from src/Behat/Mink/Exception/DriverException.php
rename to src/Exception/DriverException.php
diff --git a/src/Behat/Mink/Exception/ElementException.php b/src/Exception/ElementException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ElementException.php
rename to src/Exception/ElementException.php
diff --git a/src/Behat/Mink/Exception/ElementHtmlException.php b/src/Exception/ElementHtmlException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ElementHtmlException.php
rename to src/Exception/ElementHtmlException.php
diff --git a/src/Behat/Mink/Exception/ElementNotFoundException.php b/src/Exception/ElementNotFoundException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ElementNotFoundException.php
rename to src/Exception/ElementNotFoundException.php
diff --git a/src/Behat/Mink/Exception/ElementTextException.php b/src/Exception/ElementTextException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ElementTextException.php
rename to src/Exception/ElementTextException.php
diff --git a/src/Behat/Mink/Exception/Exception.php b/src/Exception/Exception.php
similarity index 100%
rename from src/Behat/Mink/Exception/Exception.php
rename to src/Exception/Exception.php
diff --git a/src/Behat/Mink/Exception/ExpectationException.php b/src/Exception/ExpectationException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ExpectationException.php
rename to src/Exception/ExpectationException.php
diff --git a/src/Behat/Mink/Exception/ResponseTextException.php b/src/Exception/ResponseTextException.php
similarity index 100%
rename from src/Behat/Mink/Exception/ResponseTextException.php
rename to src/Exception/ResponseTextException.php
diff --git a/src/Behat/Mink/Exception/UnsupportedDriverActionException.php b/src/Exception/UnsupportedDriverActionException.php
similarity index 100%
rename from src/Behat/Mink/Exception/UnsupportedDriverActionException.php
rename to src/Exception/UnsupportedDriverActionException.php
diff --git a/src/Behat/Mink/Mink.php b/src/Mink.php
similarity index 100%
rename from src/Behat/Mink/Mink.php
rename to src/Mink.php
diff --git a/src/Behat/Mink/Selector/CssSelector.php b/src/Selector/CssSelector.php
similarity index 100%
rename from src/Behat/Mink/Selector/CssSelector.php
rename to src/Selector/CssSelector.php
diff --git a/src/Behat/Mink/Selector/ExactNamedSelector.php b/src/Selector/ExactNamedSelector.php
similarity index 100%
rename from src/Behat/Mink/Selector/ExactNamedSelector.php
rename to src/Selector/ExactNamedSelector.php
diff --git a/src/Behat/Mink/Selector/NamedSelector.php b/src/Selector/NamedSelector.php
similarity index 100%
rename from src/Behat/Mink/Selector/NamedSelector.php
rename to src/Selector/NamedSelector.php
diff --git a/src/Behat/Mink/Selector/PartialNamedSelector.php b/src/Selector/PartialNamedSelector.php
similarity index 100%
rename from src/Behat/Mink/Selector/PartialNamedSelector.php
rename to src/Selector/PartialNamedSelector.php
diff --git a/src/Behat/Mink/Selector/SelectorInterface.php b/src/Selector/SelectorInterface.php
similarity index 100%
rename from src/Behat/Mink/Selector/SelectorInterface.php
rename to src/Selector/SelectorInterface.php
diff --git a/src/Behat/Mink/Selector/SelectorsHandler.php b/src/Selector/SelectorsHandler.php
similarity index 100%
rename from src/Behat/Mink/Selector/SelectorsHandler.php
rename to src/Selector/SelectorsHandler.php
diff --git a/src/Behat/Mink/Selector/Xpath/Escaper.php b/src/Selector/Xpath/Escaper.php
similarity index 100%
rename from src/Behat/Mink/Selector/Xpath/Escaper.php
rename to src/Selector/Xpath/Escaper.php
diff --git a/src/Behat/Mink/Selector/Xpath/Manipulator.php b/src/Selector/Xpath/Manipulator.php
similarity index 100%
rename from src/Behat/Mink/Selector/Xpath/Manipulator.php
rename to src/Selector/Xpath/Manipulator.php
diff --git a/src/Behat/Mink/Session.php b/src/Session.php
similarity index 100%
rename from src/Behat/Mink/Session.php
rename to src/Session.php
diff --git a/src/Behat/Mink/WebAssert.php b/src/WebAssert.php
similarity index 100%
rename from src/Behat/Mink/WebAssert.php
rename to src/WebAssert.php