diff --git a/composer.json b/composer.json
index a070429..939ac58 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         ]
     },
     "autoload-dev": {
-        "classmap": [ "php-tests/" ]
+        "classmap": [ "tests/" ]
     },
     "license": "MIT",
     "authors": [
diff --git a/php/Environments.php b/php/Environments.php
index 91faef2..bc9875c 100644
--- a/php/Environments.php
+++ b/php/Environments.php
@@ -1,10 +1,10 @@
 <?php
 
 /**
- * Class Environment
+ * Class Environments
  * Handles the environment differences between production and development
  */
-class Environment
+class Environments
 {
 
     /**
diff --git a/php/shorten.php b/php/shorten.php
index b926e41..faf29f2 100644
--- a/php/shorten.php
+++ b/php/shorten.php
@@ -7,7 +7,7 @@
     $env = "production";
 }
 
-$environment = new Environment( $env );
+$environment = new Environments( $env );
 
 $host = $environment->getHost();
 $script = $environment->getScript();
diff --git a/php-tests/EnvironmentsTest.php b/tests/EnvironmentsTest.php
similarity index 66%
rename from php-tests/EnvironmentsTest.php
rename to tests/EnvironmentsTest.php
index 64ad2e9..ae81123 100644
--- a/php-tests/EnvironmentsTest.php
+++ b/tests/EnvironmentsTest.php
@@ -13,26 +13,26 @@ class EnvironmentsTest extends TestCase
 {
     public function testDev()
     {
-        $target = new Environment("dev");
+        $target = new Environments("dev");
         $this->assertEquals(
-            Environment::developmentHost,
+            Environments::developmentHost,
             $target->getHost()
         );
         $this->assertEquals(
-            Environment::developmentScript,
+            Environments::developmentScript,
             $target->getScript()
         );
     }
 
     public function testElse()
     {
-        $target = new Environment("anything else");
+        $target = new Environments("anything else");
         $this->assertEquals(
-            Environment::productionHost,
+            Environments::productionHost,
             $target->getHost()
         );
         $this->assertEquals(
-            Environment::productionScript,
+            Environments::productionScript,
             $target->getScript()
         );
     }