diff --git a/composer.json b/composer.json
index cf2aaac..2908ee5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "stevenmaguire/yelp-php",
     "description": "A php client for consumer Yelp API",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "homepage" : "http://github.com/stevenmaguire/yelp-php",
     "authors" : [
         {
@@ -11,6 +11,12 @@
             "role" : "Developer"
         }
     ],
+    "keywords": [
+        "api",
+        "oauth1",
+        "yelp",
+        "php"
+    ],
     "license": "MIT",
     "require": {
         "php": ">=5.4.0",
@@ -18,12 +24,6 @@
         "guzzlehttp/oauth-subscriber": "0.1.*"
     },
     "autoload": {
-        "classmap": [
-            "tests/TestCase.php"
-        ],
-        "psr-0": {
-            "Stevenmaguire\\Yelp\\": "src/"
-        },
         "psr-4": {
             "Stevenmaguire\\Yelp\\": "src/"
         }
diff --git a/src/Stevenmaguire/Yelp/Client.php b/src/Client.php
similarity index 100%
rename from src/Stevenmaguire/Yelp/Client.php
rename to src/Client.php
diff --git a/src/Stevenmaguire/Yelp/Exception.php b/src/Exception.php
similarity index 100%
rename from src/Stevenmaguire/Yelp/Exception.php
rename to src/Exception.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
deleted file mode 100644
index 1234e7a..0000000
--- a/tests/TestCase.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-abstract class TestCase extends PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        @session_start();
-        parent::setUp();
-    }
-}
diff --git a/tests/YelpTest.php b/tests/YelpTest.php
index 7ad773d..873d610 100644
--- a/tests/YelpTest.php
+++ b/tests/YelpTest.php
@@ -1,8 +1,8 @@
-<?php
+<?php namespace Stevenmaguire\Yelp\Test;
 
 use Stevenmaguire\Yelp\Client as Yelp;
 
-class YelpTest extends TestCase
+class YelpTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {