diff --git a/composer.json b/composer.json
index 64d40b458..b9fecfb79 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,8 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": {
-            "Phpfastcache": "src/"
+        "psr-4": {
+            "": "src/"
         },
         "files": [
             "src/Phpfastcache/legacy/aliases.php"
diff --git a/phpfastcache/3.0.0/exceptions/phpfastcacheCoreException.php b/phpfastcache/3.0.0/exceptions/phpfastcacheCoreException.php
deleted file mode 100644
index f01f7203c..000000000
--- a/phpfastcache/3.0.0/exceptions/phpfastcacheCoreException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * phpfastcacheCoreException
- * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
- * @author Georges.L (Geolim4)  <contact@geolim4.com>
- */
-class phpfastcacheCoreException extends Exception
-{
-
-}
\ No newline at end of file
diff --git a/phpfastcache/3.0.0/exceptions/phpfastcacheDriverException.php b/phpfastcache/3.0.0/exceptions/phpfastcacheDriverException.php
deleted file mode 100644
index 87cd2ba62..000000000
--- a/phpfastcache/3.0.0/exceptions/phpfastcacheDriverException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * phpfastcacheDriverException
- * @author Khoa Bui (khoaofgod)  <khoaofgod@gmail.com> http://www.phpfastcache.com
- * @author Georges.L (Geolim4)  <contact@geolim4.com>
- */
-class phpfastcacheDriverException extends Exception
-{
-
-}
\ No newline at end of file
diff --git a/src/phpfastcache/core/instanceManager.php b/src/phpfastcache/core/InstanceManager.php
similarity index 100%
rename from src/phpfastcache/core/instanceManager.php
rename to src/phpfastcache/core/InstanceManager.php