diff --git a/composer.json b/composer.json
index e49c2e361..da5b0fc5a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "League\\Flysystem": "src/"
+        "psr-4": {
+            "League\\Flysystem\\": "src/"
         }
     },
     "require-dev": {
diff --git a/src/League/Flysystem/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php
similarity index 100%
rename from src/League/Flysystem/Adapter/AbstractAdapter.php
rename to src/Adapter/AbstractAdapter.php
diff --git a/src/League/Flysystem/Adapter/AbstractFtpAdapter.php b/src/Adapter/AbstractFtpAdapter.php
similarity index 100%
rename from src/League/Flysystem/Adapter/AbstractFtpAdapter.php
rename to src/Adapter/AbstractFtpAdapter.php
diff --git a/src/League/Flysystem/Adapter/AwsS3.php b/src/Adapter/AwsS3.php
similarity index 100%
rename from src/League/Flysystem/Adapter/AwsS3.php
rename to src/Adapter/AwsS3.php
diff --git a/src/League/Flysystem/Adapter/Dropbox.php b/src/Adapter/Dropbox.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Dropbox.php
rename to src/Adapter/Dropbox.php
diff --git a/src/League/Flysystem/Adapter/Ftp.php b/src/Adapter/Ftp.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Ftp.php
rename to src/Adapter/Ftp.php
diff --git a/src/League/Flysystem/Adapter/Local.php b/src/Adapter/Local.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Local.php
rename to src/Adapter/Local.php
diff --git a/src/League/Flysystem/Adapter/Rackspace.php b/src/Adapter/Rackspace.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Rackspace.php
rename to src/Adapter/Rackspace.php
diff --git a/src/League/Flysystem/Adapter/Sftp.php b/src/Adapter/Sftp.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Sftp.php
rename to src/Adapter/Sftp.php
diff --git a/src/League/Flysystem/Adapter/WebDav.php b/src/Adapter/WebDav.php
similarity index 100%
rename from src/League/Flysystem/Adapter/WebDav.php
rename to src/Adapter/WebDav.php
diff --git a/src/League/Flysystem/Adapter/Zip.php b/src/Adapter/Zip.php
similarity index 100%
rename from src/League/Flysystem/Adapter/Zip.php
rename to src/Adapter/Zip.php
diff --git a/src/League/Flysystem/AdapterInterface.php b/src/AdapterInterface.php
similarity index 100%
rename from src/League/Flysystem/AdapterInterface.php
rename to src/AdapterInterface.php
diff --git a/src/League/Flysystem/Cache/AbstractCache.php b/src/Cache/AbstractCache.php
similarity index 100%
rename from src/League/Flysystem/Cache/AbstractCache.php
rename to src/Cache/AbstractCache.php
diff --git a/src/League/Flysystem/Cache/Memcached.php b/src/Cache/Memcached.php
similarity index 100%
rename from src/League/Flysystem/Cache/Memcached.php
rename to src/Cache/Memcached.php
diff --git a/src/League/Flysystem/Cache/Memory.php b/src/Cache/Memory.php
similarity index 100%
rename from src/League/Flysystem/Cache/Memory.php
rename to src/Cache/Memory.php
diff --git a/src/League/Flysystem/Cache/Noop.php b/src/Cache/Noop.php
similarity index 100%
rename from src/League/Flysystem/Cache/Noop.php
rename to src/Cache/Noop.php
diff --git a/src/League/Flysystem/Cache/Predis.php b/src/Cache/Predis.php
similarity index 100%
rename from src/League/Flysystem/Cache/Predis.php
rename to src/Cache/Predis.php
diff --git a/src/League/Flysystem/CacheInterface.php b/src/CacheInterface.php
similarity index 100%
rename from src/League/Flysystem/CacheInterface.php
rename to src/CacheInterface.php
diff --git a/src/League/Flysystem/Config.php b/src/Config.php
similarity index 100%
rename from src/League/Flysystem/Config.php
rename to src/Config.php
diff --git a/src/League/Flysystem/Directory.php b/src/Directory.php
similarity index 100%
rename from src/League/Flysystem/Directory.php
rename to src/Directory.php
diff --git a/src/League/Flysystem/File.php b/src/File.php
similarity index 100%
rename from src/League/Flysystem/File.php
rename to src/File.php
diff --git a/src/League/Flysystem/FileExistsException.php b/src/FileExistsException.php
similarity index 100%
rename from src/League/Flysystem/FileExistsException.php
rename to src/FileExistsException.php
diff --git a/src/League/Flysystem/FileNotFoundException.php b/src/FileNotFoundException.php
similarity index 100%
rename from src/League/Flysystem/FileNotFoundException.php
rename to src/FileNotFoundException.php
diff --git a/src/League/Flysystem/Filesystem.php b/src/Filesystem.php
similarity index 100%
rename from src/League/Flysystem/Filesystem.php
rename to src/Filesystem.php
diff --git a/src/League/Flysystem/FilesystemInterface.php b/src/FilesystemInterface.php
similarity index 100%
rename from src/League/Flysystem/FilesystemInterface.php
rename to src/FilesystemInterface.php
diff --git a/src/League/Flysystem/Handler.php b/src/Handler.php
similarity index 100%
rename from src/League/Flysystem/Handler.php
rename to src/Handler.php
diff --git a/src/League/Flysystem/MountManager.php b/src/MountManager.php
similarity index 100%
rename from src/League/Flysystem/MountManager.php
rename to src/MountManager.php
diff --git a/src/League/Flysystem/PluginInterface.php b/src/PluginInterface.php
similarity index 100%
rename from src/League/Flysystem/PluginInterface.php
rename to src/PluginInterface.php
diff --git a/src/League/Flysystem/ReadInterface.php b/src/ReadInterface.php
similarity index 100%
rename from src/League/Flysystem/ReadInterface.php
rename to src/ReadInterface.php
diff --git a/src/League/Flysystem/Util.php b/src/Util.php
similarity index 100%
rename from src/League/Flysystem/Util.php
rename to src/Util.php