diff --git a/composer.json b/composer.json
index 6ced92f..1ea0f2c 100644
--- a/composer.json
+++ b/composer.json
@@ -11,12 +11,12 @@
             "email": "gilbert@pellegrom.me"
         }
     ],
+    "autoload": {
+        "classmap": ["lib/"]
+    },
     "require": {
         "php": ">=5.2.4",
         "twig/twig": "1.12.*",
         "erusev/parsedown-extra": "dev-master@dev"
-    },
-    "autoload": {
-        "files": ["lib/pico.php"]
     }
 }
diff --git a/index.php b/index.php
index 6e3bdab..278606f 100644
--- a/index.php
+++ b/index.php
@@ -9,5 +9,5 @@ define('THEMES_DIR', ROOT_DIR .'themes/');
 define('CACHE_DIR', LIB_DIR .'cache/');
 
 require_once(ROOT_DIR .'vendor/autoload.php');
-require_once(LIB_DIR .'pico.php');
-$pico = new Pico\Pico();
+
+$pico = new \PicoCMS\Pico();
diff --git a/lib/pico.php b/lib/pico.php
index 13c132a..19208ef 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -1,5 +1,5 @@
 <?php
-namespace Pico;
+namespace PicoCMS;
 /**
  * Pico
  *
@@ -8,7 +8,7 @@ namespace Pico;
  * @license http://opensource.org/licenses/MIT
  * @version 0.8
  */
-class pico
+class Pico
 {
     private $plugins;
 
diff --git a/vendor/autoload.php b/vendor/autoload.php
index a9aba7a..32687f3 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1::getLoader();
+return ComposerAutoloaderInit3600353917ba20bdd95a558603485a27::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 7a91153..ba55445 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'PicoCMS\\Pico' => $baseDir . '/lib/Pico.php',
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 8043c90..983fbca 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1
+class ComposerAutoloaderInit3600353917ba20bdd95a558603485a27
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3600353917ba20bdd95a558603485a27', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3600353917ba20bdd95a558603485a27', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -43,16 +43,11 @@ class ComposerAutoloaderInit607b27418f6a3e585119eb8ceb7ae2a1
 
         $loader->register(true);
 
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $file) {
-            composerRequire607b27418f6a3e585119eb8ceb7ae2a1($file);
-        }
-
         return $loader;
     }
 }
 
-function composerRequire607b27418f6a3e585119eb8ceb7ae2a1($file)
+function composerRequire3600353917ba20bdd95a558603485a27($file)
 {
     require $file;
 }