diff --git a/.travis.yml b/.travis.yml
index d6f3054..480f72b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: php
- 
+
 cache:
   directories:
       - src/vendor/
@@ -8,13 +8,12 @@ cache:
 php:
   - 5.6
   - 7.0
- 
+
 before_script:
-  - cd src/
-  - composer config --global http-basic.repo.magento.com $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD
+  - composer config --global --auth http-basic.repo.magento.com $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD
   - composer self-update
   - composer install --prefer-source --no-interaction --dev --no-scripts
- 
+
 script:
   - phpunit --coverage-clover "coverage.xml" -c dev/tests/unit/phpunit.xml
 
diff --git a/src/composer.json b/composer.json
similarity index 91%
rename from src/composer.json
rename to composer.json
index 38a9047..ec66779 100644
--- a/src/composer.json
+++ b/composer.json
@@ -24,9 +24,9 @@
     "friendsofphp/php-cs-fixer": "~1.10"
   },
   "autoload": {
-    "files": [ "registration.php" ],
+    "files": [ "src/registration.php" ],
     "psr-4": {
-      "Meanbee\\MagentoRoyalmail\\": ""
+      "Meanbee\\MagentoRoyalmail\\": "src/"
     }
   },
   "authors": [
diff --git a/src/composer.lock b/composer.lock
similarity index 100%
rename from src/composer.lock
rename to composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
index a6a7b9a..601d9d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ appdata:
   image: tianon/true
   volumes:
     - ./magento:/var/www/magento
-    - ./:/src
+    - ./:./src
     - ~/.composer/cache:/root/.composer/cache
 
 fpm: