From 0bb6a1bba15d01cad866d8cdafb31eb12667f476 Mon Sep 17 00:00:00 2001
From: Marcel Pociot <m.pociot@gmail.com>
Date: Tue, 27 Nov 2018 16:07:29 +0100
Subject: [PATCH] wip

---
 src/Dashboard/EventSubscriber.php                    |  2 +-
 src/Server/Router.php                                | 10 +++++-----
 .../Controllers/Controller.php                       |  6 +++---
 .../Controllers/FetchChannel.php                     |  2 +-
 .../Controllers/FetchChannels.php                    |  4 ++--
 .../Controllers/FetchUsers.php                       |  4 ++--
 .../Controllers/TriggerEvent.php                     |  2 +-
 .../Messages/Message.php                             |  6 +++---
 .../Messages/RespondableMessage.php                  |  2 +-
 .../Messages/RespondableMessageFactory.php           |  6 +++---
 .../Pusher/Channels/Channel.php                      |  4 ++--
 .../Pusher/Channels/ChannelManager.php               |  2 +-
 .../Pusher/Channels/PresenceChannel.php              |  2 +-
 .../Pusher/Channels/PrivateChannel.php               |  2 +-
 .../Pusher/Dashboard.php                             |  4 ++--
 .../Pusher/Exceptions/InvalidConnection.php          |  2 +-
 .../Pusher/Exceptions/InvalidSignature.php           |  2 +-
 .../Pusher/Exceptions/PusherException.php            |  2 +-
 .../Pusher/Exceptions/UnknownAppKey.php              |  2 +-
 .../Pusher/PusherController.php                      | 12 ++++++------
 .../Pusher/PusherMessage.php                         | 10 +++++-----
 src/WebSocketsServiceProvider.php                    |  2 +-
 tests/ConnectionTest.php                             |  8 ++++----
 23 files changed, 49 insertions(+), 49 deletions(-)
 rename src/{WebSocketServer => WebSocket}/Controllers/Controller.php (92%)
 rename src/{WebSocketServer => WebSocket}/Controllers/FetchChannel.php (86%)
 rename src/{WebSocketServer => WebSocket}/Controllers/FetchChannels.php (84%)
 rename src/{WebSocketServer => WebSocket}/Controllers/FetchUsers.php (84%)
 rename src/{WebSocketServer => WebSocket}/Controllers/TriggerEvent.php (93%)
 rename src/{WebSocketServer => WebSocket}/Messages/Message.php (79%)
 rename src/{WebSocketServer => WebSocket}/Messages/RespondableMessage.php (51%)
 rename src/{WebSocketServer => WebSocket}/Messages/RespondableMessageFactory.php (72%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Channels/Channel.php (95%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Channels/ChannelManager.php (95%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Channels/PresenceChannel.php (96%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Channels/PrivateChannel.php (80%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Dashboard.php (95%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Exceptions/InvalidConnection.php (70%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Exceptions/InvalidSignature.php (70%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Exceptions/PusherException.php (80%)
 rename src/{WebSocketServer => WebSocket}/Pusher/Exceptions/UnknownAppKey.php (73%)
 rename src/{WebSocketServer => WebSocket}/Pusher/PusherController.php (83%)
 rename src/{WebSocketServer => WebSocket}/Pusher/PusherMessage.php (80%)

diff --git a/src/Dashboard/EventSubscriber.php b/src/Dashboard/EventSubscriber.php
index 65806be..15c269d 100644
--- a/src/Dashboard/EventSubscriber.php
+++ b/src/Dashboard/EventSubscriber.php
@@ -8,7 +8,7 @@ use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Dashboard;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Dashboard;
 use Illuminate\Events\Dispatcher;
 
 class EventSubscriber
diff --git a/src/Server/Router.php b/src/Server/Router.php
index f973282..8a7e666 100644
--- a/src/Server/Router.php
+++ b/src/Server/Router.php
@@ -4,11 +4,11 @@ namespace BeyondCode\LaravelWebSockets\Server;
 
 use BeyondCode\LaravelWebSockets\LaravelEcho;
 use BeyondCode\LaravelWebSockets\Server\Logger\MessageLogger;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannel;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchChannels;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\FetchUsers;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Controllers\TriggerEvent;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchChannels;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\FetchUsers;
+use BeyondCode\LaravelWebSockets\WebSocket\Controllers\TriggerEvent;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
 use Ratchet\Http\HttpServerInterface;
diff --git a/src/WebSocketServer/Controllers/Controller.php b/src/WebSocket/Controllers/Controller.php
similarity index 92%
rename from src/WebSocketServer/Controllers/Controller.php
rename to src/WebSocket/Controllers/Controller.php
index fd69aa8..0143018 100644
--- a/src/WebSocketServer/Controllers/Controller.php
+++ b/src/WebSocket/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
@@ -15,11 +15,11 @@ use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 
 abstract class Controller implements HttpServerInterface
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)
diff --git a/src/WebSocketServer/Controllers/FetchChannel.php b/src/WebSocket/Controllers/FetchChannel.php
similarity index 86%
rename from src/WebSocketServer/Controllers/FetchChannel.php
rename to src/WebSocket/Controllers/FetchChannel.php
index 937e642..acb6eb8 100644
--- a/src/WebSocketServer/Controllers/FetchChannel.php
+++ b/src/WebSocket/Controllers/FetchChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/src/WebSocketServer/Controllers/FetchChannels.php b/src/WebSocket/Controllers/FetchChannels.php
similarity index 84%
rename from src/WebSocketServer/Controllers/FetchChannels.php
rename to src/WebSocket/Controllers/FetchChannels.php
index 73d6049..46e2b2b 100644
--- a/src/WebSocketServer/Controllers/FetchChannels.php
+++ b/src/WebSocket/Controllers/FetchChannels.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
 
 class FetchChannels extends Controller
 {
diff --git a/src/WebSocketServer/Controllers/FetchUsers.php b/src/WebSocket/Controllers/FetchUsers.php
similarity index 84%
rename from src/WebSocketServer/Controllers/FetchUsers.php
rename to src/WebSocket/Controllers/FetchUsers.php
index c66f1ef..ab071ef 100644
--- a/src/WebSocketServer/Controllers/FetchUsers.php
+++ b/src/WebSocket/Controllers/FetchUsers.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
 
 class FetchUsers extends Controller
 {
diff --git a/src/WebSocketServer/Controllers/TriggerEvent.php b/src/WebSocket/Controllers/TriggerEvent.php
similarity index 93%
rename from src/WebSocketServer/Controllers/TriggerEvent.php
rename to src/WebSocket/Controllers/TriggerEvent.php
index db49722..08ce8ce 100644
--- a/src/WebSocketServer/Controllers/TriggerEvent.php
+++ b/src/WebSocket/Controllers/TriggerEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ApiMessageSent;
 use Illuminate\Http\Request;
diff --git a/src/WebSocketServer/Messages/Message.php b/src/WebSocket/Messages/Message.php
similarity index 79%
rename from src/WebSocketServer/Messages/Message.php
rename to src/WebSocket/Messages/Message.php
index 0e1f63d..acf5cd5 100644
--- a/src/WebSocketServer/Messages/Message.php
+++ b/src/WebSocket/Messages/Message.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
@@ -15,7 +15,7 @@ class Message implements RespondableMessage
     /** @var \Ratchet\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)
diff --git a/src/WebSocketServer/Messages/RespondableMessage.php b/src/WebSocket/Messages/RespondableMessage.php
similarity index 51%
rename from src/WebSocketServer/Messages/RespondableMessage.php
rename to src/WebSocket/Messages/RespondableMessage.php
index 17dec71..9236874 100644
--- a/src/WebSocketServer/Messages/RespondableMessage.php
+++ b/src/WebSocket/Messages/RespondableMessage.php
@@ -1,5 +1,5 @@
 <?php
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
 interface RespondableMessage
 {
diff --git a/src/WebSocketServer/Messages/RespondableMessageFactory.php b/src/WebSocket/Messages/RespondableMessageFactory.php
similarity index 72%
rename from src/WebSocketServer/Messages/RespondableMessageFactory.php
rename to src/WebSocket/Messages/RespondableMessageFactory.php
index 910aa7c..af975e5 100644
--- a/src/WebSocketServer/Messages/RespondableMessageFactory.php
+++ b/src/WebSocket/Messages/RespondableMessageFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
 
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherMessage;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherMessage;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 
diff --git a/src/WebSocketServer/Pusher/Channels/Channel.php b/src/WebSocket/Pusher/Channels/Channel.php
similarity index 95%
rename from src/WebSocketServer/Pusher/Channels/Channel.php
rename to src/WebSocket/Pusher/Channels/Channel.php
index da6740a..464c709 100644
--- a/src/WebSocketServer/Pusher/Channels/Channel.php
+++ b/src/WebSocket/Pusher/Channels/Channel.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
 use Illuminate\Support\Collection;
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSocketServer/Pusher/Channels/ChannelManager.php b/src/WebSocket/Pusher/Channels/ChannelManager.php
similarity index 95%
rename from src/WebSocketServer/Pusher/Channels/ChannelManager.php
rename to src/WebSocket/Pusher/Channels/ChannelManager.php
index 08556cf..369becc 100644
--- a/src/WebSocketServer/Pusher/Channels/ChannelManager.php
+++ b/src/WebSocket/Pusher/Channels/ChannelManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use ReflectionClass;
 use Ratchet\ConnectionInterface;
diff --git a/src/WebSocketServer/Pusher/Channels/PresenceChannel.php b/src/WebSocket/Pusher/Channels/PresenceChannel.php
similarity index 96%
rename from src/WebSocketServer/Pusher/Channels/PresenceChannel.php
rename to src/WebSocket/Pusher/Channels/PresenceChannel.php
index 26ea422..233591f 100644
--- a/src/WebSocketServer/Pusher/Channels/PresenceChannel.php
+++ b/src/WebSocket/Pusher/Channels/PresenceChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSocketServer/Pusher/Channels/PrivateChannel.php b/src/WebSocket/Pusher/Channels/PrivateChannel.php
similarity index 80%
rename from src/WebSocketServer/Pusher/Channels/PrivateChannel.php
rename to src/WebSocket/Pusher/Channels/PrivateChannel.php
index a176f9d..928e53b 100644
--- a/src/WebSocketServer/Pusher/Channels/PrivateChannel.php
+++ b/src/WebSocket/Pusher/Channels/PrivateChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSocketServer/Pusher/Dashboard.php b/src/WebSocket/Pusher/Dashboard.php
similarity index 95%
rename from src/WebSocketServer/Pusher/Dashboard.php
rename to src/WebSocket/Pusher/Dashboard.php
index 56dadf0..5bd9de4 100644
--- a/src/WebSocketServer/Pusher/Dashboard.php
+++ b/src/WebSocket/Pusher/Dashboard.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
 use Ratchet\ConnectionInterface;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use stdClass;
 
 class Dashboard
diff --git a/src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php b/src/WebSocket/Pusher/Exceptions/InvalidConnection.php
similarity index 70%
rename from src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php
rename to src/WebSocket/Pusher/Exceptions/InvalidConnection.php
index 3863df7..4b734d9 100644
--- a/src/WebSocketServer/Pusher/Exceptions/InvalidConnection.php
+++ b/src/WebSocket/Pusher/Exceptions/InvalidConnection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class InvalidConnection extends PusherException
 {
diff --git a/src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php b/src/WebSocket/Pusher/Exceptions/InvalidSignature.php
similarity index 70%
rename from src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php
rename to src/WebSocket/Pusher/Exceptions/InvalidSignature.php
index 8165683..376dea3 100644
--- a/src/WebSocketServer/Pusher/Exceptions/InvalidSignature.php
+++ b/src/WebSocket/Pusher/Exceptions/InvalidSignature.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class InvalidSignature extends PusherException
 {
diff --git a/src/WebSocketServer/Pusher/Exceptions/PusherException.php b/src/WebSocket/Pusher/Exceptions/PusherException.php
similarity index 80%
rename from src/WebSocketServer/Pusher/Exceptions/PusherException.php
rename to src/WebSocket/Pusher/Exceptions/PusherException.php
index afb2c94..6c4a419 100644
--- a/src/WebSocketServer/Pusher/Exceptions/PusherException.php
+++ b/src/WebSocket/Pusher/Exceptions/PusherException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 use Exception;
 
diff --git a/src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php b/src/WebSocket/Pusher/Exceptions/UnknownAppKey.php
similarity index 73%
rename from src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php
rename to src/WebSocket/Pusher/Exceptions/UnknownAppKey.php
index ec7ee39..2cbf0da 100644
--- a/src/WebSocketServer/Pusher/Exceptions/UnknownAppKey.php
+++ b/src/WebSocket/Pusher/Exceptions/UnknownAppKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
 
 class UnknownAppKey extends PusherException
 {
diff --git a/src/WebSocketServer/Pusher/PusherController.php b/src/WebSocket/Pusher/PusherController.php
similarity index 83%
rename from src/WebSocketServer/Pusher/PusherController.php
rename to src/WebSocket/Pusher/PusherController.php
index 062b59f..dbb2449 100644
--- a/src/WebSocketServer/Pusher/PusherController.php
+++ b/src/WebSocket/Pusher/PusherController.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessageFactory;
+use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessageFactory;
 use BeyondCode\LaravelWebSockets\QueryParameters;
 use Exception;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 use BeyondCode\LaravelWebSockets\Server\WebSocketController;
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\PusherException;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\PusherException;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
 
 class PusherController extends WebSocketController
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(ChannelManager $channelManager)
diff --git a/src/WebSocketServer/Pusher/PusherMessage.php b/src/WebSocket/Pusher/PusherMessage.php
similarity index 80%
rename from src/WebSocketServer/Pusher/PusherMessage.php
rename to src/WebSocket/Pusher/PusherMessage.php
index d9036ce..391bb4c 100644
--- a/src/WebSocketServer/Pusher/PusherMessage.php
+++ b/src/WebSocket/Pusher/PusherMessage.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocketServer\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
 
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Messages\RespondableMessage;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessage;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
 class PusherMessage implements RespondableMessage
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\stdClass */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\stdClass */
     protected $payload;
 
     /** @var \React\Socket\ConnectionInterface */
     protected $connection;
 
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager */
     protected $channelManager;
 
     public function __construct(stdClass $payload, ConnectionInterface $connection, ChannelManager $channelManager)
diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php
index a8e8853..2900c43 100644
--- a/src/WebSocketsServiceProvider.php
+++ b/src/WebSocketsServiceProvider.php
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Route;
 use BeyondCode\LaravelWebSockets\ClientProviders\ClientProvider;
 use Illuminate\Support\ServiceProvider;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 
 class WebSocketsServiceProvider extends ServiceProvider
 {
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 0189b71..40efb45 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -3,14 +3,14 @@
 namespace BeyondCode\LaravelWebSockets\Tests;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\InvalidSignature;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\Exceptions\UnknownAppKey;
-use BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
 
 class ConnectionTest extends TestCase
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSocketServer\Pusher\PusherController */
+    /** @var \BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController */
     protected $pusherServer;
 
     public function setUp()