diff --git a/composer.json b/composer.json
index b9b32cc..f544fed 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
   },
 
   "autoload": {
-    "files": ["lib/Tinify.php", "lib/Tinify/Exception.php"],
-    "psr-4": {"Tinify\\": "lib/Tinify/"}
+    "psr-4": {"Tinify\\": "lib/Tinify/"},
+    "files": ["lib/functions.php"]
   }
 }
diff --git a/lib/Tinify/AccountException.php b/lib/Tinify/AccountException.php
new file mode 100644
index 0000000..7d4ec15
--- /dev/null
+++ b/lib/Tinify/AccountException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Tinify;
+
+class AccountException extends Exception {}
diff --git a/lib/Tinify/ClientException.php b/lib/Tinify/ClientException.php
new file mode 100644
index 0000000..607cc27
--- /dev/null
+++ b/lib/Tinify/ClientException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Tinify;
+
+class ClientException extends Exception {}
diff --git a/lib/Tinify/ConnectionException.php b/lib/Tinify/ConnectionException.php
new file mode 100644
index 0000000..9bae9a3
--- /dev/null
+++ b/lib/Tinify/ConnectionException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Tinify;
+
+class ConnectionException extends Exception {}
diff --git a/lib/Tinify/Exception.php b/lib/Tinify/Exception.php
index d88bdef..95375a1 100644
--- a/lib/Tinify/Exception.php
+++ b/lib/Tinify/Exception.php
@@ -29,8 +29,3 @@ function __construct($message, $type = NULL, $status = NULL) {
         }
     }
 }
-
-class AccountException extends Exception {}
-class ClientException extends Exception {}
-class ServerException extends Exception {}
-class ConnectionException extends Exception {}
diff --git a/lib/Tinify/ServerException.php b/lib/Tinify/ServerException.php
new file mode 100644
index 0000000..5b9933b
--- /dev/null
+++ b/lib/Tinify/ServerException.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace Tinify;
+
+class ServerException extends Exception {}
diff --git a/lib/Tinify.php b/lib/Tinify/Tinify.php
similarity index 58%
rename from lib/Tinify.php
rename to lib/Tinify/Tinify.php
index 3c258f6..5b675c3 100644
--- a/lib/Tinify.php
+++ b/lib/Tinify/Tinify.php
@@ -2,9 +2,8 @@
 
 namespace Tinify;
 
-const VERSION = "1.6.1";
-
 class Tinify {
+
     private static $key = NULL;
     private static $appIdentifier = NULL;
     private static $proxy = NULL;
@@ -51,46 +50,3 @@ public static function setClient($client) {
         self::$client = $client;
     }
 }
-
-function setKey($key) {
-    return Tinify::setKey($key);
-}
-
-function setAppIdentifier($appIdentifier) {
-    return Tinify::setAppIdentifier($appIdentifier);
-}
-
-function setProxy($proxy) {
-    return Tinify::setProxy($proxy);
-}
-
-function getCompressionCount() {
-    return Tinify::getCompressionCount();
-}
-
-function compressionCount() {
-    return Tinify::getCompressionCount();
-}
-
-function fromFile($path) {
-    return Source::fromFile($path);
-}
-
-function fromBuffer($string) {
-    return Source::fromBuffer($string);
-}
-
-function fromUrl($string) {
-    return Source::fromUrl($string);
-}
-
-function validate() {
-    try {
-        Tinify::getClient()->request("post", "/shrink");
-    } catch (AccountException $err) {
-        if ($err->status == 429) return true;
-        throw $err;
-    } catch (ClientException $err) {
-        return true;
-    }
-}
diff --git a/lib/functions.php b/lib/functions.php
new file mode 100644
index 0000000..7db27ba
--- /dev/null
+++ b/lib/functions.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tinify;
+
+const VERSION = "1.6.1";
+
+function setKey($key) {
+    return Tinify::setKey($key);
+}
+
+function setAppIdentifier($appIdentifier) {
+    return Tinify::setAppIdentifier($appIdentifier);
+}
+
+function setProxy($proxy) {
+    return Tinify::setProxy($proxy);
+}
+
+function getCompressionCount() {
+    return Tinify::getCompressionCount();
+}
+
+function compressionCount() {
+    return Tinify::getCompressionCount();
+}
+
+function fromFile($path) {
+    return Source::fromFile($path);
+}
+
+function fromBuffer($string) {
+    return Source::fromBuffer($string);
+}
+
+function fromUrl($string) {
+    return Source::fromUrl($string);
+}
+
+function validate() {
+    try {
+        Tinify::getClient()->request("post", "/shrink");
+    } catch (AccountException $err) {
+        if ($err->status == 429) return true;
+        throw $err;
+    } catch (ClientException $err) {
+        return true;
+    }
+}
diff --git a/test/base/test_case_1.php b/test/base/test_case_1.php
index 3a2082b..3755d57 100644
--- a/test/base/test_case_1.php
+++ b/test/base/test_case_1.php
@@ -3,7 +3,7 @@ abstract class TestCase_1 extends \PHPUnit\Framework\TestCase {
     protected  function setUp() {
         Tinify\CurlMock::reset();
         Tinify\setKey(NULL);
-        TInify\setProxy(NULL);
+        Tinify\setProxy(NULL);
     }
 
     protected function tearDown() {
diff --git a/test/base/test_case_2.php b/test/base/test_case_2.php
index b65bf1b..7c69890 100644
--- a/test/base/test_case_2.php
+++ b/test/base/test_case_2.php
@@ -3,7 +3,7 @@ abstract class TestCase_2 extends \PHPUnit\Framework\TestCase {
     protected  function setUp(): void {
         Tinify\CurlMock::reset();
         Tinify\setKey(NULL);
-        TInify\setProxy(NULL);
+        Tinify\setProxy(NULL);
     }
 
     protected function tearDown(): void {
diff --git a/test/bootstrap.php b/test/bootstrap.php
index 4877c42..2653d50 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once("curl_mock.php");
 require_once("vendor" . DIRECTORY_SEPARATOR . "autoload.php");
+require_once("curl_mock.php");
 
 
 # Some PHPUnit glue to support testing PHP 5.4 and onwards together
diff --git a/test/curl_mock.php b/test/curl_mock.php
index 9008924..d326d59 100644
--- a/test/curl_mock.php
+++ b/test/curl_mock.php
@@ -17,6 +17,7 @@ class CurlMock {
     private static $version = array();
 
     public $options = array();
+    public $request;
     public $response;
     public $closed = false;