diff --git a/.travis.yml b/.travis.yml
index f708ffe..2ba6283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,11 +27,3 @@ before_script:
 
 script:
   - phpunit --verbose $PHPUNIT_FLAGS
-
-after_script:
-  - |
-    if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
-      cd ../../..
-      travis_retry wget https://scrutinizer-ci.com/ocular.phar
-      php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-    fi
diff --git a/composer.json b/composer.json
index 4ff4367..40bd970 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     ],
     "autoload": {
-        "psr-4": { "yii\\swiftmailer\\": "" }
+        "psr-4": { "yii\\swiftmailer\\": "src" }
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d93d427..5ca8862 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit bootstrap="./tests/bootstrap.php"
 		colors="true"
+		verbose="true"
 		convertErrorsToExceptions="true"
 		convertNoticesToExceptions="true"
 		convertWarningsToExceptions="true"
diff --git a/Logger.php b/src/Logger.php
similarity index 100%
rename from Logger.php
rename to src/Logger.php
diff --git a/Mailer.php b/src/Mailer.php
similarity index 100%
rename from Mailer.php
rename to src/Mailer.php
diff --git a/Message.php b/src/Message.php
similarity index 100%
rename from Message.php
rename to src/Message.php