diff --git a/src/WebSockets/Pusher/Channels/Channel.php b/src/WebSockets/Channels/Channel.php
similarity index 97%
rename from src/WebSockets/Pusher/Channels/Channel.php
rename to src/WebSockets/Channels/Channel.php
index a70a5af..4749b77 100644
--- a/src/WebSockets/Pusher/Channels/Channel.php
+++ b/src/WebSockets/Channels/Channel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Channels;
 
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
diff --git a/src/WebSockets/Pusher/Channels/ChannelManager.php b/src/WebSockets/Channels/ChannelManager.php
similarity index 96%
rename from src/WebSockets/Pusher/Channels/ChannelManager.php
rename to src/WebSockets/Channels/ChannelManager.php
index 7a18a45..765bc23 100644
--- a/src/WebSockets/Pusher/Channels/ChannelManager.php
+++ b/src/WebSockets/Channels/ChannelManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Channels;
 
 use ReflectionClass;
 use Ratchet\ConnectionInterface;
diff --git a/src/WebSockets/Pusher/Channels/PresenceChannel.php b/src/WebSockets/Channels/PresenceChannel.php
similarity index 96%
rename from src/WebSockets/Pusher/Channels/PresenceChannel.php
rename to src/WebSockets/Channels/PresenceChannel.php
index 93faf6b..be37a27 100644
--- a/src/WebSockets/Pusher/Channels/PresenceChannel.php
+++ b/src/WebSockets/Channels/PresenceChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSockets/Pusher/Channels/PrivateChannel.php b/src/WebSockets/Channels/PrivateChannel.php
similarity index 81%
rename from src/WebSockets/Pusher/Channels/PrivateChannel.php
rename to src/WebSockets/Channels/PrivateChannel.php
index fa03831..d758ed1 100644
--- a/src/WebSockets/Pusher/Channels/PrivateChannel.php
+++ b/src/WebSockets/Channels/PrivateChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Channels;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Channels;
 
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSockets/Pusher/Exceptions/InvalidConnection.php b/src/WebSockets/Exceptions/InvalidConnection.php
similarity index 52%
rename from src/WebSockets/Pusher/Exceptions/InvalidConnection.php
rename to src/WebSockets/Exceptions/InvalidConnection.php
index 517b566..bbad9e3 100644
--- a/src/WebSockets/Pusher/Exceptions/InvalidConnection.php
+++ b/src/WebSockets/Exceptions/InvalidConnection.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Exceptions;
 
-class InvalidConnection extends PusherException
+class InvalidConnection extends WebSocketException
 {
     public function __construct()
     {
diff --git a/src/WebSockets/Pusher/Exceptions/InvalidSignature.php b/src/WebSockets/Exceptions/InvalidSignature.php
similarity index 52%
rename from src/WebSockets/Pusher/Exceptions/InvalidSignature.php
rename to src/WebSockets/Exceptions/InvalidSignature.php
index 9174db5..2341bb5 100644
--- a/src/WebSockets/Pusher/Exceptions/InvalidSignature.php
+++ b/src/WebSockets/Exceptions/InvalidSignature.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Exceptions;
 
-class InvalidSignature extends PusherException
+class InvalidSignature extends WebSocketException
 {
     public function __construct()
     {
diff --git a/src/WebSockets/Pusher/Exceptions/UnknownAppKey.php b/src/WebSockets/Exceptions/UnknownAppKey.php
similarity index 58%
rename from src/WebSockets/Pusher/Exceptions/UnknownAppKey.php
rename to src/WebSockets/Exceptions/UnknownAppKey.php
index cb32154..7f5285e 100644
--- a/src/WebSockets/Pusher/Exceptions/UnknownAppKey.php
+++ b/src/WebSockets/Exceptions/UnknownAppKey.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Exceptions;
 
-class UnknownAppKey extends PusherException
+class UnknownAppKey extends WebSocketException
 {
     public function __construct(string $appKey)
     {
diff --git a/src/WebSockets/Pusher/Exceptions/PusherException.php b/src/WebSockets/Exceptions/WebSocketException.php
similarity index 70%
rename from src/WebSockets/Pusher/Exceptions/PusherException.php
rename to src/WebSockets/Exceptions/WebSocketException.php
index 0424fea..3832e12 100644
--- a/src/WebSockets/Pusher/Exceptions/PusherException.php
+++ b/src/WebSockets/Exceptions/WebSocketException.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Pusher\Exceptions;
+namespace BeyondCode\LaravelWebSockets\WebSockets\Exceptions;
 
 use Exception;
 
-class PusherException extends Exception
+class WebSocketException extends Exception
 {
     public function getPayload()
     {