From 4735218aa0fe616dba1daa55fbd800c7b398f962 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Tue, 8 May 2012 23:14:28 -0400
Subject: [PATCH] [BCB] Namespace changes

Removed the `Component` namespace
Removed the `Resource` namespace
Renamed components:
`IOServerComponent` => `IoServer`
`WebSocketComponent` => `WsServer`
`SessionComponent` => `SessionProvider`
`WAMPServerComponent` => `WampServer`
`IpBlackListComponent` => `IpBlackList`
`FlashPolicyComponent` => `FlashPolicy`
---
 .../AbstractConnectionDecorator.php           |  2 +-
 .../WAMP/Command/Action/CallError.php         | 79 -------------------
 .../WAMP/Command/Action/CallResult.php        | 45 -----------
 .../Component/WAMP/Command/Action/Event.php   | 19 -----
 .../Component/WAMP/Command/Action/Prefix.php  | 40 ----------
 .../Component/WAMP/Command/Action/Welcome.php | 18 -----
 .../{Component => }/ComponentInterface.php    | 13 ++-
 .../{Resource => }/ConnectionInterface.php    |  2 +-
 .../MessageComponentInterface.php             |  7 +-
 .../FlashPolicy.php}                          | 12 +--
 .../{Component => }/Server/IoConnection.php   |  8 +-
 .../IoServer.php}                             |  8 +-
 .../IpBlackList.php}                          | 10 +--
 .../Session/Serialize/HandlerInterface.php    |  2 +-
 .../Session/Serialize/PhpBinaryHandler.php    |  2 +-
 .../Session/Serialize/PhpHandler.php          |  2 +-
 .../SessionProvider.php}                      | 20 ++---
 .../Session/Storage/Proxy/VirtualProxy.php    |  2 +-
 .../Session/Storage/VirtualSessionStorage.php | 10 +--
 .../{Component/WAMP => Wamp}/Exception.php    |  2 +-
 .../WAMP => Wamp}/JSONException.php           |  2 +-
 .../WAMP => Wamp}/WampConnection.php          | 10 +--
 .../WampServer.php}                           | 14 ++--
 .../WampServerInterface.php}                  | 22 +++---
 .../Guzzle/Http/Message/RequestFactory.php    |  2 +-
 .../WebSocket/Version/FrameInterface.php      |  2 +-
 .../WebSocket/Version/Hixie76.php             |  2 +-
 .../WebSocket/Version/Hixie76/Frame.php       |  4 +-
 .../WebSocket/Version/Hixie76/Message.php     |  8 +-
 .../WebSocket/Version/HyBi10.php              |  2 +-
 .../WebSocket/Version/MessageInterface.php    |  2 +-
 .../WebSocket/Version/RFC6455.php             |  4 +-
 .../WebSocket/Version/RFC6455/Frame.php       |  4 +-
 .../Version/RFC6455/HandshakeVerifier.php     |  2 +-
 .../WebSocket/Version/RFC6455/Message.php     |  6 +-
 .../WebSocket/Version/VersionInterface.php    |  2 +-
 .../WebSocket/WsConnection.php                |  4 +-
 .../WsServer.php}                             | 14 ++--
 .../WsServerInterface.php}                    |  6 +-
 .../AbstractConnectionDecoratorTest.php       |  8 +-
 tests/Ratchet/Tests/Mock/Component.php        |  4 +-
 tests/Ratchet/Tests/Mock/Connection.php       |  2 +-
 .../Tests/Mock/ConnectionDecorator.php        |  2 +-
 tests/Ratchet/Tests/Mock/WAMPComponent.php    |  6 +-
 .../Server/FlashPolicyComponentTest.php       |  8 +-
 .../Server/IpBlackListComponentTest.php       | 12 +--
 .../Session/Serialize/PhpHandlerTest.php      |  6 +-
 .../Session/SessionComponentTest.php          | 20 ++---
 .../WAMP => Wamp}/WampConnectionTest.php      |  6 +-
 .../WampServerTest.php}                       | 26 +++---
 .../Http/Message/RequestFactoryTest.php       |  6 +-
 .../WebSocket/Version/Hixie76Test.php         |  8 +-
 .../WebSocket/Version/HyBi10Test.php          | 10 +--
 .../WebSocket/Version/RFC6455/FrameTest.php   |  6 +-
 .../Version/RFC6455/HandshakeVerifierTest.php |  8 +-
 .../WebSocket/Version/RFC6455Test.php         | 14 ++--
 56 files changed, 179 insertions(+), 388 deletions(-)
 rename src/Ratchet/{Resource => }/AbstractConnectionDecorator.php (96%)
 delete mode 100644 src/Ratchet/Component/WAMP/Command/Action/CallError.php
 delete mode 100644 src/Ratchet/Component/WAMP/Command/Action/CallResult.php
 delete mode 100644 src/Ratchet/Component/WAMP/Command/Action/Event.php
 delete mode 100644 src/Ratchet/Component/WAMP/Command/Action/Prefix.php
 delete mode 100644 src/Ratchet/Component/WAMP/Command/Action/Welcome.php
 rename src/Ratchet/{Component => }/ComponentInterface.php (66%)
 rename src/Ratchet/{Resource => }/ConnectionInterface.php (89%)
 rename src/Ratchet/{Component => }/MessageComponentInterface.php (52%)
 rename src/Ratchet/{Component/Server/FlashPolicyComponent.php => Server/FlashPolicy.php} (95%)
 rename src/Ratchet/{Component => }/Server/IoConnection.php (77%)
 rename src/Ratchet/{Component/Server/IOServerComponent.php => Server/IoServer.php} (91%)
 rename src/Ratchet/{Component/Server/IpBlackListComponent.php => Server/IpBlackList.php} (90%)
 rename src/Ratchet/{Component => }/Session/Serialize/HandlerInterface.php (82%)
 rename src/Ratchet/{Component => }/Session/Serialize/PhpBinaryHandler.php (94%)
 rename src/Ratchet/{Component => }/Session/Serialize/PhpHandler.php (96%)
 rename src/Ratchet/{Component/Session/SessionComponent.php => Session/SessionProvider.php} (88%)
 rename src/Ratchet/{Component => }/Session/Storage/Proxy/VirtualProxy.php (95%)
 rename src/Ratchet/{Component => }/Session/Storage/VirtualSessionStorage.php (87%)
 rename src/Ratchet/{Component/WAMP => Wamp}/Exception.php (55%)
 rename src/Ratchet/{Component/WAMP => Wamp}/JSONException.php (96%)
 rename src/Ratchet/{Component/WAMP => Wamp}/WampConnection.php (90%)
 rename src/Ratchet/{Component/WAMP/WAMPServerComponent.php => Wamp/WampServer.php} (89%)
 rename src/Ratchet/{Component/WAMP/WAMPServerComponentInterface.php => Wamp/WampServerInterface.php} (58%)
 rename src/Ratchet/{Component => }/WebSocket/Guzzle/Http/Message/RequestFactory.php (89%)
 rename src/Ratchet/{Component => }/WebSocket/Version/FrameInterface.php (95%)
 rename src/Ratchet/{Component => }/WebSocket/Version/Hixie76.php (98%)
 rename src/Ratchet/{Component => }/WebSocket/Version/Hixie76/Frame.php (93%)
 rename src/Ratchet/{Component => }/WebSocket/Version/Hixie76/Message.php (84%)
 rename src/Ratchet/{Component => }/WebSocket/Version/HyBi10.php (91%)
 rename src/Ratchet/{Component => }/WebSocket/Version/MessageInterface.php (92%)
 rename src/Ratchet/{Component => }/WebSocket/Version/RFC6455.php (97%)
 rename src/Ratchet/{Component => }/WebSocket/Version/RFC6455/Frame.php (98%)
 rename src/Ratchet/{Component => }/WebSocket/Version/RFC6455/HandshakeVerifier.php (98%)
 rename src/Ratchet/{Component => }/WebSocket/Version/RFC6455/Message.php (92%)
 rename src/Ratchet/{Component => }/WebSocket/Version/VersionInterface.php (97%)
 rename src/Ratchet/{Component => }/WebSocket/WsConnection.php (85%)
 rename src/Ratchet/{Component/WebSocket/WebSocketComponent.php => WebSocket/WsServer.php} (95%)
 rename src/Ratchet/{Component/WebSocket/WebSocketComponentInterface.php => WebSocket/WsServerInterface.php} (62%)
 rename tests/Ratchet/Tests/{Resource => }/AbstractConnectionDecoratorTest.php (93%)
 rename tests/Ratchet/Tests/{Component => }/Server/FlashPolicyComponentTest.php (93%)
 rename tests/Ratchet/Tests/{Component => }/Server/IpBlackListComponentTest.php (85%)
 rename tests/Ratchet/Tests/{Component => }/Session/Serialize/PhpHandlerTest.php (83%)
 rename tests/Ratchet/Tests/{Component => }/Session/SessionComponentTest.php (83%)
 rename tests/Ratchet/Tests/{Component/WAMP => Wamp}/WampConnectionTest.php (93%)
 rename tests/Ratchet/Tests/{Component/WAMP/WAMPServerComponentTest.php => Wamp/WampServerTest.php} (86%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php (90%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Version/Hixie76Test.php (82%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Version/HyBi10Test.php (87%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Version/RFC6455/FrameTest.php (98%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Version/RFC6455/HandshakeVerifierTest.php (94%)
 rename tests/Ratchet/Tests/{Component => }/WebSocket/Version/RFC6455Test.php (88%)

diff --git a/src/Ratchet/Resource/AbstractConnectionDecorator.php b/src/Ratchet/AbstractConnectionDecorator.php
similarity index 96%
rename from src/Ratchet/Resource/AbstractConnectionDecorator.php
rename to src/Ratchet/AbstractConnectionDecorator.php
index c4ea479..c683fa3 100644
--- a/src/Ratchet/Resource/AbstractConnectionDecorator.php
+++ b/src/Ratchet/AbstractConnectionDecorator.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Resource;
+namespace Ratchet;
 
 abstract class AbstractConnectionDecorator implements ConnectionInterface {
     /**
diff --git a/src/Ratchet/Component/WAMP/Command/Action/CallError.php b/src/Ratchet/Component/WAMP/Command/Action/CallError.php
deleted file mode 100644
index 4aafbee..0000000
--- a/src/Ratchet/Component/WAMP/Command/Action/CallError.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-namespace Ratchet\Component\WAMP\Command\Action;
-use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
-
-/**
- * Respond to a client RPC with an error
- */
-class CallError extends SendMessage {
-    /**
-     * @var string
-     */
-    protected $_id;
-
-    /**
-     * @var string
-     */
-    protected $_uri;
-
-    /**
-     * @var string
-     */
-    protected $_desc = '';
-
-    /**
-     * @var string
-     */
-    protected $_details;
-
-    /**
-     * @param string The unique ID given by the client to respond to
-     * @param string The URI given by the client ot respond to
-     * @param string A developer-oriented description of the error
-     * @param string|null An optional human readable detail message to send back
-     * @return CallError
-     */
-    public function setError($callId, $uri, $desc = '', $details = null) {
-        $this->_id   = $callId;
-        $this->_uri  = $uri;
-        $this->_desc = $desc;
-
-        $data = array(WAMP::MSG_CALL_ERROR, $callId, $uri, $desc);
-
-        if (null !== $details) {
-            $data[] = $details;
-            $this->_details = $details;
-        }
-
-        return $this->setMessage(json_encode($data));
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getId() {
-        return $this->_id;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getUri() {
-        return $this->_uri;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription() {
-        return $this->_desc;
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getDetails() {
-        return $this->_details;
-    }
-}
\ No newline at end of file
diff --git a/src/Ratchet/Component/WAMP/Command/Action/CallResult.php b/src/Ratchet/Component/WAMP/Command/Action/CallResult.php
deleted file mode 100644
index b65d062..0000000
--- a/src/Ratchet/Component/WAMP/Command/Action/CallResult.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace Ratchet\Component\WAMP\Command\Action;
-use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
-
-/**
- * Respond to a client RPC
- */
-class CallResult extends SendMessage {
-    /**
-     * @var string
-     */
-    protected $_id;
-
-    /**
-     * @var array
-     */
-    protected $_data;
-
-    /**
-     * @param string The unique ID given by the client to respond to
-     * @param array An array of data to return to the client
-     * @return CallResult
-     */
-    public function setResult($callId, array $data = array()) {
-        $this->_id   = $callId;
-        $this->_data = $data;
-
-        return $this->setMessage(json_encode(array(WAMP::MSG_CALL_RESULT, $callId, $data)));
-    }
-
-    /**
-     * @return string|null
-     */
-    public function getId() {
-        return $this->_id;
-    }
-
-    /**
-     * @return array|null
-     */
-    public function getData() {
-        return $this->_data;
-    }
-}
\ No newline at end of file
diff --git a/src/Ratchet/Component/WAMP/Command/Action/Event.php b/src/Ratchet/Component/WAMP/Command/Action/Event.php
deleted file mode 100644
index a26a18d..0000000
--- a/src/Ratchet/Component/WAMP/Command/Action/Event.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace Ratchet\Component\WAMP\Command\Action;
-use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
-
-/**
- * This is an event in the context of a topicURI
- * This event (message) is to be sent to all subscribers of $uri
- */
-class Event extends SendMessage {
-    /**
-     * @param string The URI or CURIE to broadcast to
-     * @param mixed Data to send with the event.  Anything that is json'able
-     * @return Event
-     */
-    public function setEvent($uri, $msg) {
-        return $this->setMessage(json_encode(array(WAMP::MSG_EVENT, $uri, $msg)));
-    }
-}
\ No newline at end of file
diff --git a/src/Ratchet/Component/WAMP/Command/Action/Prefix.php b/src/Ratchet/Component/WAMP/Command/Action/Prefix.php
deleted file mode 100644
index 047c1ea..0000000
--- a/src/Ratchet/Component/WAMP/Command/Action/Prefix.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace Ratchet\Component\WAMP\Command\Action;
-use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
-
-/**
- * Send a curie to uri mapping to the client
- * Both sides will agree to send the curie, representing the uri,
- * resulting in less data transfered
- */
-class Prefix extends SendMessage {
-    protected $_curie;
-    protected $_uri;
-
-    /**
-     * @param string
-     * @param string
-     * @return Prefix
-     */
-    public function setPrefix($curie, $uri) {
-        $this->_curie = $curie;
-        $this->_uri   = $uri;
-
-        return $this->setMessage(json_encode(array(WAMP::MSG_PREFIX, $curie, $uri)));
-    }
-
-    /**
-     * @return string
-     */
-    public function getCurie() {
-        return $this->_curie;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUri() {
-        return $this->_uri;
-    }
-}
diff --git a/src/Ratchet/Component/WAMP/Command/Action/Welcome.php b/src/Ratchet/Component/WAMP/Command/Action/Welcome.php
deleted file mode 100644
index c9c8974..0000000
--- a/src/Ratchet/Component/WAMP/Command/Action/Welcome.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-namespace Ratchet\Component\WAMP\Command\Action;
-use Ratchet\Resource\Command\Action\SendMessage;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
-
-/**
- * Send Welcome message to each new connecting client
- */
-class Welcome extends SendMessage {
-    /**
-     * @param string The unique identifier to mark the client
-     * @param string The server application name/version
-     * @return Welcome
-     */
-    public function setWelcome($sessionId, $serverIdent = '') {
-        return $this->setMessage(json_encode(array(WAMP::MSG_WELCOME, $sessionId, 1, $serverIdent)));
-    }
-}
\ No newline at end of file
diff --git a/src/Ratchet/Component/ComponentInterface.php b/src/Ratchet/ComponentInterface.php
similarity index 66%
rename from src/Ratchet/Component/ComponentInterface.php
rename to src/Ratchet/ComponentInterface.php
index 63ed81c..abebe3f 100644
--- a/src/Ratchet/Component/ComponentInterface.php
+++ b/src/Ratchet/ComponentInterface.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet;
+use Ratchet\ConnectionInterface;
 
 /**
  * This is the interface to build a Ratchet application with
@@ -9,16 +9,14 @@ use Ratchet\Resource\ConnectionInterface;
 interface ComponentInterface {
     /**
      * When a new connection is opened it will be passed to this method
-     * @param Ratchet\Resource\Connection The socket/connection that just connected to your application
-     * @return Ratchet\Resource\Command\CommandInterface|null
+     * @param Ratchet\Connection The socket/connection that just connected to your application
      * @throws Exception
      */
     function onOpen(ConnectionInterface $conn);
 
     /**
      * This is called before or after a socket is closed (depends on how it's closed).  SendMessage to $conn will not result in an error if it has already been closed.
-     * @param Ratchet\Resource\Connection The socket/connection that is closing/closed
-     * @return Ratchet\Resource\Command\CommandInterface|null
+     * @param Ratchet\Connection The socket/connection that is closing/closed
      * @throws Exception
      */
     function onClose(ConnectionInterface $conn);
@@ -26,9 +24,8 @@ interface ComponentInterface {
     /**
      * If there is an error with one of the sockets, or somewhere in the application where an Exception is thrown,
      * the Exception is sent back down the stack, handled by the Server and bubbled back up the application through this method
-     * @param Ratchet\Resource\Connection
+     * @param Ratchet\Connection
      * @param \Exception
-     * @return Ratchet\Resource\Command\CommandInterface|null
      * @throws Exception
      */
     function onError(ConnectionInterface $conn, \Exception $e);
diff --git a/src/Ratchet/Resource/ConnectionInterface.php b/src/Ratchet/ConnectionInterface.php
similarity index 89%
rename from src/Ratchet/Resource/ConnectionInterface.php
rename to src/Ratchet/ConnectionInterface.php
index 49030f2..0bb63d1 100644
--- a/src/Ratchet/Resource/ConnectionInterface.php
+++ b/src/Ratchet/ConnectionInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Resource;
+namespace Ratchet;
 
 const VERSION = 'Ratchet/0.1';
 
diff --git a/src/Ratchet/Component/MessageComponentInterface.php b/src/Ratchet/MessageComponentInterface.php
similarity index 52%
rename from src/Ratchet/Component/MessageComponentInterface.php
rename to src/Ratchet/MessageComponentInterface.php
index 10e9fea..018cdf7 100644
--- a/src/Ratchet/Component/MessageComponentInterface.php
+++ b/src/Ratchet/MessageComponentInterface.php
@@ -1,13 +1,12 @@
 <?php
-namespace Ratchet\Component;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet;
+use Ratchet\ConnectionInterface;
 
 interface MessageComponentInterface extends ComponentInterface {
     /**
      * Triggered when a client sends data through the socket
-     * @param Ratchet\Resource\ConnectionInterface The socket/connection that sent the message to your application
+     * @param Ratchet\ConnectionInterface The socket/connection that sent the message to your application
      * @param string The message received
-     * @return Ratchet\Resource\Command\CommandInterface|null
      * @throws Exception
      */
     function onMessage(ConnectionInterface $from, $msg);
diff --git a/src/Ratchet/Component/Server/FlashPolicyComponent.php b/src/Ratchet/Server/FlashPolicy.php
similarity index 95%
rename from src/Ratchet/Component/Server/FlashPolicyComponent.php
rename to src/Ratchet/Server/FlashPolicy.php
index e7031a2..ed6c2cf 100644
--- a/src/Ratchet/Component/Server/FlashPolicyComponent.php
+++ b/src/Ratchet/Server/FlashPolicy.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\Component\Server;
-use Ratchet\Component\MessageComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Server;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
 
 /**
  * An app to go on a server stack to pass a policy file to a Flash socket
@@ -13,7 +13,7 @@ use Ratchet\Resource\ConnectionInterface;
  * @link http://learn.adobe.com/wiki/download/attachments/64389123/CrossDomain_PolicyFile_Specification.pdf?version=1
  * @link view-source:http://www.adobe.com/xml/schemas/PolicyFileSocket.xsd
  */
-class FlashPolicyComponent implements MessageComponentInterface {
+class FlashPolicy implements MessageComponentInterface {
 
     /**
      * Contains the root policy node
@@ -54,7 +54,7 @@ class FlashPolicyComponent implements MessageComponentInterface {
      * Ranges can be used with individual ports when separated with a comma. A single wildcard (*) can
      * be used to allow all ports.
      * @param bool
-     * @return FlashPolicyComponent
+     * @return FlashPolicy
      */
     public function addAllowedAccess($domain, $ports = '*', $secure = false) {
         if (!$this->validateDomain($domain)) {
@@ -77,7 +77,7 @@ class FlashPolicyComponent implements MessageComponentInterface {
      * crossdomain.xml.
      *
      * @param string
-     * @return FlashPolicyComponent
+     * @return FlashPolicy
      */
     public function setSiteControl($permittedCrossDomainPolicies = 'all') {
         if (!$this->validateSiteControl($permittedCrossDomainPolicies)) {
diff --git a/src/Ratchet/Component/Server/IoConnection.php b/src/Ratchet/Server/IoConnection.php
similarity index 77%
rename from src/Ratchet/Component/Server/IoConnection.php
rename to src/Ratchet/Server/IoConnection.php
index c14303e..5338435 100644
--- a/src/Ratchet/Component/Server/IoConnection.php
+++ b/src/Ratchet/Server/IoConnection.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component\Server;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Server;
+use Ratchet\ConnectionInterface;
 use React\Socket\ConnectionInterface as ReactConn;
 
 /**
@@ -9,7 +9,7 @@ use React\Socket\ConnectionInterface as ReactConn;
  */
 class IoConnection implements ConnectionInterface {
     /**
-     * @var Ratchet\Component\Server\IOServer
+     * @var Ratchet\Server\IOServer
      */
     protected $server;
 
@@ -18,7 +18,7 @@ class IoConnection implements ConnectionInterface {
      */
     protected $conn;
 
-    public function __construct(ReactConn $conn, IOServerComponent $server) {
+    public function __construct(ReactConn $conn, IoServer $server) {
         $this->conn   = $conn;
         $this->server = $server;
     }
diff --git a/src/Ratchet/Component/Server/IOServerComponent.php b/src/Ratchet/Server/IoServer.php
similarity index 91%
rename from src/Ratchet/Component/Server/IOServerComponent.php
rename to src/Ratchet/Server/IoServer.php
index 234fed5..d6dfc80 100644
--- a/src/Ratchet/Component/Server/IOServerComponent.php
+++ b/src/Ratchet/Server/IoServer.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\Component\Server;
-use Ratchet\Component\MessageComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Server;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
 use React\EventLoop\LoopInterface;
 use React\Socket\ServerInterface;
 use React\EventLoop\Factory as LoopFactory;
@@ -10,7 +10,7 @@ use React\Socket\Server as Reactor;
 /**
  * Creates an open-ended socket to listen on a port for incomming connections.  Events are delegated through this to attached applications
  */
-class IOServerComponent {
+class IoServer {
     /**
      * @var React\EventLoop\LoopInterface
      */
diff --git a/src/Ratchet/Component/Server/IpBlackListComponent.php b/src/Ratchet/Server/IpBlackList.php
similarity index 90%
rename from src/Ratchet/Component/Server/IpBlackListComponent.php
rename to src/Ratchet/Server/IpBlackList.php
index f78f9ad..150e560 100644
--- a/src/Ratchet/Component/Server/IpBlackListComponent.php
+++ b/src/Ratchet/Server/IpBlackList.php
@@ -1,16 +1,16 @@
 <?php
-namespace Ratchet\Component\Server;
-use Ratchet\Component\MessageComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Server;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
 
-class IpBlackListComponent implements MessageComponentInterface {
+class IpBlackList implements MessageComponentInterface {
     /**
      * @var array
      */
     protected $_blacklist = array();
 
     /**
-     * @var Ratchet\Component\MessageComponentInterface
+     * @var Ratchet\MessageComponentInterface
      */
     protected $_decorating;
 
diff --git a/src/Ratchet/Component/Session/Serialize/HandlerInterface.php b/src/Ratchet/Session/Serialize/HandlerInterface.php
similarity index 82%
rename from src/Ratchet/Component/Session/Serialize/HandlerInterface.php
rename to src/Ratchet/Session/Serialize/HandlerInterface.php
index 42774b1..f1c7c0c 100644
--- a/src/Ratchet/Component/Session/Serialize/HandlerInterface.php
+++ b/src/Ratchet/Session/Serialize/HandlerInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\Session\Serialize;
+namespace Ratchet\Session\Serialize;
 
 interface HandlerInterface {
     /**
diff --git a/src/Ratchet/Component/Session/Serialize/PhpBinaryHandler.php b/src/Ratchet/Session/Serialize/PhpBinaryHandler.php
similarity index 94%
rename from src/Ratchet/Component/Session/Serialize/PhpBinaryHandler.php
rename to src/Ratchet/Session/Serialize/PhpBinaryHandler.php
index a44ca26..3f1b350 100644
--- a/src/Ratchet/Component/Session/Serialize/PhpBinaryHandler.php
+++ b/src/Ratchet/Session/Serialize/PhpBinaryHandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\Session\Serialize;
+namespace Ratchet\Session\Serialize;
 
 class PhpBinaryHandler implements HandlerInterface {
     /**
diff --git a/src/Ratchet/Component/Session/Serialize/PhpHandler.php b/src/Ratchet/Session/Serialize/PhpHandler.php
similarity index 96%
rename from src/Ratchet/Component/Session/Serialize/PhpHandler.php
rename to src/Ratchet/Session/Serialize/PhpHandler.php
index 4bc2102..f0846c9 100644
--- a/src/Ratchet/Component/Session/Serialize/PhpHandler.php
+++ b/src/Ratchet/Session/Serialize/PhpHandler.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\Session\Serialize;
+namespace Ratchet\Session\Serialize;
 
 class PhpHandler implements HandlerInterface {
     /**
diff --git a/src/Ratchet/Component/Session/SessionComponent.php b/src/Ratchet/Session/SessionProvider.php
similarity index 88%
rename from src/Ratchet/Component/Session/SessionComponent.php
rename to src/Ratchet/Session/SessionProvider.php
index 30654c2..7dd1f33 100644
--- a/src/Ratchet/Component/Session/SessionComponent.php
+++ b/src/Ratchet/Session/SessionProvider.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Component\Session;
-use Ratchet\Component\MessageComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
-use Ratchet\Component\Session\Storage\VirtualSessionStorage;
-use Ratchet\Component\Session\Serialize\HandlerInterface;
+namespace Ratchet\Session;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
+use Ratchet\Session\Storage\VirtualSessionStorage;
+use Ratchet\Session\Serialize\HandlerInterface;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 
@@ -13,9 +13,9 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
  * Your website must also use Symfony HttpFoundation Sessions to read your sites session data
  * If your are not using at least PHP 5.4 you must include a SessionHandlerInterface stub (is included in Symfony HttpFoundation, loaded w/ composer)
  */
-class SessionComponent implements MessageComponentInterface {
+class SessionProvider implements MessageComponentInterface {
     /**
-     * @var Ratchet\Component\MessageComponentInterface
+     * @var Ratchet\MessageComponentInterface
      */
     protected $_app;
 
@@ -32,15 +32,15 @@ class SessionComponent implements MessageComponentInterface {
     protected $_null;
 
     /**
-     * @var Ratchet\Component\Session\Serialize\HandlerInterface
+     * @var Ratchet\Session\Serialize\HandlerInterface
      */
     protected $_serializer;
 
     /**
-     * @param Ratchet\Component\MessageComponentInterface
+     * @param Ratchet\MessageComponentInterface
      * @param SessionHandlerInterface
      * @param array
-     * @param Ratchet\Component\Session\Serialize\HandlerInterface
+     * @param Ratchet\Session\Serialize\HandlerInterface
      * @throws RuntimeException If unable to match serialization methods
      */
     public function __construct(MessageComponentInterface $app, \SessionHandlerInterface $handler, array $options = array(), HandlerInterface $serializer = null) {
diff --git a/src/Ratchet/Component/Session/Storage/Proxy/VirtualProxy.php b/src/Ratchet/Session/Storage/Proxy/VirtualProxy.php
similarity index 95%
rename from src/Ratchet/Component/Session/Storage/Proxy/VirtualProxy.php
rename to src/Ratchet/Session/Storage/Proxy/VirtualProxy.php
index 25ce486..f7e52ae 100644
--- a/src/Ratchet/Component/Session/Storage/Proxy/VirtualProxy.php
+++ b/src/Ratchet/Session/Storage/Proxy/VirtualProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\Session\Storage\Proxy;
+namespace Ratchet\Session\Storage\Proxy;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
 class VirtualProxy extends SessionHandlerProxy {
diff --git a/src/Ratchet/Component/Session/Storage/VirtualSessionStorage.php b/src/Ratchet/Session/Storage/VirtualSessionStorage.php
similarity index 87%
rename from src/Ratchet/Component/Session/Storage/VirtualSessionStorage.php
rename to src/Ratchet/Session/Storage/VirtualSessionStorage.php
index 3f6dba4..1aee1eb 100644
--- a/src/Ratchet/Component/Session/Storage/VirtualSessionStorage.php
+++ b/src/Ratchet/Session/Storage/VirtualSessionStorage.php
@@ -1,19 +1,19 @@
 <?php
-namespace Ratchet\Component\Session\Storage;
+namespace Ratchet\Session\Storage;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-use Ratchet\Component\Session\Storage\Proxy\VirtualProxy;
-use Ratchet\Component\Session\Serialize\HandlerInterface;
+use Ratchet\Session\Storage\Proxy\VirtualProxy;
+use Ratchet\Session\Serialize\HandlerInterface;
 
 class VirtualSessionStorage extends NativeSessionStorage {
     /**
-     * @var Ratchet\Component\Session\Serialize\HandlerInterface
+     * @var Ratchet\Session\Serialize\HandlerInterface
      */
     protected $_serializer;
 
     /**
      * @param SessionHandlerInterface
      * @param string The ID of the session to retreive
-     * @param Ratchet\Component\Session\Serialize\HandlerInterface
+     * @param Ratchet\Session\Serialize\HandlerInterface
      */
     public function __construct(\SessionHandlerInterface $handler, $sessionId, HandlerInterface $serializer) {
         $this->setSaveHandler($handler);
diff --git a/src/Ratchet/Component/WAMP/Exception.php b/src/Ratchet/Wamp/Exception.php
similarity index 55%
rename from src/Ratchet/Component/WAMP/Exception.php
rename to src/Ratchet/Wamp/Exception.php
index f66097e..9b0ca24 100644
--- a/src/Ratchet/Component/WAMP/Exception.php
+++ b/src/Ratchet/Wamp/Exception.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WAMP;
+namespace Ratchet\Wamp;
 
 class Exception extends \Exception {
 }
\ No newline at end of file
diff --git a/src/Ratchet/Component/WAMP/JSONException.php b/src/Ratchet/Wamp/JSONException.php
similarity index 96%
rename from src/Ratchet/Component/WAMP/JSONException.php
rename to src/Ratchet/Wamp/JSONException.php
index ccad396..c9ee20f 100644
--- a/src/Ratchet/Component/WAMP/JSONException.php
+++ b/src/Ratchet/Wamp/JSONException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WAMP;
+namespace Ratchet\Wamp;
 
 class JSONException extends Exception {
     public function __construct() {
diff --git a/src/Ratchet/Component/WAMP/WampConnection.php b/src/Ratchet/Wamp/WampConnection.php
similarity index 90%
rename from src/Ratchet/Component/WAMP/WampConnection.php
rename to src/Ratchet/Wamp/WampConnection.php
index e8edc01..c98ad65 100644
--- a/src/Ratchet/Component/WAMP/WampConnection.php
+++ b/src/Ratchet/Wamp/WampConnection.php
@@ -1,8 +1,8 @@
 <?php
-namespace Ratchet\Component\WAMP;
-use Ratchet\Resource\ConnectionInterface;
-use Ratchet\Resource\AbstractConnectionDecorator;
-use Ratchet\Component\WAMP\WAMPServerComponent as WAMP;
+namespace Ratchet\Wamp;
+use Ratchet\ConnectionInterface;
+use Ratchet\AbstractConnectionDecorator;
+use Ratchet\Wamp\WampServer as WAMP;
 
 /**
  * @property stdClass $WAMP
@@ -15,7 +15,7 @@ class WampConnection extends AbstractConnectionDecorator {
         $this->WAMP->sessionId = uniqid();
         $this->WAMP->prefixes  = array();
 
-        $this->send(json_encode(array(WAMP::MSG_WELCOME, $this->WAMP->sessionId, 1, \Ratchet\Resource\VERSION)));
+        $this->send(json_encode(array(WAMP::MSG_WELCOME, $this->WAMP->sessionId, 1, \Ratchet\VERSION)));
     }
 
     /**
diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponent.php b/src/Ratchet/Wamp/WampServer.php
similarity index 89%
rename from src/Ratchet/Component/WAMP/WAMPServerComponent.php
rename to src/Ratchet/Wamp/WampServer.php
index 06e5099..b80f239 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponent.php
+++ b/src/Ratchet/Wamp/WampServer.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\Component\WAMP;
-use Ratchet\Component\WebSocket\WebSocketComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Wamp;
+use Ratchet\WebSocket\WsServerInterface;
+use Ratchet\ConnectionInterface;
 
 /**
  * WebSocket Application Messaging Protocol
@@ -23,7 +23,7 @@ use Ratchet\Resource\ConnectionInterface;
  * | EVENT        | 8  | Server-to-Client |
  * +--------------+----+------------------+
  */
-class WAMPServerComponent implements WebSocketComponentInterface {
+class WampServer implements WsServerInterface {
     const MSG_WELCOME     = 0;
     const MSG_PREFIX      = 1;
     const MSG_CALL        = 2;
@@ -35,7 +35,7 @@ class WAMPServerComponent implements WebSocketComponentInterface {
     const MSG_EVENT       = 8;
 
     /**
-     * @var WAMPServerComponentInterface
+     * @var WampServerInterface
      */
     protected $_decorating;
 
@@ -45,9 +45,9 @@ class WAMPServerComponent implements WebSocketComponentInterface {
     protected $connections;
 
     /**
-     * @param WAMPServerComponentInterface An class to propagate calls through
+     * @param WampServerInterface An class to propagate calls through
      */
-    public function __construct(WAMPServerComponentInterface $server_component) {
+    public function __construct(WampServerInterface $server_component) {
         $this->_decorating = $server_component;
         $this->connections = new \SplObjectStorage;
     }
diff --git a/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php b/src/Ratchet/Wamp/WampServerInterface.php
similarity index 58%
rename from src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php
rename to src/Ratchet/Wamp/WampServerInterface.php
index 180ad2a..144fabe 100644
--- a/src/Ratchet/Component/WAMP/WAMPServerComponentInterface.php
+++ b/src/Ratchet/Wamp/WampServerInterface.php
@@ -1,46 +1,42 @@
 <?php
-namespace Ratchet\Component\WAMP;
-use Ratchet\Component\ComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\Wamp;
+use Ratchet\ComponentInterface;
+use Ratchet\ConnectionInterface;
 
 /**
- * A (not literal) extension of Ratchet\Component\ComponentInterface
+ * A (not literal) extension of Ratchet\ConnectionInterface
  * onMessage is replaced by various types of messages for this protocol (pub/sub or rpc)
  * @todo Thought: URI as class.  Class has short and long version stored (if as prefix)
  */
-interface WAMPServerComponentInterface extends ComponentInterface {
+interface WampServerInterface extends ComponentInterface {
     /**
      * An RPC call has been received
-     * @param Ratchet\Resource\Connection
+     * @param Ratchet\Connection
      * @param string
      * @param ...
      * @param array Call parameters received from the client
-     * @return Ratchet\Resource\Command\CommandInterface|null
      */
     function onCall(ConnectionInterface $conn, $id, $procURI, array $params);
 
     /**
      * A request to subscribe to a URI has been made
-     * @param Ratchet\Resource\Connection
+     * @param Ratchet\Connection
      * @param ...
-     * @return Ratchet\Resource\Command\CommandInterface|null
      */
     function onSubscribe(ConnectionInterface $conn, $uri);
 
     /**
      * A request to unsubscribe from a URI has been made
-     * @param Ratchet\Resource\Connection
+     * @param Ratchet\Connection
      * @param ...
-     * @return Ratchet\Resource\Command\CommandInterface|null
      */
     function onUnSubscribe(ConnectionInterface $conn, $uri);
 
     /**
      * A client is attempting to publish content to a subscribed connections on a URI
-     * @param Ratchet\Resource\Connection
+     * @param Ratchet\Connection
      * @param ...
      * @param string
-     * @return Ratchet\Resource\Command\CommandInterface|null
      */
     function onPublish(ConnectionInterface $conn, $uri, $event);
 }
\ No newline at end of file
diff --git a/src/Ratchet/Component/WebSocket/Guzzle/Http/Message/RequestFactory.php b/src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php
similarity index 89%
rename from src/Ratchet/Component/WebSocket/Guzzle/Http/Message/RequestFactory.php
rename to src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php
index 3c039c2..bd7e490 100644
--- a/src/Ratchet/Component/WebSocket/Guzzle/Http/Message/RequestFactory.php
+++ b/src/Ratchet/WebSocket/Guzzle/Http/Message/RequestFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Guzzle\Http\Message;
+namespace Ratchet\WebSocket\Guzzle\Http\Message;
 use Guzzle\Http\Message\RequestFactory as GuzzleRequestFactory;
 use Guzzle\Http\EntityBody;
 
diff --git a/src/Ratchet/Component/WebSocket/Version/FrameInterface.php b/src/Ratchet/WebSocket/Version/FrameInterface.php
similarity index 95%
rename from src/Ratchet/Component/WebSocket/Version/FrameInterface.php
rename to src/Ratchet/WebSocket/Version/FrameInterface.php
index 3e9882b..57b27ea 100644
--- a/src/Ratchet/Component/WebSocket/Version/FrameInterface.php
+++ b/src/Ratchet/WebSocket/Version/FrameInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
+namespace Ratchet\WebSocket\Version;
 
 interface FrameInterface {
     /**
diff --git a/src/Ratchet/Component/WebSocket/Version/Hixie76.php b/src/Ratchet/WebSocket/Version/Hixie76.php
similarity index 98%
rename from src/Ratchet/Component/WebSocket/Version/Hixie76.php
rename to src/Ratchet/WebSocket/Version/Hixie76.php
index 84973af..941eec4 100644
--- a/src/Ratchet/Component/WebSocket/Version/Hixie76.php
+++ b/src/Ratchet/WebSocket/Version/Hixie76.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
+namespace Ratchet\WebSocket\Version;
 use Guzzle\Http\Message\RequestInterface;
 use Guzzle\Http\Message\Response;
 
diff --git a/src/Ratchet/Component/WebSocket/Version/Hixie76/Frame.php b/src/Ratchet/WebSocket/Version/Hixie76/Frame.php
similarity index 93%
rename from src/Ratchet/Component/WebSocket/Version/Hixie76/Frame.php
rename to src/Ratchet/WebSocket/Version/Hixie76/Frame.php
index 8be42c7..b9af87d 100644
--- a/src/Ratchet/Component/WebSocket/Version/Hixie76/Frame.php
+++ b/src/Ratchet/WebSocket/Version/Hixie76/Frame.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version\Hixie76;
-use Ratchet\Component\WebSocket\Version\FrameInterface;
+namespace Ratchet\WebSocket\Version\Hixie76;
+use Ratchet\WebSocket\Version\FrameInterface;
 
 /**
  * This does not entirely follow the protocol to spec, but (mostly) works
diff --git a/src/Ratchet/Component/WebSocket/Version/Hixie76/Message.php b/src/Ratchet/WebSocket/Version/Hixie76/Message.php
similarity index 84%
rename from src/Ratchet/Component/WebSocket/Version/Hixie76/Message.php
rename to src/Ratchet/WebSocket/Version/Hixie76/Message.php
index 0f7784c..f783e8b 100644
--- a/src/Ratchet/Component/WebSocket/Version/Hixie76/Message.php
+++ b/src/Ratchet/WebSocket/Version/Hixie76/Message.php
@@ -1,11 +1,11 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version\Hixie76;
-use Ratchet\Component\WebSocket\Version\MessageInterface;
-use Ratchet\Component\WebSocket\Version\FrameInterface;
+namespace Ratchet\WebSocket\Version\Hixie76;
+use Ratchet\WebSocket\Version\MessageInterface;
+use Ratchet\WebSocket\Version\FrameInterface;
 
 class Message implements MessageInterface {
     /**
-     * @var Ratchet\Component\WebSocket\Version\FrameInterface
+     * @var Ratchet\WebSocket\Version\FrameInterface
      */
     protected $_frame = null;
 
diff --git a/src/Ratchet/Component/WebSocket/Version/HyBi10.php b/src/Ratchet/WebSocket/Version/HyBi10.php
similarity index 91%
rename from src/Ratchet/Component/WebSocket/Version/HyBi10.php
rename to src/Ratchet/WebSocket/Version/HyBi10.php
index c6cf5f8..734d7e4 100644
--- a/src/Ratchet/Component/WebSocket/Version/HyBi10.php
+++ b/src/Ratchet/WebSocket/Version/HyBi10.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
+namespace Ratchet\WebSocket\Version;
 use Guzzle\Http\Message\RequestInterface;
 
 class HyBi10 extends RFC6455 {
diff --git a/src/Ratchet/Component/WebSocket/Version/MessageInterface.php b/src/Ratchet/WebSocket/Version/MessageInterface.php
similarity index 92%
rename from src/Ratchet/Component/WebSocket/Version/MessageInterface.php
rename to src/Ratchet/WebSocket/Version/MessageInterface.php
index 108789d..90d0179 100644
--- a/src/Ratchet/Component/WebSocket/Version/MessageInterface.php
+++ b/src/Ratchet/WebSocket/Version/MessageInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
+namespace Ratchet\WebSocket\Version;
 
 /**
  * @todo Consider making parent interface/composite for Message/Frame with (isCoalesced, getOpcdoe, getPayloadLength, getPayload)
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455.php b/src/Ratchet/WebSocket/Version/RFC6455.php
similarity index 97%
rename from src/Ratchet/Component/WebSocket/Version/RFC6455.php
rename to src/Ratchet/WebSocket/Version/RFC6455.php
index 38129a4..50d7632 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455.php
+++ b/src/Ratchet/WebSocket/Version/RFC6455.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
-use Ratchet\Component\WebSocket\Version\RFC6455\HandshakeVerifier;
+namespace Ratchet\WebSocket\Version;
+use Ratchet\WebSocket\Version\RFC6455\HandshakeVerifier;
 use Guzzle\Http\Message\RequestInterface;
 use Guzzle\Http\Message\Response;
 
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455/Frame.php b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php
similarity index 98%
rename from src/Ratchet/Component/WebSocket/Version/RFC6455/Frame.php
rename to src/Ratchet/WebSocket/Version/RFC6455/Frame.php
index 66090e9..60c8a2f 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455/Frame.php
+++ b/src/Ratchet/WebSocket/Version/RFC6455/Frame.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version\RFC6455;
-use Ratchet\Component\WebSocket\Version\FrameInterface;
+namespace Ratchet\WebSocket\Version\RFC6455;
+use Ratchet\WebSocket\Version\FrameInterface;
 
 class Frame implements FrameInterface {
     /**
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php b/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php
similarity index 98%
rename from src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
rename to src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php
index 3c634e6..afad604 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
+++ b/src/Ratchet/WebSocket/Version/RFC6455/HandshakeVerifier.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version\RFC6455;
+namespace Ratchet\WebSocket\Version\RFC6455;
 use Guzzle\Http\Message\RequestInterface;
 
 /**
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455/Message.php b/src/Ratchet/WebSocket/Version/RFC6455/Message.php
similarity index 92%
rename from src/Ratchet/Component/WebSocket/Version/RFC6455/Message.php
rename to src/Ratchet/WebSocket/Version/RFC6455/Message.php
index 1123d25..5385475 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455/Message.php
+++ b/src/Ratchet/WebSocket/Version/RFC6455/Message.php
@@ -1,7 +1,7 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version\RFC6455;
-use Ratchet\Component\WebSocket\Version\MessageInterface;
-use Ratchet\Component\WebSocket\Version\FrameInterface;
+namespace Ratchet\WebSocket\Version\RFC6455;
+use Ratchet\WebSocket\Version\MessageInterface;
+use Ratchet\WebSocket\Version\FrameInterface;
 
 class Message implements MessageInterface {
     /**
diff --git a/src/Ratchet/Component/WebSocket/Version/VersionInterface.php b/src/Ratchet/WebSocket/Version/VersionInterface.php
similarity index 97%
rename from src/Ratchet/Component/WebSocket/Version/VersionInterface.php
rename to src/Ratchet/WebSocket/Version/VersionInterface.php
index 72a5bba..1602641 100644
--- a/src/Ratchet/Component/WebSocket/Version/VersionInterface.php
+++ b/src/Ratchet/WebSocket/Version/VersionInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Ratchet\Component\WebSocket\Version;
+namespace Ratchet\WebSocket\Version;
 use Guzzle\Http\Message\RequestInterface;
 
 /**
diff --git a/src/Ratchet/Component/WebSocket/WsConnection.php b/src/Ratchet/WebSocket/WsConnection.php
similarity index 85%
rename from src/Ratchet/Component/WebSocket/WsConnection.php
rename to src/Ratchet/WebSocket/WsConnection.php
index 7bf20ed..ce769bc 100644
--- a/src/Ratchet/Component/WebSocket/WsConnection.php
+++ b/src/Ratchet/WebSocket/WsConnection.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Component\WebSocket;
-use Ratchet\Resource\AbstractConnectionDecorator;
+namespace Ratchet\WebSocket;
+use Ratchet\AbstractConnectionDecorator;
 
 /**
  * @property stdClass $WebSocket
diff --git a/src/Ratchet/Component/WebSocket/WebSocketComponent.php b/src/Ratchet/WebSocket/WsServer.php
similarity index 95%
rename from src/Ratchet/Component/WebSocket/WebSocketComponent.php
rename to src/Ratchet/WebSocket/WsServer.php
index 03a5ab1..c3b1a48 100644
--- a/src/Ratchet/Component/WebSocket/WebSocketComponent.php
+++ b/src/Ratchet/WebSocket/WsServer.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Component\WebSocket;
-use Ratchet\Component\MessageComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+namespace Ratchet\WebSocket;
+use Ratchet\MessageComponentInterface;
+use Ratchet\ConnectionInterface;
 use Guzzle\Http\Message\RequestInterface;
-use Ratchet\Component\WebSocket\Guzzle\Http\Message\RequestFactory;
+use Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory;
 
 /**
  * The adapter to handle WebSocket requests/responses
@@ -12,10 +12,10 @@ use Ratchet\Component\WebSocket\Guzzle\Http\Message\RequestFactory;
  * @link http://ca.php.net/manual/en/ref.http.php
  * @link http://dev.w3.org/html5/websockets/
  */
-class WebSocketComponent implements MessageComponentInterface {
+class WsServer implements MessageComponentInterface {
     /**
      * Decorated component
-     * @var Ratchet\Component\MessageComponentInterface
+     * @var Ratchet\MessageComponentInterface
      */
     protected $_decorating;
 
@@ -90,7 +90,7 @@ class WebSocketComponent implements MessageComponentInterface {
             if (count($agreed_protocols) > 0) {
                 $response->setHeader('Sec-WebSocket-Protocol', implode(',', $agreed_protocols));
             }
-            $response->setHeader('X-Powered-By', \Ratchet\Resource\VERSION);
+            $response->setHeader('X-Powered-By', \Ratchet\VERSION);
             $header = (string)$response;
 
             $from->send($header);
diff --git a/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php b/src/Ratchet/WebSocket/WsServerInterface.php
similarity index 62%
rename from src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php
rename to src/Ratchet/WebSocket/WsServerInterface.php
index 14f70d5..30b9ba4 100644
--- a/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php
+++ b/src/Ratchet/WebSocket/WsServerInterface.php
@@ -1,8 +1,8 @@
 <?php
-namespace Ratchet\Component\WebSocket;
-use Ratchet\Component\MessageComponentInterface;
+namespace Ratchet\WebSocket;
+use Ratchet\MessageComponentInterface;
 
-interface WebSocketComponentInterface extends MessageComponentInterface {
+interface WsServerInterface extends MessageComponentInterface {
     /**
      * Currently instead of this, I'm setting header in the Connection object passed around...not sure which I like more
      * @param string
diff --git a/tests/Ratchet/Tests/Resource/AbstractConnectionDecoratorTest.php b/tests/Ratchet/Tests/AbstractConnectionDecoratorTest.php
similarity index 93%
rename from tests/Ratchet/Tests/Resource/AbstractConnectionDecoratorTest.php
rename to tests/Ratchet/Tests/AbstractConnectionDecoratorTest.php
index 5333093..197537d 100644
--- a/tests/Ratchet/Tests/Resource/AbstractConnectionDecoratorTest.php
+++ b/tests/Ratchet/Tests/AbstractConnectionDecoratorTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Ratchet\Tests\Resource;
+namespace Ratchet\Tests;
 use Ratchet\Tests\Mock\ConnectionDecorator;
 use Ratchet\Tests\Mock\Connection;
 
 /**
- * @covers Ratchet\Resource\AbstractConnectionDecorator
+ * @covers Ratchet\AbstractConnectionDecorator
  */
 class AbstractConnectionDecoratorTest extends \PHPUnit_Framework_TestCase {
     protected $mock;
@@ -84,7 +84,7 @@ class AbstractConnectionDecoratorTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testGetConnection() {
-        $class  = new \ReflectionClass('\\Ratchet\\Resource\\AbstractConnectionDecorator');
+        $class  = new \ReflectionClass('\\Ratchet\\AbstractConnectionDecorator');
         $method = $class->getMethod('getConnection');
         $method->setAccessible(true);
 
@@ -94,7 +94,7 @@ class AbstractConnectionDecoratorTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testGetConnectionLevel2() {
-        $class  = new \ReflectionClass('\\Ratchet\\Resource\\AbstractConnectionDecorator');
+        $class  = new \ReflectionClass('\\Ratchet\\AbstractConnectionDecorator');
         $method = $class->getMethod('getConnection');
         $method->setAccessible(true);
 
diff --git a/tests/Ratchet/Tests/Mock/Component.php b/tests/Ratchet/Tests/Mock/Component.php
index bcf0fbb..d0064d0 100644
--- a/tests/Ratchet/Tests/Mock/Component.php
+++ b/tests/Ratchet/Tests/Mock/Component.php
@@ -1,8 +1,8 @@
 <?php
 namespace Ratchet\Tests\Mock;
-use Ratchet\Component\MessageComponentInterface;
+use Ratchet\MessageComponentInterface;
 use Ratchet\Tests\Mock\Socket as MockSocket;
-use Ratchet\Resource\ConnectionInterface;
+use Ratchet\ConnectionInterface;
 
 /**
  * @todo Rename to MessageComponent
diff --git a/tests/Ratchet/Tests/Mock/Connection.php b/tests/Ratchet/Tests/Mock/Connection.php
index 03acfb1..8707266 100644
--- a/tests/Ratchet/Tests/Mock/Connection.php
+++ b/tests/Ratchet/Tests/Mock/Connection.php
@@ -1,6 +1,6 @@
 <?php
 namespace Ratchet\Tests\Mock;
-use Ratchet\Resource\ConnectionInterface;
+use Ratchet\ConnectionInterface;
 
 class Connection implements ConnectionInterface {
     public $last = array(
diff --git a/tests/Ratchet/Tests/Mock/ConnectionDecorator.php b/tests/Ratchet/Tests/Mock/ConnectionDecorator.php
index f876e67..72a430c 100644
--- a/tests/Ratchet/Tests/Mock/ConnectionDecorator.php
+++ b/tests/Ratchet/Tests/Mock/ConnectionDecorator.php
@@ -1,6 +1,6 @@
 <?php
 namespace Ratchet\Tests\Mock;
-use Ratchet\Resource\AbstractConnectionDecorator;
+use Ratchet\AbstractConnectionDecorator;
 
 class ConnectionDecorator extends AbstractConnectionDecorator {
     public $last = array(
diff --git a/tests/Ratchet/Tests/Mock/WAMPComponent.php b/tests/Ratchet/Tests/Mock/WAMPComponent.php
index 9473e85..1b59f30 100644
--- a/tests/Ratchet/Tests/Mock/WAMPComponent.php
+++ b/tests/Ratchet/Tests/Mock/WAMPComponent.php
@@ -1,9 +1,9 @@
 <?php
 namespace Ratchet\Tests\Mock;
-use Ratchet\Component\WAMP\WAMPServerComponentInterface;
-use Ratchet\Resource\ConnectionInterface;
+use Ratchet\Wamp\WampServerInterface;
+use Ratchet\ConnectionInterface;
 
-class WAMPComponent implements WAMPServerComponentInterface {
+class WAMPComponent implements WampServerInterface {
     public $last = array();
 
     public function onCall(ConnectionInterface $conn, $id, $procURI, array $params) {
diff --git a/tests/Ratchet/Tests/Component/Server/FlashPolicyComponentTest.php b/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php
similarity index 93%
rename from tests/Ratchet/Tests/Component/Server/FlashPolicyComponentTest.php
rename to tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php
index 1c152b1..51597ca 100644
--- a/tests/Ratchet/Tests/Component/Server/FlashPolicyComponentTest.php
+++ b/tests/Ratchet/Tests/Server/FlashPolicyComponentTest.php
@@ -1,16 +1,16 @@
 <?php
 namespace Ratchet\Tests\Application\Server;
-use Ratchet\Component\Server\FlashPolicyComponent;
+use Ratchet\Server\FlashPolicy;
 
 /**
- * @covers Ratchet\Component\Server\FlashPolicyComponent
+ * @covers Ratchet\Server\FlashPolicy
  */
-class FlashPolicyComponentTest extends \PHPUnit_Framework_TestCase {
+class FlashPolicyTest extends \PHPUnit_Framework_TestCase {
 
     protected $_policy;
 
     public function setUp() {
-        $this->_policy = new FlashPolicyComponent();
+        $this->_policy = new FlashPolicy();
     }
 
     public function testPolicyRender() {
diff --git a/tests/Ratchet/Tests/Component/Server/IpBlackListComponentTest.php b/tests/Ratchet/Tests/Server/IpBlackListComponentTest.php
similarity index 85%
rename from tests/Ratchet/Tests/Component/Server/IpBlackListComponentTest.php
rename to tests/Ratchet/Tests/Server/IpBlackListComponentTest.php
index bd0d5e2..2d1f662 100644
--- a/tests/Ratchet/Tests/Component/Server/IpBlackListComponentTest.php
+++ b/tests/Ratchet/Tests/Server/IpBlackListComponentTest.php
@@ -1,19 +1,19 @@
 <?php
-namespace Ratchet\Tests\Component\Server;
-use Ratchet\Component\Server\IpBlackListComponent;
+namespace Ratchet\Tests\Server;
+use Ratchet\Server\IpBlackList;
 use Ratchet\Tests\Mock\Connection;
 use Ratchet\Tests\Mock\Component as MockComponent;
 
 /**
- * @covers Ratchet\Component\Server\IpBlackListComponent
+ * @covers Ratchet\Server\IpBlackList
  */
-class IpBlackListComponentTest extends \PHPUnit_Framework_TestCase {
+class IpBlackListTest extends \PHPUnit_Framework_TestCase {
     protected $_comp;
     protected $_mock;
 
     public function setUp() {
         $this->_mock = new MockComponent;
-        $this->_comp = new IpBlackListComponent($this->_mock);
+        $this->_comp = new IpBlackList($this->_mock);
     }
 
     public function testBlockAndCloseOnOpen() {
@@ -86,6 +86,6 @@ class IpBlackListComponentTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testUnblockingSilentlyFails() {
-        $this->assertInstanceOf('\\Ratchet\\Component\\Server\\IpBlackListComponent', $this->_comp->unblockAddress('localhost'));
+        $this->assertInstanceOf('\\Ratchet\\Server\\IpBlackList', $this->_comp->unblockAddress('localhost'));
     }
 }
\ No newline at end of file
diff --git a/tests/Ratchet/Tests/Component/Session/Serialize/PhpHandlerTest.php b/tests/Ratchet/Tests/Session/Serialize/PhpHandlerTest.php
similarity index 83%
rename from tests/Ratchet/Tests/Component/Session/Serialize/PhpHandlerTest.php
rename to tests/Ratchet/Tests/Session/Serialize/PhpHandlerTest.php
index 0528817..c8bf0dc 100644
--- a/tests/Ratchet/Tests/Component/Session/Serialize/PhpHandlerTest.php
+++ b/tests/Ratchet/Tests/Session/Serialize/PhpHandlerTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Tests\Component\Session\Serialize;
-use Ratchet\Component\Session\Serialize\PhpHandler;
+namespace Ratchet\Tests\Session\Serialize;
+use Ratchet\Session\Serialize\PhpHandler;
 
 /**
- * @covers Ratchet\Component\Session\Serialize\PhpHandler
+ * @covers Ratchet\Session\Serialize\PhpHandler
  */
 class PhpHandlerTest extends \PHPUnit_Framework_TestCase {
     protected $_handler;
diff --git a/tests/Ratchet/Tests/Component/Session/SessionComponentTest.php b/tests/Ratchet/Tests/Session/SessionComponentTest.php
similarity index 83%
rename from tests/Ratchet/Tests/Component/Session/SessionComponentTest.php
rename to tests/Ratchet/Tests/Session/SessionComponentTest.php
index 03527c1..3222cca 100644
--- a/tests/Ratchet/Tests/Component/Session/SessionComponentTest.php
+++ b/tests/Ratchet/Tests/Session/SessionComponentTest.php
@@ -1,6 +1,6 @@
 <?php
-namespace Ratchet\Tests\Component\Session;
-use Ratchet\Component\Session\SessionComponent;
+namespace Ratchet\Tests\Session;
+use Ratchet\Session\SessionProvider;
 use Ratchet\Tests\Mock\Component as MockComponent;
 use Ratchet\Tests\Mock\MemorySessionHandler;
 use Ratchet\Tests\Mock\Connection;
@@ -9,11 +9,11 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
 use Guzzle\Http\Message\Request;
 
 /**
- * @covers Ratchet\Component\Session\SessionComponent
- * @covers Ratchet\Component\Session\Storage\VirtualSessionStorage
- * @covers Ratchet\Component\Session\Storage\Proxy\VirtualProxy
+ * @covers Ratchet\Session\SessionProvider
+ * @covers Ratchet\Session\Storage\VirtualSessionStorage
+ * @covers Ratchet\Session\Storage\Proxy\VirtualProxy
  */
-class SessionComponentTest extends \PHPUnit_Framework_TestCase {
+class SessionProviderTest extends \PHPUnit_Framework_TestCase {
     public function setUp() {
         if (!class_exists('Symfony\\Component\\HttpFoundation\\Session\\Session')) {
             return $this->markTestSkipped('Dependency of Symfony HttpFoundation failed');
@@ -31,11 +31,11 @@ class SessionComponentTest extends \PHPUnit_Framework_TestCase {
      * @dataProvider classCaseProvider
      */
     public function testToClassCase($in, $out) {
-        $ref = new \ReflectionClass('\\Ratchet\\Component\\Session\\SessionComponent');
+        $ref = new \ReflectionClass('\\Ratchet\\Session\\SessionProvider');
         $method = $ref->getMethod('toClassCase');
         $method->setAccessible(true);
 
-        $component = new SessionComponent(new MockComponent, new MemorySessionHandler);
+        $component = new SessionProvider(new MockComponent, new MemorySessionHandler);
         $this->assertEquals($out, $method->invokeArgs($component, array($in)));
     }
 
@@ -56,7 +56,7 @@ class SessionComponentTest extends \PHPUnit_Framework_TestCase {
         $pdo->exec(vsprintf("CREATE TABLE %s (%s VARCHAR(255) PRIMARY KEY, %s TEXT, %s INTEGER)", $dbOptions));
         $pdo->prepare(vsprintf("INSERT INTO %s (%s, %s, %s) VALUES (?, ?, ?)", $dbOptions))->execute(array($sessionId, base64_encode('_sf2_attributes|a:2:{s:5:"hello";s:5:"world";s:4:"last";i:1332872102;}_sf2_flashes|a:0:{}'), time()));
 
-        $component  = new SessionComponent(new MockComponent, new PdoSessionHandler($pdo, $dbOptions), array('auto_start' => 1));
+        $component  = new SessionProvider(new MockComponent, new PdoSessionHandler($pdo, $dbOptions), array('auto_start' => 1));
         $connection = new Connection();
 
         $headers = $this->getMock('Guzzle\\Http\\Message\\Request', array('getCookie'), array('POST', '/', array()));
@@ -83,7 +83,7 @@ class SessionComponentTest extends \PHPUnit_Framework_TestCase {
         }
 
         $mock = new MockComponent;
-        $comp = new SessionComponent($mock, new NullSessionHandler);
+        $comp = new SessionProvider($mock, new NullSessionHandler);
 
         $comp->onOpen($conns[1]);
         $comp->onOpen($conns[3]);
diff --git a/tests/Ratchet/Tests/Component/WAMP/WampConnectionTest.php b/tests/Ratchet/Tests/Wamp/WampConnectionTest.php
similarity index 93%
rename from tests/Ratchet/Tests/Component/WAMP/WampConnectionTest.php
rename to tests/Ratchet/Tests/Wamp/WampConnectionTest.php
index b77cfe5..43a1127 100644
--- a/tests/Ratchet/Tests/Component/WAMP/WampConnectionTest.php
+++ b/tests/Ratchet/Tests/Wamp/WampConnectionTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace Ratchet\Tests\Component\WAMP;
-use Ratchet\Component\WAMP\WampConnection;
+namespace Ratchet\Tests\Wamp;
+use Ratchet\Wamp\WampConnection;
 use Ratchet\Tests\Mock\Connection;
 
 /**
- * @covers Ratchet\Component\WAMP\WampConnection
+ * @covers Ratchet\Wamp\WampConnection
  */
 class WampConnectionTest extends \PHPUnit_Framework_TestCase {
     public function testCallResult() {
diff --git a/tests/Ratchet/Tests/Component/WAMP/WAMPServerComponentTest.php b/tests/Ratchet/Tests/Wamp/WampServerTest.php
similarity index 86%
rename from tests/Ratchet/Tests/Component/WAMP/WAMPServerComponentTest.php
rename to tests/Ratchet/Tests/Wamp/WampServerTest.php
index ae2f01d..fb68862 100644
--- a/tests/Ratchet/Tests/Component/WAMP/WAMPServerComponentTest.php
+++ b/tests/Ratchet/Tests/Wamp/WampServerTest.php
@@ -1,23 +1,23 @@
 <?php
-namespace Ratchet\Tests\Component\WAMP;
-use Ratchet\Component\WAMP\WAMPServerComponent;
-use Ratchet\Component\WAMP\WampConnection;
+namespace Ratchet\Tests\Wamp;
+use Ratchet\Wamp\WampServer;
+use Ratchet\Wamp\WampConnection;
 use Ratchet\Tests\Mock\Connection;
-use Ratchet\Tests\Mock\WAMPComponent as TestComponent;
+use Ratchet\Tests\Mock\WampComponent as TestComponent;
 
 /**
- * @covers Ratchet\Component\WAMP\WAMPServerComponent
- * @covers Ratchet\Component\WAMP\WAMPServerComponentInterface
- * @covers Ratchet\Component\WAMP\WampConnection
+ * @covers Ratchet\Wamp\WampServer
+ * @covers Ratchet\Wamp\WampServerInterface
+ * @covers Ratchet\Wamp\WampConnection
  */
-class WAMPServerComponentTest extends \PHPUnit_Framework_TestCase {
+class WampServerTest extends \PHPUnit_Framework_TestCase {
     protected $_comp;
 
     protected $_app;
 
     public function setUp() {
         $this->_app  = new TestComponent;
-        $this->_comp = new WAMPServerComponent($this->_app);
+        $this->_comp = new WampServer($this->_app);
     }
 
     protected function newConn() {
@@ -38,7 +38,7 @@ class WAMPServerComponentTest extends \PHPUnit_Framework_TestCase {
      * @dataProvider invalidMessageProvider
      */
     public function testInvalidMessages($type) {
-        $this->setExpectedException('\\Ratchet\\Component\\WAMP\\Exception');
+        $this->setExpectedException('\\Ratchet\\WAMP\\Exception');
 
         $conn = $this->newConn();
         $this->_comp->onOpen($conn);
@@ -155,7 +155,7 @@ class WAMPServerComponentTest extends \PHPUnit_Framework_TestCase {
         $this->_comp->onOpen($conn);
         $this->_comp->onClose($conn);
 
-        $class  = new \ReflectionClass('\\Ratchet\\Component\\WAMP\\WampConnection');
+        $class  = new \ReflectionClass('\\Ratchet\\WAMP\\WampConnection');
         $method = $class->getMethod('getConnection');
         $method->setAccessible(true);
 
@@ -172,7 +172,7 @@ class WAMPServerComponentTest extends \PHPUnit_Framework_TestCase {
         $this->_comp->onOpen($conn);
         $this->_comp->onError($conn, $e);
 
-        $class  = new \ReflectionClass('\\Ratchet\\Component\\WAMP\\WampConnection');
+        $class  = new \ReflectionClass('\\Ratchet\\WAMP\\WampConnection');
         $method = $class->getMethod('getConnection');
         $method->setAccessible(true);
 
@@ -196,7 +196,7 @@ class WAMPServerComponentTest extends \PHPUnit_Framework_TestCase {
     }
 
     public function testMessageMustBeJson() {
-        $this->setExpectedException('\\Ratchet\\Component\\WAMP\\JsonException');
+        $this->setExpectedException('\\Ratchet\\WAMP\\JsonException');
 
         $conn = new Connection;
 
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php b/tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
similarity index 90%
rename from tests/Ratchet/Tests/Component/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
rename to tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
index 1bf54e9..01d5df0 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
+++ b/tests/Ratchet/Tests/WebSocket/Guzzle/Http/Message/RequestFactoryTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Guzzle\Http\Message;
-use Ratchet\Component\WebSocket\Guzzle\Http\Message\RequestFactory;
+namespace Ratchet\Tests\WebSocket\Guzzle\Http\Message;
+use Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory;
 
 /**
- * @covers Ratchet\Component\WebSocket\Guzzle\Http\Message\RequestFactory
+ * @covers Ratchet\WebSocket\Guzzle\Http\Message\RequestFactory
  */
 class RequestFactoryTest extends \PHPUnit_Framework_TestCase {
     protected $factory;
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/Hixie76Test.php b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
similarity index 82%
rename from tests/Ratchet/Tests/Component/WebSocket/Version/Hixie76Test.php
rename to tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
index bf08215..9773c13 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/Hixie76Test.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Version;
-use Ratchet\Component\WebSocket\Version\Hixie76;
+namespace Ratchet\Tests\WebSocket\Version;
+use Ratchet\WebSocket\Version\Hixie76;
 
 /**
- * @covers Ratchet\Component\WebSocket\Version\Hixie76
+ * @covers Ratchet\WebSocket\Version\Hixie76
  */
 class Hixie76Test extends \PHPUnit_Framework_TestCase {
     protected $_version;
@@ -13,7 +13,7 @@ class Hixie76Test extends \PHPUnit_Framework_TestCase {
     }
 
     public function testClassImplementsVersionInterface() {
-        $constraint = $this->isInstanceOf('\\Ratchet\\Component\\WebSocket\\Version\\VersionInterface');
+        $constraint = $this->isInstanceOf('\\Ratchet\\WebSocket\\Version\\VersionInterface');
         $this->assertThat($this->_version, $constraint);
     }
 
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/HyBi10Test.php b/tests/Ratchet/Tests/WebSocket/Version/HyBi10Test.php
similarity index 87%
rename from tests/Ratchet/Tests/Component/WebSocket/Version/HyBi10Test.php
rename to tests/Ratchet/Tests/WebSocket/Version/HyBi10Test.php
index cac5280..c8ded8b 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/HyBi10Test.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/HyBi10Test.php
@@ -1,10 +1,10 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Version;
-use Ratchet\Component\WebSocket\Version\HyBi10;
-use Ratchet\Component\WebSocket\Version\RFC6455\Frame;
+namespace Ratchet\Tests\WebSocket\Version;
+use Ratchet\WebSocket\Version\HyBi10;
+use Ratchet\WebSocket\Version\RFC6455\Frame;
 
 /**
- * @covers Ratchet\Component\WebSocket\Version\Hybi10
+ * @covers Ratchet\WebSocket\Version\Hybi10
  */
 class HyBi10Test extends \PHPUnit_Framework_TestCase {
     protected $_version;
@@ -17,7 +17,7 @@ class HyBi10Test extends \PHPUnit_Framework_TestCase {
      * Is this useful?
      */
     public function testClassImplementsVersionInterface() {
-        $constraint = $this->isInstanceOf('\\Ratchet\\Component\\WebSocket\\Version\\VersionInterface');
+        $constraint = $this->isInstanceOf('\\Ratchet\\WebSocket\\Version\\VersionInterface');
         $this->assertThat($this->_version, $constraint);
     }
 
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/FrameTest.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php
similarity index 98%
rename from tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/FrameTest.php
rename to tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php
index 820bf6c..84352fb 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/FrameTest.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/FrameTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Version\RFC6455;
-use Ratchet\Component\WebSocket\Version\RFC6455\Frame;
+namespace Ratchet\Tests\WebSocket\Version\RFC6455;
+use Ratchet\WebSocket\Version\RFC6455\Frame;
 
 /**
- * @covers Ratchet\Component\WebSocket\Version\RFC6455\Frame
+ * @covers Ratchet\WebSocket\Version\RFC6455\Frame
  * @todo getMaskingKey, getPayloadStartingByte don't have tests yet
  * @todo Could use some clean up in general, I had to rush to fix a bug for a deadline, sorry.
  */
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/HandshakeVerifierTest.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/HandshakeVerifierTest.php
similarity index 94%
rename from tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/HandshakeVerifierTest.php
rename to tests/Ratchet/Tests/WebSocket/Version/RFC6455/HandshakeVerifierTest.php
index b9e9b45..2e51648 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455/HandshakeVerifierTest.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455/HandshakeVerifierTest.php
@@ -1,13 +1,13 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Version\RFC6455;
-use Ratchet\Component\WebSocket\Version\RFC6455\HandshakeVerifier;
+namespace Ratchet\Tests\WebSocket\Version\RFC6455;
+use Ratchet\WebSocket\Version\RFC6455\HandshakeVerifier;
 
 /**
- * @covers Ratchet\Component\WebSocket\Version\RFC6455\HandshakeVerifier
+ * @covers Ratchet\WebSocket\Version\RFC6455\HandshakeVerifier
  */
 class HandshakeVerifierTest extends \PHPUnit_Framework_TestCase {
     /**
-     * @var Ratchet\Component\WebSocket\Version\RFC6455\HandshakeVerifier
+     * @var Ratchet\WebSocket\Version\RFC6455\HandshakeVerifier
      */
     protected $_v;
 
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php b/tests/Ratchet/Tests/WebSocket/Version/RFC6455Test.php
similarity index 88%
rename from tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
rename to tests/Ratchet/Tests/WebSocket/Version/RFC6455Test.php
index b33b9e8..2e6dd0b 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
+++ b/tests/Ratchet/Tests/WebSocket/Version/RFC6455Test.php
@@ -1,11 +1,11 @@
 <?php
-namespace Ratchet\Tests\Component\WebSocket\Version;
-use Ratchet\Component\WebSocket\Version\RFC6455;
-use Ratchet\Component\WebSocket\Version\RFC6455\Frame;
+namespace Ratchet\Tests\WebSocket\Version;
+use Ratchet\WebSocket\Version\RFC6455;
+use Ratchet\WebSocket\Version\RFC6455\Frame;
 use Guzzle\Http\Message\RequestFactory;
 
 /**
- * @covers Ratchet\Component\WebSocket\Version\RFC6455
+ * @covers Ratchet\WebSocket\Version\RFC6455
  */
 class RFC6455Test extends \PHPUnit_Framework_TestCase {
     protected $_version;
@@ -18,7 +18,7 @@ class RFC6455Test extends \PHPUnit_Framework_TestCase {
      * Is this useful?
      */
     public function testClassImplementsVersionInterface() {
-        $constraint = $this->isInstanceOf('\\Ratchet\\Component\\WebSocket\\Version\\VersionInterface');
+        $constraint = $this->isInstanceOf('\\Ratchet\\WebSocket\\Version\\VersionInterface');
         $this->assertThat($this->_version, $constraint);
     }
 
@@ -127,10 +127,10 @@ class RFC6455Test extends \PHPUnit_Framework_TestCase {
     }
 
     public function testNewMessage() {
-        $this->assertInstanceOf('\\Ratchet\\Component\\WebSocket\\Version\\RFC6455\\Message', $this->_version->newMessage());
+        $this->assertInstanceOf('\\Ratchet\\WebSocket\\Version\\RFC6455\\Message', $this->_version->newMessage());
     }
 
     public function testNewFrame() {
-        $this->assertInstanceOf('\\Ratchet\\Component\\WebSocket\\Version\\RFC6455\\Frame', $this->_version->newFrame());
+        $this->assertInstanceOf('\\Ratchet\\WebSocket\\Version\\RFC6455\\Frame', $this->_version->newFrame());
     }
 }
\ No newline at end of file