diff --git a/README.md b/README.md
index b09a587..0c0b8b6 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ This library makes it stupidly simple to integrate your application with OAuth 2
 
 Adding support for other providers is trivial.
 
-The library requires PHP 5.3+ and is PSR-0 compatible.
+The library requires PHP 5.3+ and is PSR-4 compatible.
 
 ## Usage
 
diff --git a/composer.json b/composer.json
index d34f5f4..bb65f22 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,8 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "League\\OAuth2\\Client": "src/"
+        "psr-4": {
+            "League\\OAuth2\\Client\\": "src/"
         }
     }
 }
diff --git a/src/League/OAuth2/Client/Exception/IDPException.php b/src/Exception/IDPException.php
similarity index 100%
rename from src/League/OAuth2/Client/Exception/IDPException.php
rename to src/Exception/IDPException.php
diff --git a/src/League/OAuth2/Client/Grant/Authorizationcode.php b/src/Grant/Authorizationcode.php
similarity index 100%
rename from src/League/OAuth2/Client/Grant/Authorizationcode.php
rename to src/Grant/Authorizationcode.php
diff --git a/src/League/OAuth2/Client/Grant/GrantInterface.php b/src/Grant/GrantInterface.php
similarity index 100%
rename from src/League/OAuth2/Client/Grant/GrantInterface.php
rename to src/Grant/GrantInterface.php
diff --git a/src/League/OAuth2/Client/Provider/Eventbrite.php b/src/Provider/Eventbrite.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Eventbrite.php
rename to src/Provider/Eventbrite.php
diff --git a/src/League/OAuth2/Client/Provider/Facebook.php b/src/Provider/Facebook.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Facebook.php
rename to src/Provider/Facebook.php
diff --git a/src/League/OAuth2/Client/Provider/Github.php b/src/Provider/Github.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Github.php
rename to src/Provider/Github.php
diff --git a/src/League/OAuth2/Client/Provider/Google.php b/src/Provider/Google.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Google.php
rename to src/Provider/Google.php
diff --git a/src/League/OAuth2/Client/Provider/IdentityProvider.php b/src/Provider/IdentityProvider.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/IdentityProvider.php
rename to src/Provider/IdentityProvider.php
diff --git a/src/League/OAuth2/Client/Provider/Instagram.php b/src/Provider/Instagram.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Instagram.php
rename to src/Provider/Instagram.php
diff --git a/src/League/OAuth2/Client/Provider/LinkedIn.php b/src/Provider/LinkedIn.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/LinkedIn.php
rename to src/Provider/LinkedIn.php
diff --git a/src/League/OAuth2/Client/Provider/Microsoft.php b/src/Provider/Microsoft.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Microsoft.php
rename to src/Provider/Microsoft.php
diff --git a/src/League/OAuth2/Client/Provider/User.php b/src/Provider/User.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/User.php
rename to src/Provider/User.php
diff --git a/src/League/OAuth2/Client/Provider/Vkontakte.php b/src/Provider/Vkontakte.php
similarity index 100%
rename from src/League/OAuth2/Client/Provider/Vkontakte.php
rename to src/Provider/Vkontakte.php
diff --git a/src/League/OAuth2/Client/Token/AccessToken.php b/src/Token/AccessToken.php
similarity index 100%
rename from src/League/OAuth2/Client/Token/AccessToken.php
rename to src/Token/AccessToken.php