diff --git a/composer.json b/composer.json
index 80cbc9d..a0f98e7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "adoy/oauth2",
     "description": "Light PHP wrapper for the OAuth 2.0 protocol (based on OAuth 2.0 Authorization Protocol draft-ietf-oauth-v2-15)",
-    "license": "LGPL-2.1", 
+    "license": "LGPL-2.1",
     "authors": [
         {
             "name": "Charron Pierrick",
@@ -16,6 +16,6 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": {"OAuth2": "src/"}
+        "psr-0": {"Adoy\\OAuth2\\": "src/"}
     }
 }
diff --git a/src/OAuth2/Client.php b/src/Adoy/OAuth2/Client.php
similarity index 99%
rename from src/OAuth2/Client.php
rename to src/Adoy/OAuth2/Client.php
index c09fa5a..a5e91a4 100644
--- a/src/OAuth2/Client.php
+++ b/src/Adoy/OAuth2/Client.php
@@ -24,7 +24,7 @@
  * @author      Anis Berejeb <anis.berejeb@gmail.com>
  * @version     1.3.1
  */
-namespace OAuth2;
+namespace Adoy\OAuth2;
 
 class Client
 {
diff --git a/src/OAuth2/GrantType/AuthorizationCode.php b/src/Adoy/OAuth2/GrantType/AuthorizationCode.php
similarity index 93%
rename from src/OAuth2/GrantType/AuthorizationCode.php
rename to src/Adoy/OAuth2/GrantType/AuthorizationCode.php
index f3436e4..ff3db25 100644
--- a/src/OAuth2/GrantType/AuthorizationCode.php
+++ b/src/Adoy/OAuth2/GrantType/AuthorizationCode.php
@@ -1,7 +1,7 @@
 <?php
-namespace OAuth2\GrantType;
+namespace Adoy\OAuth2\GrantType;
 
-use OAuth2\InvalidArgumentException;
+use Adoy\OAuth2\InvalidArgumentException;
 
 /**
  * Authorization code  Grant Type Validator
diff --git a/src/OAuth2/GrantType/ClientCredentials.php b/src/Adoy/OAuth2/GrantType/ClientCredentials.php
similarity index 75%
rename from src/OAuth2/GrantType/ClientCredentials.php
rename to src/Adoy/OAuth2/GrantType/ClientCredentials.php
index c6c81f8..f8da7a2 100644
--- a/src/OAuth2/GrantType/ClientCredentials.php
+++ b/src/Adoy/OAuth2/GrantType/ClientCredentials.php
@@ -1,21 +1,21 @@
 <?php
-namespace OAuth2\GrantType;
+namespace Adoy\OAuth2\GrantType;
 
 /**
- * Client Credentials Parameters 
+ * Client Credentials Parameters
  */
 class ClientCredentials implements IGrantType
 {
     /**
      * Defines the Grant Type
-     * 
-     * @var string  Defaults to 'client_credentials'. 
+     *
+     * @var string  Defaults to 'client_credentials'.
      */
     const GRANT_TYPE = 'client_credentials';
 
     /**
      * Adds a specific Handling of the parameters
-     * 
+     *
      * @return array of Specific parameters to be sent.
      * @param  mixed  $parameters the parameters array (passed by reference)
      */
diff --git a/src/OAuth2/GrantType/IGrantType.php b/src/Adoy/OAuth2/GrantType/IGrantType.php
similarity index 83%
rename from src/OAuth2/GrantType/IGrantType.php
rename to src/Adoy/OAuth2/GrantType/IGrantType.php
index 6063192..4bbeeec 100644
--- a/src/OAuth2/GrantType/IGrantType.php
+++ b/src/Adoy/OAuth2/GrantType/IGrantType.php
@@ -1,13 +1,13 @@
 <?php
-namespace OAuth2\GrantType;
+namespace Adoy\OAuth2\GrantType;
 /**
  * Specific GrantType Interface
  */
-interface IGrantType 
+interface IGrantType
 {
     /**
      * Adds a specific Handling of the parameters
-     * 
+     *
      * @return array of Specific parameters to be sent.
      * @param  mixed  $parameters the parameters array (passed by reference)
      */
diff --git a/src/OAuth2/GrantType/Password.php b/src/Adoy/OAuth2/GrantType/Password.php
similarity index 93%
rename from src/OAuth2/GrantType/Password.php
rename to src/Adoy/OAuth2/GrantType/Password.php
index 8972409..fe98927 100644
--- a/src/OAuth2/GrantType/Password.php
+++ b/src/Adoy/OAuth2/GrantType/Password.php
@@ -1,7 +1,7 @@
 <?php
-namespace OAuth2\GrantType;
+namespace Adoy\OAuth2\GrantType;
 
-use OAuth2\InvalidArgumentException;
+use Adoy\OAuth2\InvalidArgumentException;
 
 /**
  * Password Parameters
diff --git a/src/OAuth2/GrantType/RefreshToken.php b/src/Adoy/OAuth2/GrantType/RefreshToken.php
similarity index 91%
rename from src/OAuth2/GrantType/RefreshToken.php
rename to src/Adoy/OAuth2/GrantType/RefreshToken.php
index 12fccb0..09fd917 100644
--- a/src/OAuth2/GrantType/RefreshToken.php
+++ b/src/Adoy/OAuth2/GrantType/RefreshToken.php
@@ -1,7 +1,7 @@
 <?php
-namespace OAuth2\GrantType;
+namespace Adoy\OAuth2\GrantType;
 
-use OAuth2\InvalidArgumentException;
+use Adoy\OAuth2\InvalidArgumentException;
 
 /**
  * Refresh Token  Parameters