diff --git a/.gitignore b/.gitignore
index 2a2625d..4da07a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 phpunit.xml
 coverage
 docs
-sandbox
\ No newline at end of file
+sandbox
+vendor
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 40105df..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "vendor/guzzle"]
-	path = vendor/guzzle
-	url = git://github.com/guzzle/guzzle.git
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e7263f6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: php
+php:
+  - 5.3
+before_script:
+  - wget --quiet http://getcomposer.org/composer.phar
+  - php composer.phar install
+script: phpunit
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..33bdac6
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,46 @@
+{
+    "name": "cboden/Ratchet"
+  , "type": "library"
+  , "description": "PHP WebSocket server component library"
+  , "keywords": ["WebSocket"]
+  , "homepage": "http://socketo.me"
+  , "repository": "https://github.com/cboden/Ratchet"
+  , "license": "MIT"
+  , "version": "0.1"
+  , "authors": [
+        {
+            "name": "Chris Boden"
+          , "email": "cboden@gmail.com"
+          , "homepage": "http://res.im"
+        }
+    ]
+  , "autoload": {
+        "psr-0": {
+            "Ratchet\\Tests": "tests"
+          , "Ratchet": "lib"
+        }
+    }
+  , "repositories": {
+        "guzzle": {
+            "package": {
+                "name": "guzzle"
+              , "type": "library"
+              , "version": "2.0.2"
+              , "autoload": {
+                    "psr-0": {
+                        "Guzzle": "src"
+                    }
+                }
+              , "source": {
+                    "url": "https://github.com/guzzle/guzzle.git"
+                  , "type": "git"
+                  , "reference": "ac64abc2c05b921efc4623379c1674a282475ae5"
+                }
+            }
+        }
+    }
+  , "require": {
+        "php": ">=5.3.2"
+      , "guzzle": "2.0.2"
+    }
+}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..7b8b66e
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,9 @@
+{
+    "hash": "75f85f47f6365abbeeabb065601c6ec2",
+    "packages": [
+        {
+            "package": "guzzle",
+            "version": "2.0.2"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/SplClassLoader.php b/tests/SplClassLoader.php
deleted file mode 100644
index 4cba7a3..0000000
--- a/tests/SplClassLoader.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * SplClassLoader implementation that implements the technical interoperability
- * standards for PHP 5.3 namespaces and class names.
- *
- * http://groups.google.com/group/php-standards/web/final-proposal
- *
- *     // Example which loads classes for the Doctrine Common package in the
- *     // Doctrine\Common namespace.
- *     $classLoader = new SplClassLoader('Doctrine\Common', '/path/to/doctrine');
- *     $classLoader->register();
- *
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman S. Borschel <roman@code-factory.org>
- * @author Matthew Weier O'Phinney <matthew@zend.com>
- * @author Kris Wallsmith <kris.wallsmith@gmail.com>
- * @author Fabien Potencier <fabien.potencier@symfony-project.org>
- */
-class SplClassLoader
-{
-    private $_fileExtension = '.php';
-    private $_namespace;
-    private $_includePath;
-    private $_namespaceSeparator = '\\';
-
-    /**
-     * Creates a new <tt>SplClassLoader</tt> that loads classes of the
-     * specified namespace.
-     * 
-     * @param string $ns The namespace to use.
-     */
-    public function __construct($ns = null, $includePath = null)
-    {
-        $this->_namespace = $ns;
-        $this->_includePath = $includePath;
-    }
-
-    /**
-     * Sets the namespace separator used by classes in the namespace of this class loader.
-     * 
-     * @param string $sep The separator to use.
-     */
-    public function setNamespaceSeparator($sep)
-    {
-        $this->_namespaceSeparator = $sep;
-    }
-
-    /**
-     * Gets the namespace seperator used by classes in the namespace of this class loader.
-     *
-     * @return void
-     */
-    public function getNamespaceSeparator()
-    {
-        return $this->_namespaceSeparator;
-    }
-
-    /**
-     * Sets the base include path for all class files in the namespace of this class loader.
-     * 
-     * @param string $includePath
-     */
-    public function setIncludePath($includePath)
-    {
-        $this->_includePath = $includePath;
-    }
-
-    /**
-     * Gets the base include path for all class files in the namespace of this class loader.
-     *
-     * @return string $includePath
-     */
-    public function getIncludePath()
-    {
-        return $this->_includePath;
-    }
-
-    /**
-     * Sets the file extension of class files in the namespace of this class loader.
-     * 
-     * @param string $fileExtension
-     */
-    public function setFileExtension($fileExtension)
-    {
-        $this->_fileExtension = $fileExtension;
-    }
-
-    /**
-     * Gets the file extension of class files in the namespace of this class loader.
-     *
-     * @return string $fileExtension
-     */
-    public function getFileExtension()
-    {
-        return $this->_fileExtension;
-    }
-
-    /**
-     * Installs this class loader on the SPL autoload stack.
-     */
-    public function register()
-    {
-        spl_autoload_register(array($this, 'loadClass'));
-    }
-
-    /**
-     * Uninstalls this class loader from the SPL autoloader stack.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $className The name of the class to load.
-     * @return void
-     */
-    public function loadClass($className)
-    {
-        if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
-            $fileName = '';
-            $namespace = '';
-            if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
-                $namespace = substr($className, 0, $lastNsPos);
-                $className = substr($className, $lastNsPos + 1);
-                $fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
-            }
-            $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
-            $filePath  = ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
-
-            if (is_file($filePath)) {
-                require $filePath;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 658bdac..259d106 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,11 +1,3 @@
 <?php
-    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'SplClassLoader.php');
 
-    $app = new SplClassLoader('Ratchet', __DIR__);
-    $app->register();
-
-    $app = new SplClassLoader('Ratchet', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src');
-    $app->register();
-
-    $app = new SplClassLoader('Guzzle', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'guzzle' . DIRECTORY_SEPARATOR . 'src');
-    $app->register();
\ No newline at end of file
+    require_once dirname(__DIR__) . '/vendor/.composer/autoload.php';
\ No newline at end of file
diff --git a/vendor/README.md b/vendor/README.md
deleted file mode 100644
index 03f7f86..0000000
--- a/vendor/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## External Libraries
-
-### Guzzle
-
-Used to parse the incoming HTTP handshake request.  A Guzzle Request object is then passed around the application for a consistent API. 
\ No newline at end of file
diff --git a/vendor/guzzle b/vendor/guzzle
deleted file mode 160000
index ac64abc..0000000
--- a/vendor/guzzle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac64abc2c05b921efc4623379c1674a282475ae5