diff --git a/.travis.yml b/.travis.yml
index bd79850b..c424d3e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,13 @@ before_script:
   ## Packages
   - sudo apt-get -qq update > /dev/null
   ## Composer
-  ##@todo Remove when support of 5.2 will be dropped
   - composer self-update
   - composer install --prefer-source --dev
   - phpenv global "$TRAVIS_PHP_VERSION"
 
 script:
   ## PHP_CodeSniffer
-  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full Classes/ unitTests/ --standard=PSR2 -n
+  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full src/ unitTests/ --standard=PSR2 -n
   ## PHPUnit
   - phpunit -c ./unitTests/
 
diff --git a/composer.json b/composer.json
index 64ded6ee..3e4c2769 100644
--- a/composer.json
+++ b/composer.json
@@ -36,8 +36,8 @@
         "ext-gd2": "*"
     },
     "autoload": {
-        "psr-0": {
-            "PHPExcel": "Classes/"
+        "psr-4": {
+            "PHPExcel": "src/PhpSpreadsheet"
         }
     }
 }