diff --git a/composer.json b/composer.json
index d40a59c..b599af2 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,8 @@
         "php": ">=5.4"
     },
     "autoload": {
-        "classmap": ["src/"]
+        "psr-4": {
+            "Pickles\\" : "src/"
+        }
     }
 }
diff --git a/src/classes/Auth.php b/src/Auth.php
similarity index 100%
rename from src/classes/Auth.php
rename to src/Auth.php
diff --git a/src/classes/Browser.php b/src/Browser.php
similarity index 99%
rename from src/classes/Browser.php
rename to src/Browser.php
index a7359ed..9c70cda 100644
--- a/src/classes/Browser.php
+++ b/src/Browser.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Browser Utility Class
  *
diff --git a/src/classes/Cache.php b/src/Cache.php
similarity index 99%
rename from src/classes/Cache.php
rename to src/Cache.php
index 5a02d70..1f8d7fc 100644
--- a/src/classes/Cache.php
+++ b/src/Cache.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Cache Class
  *
diff --git a/src/classes/Config.php b/src/Config.php
similarity index 99%
rename from src/classes/Config.php
rename to src/Config.php
index 3dbcfe4..3e301e4 100644
--- a/src/classes/Config.php
+++ b/src/Config.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Config Class
  *
diff --git a/src/classes/Convert.php b/src/Convert.php
similarity index 99%
rename from src/classes/Convert.php
rename to src/Convert.php
index 4261c03..e46d22a 100644
--- a/src/classes/Convert.php
+++ b/src/Convert.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Convert Class
  *
diff --git a/src/classes/Database.php b/src/Database.php
similarity index 99%
rename from src/classes/Database.php
rename to src/Database.php
index 6218be3..cf69e51 100644
--- a/src/classes/Database.php
+++ b/src/Database.php
@@ -17,6 +17,8 @@
  * @todo      More assumptions for the datasource variables
  */
 
+namespace Pickles;
+
 /**
  * Database Class
  *
diff --git a/src/classes/Date.php b/src/Date.php
similarity index 97%
rename from src/classes/Date.php
rename to src/Date.php
index 6168a26..d38c75a 100644
--- a/src/classes/Date.php
+++ b/src/Date.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Date Class
  *
diff --git a/src/classes/Distance.php b/src/Distance.php
similarity index 99%
rename from src/classes/Distance.php
rename to src/Distance.php
index d079228..3c65b7e 100644
--- a/src/classes/Distance.php
+++ b/src/Distance.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Distance Class
  *
diff --git a/src/Exception.php b/src/Exception.php
new file mode 100644
index 0000000..f83fbf8
--- /dev/null
+++ b/src/Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Pickles;
+
+class Exception extends \Exception
+{
+
+}
+
diff --git a/src/classes/File.php b/src/File.php
similarity index 98%
rename from src/classes/File.php
rename to src/File.php
index 585303f..af69806 100644
--- a/src/classes/File.php
+++ b/src/File.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * File Class
  *
diff --git a/src/classes/Model.php b/src/Model.php
similarity index 99%
rename from src/classes/Model.php
rename to src/Model.php
index 396cd60..d26443a 100644
--- a/src/classes/Model.php
+++ b/src/Model.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Model Class
  *
diff --git a/src/classes/Number.php b/src/Number.php
similarity index 98%
rename from src/classes/Number.php
rename to src/Number.php
index 698bd84..5b7bc8f 100644
--- a/src/classes/Number.php
+++ b/src/Number.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Number Class
  *
diff --git a/src/classes/Object.php b/src/Object.php
similarity index 99%
rename from src/classes/Object.php
rename to src/Object.php
index d3e298c..184eabf 100644
--- a/src/classes/Object.php
+++ b/src/Object.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Object Class
  *
diff --git a/src/classes/Profiler.php b/src/Profiler.php
similarity index 99%
rename from src/classes/Profiler.php
rename to src/Profiler.php
index c5a8e88..0e4d3ee 100644
--- a/src/classes/Profiler.php
+++ b/src/Profiler.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Profiler Class
  *
diff --git a/src/classes/Resource.php b/src/Resource.php
similarity index 99%
rename from src/classes/Resource.php
rename to src/Resource.php
index aeae4b1..55b4388 100644
--- a/src/classes/Resource.php
+++ b/src/Resource.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Resource Class
  *
diff --git a/src/classes/Router.php b/src/Router.php
similarity index 99%
rename from src/classes/Router.php
rename to src/Router.php
index c1f17b7..6468f2f 100644
--- a/src/classes/Router.php
+++ b/src/Router.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Router Class
  *
diff --git a/src/classes/Sort.php b/src/Sort.php
similarity index 98%
rename from src/classes/Sort.php
rename to src/Sort.php
index ff01ec9..92b9417 100644
--- a/src/classes/Sort.php
+++ b/src/Sort.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Sort Class
  *
diff --git a/src/classes/String.php b/src/String.php
similarity index 99%
rename from src/classes/String.php
rename to src/String.php
index f51ac3c..62ca630 100644
--- a/src/classes/String.php
+++ b/src/String.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * String Class
  *
diff --git a/src/classes/Time.php b/src/Time.php
similarity index 99%
rename from src/classes/Time.php
rename to src/Time.php
index 1f7ca66..af7e4e7 100644
--- a/src/classes/Time.php
+++ b/src/Time.php
@@ -15,6 +15,8 @@
  * @link      https://github.com/joshtronic/pickles
  */
 
