diff --git a/src/WebSocket/Controllers/Controller.php b/src/WebSockets/Controllers/Controller.php
similarity index 98%
rename from src/WebSocket/Controllers/Controller.php
rename to src/WebSockets/Controllers/Controller.php
index 0143018..165d8f3 100644
--- a/src/WebSocket/Controllers/Controller.php
+++ b/src/WebSockets/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\Events\ExceptionThrown;
diff --git a/src/WebSocket/Controllers/FetchChannel.php b/src/WebSockets/Controllers/FetchChannel.php
similarity index 87%
rename from src/WebSocket/Controllers/FetchChannel.php
rename to src/WebSockets/Controllers/FetchChannel.php
index acb6eb8..fce1430 100644
--- a/src/WebSocket/Controllers/FetchChannel.php
+++ b/src/WebSockets/Controllers/FetchChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/src/WebSocket/Controllers/FetchChannels.php b/src/WebSockets/Controllers/FetchChannels.php
similarity index 93%
rename from src/WebSocket/Controllers/FetchChannels.php
rename to src/WebSockets/Controllers/FetchChannels.php
index 46e2b2b..6ae7232 100644
--- a/src/WebSocket/Controllers/FetchChannels.php
+++ b/src/WebSockets/Controllers/FetchChannels.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
diff --git a/src/WebSocket/Controllers/FetchUsers.php b/src/WebSockets/Controllers/FetchUsers.php
similarity index 93%
rename from src/WebSocket/Controllers/FetchUsers.php
rename to src/WebSockets/Controllers/FetchUsers.php
index ab071ef..948661c 100644
--- a/src/WebSocket/Controllers/FetchUsers.php
+++ b/src/WebSockets/Controllers/FetchUsers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
diff --git a/src/WebSocket/Controllers/TriggerEvent.php b/src/WebSockets/Controllers/TriggerEvent.php
similarity index 93%
rename from src/WebSocket/Controllers/TriggerEvent.php
rename to src/WebSockets/Controllers/TriggerEvent.php
index 08ce8ce..59aeb84 100644
--- a/src/WebSocket/Controllers/TriggerEvent.php
+++ b/src/WebSockets/Controllers/TriggerEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use BeyondCode\LaravelWebSockets\Events\ApiMessageSent;
 use Illuminate\Http\Request;
diff --git a/src/WebSocket/Messages/Message.php b/src/WebSockets/Messages/Message.php
similarity index 94%
rename from src/WebSocket/Messages/Message.php
rename to src/WebSockets/Messages/Message.php
index acf5cd5..1e4fd19 100644
--- a/src/WebSocket/Messages/Message.php
+++ b/src/WebSockets/Messages/Message.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
 use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
diff --git a/src/WebSocket/Messages/RespondableMessage.php b/src/WebSockets/Messages/RespondableMessage.php
similarity index 53%
rename from src/WebSocket/Messages/RespondableMessage.php
rename to src/WebSockets/Messages/RespondableMessage.php
index 9236874..a04f401 100644
--- a/src/WebSocket/Messages/RespondableMessage.php
+++ b/src/WebSockets/Messages/RespondableMessage.php
@@ -1,5 +1,5 @@
 <?php
-namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
 interface RespondableMessage
 {
diff --git a/src/WebSocket/Messages/RespondableMessageFactory.php b/src/WebSockets/Messages/RespondableMessageFactory.php
similarity index 92%
rename from src/WebSocket/Messages/RespondableMessageFactory.php
rename to src/WebSockets/Messages/RespondableMessageFactory.php
index af975e5..9c25fc5 100644
--- a/src/WebSocket/Messages/RespondableMessageFactory.php
+++ b/src/WebSockets/Messages/RespondableMessageFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Messages;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
 use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherMessage;
diff --git a/src/WebSocket/Pusher/Channels/Channel.php b/src/WebSockets/Pusher/Channels/Channel.php
similarity index 97%
rename from src/WebSocket/Pusher/Channels/Channel.php
rename to src/WebSockets/Pusher/Channels/Channel.php
index 464c709..a70a5af 100644
--- a/src/WebSocket/Pusher/Channels/Channel.php
+++ b/src/WebSockets/Pusher/Channels/Channel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
 
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
diff --git a/src/WebSocket/Pusher/Channels/ChannelManager.php b/src/WebSockets/Pusher/Channels/ChannelManager.php
similarity index 96%
rename from src/WebSocket/Pusher/Channels/ChannelManager.php
rename to src/WebSockets/Pusher/Channels/ChannelManager.php
index 369becc..7a18a45 100644
--- a/src/WebSocket/Pusher/Channels/ChannelManager.php
+++ b/src/WebSockets/Pusher/Channels/ChannelManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
 
 use ReflectionClass;
 use Ratchet\ConnectionInterface;
diff --git a/src/WebSocket/Pusher/Channels/PresenceChannel.php b/src/WebSockets/Pusher/Channels/PresenceChannel.php
similarity index 96%
rename from src/WebSocket/Pusher/Channels/PresenceChannel.php
rename to src/WebSockets/Pusher/Channels/PresenceChannel.php
index 233591f..93faf6b 100644
--- a/src/WebSocket/Pusher/Channels/PresenceChannel.php
+++ b/src/WebSockets/Pusher/Channels/PresenceChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSocket/Pusher/Channels/PrivateChannel.php b/src/WebSockets/Pusher/Channels/PrivateChannel.php
similarity index 81%
rename from src/WebSocket/Pusher/Channels/PrivateChannel.php
rename to src/WebSockets/Pusher/Channels/PrivateChannel.php
index 928e53b..fa03831 100644
--- a/src/WebSocket/Pusher/Channels/PrivateChannel.php
+++ b/src/WebSockets/Pusher/Channels/PrivateChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSocket/Pusher/DashboardLogger.php b/src/WebSockets/Pusher/DashboardLogger.php
similarity index 98%
rename from src/WebSocket/Pusher/DashboardLogger.php
rename to src/WebSockets/Pusher/DashboardLogger.php
index 6f81ceb..5880ad7 100644
--- a/src/WebSocket/Pusher/DashboardLogger.php
+++ b/src/WebSockets/Pusher/DashboardLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher;
 
 use Ratchet\ConnectionInterface;
 use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
diff --git a/src/WebSocket/Pusher/Exceptions/InvalidConnection.php b/src/WebSockets/Pusher/Exceptions/InvalidConnection.php
similarity index 72%
rename from src/WebSocket/Pusher/Exceptions/InvalidConnection.php
rename to src/WebSockets/Pusher/Exceptions/InvalidConnection.php
index 4b734d9..517b566 100644
--- a/src/WebSocket/Pusher/Exceptions/InvalidConnection.php
+++ b/src/WebSockets/Pusher/Exceptions/InvalidConnection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
 
 class InvalidConnection extends PusherException
 {
diff --git a/src/WebSocket/Pusher/Exceptions/InvalidSignature.php b/src/WebSockets/Pusher/Exceptions/InvalidSignature.php
similarity index 71%
rename from src/WebSocket/Pusher/Exceptions/InvalidSignature.php
rename to src/WebSockets/Pusher/Exceptions/InvalidSignature.php
index 376dea3..9174db5 100644
--- a/src/WebSocket/Pusher/Exceptions/InvalidSignature.php
+++ b/src/WebSockets/Pusher/Exceptions/InvalidSignature.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
 
 class InvalidSignature extends PusherException
 {
diff --git a/src/WebSocket/Pusher/Exceptions/PusherException.php b/src/WebSockets/Pusher/Exceptions/PusherException.php
similarity index 81%
rename from src/WebSocket/Pusher/Exceptions/PusherException.php
rename to src/WebSockets/Pusher/Exceptions/PusherException.php
index 6c4a419..0424fea 100644
--- a/src/WebSocket/Pusher/Exceptions/PusherException.php
+++ b/src/WebSockets/Pusher/Exceptions/PusherException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
 
 use Exception;
 
diff --git a/src/WebSocket/Pusher/Exceptions/UnknownAppKey.php b/src/WebSockets/Pusher/Exceptions/UnknownAppKey.php
similarity index 74%
rename from src/WebSocket/Pusher/Exceptions/UnknownAppKey.php
rename to src/WebSockets/Pusher/Exceptions/UnknownAppKey.php
index 2cbf0da..cb32154 100644
--- a/src/WebSocket/Pusher/Exceptions/UnknownAppKey.php
+++ b/src/WebSockets/Pusher/Exceptions/UnknownAppKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
 
 class UnknownAppKey extends PusherException
 {
diff --git a/src/WebSocket/Pusher/PusherController.php b/src/WebSockets/Pusher/PusherController.php
similarity index 97%
rename from src/WebSocket/Pusher/PusherController.php
rename to src/WebSockets/Pusher/PusherController.php
index dbb2449..37846ad 100644
--- a/src/WebSocket/Pusher/PusherController.php
+++ b/src/WebSockets/Pusher/PusherController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessageFactory;
diff --git a/src/WebSocket/Pusher/PusherMessage.php b/src/WebSockets/Pusher/PusherMessage.php
similarity index 97%
rename from src/WebSocket/Pusher/PusherMessage.php
rename to src/WebSockets/Pusher/PusherMessage.php
index 391bb4c..5ce7d79 100644
--- a/src/WebSocket/Pusher/PusherMessage.php
+++ b/src/WebSockets/Pusher/PusherMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSocket\Pusher;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher;
 
 use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
 use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessage;