diff --git a/.gitignore b/.gitignore
index 57872d0..491f666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /vendor/
+.idea/
diff --git a/composer.json b/composer.json
index 067f878..2c6c9dc 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,8 @@
         "ext-mcrypt": "*"
     },
     "autoload": {
-        "classmap": ["src/"]
+        "psr-4": {
+            "": "src"
+        }
     }
 }
diff --git a/src/snapchat_agent.php b/src/SnapchatAgent.php
similarity index 100%
rename from src/snapchat_agent.php
rename to src/SnapchatAgent.php
diff --git a/src/snapchat_cache.php b/src/SnapchatCache.php
similarity index 100%
rename from src/snapchat_cache.php
rename to src/SnapchatCache.php
diff --git a/src/snapchat.php b/src/snapchat.php
index fe64534..7cf4e3a 100755
--- a/src/snapchat.php
+++ b/src/snapchat.php
@@ -1,11 +1,8 @@
 <?php
 
-include_once dirname(__FILE__) . '/snapchat_agent.php';
-include_once dirname(__FILE__) . '/snapchat_cache.php';
 
 /**
- * @file
- *   Provides an implementation of the undocumented Snapchat API.
+ * @class Provides an implementation of the undocumented Snapchat API.
  */
 class Snapchat extends SnapchatAgent {