+namespace Pickles;
+
 /**
  * Time Class
  *
diff --git a/src/classes/Exception.php b/src/classes/Exception.php
deleted file mode 100644
index b689a80..0000000
--- a/src/classes/Exception.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class PicklesException extends Exception
-{
-
-}
-
diff --git a/src/pickles.php b/src/pickles.php
index 4e2d8c1..505f5e4 100644
--- a/src/pickles.php
+++ b/src/pickles.php
@@ -62,64 +62,6 @@ ini_set('session.gc_probability', 1);
 ini_set('session.gc_divisor',     1000);
 ini_set('session.hash_function',  1);
 
-// }}}
-// {{{ Auto[magical] Loader
-
-/**
- * Magic function to automatically load classes
- *
- * Attempts to load a core PICKLES class or a site level data model or
- * module class.
- *
- * @param  string $class Name of the class to be loaded
- * @return boolean Return value of require_once() or false (default)
- */
-function __autoload($class)
-{
-    $loaded   = false;
-    $filename = preg_replace('/_/', '/', $class) . '.php';
-
-    $pickles_path  = dirname(__FILE__) . '/';
-    $pickles_paths = [
-        'class'  => $pickles_path,
-    ];
-
-    // Hack to deal with namespaces
-    if (strpos($class, '\\') !== false)
-    {
-        list($namespace, $class) = explode('\\', $class);
-
-        return require_once $pickles_path . 'classes/' . $class . '.php';
-    }
-
-    // Path as the key, boolean value is whether ot not to convert back to hyphenated
-    $paths = [
-        $pickles_paths['class'] => false,
-        SITE_CLASS_PATH         => false,
-        SITE_MODEL_PATH         => false,
-        SITE_RESOURCE_PATH      => true,
-    ];
-
-    foreach ($paths as $path => $hyphenated)
-    {
-        // Converts the filename back to hypenated
-        if ($hyphenated == true)
-        {
-            $filename = strtolower(preg_replace('/([A-Z]{1})/', '-$1', $filename));;
-        }
-
-        if (file_exists($path . $filename))
-        {
-            $loaded = require_once $path . $filename;
-            break;
-        }
-    }
-
-    return $loaded;
-}
-
-spl_autoload_register('__autoload');
-
 // }}}
 // {{{ Loads the configuration file and sets any configuration options