diff --git a/lib/Ratchet/Command/CloseConnection.php b/lib/Ratchet/Command/Action/CloseConnection.php
similarity index 84%
rename from lib/Ratchet/Command/CloseConnection.php
rename to lib/Ratchet/Command/Action/CloseConnection.php
index 41308de..cd7b374 100644
--- a/lib/Ratchet/Command/CloseConnection.php
+++ b/lib/Ratchet/Command/Action/CloseConnection.php
@@ -1,5 +1,6 @@
 <?php
-namespace Ratchet\Command;
+namespace Ratchet\Command\Action;
+use Ratchet\Command\CommandInterface;
 use Ratchet\SocketInterface;
 
 /**
diff --git a/lib/Ratchet/Command/Null.php b/lib/Ratchet/Command/Action/Null.php
similarity index 78%
rename from lib/Ratchet/Command/Null.php
rename to lib/Ratchet/Command/Action/Null.php
index 010f132..0f87558 100644
--- a/lib/Ratchet/Command/Null.php
+++ b/lib/Ratchet/Command/Action/Null.php
@@ -1,5 +1,6 @@
 <?php
-namespace Ratchet\Command;
+namespace Ratchet\Command\Action;
+use Ratchet\Command\CommandInterface;
 use Ratchet\SocketInterface;
 
 /**
diff --git a/lib/Ratchet/Command/Runtime.php b/lib/Ratchet/Command/Action/Runtime.php
similarity index 90%
rename from lib/Ratchet/Command/Runtime.php
rename to lib/Ratchet/Command/Action/Runtime.php
index d56bb2c..0fff22c 100644
--- a/lib/Ratchet/Command/Runtime.php
+++ b/lib/Ratchet/Command/Action/Runtime.php
@@ -1,5 +1,6 @@
 <?php
-namespace Ratchet\Command;
+namespace Ratchet\Command\Action;
+use Ratchet\Command\CommandInterface;
 use Ratchet\SocketInterface;
 
 class Runtime implements CommandInterface {
diff --git a/lib/Ratchet/Command/SendMessage.php b/lib/Ratchet/Command/Action/SendMessage.php
similarity index 93%
rename from lib/Ratchet/Command/SendMessage.php
rename to lib/Ratchet/Command/Action/SendMessage.php
index 014beaf..30178a5 100644
--- a/lib/Ratchet/Command/SendMessage.php
+++ b/lib/Ratchet/Command/Action/SendMessage.php
@@ -1,5 +1,6 @@
 <?php
-namespace Ratchet\Command;
+namespace Ratchet\Command\Action;
+use Ratchet\Command\CommandInterface;
 use Ratchet\SocketInterface;
 
 /**
diff --git a/lib/Ratchet/Command/Composite.php b/lib/Ratchet/Command/Composite.php
index 92dae50..28b3a58 100644
--- a/lib/Ratchet/Command/Composite.php
+++ b/lib/Ratchet/Command/Composite.php
@@ -8,7 +8,7 @@ class Composite extends \SplQueue {
      * @param Ratchet\SocketInterface
      * @return CommandInterface
      */
-    public function create($name, SocketInterface $socket) {
+    public function NOPEcreate($name, SocketInterface $socket) {
         $class = __NAMESPACE__ . "\\{$name}\\";
         if (!class_exists($class)) {
             throw new \UnexpectedValueException("Command {$name} not found");
diff --git a/lib/Ratchet/Command/Factory.php b/lib/Ratchet/Command/Factory.php
new file mode 100644
index 0000000..cb88629
--- /dev/null
+++ b/lib/Ratchet/Command/Factory.php
@@ -0,0 +1,44 @@
+<?php
+namespace Ratchet\Command;
+use Ratchet\SocketInterface;
+
+class Factory {
+    protected $_paths = array();
+
+    public function __construct() {
+        $this->addActionPath(__NAMESPACE__ . '\\Action');
+    }
+
+    public function addActionPath($namespace) {
+        $this->_paths[] = $this->slashIt($namespace);
+    }
+
+    public function newComposite() {
+        return new Composite;
+    }
+
+    /**
+     * @param string
+     * @return CommandInterface
+     * @throws UnexpectedValueException
+     */
+    public function newCommand($name, SocketInterface $conn) {
+        $cmd = null;
+        foreach ($this->_paths as $path) {
+            if (class_exists($path . $name)) {
+                $cmd = $path . $name;
+                break;
+            }
+        }
+
+        if (null === $cmd) {
+            throw new \UnexepctedValueException("Command {$name} not found");
+        }
+
+        return new $cmd($conn);
+    }
+
+    protected function slashIt($ns) {
+        return (substr($ns, -1) == '\\' ? $ns : $ns . '\\');
+    }
+}
\ No newline at end of file
diff --git a/lib/Ratchet/Protocol/WebSocket.php b/lib/Ratchet/Protocol/WebSocket.php
index 80e5a55..5ca2ad6 100644
--- a/lib/Ratchet/Protocol/WebSocket.php
+++ b/lib/Ratchet/Protocol/WebSocket.php
@@ -7,7 +7,7 @@ use Ratchet\Protocol\WebSocket\VersionInterface;
 use Ratchet\SocketInterface;
 use Ratchet\SocketObserver;
 use Ratchet\Command\CommandInterface;
-use Ratchet\Command\SendMessage;
+use Ratchet\Command\Action\SendMessage;
 use Ratchet\Command\Composite;
 
 /**
diff --git a/lib/Ratchet/Command/Ping.php b/lib/Ratchet/Protocol/WebSocket/Command/Action/Ping.php
similarity index 100%
rename from lib/Ratchet/Command/Ping.php
rename to lib/Ratchet/Protocol/WebSocket/Command/Action/Ping.php
diff --git a/lib/Ratchet/Command/Pong.php b/lib/Ratchet/Protocol/WebSocket/Command/Action/Pong.php
similarity index 100%
rename from lib/Ratchet/Command/Pong.php
rename to lib/Ratchet/Protocol/WebSocket/Command/Action/Pong.php