diff --git a/src/Entase/Client.php b/src/Client.php
similarity index 99%
rename from src/Entase/Client.php
rename to src/Client.php
index f5f0148..258ba14 100644
--- a/src/Entase/Client.php
+++ b/src/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 
 class Client
diff --git a/src/Entase/Endpoint.php b/src/Endpoint.php
similarity index 94%
rename from src/Entase/Endpoint.php
rename to src/Endpoint.php
index 4023280..a9581cc 100644
--- a/src/Entase/Endpoint.php
+++ b/src/Endpoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class Endpoint
 {
diff --git a/src/Entase/Endpoints/Events.php b/src/Endpoints/Events.php
similarity index 65%
rename from src/Entase/Endpoints/Events.php
rename to src/Endpoints/Events.php
index 21d3252..aeb1806 100644
--- a/src/Entase/Endpoints/Events.php
+++ b/src/Endpoints/Events.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Entase\Endpoints;
+namespace Entase\SDK\Endpoints;
 
-class Events extends \Entase\Endpoint
+class Events extends \Entase\SDK\Endpoint
 {
     public function __construct($client)
     {
diff --git a/src/Entase/Endpoints/Productions.php b/src/Endpoints/Productions.php
similarity index 64%
rename from src/Entase/Endpoints/Productions.php
rename to src/Endpoints/Productions.php
index faf7204..7c4f614 100644
--- a/src/Entase/Endpoints/Productions.php
+++ b/src/Endpoints/Productions.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Entase\Endpoints;
+namespace Entase\SDK\Endpoints;
 
-class Productions extends \Entase\Endpoint
+class Productions extends \Entase\SDK\Endpoint
 {
     public function __construct($client)
     {
diff --git a/src/Entase/Exception.php b/src/Entase/Exception.php
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Entase/Env.php b/src/Env.php
similarity index 85%
rename from src/Entase/Env.php
rename to src/Env.php
index d984ae8..fa3969f 100644
--- a/src/Entase/Env.php
+++ b/src/Env.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 abstract class Env
 {
diff --git a/src/Entase/Exceptions/API.php b/src/Exceptions/API.php
similarity index 50%
rename from src/Entase/Exceptions/API.php
rename to src/Exceptions/API.php
index f997e22..47d1b75 100644
--- a/src/Entase/Exceptions/API.php
+++ b/src/Exceptions/API.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class API extends Base {}
\ No newline at end of file
diff --git a/src/Entase/Exceptions/Base.php b/src/Exceptions/Base.php
similarity index 91%
rename from src/Entase/Exceptions/Base.php
rename to src/Exceptions/Base.php
index 43b5c4e..8d566e2 100644
--- a/src/Entase/Exceptions/Base.php
+++ b/src/Exceptions/Base.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class Base extends \Exception
 {
diff --git a/src/Entase/Exceptions/CURL.php b/src/Exceptions/CURL.php
similarity index 50%
rename from src/Entase/Exceptions/CURL.php
rename to src/Exceptions/CURL.php
index 7633b18..8edeab9 100644
--- a/src/Entase/Exceptions/CURL.php
+++ b/src/Exceptions/CURL.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class CURL extends Base {}
\ No newline at end of file
diff --git a/src/Entase/Exceptions/Request.php b/src/Exceptions/Request.php
similarity index 52%
rename from src/Entase/Exceptions/Request.php
rename to src/Exceptions/Request.php
index 35b90d5..7bbab6d 100644
--- a/src/Entase/Exceptions/Request.php
+++ b/src/Exceptions/Request.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Entase\Exceptions;
+namespace Entase\SDK\Exceptions;
 
 class Request extends Base {}
\ No newline at end of file
diff --git a/src/Entase/ObjectBase.php b/src/ObjectBase.php
similarity index 97%
rename from src/Entase/ObjectBase.php
rename to src/ObjectBase.php
index a6db131..3212ba7 100644
--- a/src/Entase/ObjectBase.php
+++ b/src/ObjectBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class ObjectBase
 {
diff --git a/src/Entase/ObjectCollection.php b/src/ObjectCollection.php
similarity index 98%
rename from src/Entase/ObjectCollection.php
rename to src/ObjectCollection.php
index f56f45d..d8e43ab 100644
--- a/src/Entase/ObjectCollection.php
+++ b/src/ObjectCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 use \IteratorAggregate;
 use \Traversable;
diff --git a/src/Entase/ObjectCursor.php b/src/ObjectCursor.php
similarity index 94%
rename from src/Entase/ObjectCursor.php
rename to src/ObjectCursor.php
index 717f0ac..03d2c4a 100644
--- a/src/Entase/ObjectCursor.php
+++ b/src/ObjectCursor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Entase;
+namespace Entase\SDK;
 
 class ObjectCursor extends ObjectBase
 {
diff --git a/src/autoloader.php b/src/autoloader.php
index c9a2c10..5189f90 100644
--- a/src/autoloader.php
+++ b/src/autoloader.php
@@ -1,43 +1,32 @@
 <?php
 
-namespace EntaseSDK;
+namespace Entase\SDK;
 
 function AutoLoader($className) 
 {
-    if (strpos($className, 'Entase\\') !== 0)
+    if (strpos($className, 'Entase\\SDK\\') !== 0)
         return;
 
+    $calledClass = $className;
+    $className = str_replace('Entase\\SDK\\', '', $className);
+
     $fileName = '';
     $namespace = '';
 
-    // Sets the include path as the "src" directory
     $includePath = dirname(__FILE__).DIRECTORY_SEPARATOR;
-
     if (false !== ($lastNsPos = strripos($className, '\\'))) {
         $namespace = substr($className, 0, $lastNsPos);
         $className = substr($className, $lastNsPos + 1);
         $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
     }
+    
     $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-    $fullFileName = $includePath . DIRECTORY_SEPARATOR . $fileName;
-    $fullFileNameEX = $includePath . DIRECTORY_SEPARATOR .'ThirdParty/'.$fileName;
-
-    $pos = strpos($fileName, '/');
-    $fileName_src = ($pos !== false) ? substr_replace($fileName, '/src/', $pos, 1) : 'src/'.$fileName;
-    $fullFileNameEX_SRC = $includePath . DIRECTORY_SEPARATOR .'ThirdParty/'.$fileName_src;
+    $fullFilePath = $includePath.DIRECTORY_SEPARATOR.$fileName;
 
-    if (file_exists($fullFileName)) {
-        require_once $fullFileName;
-    }
-    elseif (file_exists($fullFileNameEX)) {
-        require_once $fullFileNameEX;
-    }
-    elseif (file_exists($fullFileNameEX_SRC)) {
-        require_once $fullFileNameEX_SRC;
-    }
-    else {
-        die('Class "'.$className.'" does not exist.');
+    if (file_exists($fullFilePath)) {
+        require_once $fullFilePath;
     }
+    else die('Class "'.$calledClass.'" does not exist.');
 }
 
-\spl_autoload_register('EntaseSDK\AutoLoader'); // Registers the autoloader
\ No newline at end of file
+\spl_autoload_register('Entase\\SDK\\AutoLoader'); // Registers the autoloader
\ No newline at end of file