diff --git a/src/OAuth/OAuthConsumer.php b/src/Eher/OAuth/OAuthConsumer.php
similarity index 93%
rename from src/OAuth/OAuthConsumer.php
rename to src/Eher/OAuth/OAuthConsumer.php
index 00851e1..fec1694 100644
--- a/src/OAuth/OAuthConsumer.php
+++ b/src/Eher/OAuth/OAuthConsumer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 class OAuthConsumer {
   public $key;
diff --git a/src/OAuth/OAuthDataStore.php b/src/Eher/OAuth/OAuthDataStore.php
similarity index 96%
rename from src/OAuth/OAuthDataStore.php
rename to src/Eher/OAuth/OAuthDataStore.php
index 45d203c..8ad2f30 100644
--- a/src/OAuth/OAuthDataStore.php
+++ b/src/Eher/OAuth/OAuthDataStore.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 class OAuthDataStore {
   function lookup_consumer($consumer_key) {
diff --git a/src/OAuth/OAuthException.php b/src/Eher/OAuth/OAuthException.php
similarity index 80%
rename from src/OAuth/OAuthException.php
rename to src/Eher/OAuth/OAuthException.php
index 7d22c43..17ad9ee 100644
--- a/src/OAuth/OAuthException.php
+++ b/src/Eher/OAuth/OAuthException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 /* Generic exception class
  */
diff --git a/src/OAuth/OAuthRequest.php b/src/Eher/OAuth/OAuthRequest.php
similarity index 99%
rename from src/OAuth/OAuthRequest.php
rename to src/Eher/OAuth/OAuthRequest.php
index c5d2d7b..a152b91 100644
--- a/src/OAuth/OAuthRequest.php
+++ b/src/Eher/OAuth/OAuthRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 class OAuthRequest {
   protected $parameters;
diff --git a/src/OAuth/OAuthServer.php b/src/Eher/OAuth/OAuthServer.php
similarity index 99%
rename from src/OAuth/OAuthServer.php
rename to src/Eher/OAuth/OAuthServer.php
index 26d207c..8a8b913 100644
--- a/src/OAuth/OAuthServer.php
+++ b/src/Eher/OAuth/OAuthServer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 class OAuthServer {
   protected $timestamp_threshold = 300; // in seconds, five minutes
diff --git a/src/OAuth/OAuthSignatureMethod.php b/src/Eher/OAuth/OAuthSignatureMethod.php
similarity index 97%
rename from src/OAuth/OAuthSignatureMethod.php
rename to src/Eher/OAuth/OAuthSignatureMethod.php
index 3eb1fce..fd43470 100644
--- a/src/OAuth/OAuthSignatureMethod.php
+++ b/src/Eher/OAuth/OAuthSignatureMethod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 /**
  * A class for implementing a Signature Method
diff --git a/src/OAuth/OAuthSignatureMethod_HMAC_SHA1.php b/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
similarity index 97%
rename from src/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
rename to src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
index 2425160..2da7fc4 100644
--- a/src/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
+++ b/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 /**
  * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
diff --git a/src/OAuth/OAuthSignatureMethod_PLAINTEXT.php b/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
similarity index 97%
rename from src/OAuth/OAuthSignatureMethod_PLAINTEXT.php
rename to src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
index 41af0f6..05e3670 100644
--- a/src/OAuth/OAuthSignatureMethod_PLAINTEXT.php
+++ b/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 /**
  * The PLAINTEXT method does not provide any security protection and SHOULD only be used
diff --git a/src/OAuth/OAuthSignatureMethod_RSA_SHA1.php b/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
similarity index 99%
rename from src/OAuth/OAuthSignatureMethod_RSA_SHA1.php
rename to src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
index 189e83c..39e0196 100644
--- a/src/OAuth/OAuthSignatureMethod_RSA_SHA1.php
+++ b/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OAuth;
+namespace Eher\OAuth;
 
 /**
  * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
diff --git a/src/OAuth/OAuthToken.php b/src/Eher/OAuth/OAuthToken.php
similarity index 100%
rename from src/OAuth/OAuthToken.php
rename to src/Eher/OAuth/OAuthToken.php
diff --git a/src/OAuth/OAuthUtil.php b/src/Eher/OAuth/OAuthUtil.php
similarity index 100%
rename from src/OAuth/OAuthUtil.php
rename to src/Eher/OAuth/OAuthUtil.php