diff --git a/src/Dashboard/DashboardLogger.php b/src/Dashboard/DashboardLogger.php
index 6a92b66..7816a44 100644
--- a/src/Dashboard/DashboardLogger.php
+++ b/src/Dashboard/DashboardLogger.php
@@ -3,7 +3,7 @@
 namespace BeyondCode\LaravelWebSockets\Dashboard;
 
 use Ratchet\ConnectionInterface;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use stdClass;
 
 class DashboardLogger
diff --git a/src/Server/Router.php b/src/Server/Router.php
index 8a7e666..a718caf 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\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 BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchChannel;
+use BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchChannels;
+use BeyondCode\LaravelWebSockets\WebSockets\Controllers\FetchUsers;
+use BeyondCode\LaravelWebSockets\WebSockets\Controllers\TriggerEvent;
+use BeyondCode\LaravelWebSockets\WebSockets\Pusher\PusherController;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
 use Ratchet\Http\HttpServerInterface;
diff --git a/src/WebSockets/Channels/Channel.php b/src/WebSockets/Channels/Channel.php
index 4749b77..892ad1a 100644
--- a/src/WebSockets/Channels/Channel.php
+++ b/src/WebSockets/Channels/Channel.php
@@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Channels;
 use BeyondCode\LaravelWebSockets\Events\ChannelOccupied;
 use BeyondCode\LaravelWebSockets\Events\ChannelVacated;
 use BeyondCode\LaravelWebSockets\Events\SubscribedToChannel;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature;
 use Illuminate\Support\Collection;
 use Ratchet\ConnectionInterface;
 use stdClass;
diff --git a/src/WebSockets/Controllers/Controller.php b/src/WebSockets/Controllers/Controller.php
index 165d8f3..dc57fff 100644
--- a/src/WebSockets/Controllers/Controller.php
+++ b/src/WebSockets/Controllers/Controller.php
@@ -15,7 +15,7 @@ use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 
 abstract class Controller implements HttpServerInterface
 {
diff --git a/src/WebSockets/Controllers/FetchChannels.php b/src/WebSockets/Controllers/FetchChannels.php
index 6ae7232..384a6de 100644
--- a/src/WebSockets/Controllers/FetchChannels.php
+++ b/src/WebSockets/Controllers/FetchChannels.php
@@ -4,7 +4,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel;
 
 class FetchChannels extends Controller
 {
diff --git a/src/WebSockets/Controllers/FetchUsers.php b/src/WebSockets/Controllers/FetchUsers.php
index 948661c..4661738 100644
--- a/src/WebSockets/Controllers/FetchUsers.php
+++ b/src/WebSockets/Controllers/FetchUsers.php
@@ -5,7 +5,7 @@ namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\PresenceChannel;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\PresenceChannel;
 
 class FetchUsers extends Controller
 {
diff --git a/src/WebSockets/Messages/Message.php b/src/WebSockets/Messages/Message.php
index 1e4fd19..143e263 100644
--- a/src/WebSockets/Messages/Message.php
+++ b/src/WebSockets/Messages/Message.php
@@ -3,7 +3,7 @@
 namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
 use BeyondCode\LaravelWebSockets\Events\ClientMessageSent;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
diff --git a/src/WebSockets/Messages/PusherMessage.php b/src/WebSockets/Messages/PusherMessage.php
index b4ea3b1..1c0a8fa 100644
--- a/src/WebSockets/Messages/PusherMessage.php
+++ b/src/WebSockets/Messages/PusherMessage.php
@@ -2,7 +2,7 @@
 
 namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use stdClass;
 
diff --git a/src/WebSockets/Messages/RespondableMessageFactory.php b/src/WebSockets/Messages/RespondableMessageFactory.php
index b7a20cc..1ffd7fe 100644
--- a/src/WebSockets/Messages/RespondableMessageFactory.php
+++ b/src/WebSockets/Messages/RespondableMessageFactory.php
@@ -2,7 +2,7 @@
 
 namespace BeyondCode\LaravelWebSockets\WebSockets\Messages;
 
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 use Ratchet\ConnectionInterface;
 use Ratchet\RFC6455\Messaging\MessageInterface;
 
diff --git a/src/WebSockets/PusherController.php b/src/WebSockets/PusherController.php
index dac05aa..72ddd88 100644
--- a/src/WebSockets/PusherController.php
+++ b/src/WebSockets/PusherController.php
@@ -3,16 +3,16 @@
 namespace BeyondCode\LaravelWebSockets\WebSockets;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
-use BeyondCode\LaravelWebSockets\WebSocket\Messages\RespondableMessageFactory;
+use BeyondCode\LaravelWebSockets\WebSockets\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\WebSocket\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\PusherException;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\PusherException;
+use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey;
 
 class PusherController extends WebSocketController
 {
diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php
index 2900c43..e6477b7 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\WebSocket\Pusher\Channels\ChannelManager;
+use BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManager;
 
 class WebSocketsServiceProvider extends ServiceProvider
 {
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 40efb45..9fd28ea 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -3,9 +3,9 @@
 namespace BeyondCode\LaravelWebSockets\Tests;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\InvalidSignature;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\Exceptions\UnknownAppKey;
-use BeyondCode\LaravelWebSockets\WebSocket\Pusher\PusherController;
+use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature;
+use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey;
+use BeyondCode\LaravelWebSockets\WebSockets\Pusher\PusherController;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
 
 class ConnectionTest extends TestCase