diff --git a/.travis.yml b/.travis.yml
index ca0329f..d779432 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,9 @@ php:
   - 5.3
   - 5.4
   - 5.5
-
-env:
-  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.1"
-  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.1"
-  - SYMFONY_VERSION="2.1" GUZZLE_VERSION="3.*"
-  - SYMFONY_VERSION="2.*" GUZZLE_VERSION="3.*"
+  - hhvm
 
 before_script:
-  - composer self-update
-  - composer --version
-  - composer require symfony/http-foundation:${SYMFONY_VERSION} --no-update
-  - composer require guzzle/http:${GUZZLE_VERSION} --no-update
   - composer install -n --dev --prefer-source
 
 script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
diff --git a/composer.json b/composer.json
index 96b83be..de9c617 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         }
     ],
     "autoload": {
-        "psr-0": { "Omnipay\\SagePay\\" : "src/" }
+        "psr-4": { "Omnipay\\SagePay\\" : "src/" }
     },
     "require": {
         "omnipay/common": "~2.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a61160c..a35b736 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/src/Omnipay/SagePay/DirectGateway.php b/src/DirectGateway.php
similarity index 100%
rename from src/Omnipay/SagePay/DirectGateway.php
rename to src/DirectGateway.php
diff --git a/src/Omnipay/SagePay/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/AbstractRequest.php
rename to src/Message/AbstractRequest.php
diff --git a/src/Omnipay/SagePay/Message/CaptureRequest.php b/src/Message/CaptureRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/CaptureRequest.php
rename to src/Message/CaptureRequest.php
diff --git a/src/Omnipay/SagePay/Message/DirectAuthorizeRequest.php b/src/Message/DirectAuthorizeRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/DirectAuthorizeRequest.php
rename to src/Message/DirectAuthorizeRequest.php
diff --git a/src/Omnipay/SagePay/Message/DirectCompleteAuthorizeRequest.php b/src/Message/DirectCompleteAuthorizeRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/DirectCompleteAuthorizeRequest.php
rename to src/Message/DirectCompleteAuthorizeRequest.php
diff --git a/src/Omnipay/SagePay/Message/DirectPurchaseRequest.php b/src/Message/DirectPurchaseRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/DirectPurchaseRequest.php
rename to src/Message/DirectPurchaseRequest.php
diff --git a/src/Omnipay/SagePay/Message/RefundRequest.php b/src/Message/RefundRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/RefundRequest.php
rename to src/Message/RefundRequest.php
diff --git a/src/Omnipay/SagePay/Message/Response.php b/src/Message/Response.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/Response.php
rename to src/Message/Response.php
diff --git a/src/Omnipay/SagePay/Message/ServerAuthorizeRequest.php b/src/Message/ServerAuthorizeRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/ServerAuthorizeRequest.php
rename to src/Message/ServerAuthorizeRequest.php
diff --git a/src/Omnipay/SagePay/Message/ServerAuthorizeResponse.php b/src/Message/ServerAuthorizeResponse.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/ServerAuthorizeResponse.php
rename to src/Message/ServerAuthorizeResponse.php
diff --git a/src/Omnipay/SagePay/Message/ServerCompleteAuthorizeRequest.php b/src/Message/ServerCompleteAuthorizeRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/ServerCompleteAuthorizeRequest.php
rename to src/Message/ServerCompleteAuthorizeRequest.php
diff --git a/src/Omnipay/SagePay/Message/ServerCompleteAuthorizeResponse.php b/src/Message/ServerCompleteAuthorizeResponse.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/ServerCompleteAuthorizeResponse.php
rename to src/Message/ServerCompleteAuthorizeResponse.php
diff --git a/src/Omnipay/SagePay/Message/ServerPurchaseRequest.php b/src/Message/ServerPurchaseRequest.php
similarity index 100%
rename from src/Omnipay/SagePay/Message/ServerPurchaseRequest.php
rename to src/Message/ServerPurchaseRequest.php
diff --git a/src/Omnipay/SagePay/ServerGateway.php b/src/ServerGateway.php
similarity index 100%
rename from src/Omnipay/SagePay/ServerGateway.php
rename to src/ServerGateway.php
diff --git a/tests/Omnipay/SagePay/DirectGatewayTest.php b/tests/DirectGatewayTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/DirectGatewayTest.php
rename to tests/DirectGatewayTest.php
diff --git a/tests/Omnipay/SagePay/Message/DirectAuthorizeRequestTest.php b/tests/Message/DirectAuthorizeRequestTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/DirectAuthorizeRequestTest.php
rename to tests/Message/DirectAuthorizeRequestTest.php
diff --git a/tests/Omnipay/SagePay/Message/RefundRequestTest.php b/tests/Message/RefundRequestTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/RefundRequestTest.php
rename to tests/Message/RefundRequestTest.php
diff --git a/tests/Omnipay/SagePay/Message/ResponseTest.php b/tests/Message/ResponseTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/ResponseTest.php
rename to tests/Message/ResponseTest.php
diff --git a/tests/Omnipay/SagePay/Message/ServerAuthorizeRequestTest.php b/tests/Message/ServerAuthorizeRequestTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/ServerAuthorizeRequestTest.php
rename to tests/Message/ServerAuthorizeRequestTest.php
diff --git a/tests/Omnipay/SagePay/Message/ServerAuthorizeResponseTest.php b/tests/Message/ServerAuthorizeResponseTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/ServerAuthorizeResponseTest.php
rename to tests/Message/ServerAuthorizeResponseTest.php
diff --git a/tests/Omnipay/SagePay/Message/ServerCompleteAuthorizeResponseTest.php b/tests/Message/ServerCompleteAuthorizeResponseTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/Message/ServerCompleteAuthorizeResponseTest.php
rename to tests/Message/ServerCompleteAuthorizeResponseTest.php
diff --git a/tests/Omnipay/SagePay/Mock/CaptureFailure.txt b/tests/Mock/CaptureFailure.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/CaptureFailure.txt
rename to tests/Mock/CaptureFailure.txt
diff --git a/tests/Omnipay/SagePay/Mock/CaptureSuccess.txt b/tests/Mock/CaptureSuccess.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/CaptureSuccess.txt
rename to tests/Mock/CaptureSuccess.txt
diff --git a/tests/Omnipay/SagePay/Mock/DirectPurchase3dSecure.txt b/tests/Mock/DirectPurchase3dSecure.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/DirectPurchase3dSecure.txt
rename to tests/Mock/DirectPurchase3dSecure.txt
diff --git a/tests/Omnipay/SagePay/Mock/DirectPurchaseFailure.txt b/tests/Mock/DirectPurchaseFailure.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/DirectPurchaseFailure.txt
rename to tests/Mock/DirectPurchaseFailure.txt
diff --git a/tests/Omnipay/SagePay/Mock/DirectPurchaseSuccess.txt b/tests/Mock/DirectPurchaseSuccess.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/DirectPurchaseSuccess.txt
rename to tests/Mock/DirectPurchaseSuccess.txt
diff --git a/tests/Omnipay/SagePay/Mock/ServerPurchaseFailure.txt b/tests/Mock/ServerPurchaseFailure.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/ServerPurchaseFailure.txt
rename to tests/Mock/ServerPurchaseFailure.txt
diff --git a/tests/Omnipay/SagePay/Mock/ServerPurchaseSuccess.txt b/tests/Mock/ServerPurchaseSuccess.txt
similarity index 100%
rename from tests/Omnipay/SagePay/Mock/ServerPurchaseSuccess.txt
rename to tests/Mock/ServerPurchaseSuccess.txt
diff --git a/tests/Omnipay/SagePay/ServerGatewayTest.php b/tests/ServerGatewayTest.php
similarity index 100%
rename from tests/Omnipay/SagePay/ServerGatewayTest.php
rename to tests/ServerGatewayTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 370e9c7..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-error_reporting(E_ALL | E_STRICT);
-
-// include the composer autoloader
-$autoloader = require __DIR__.'/../vendor/autoload.php';
-
-// autoload abstract TestCase classes in test directory
-$autoloader->add('Omnipay', __DIR__);