diff --git a/README.md b/README.md
index cba1edf..44fac12 100644
--- a/README.md
+++ b/README.md
@@ -88,9 +88,9 @@ require 'vendor/autoload.php';
 Otherwise, you can simply require the file directly:
 
 ```php
-require_once 'path/to/Stringy/src/Stringy/Stringy.php';
+require_once 'path/to/Stringy/src/Stringy.php';
 // or
-require_once 'path/to/Stringy/src/Stringy/StaticStringy.php';
+require_once 'path/to/Stringy/src/StaticStringy.php';
 ```
 
 And in either case, I'd suggest using an alias.
diff --git a/composer.json b/composer.json
index 72d5e8e..cbed10f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,11 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "support": {
+        "issues": "https://github.com/danielstjules/Stringy/issues",
+        "source": "https://github.com/danielstjules/Stringy"
+    },
     "autoload": {
-        "psr-0": { "Stringy": "src/" }
+        "psr-4": { "Stringy\\": "src/" }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 72c9345..e65b79e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,7 +5,7 @@
          syntaxCheck="false">
     <testsuites>
         <testsuite name="Stringy">
-            <directory>tests/Stringy</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/src/Stringy/StaticStringy.php b/src/StaticStringy.php
similarity index 100%
rename from src/Stringy/StaticStringy.php
rename to src/StaticStringy.php
diff --git a/src/Stringy/Stringy.php b/src/Stringy.php
similarity index 100%
rename from src/Stringy/Stringy.php
rename to src/Stringy.php
diff --git a/tests/Stringy/CommonTest.php b/tests/CommonTest.php
similarity index 100%
rename from tests/Stringy/CommonTest.php
rename to tests/CommonTest.php
diff --git a/tests/Stringy/StaticStringyTest.php b/tests/StaticStringyTest.php
similarity index 99%
rename from tests/Stringy/StaticStringyTest.php
rename to tests/StaticStringyTest.php
index 8227751..5b99b50 100644
--- a/tests/Stringy/StaticStringyTest.php
+++ b/tests/StaticStringyTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$base = realpath(dirname(__FILE__) . '/../..');
-require("$base/src/Stringy/StaticStringy.php");
+$base = realpath(dirname(__FILE__) . '/..');
+require("$base/src/StaticStringy.php");
 
 use Stringy\StaticStringy as S;
 
diff --git a/tests/Stringy/StringyTest.php b/tests/StringyTest.php
similarity index 99%
rename from tests/Stringy/StringyTest.php
rename to tests/StringyTest.php
index 5690370..1f2e809 100644
--- a/tests/Stringy/StringyTest.php
+++ b/tests/StringyTest.php
@@ -1,7 +1,7 @@
 <?php
 
-$base = realpath(dirname(__FILE__) . '/../..');
-require("$base/src/Stringy/Stringy.php");
+$base = realpath(dirname(__FILE__) . '/..');
+require("$base/src/Stringy.php");
 
 use Stringy\Stringy as S;