diff --git a/src/Driver/IMAPDriver.php b/src/Imap/Driver/ImapDriver.php
similarity index 96%
rename from src/Driver/IMAPDriver.php
rename to src/Imap/Driver/ImapDriver.php
index f80462a..0300345 100644
--- a/src/Driver/IMAPDriver.php
+++ b/src/Imap/Driver/ImapDriver.php
@@ -1,23 +1,24 @@
 <?php
 
-namespace BehatMailExtension\Driver;
+namespace BehatMailExtension\Imap\Driver;
 
+use BehatMailExtension\Driver\MailDriverInterface;
+use BehatMailExtension\Imap\Search\Header;
 use BehatMailExtension\Service\Connection;
 use Ddeboer\Imap\MailboxInterface;
+use Ddeboer\Imap\Message;
 use Ddeboer\Imap\MessageInterface;
 use Ddeboer\Imap\MessageIteratorInterface;
 use Ddeboer\Imap\Search\ConditionInterface;
-use BehatMailExtension\Imap\Search\Header;
 use Ddeboer\Imap\SearchExpression;
-use Ddeboer\Imap\Message;
 use const LATT_NOSELECT;
 
 /**
- * Class IMAPDriver
+ * Class ImapDriver
  *
  * @author Philip Maaß <PhilipMaasz@aol.com>
  */
-class IMAPDriver implements MailDriverInterface
+class ImapDriver implements MailDriverInterface
 {
     /**
      * @var array
diff --git a/src/ServiceContainer/MailExtension.php b/src/ServiceContainer/MailExtension.php
index 6ca0b6d..6c15152 100644
--- a/src/ServiceContainer/MailExtension.php
+++ b/src/ServiceContainer/MailExtension.php
@@ -6,8 +6,8 @@
 use Behat\Testwork\ServiceContainer\Extension;
 use Behat\Testwork\ServiceContainer\ExtensionManager;
 use BehatMailExtension\Context\MailAwareInitializer;
-use BehatMailExtension\Driver\IMAPDriver;
 use BehatMailExtension\Driver\MailDriverInterface;
+use BehatMailExtension\Imap\Driver\ImapDriver;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -83,7 +83,7 @@ public function load(ContainerBuilder $container, array $config)
 
         switch ($config['driver']) {
             case 'imap':
-                $driver = new IMAPDriver($config);
+                $driver = new ImapDriver($config);
                 break;
             case 'pop3':
             case 'smtp':
diff --git a/tests/MailExtensionTest.php b/tests/MailExtensionTest.php
new file mode 100644
index 0000000..68e090e
--- /dev/null
+++ b/tests/MailExtensionTest.php
@@ -0,0 +1,6 @@
+<?php
+
+class MailExtensionTest
+{
+
+}
\ No newline at end of file