diff --git a/src/Server/Router.php b/src/Server/Router.php
index a2977c9..34d47e1 100644
--- a/src/Server/Router.php
+++ b/src/Server/Router.php
@@ -7,7 +7,7 @@ use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelController;
 use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchChannelsController;
 use BeyondCode\LaravelWebSockets\HttpApi\Controllers\FetchUsersController;
 use BeyondCode\LaravelWebSockets\HttpApi\Controllers\TriggerEventController;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\WebSocketHandler;
+use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler;
 use Ratchet\WebSocket\MessageComponentInterface;
 use Ratchet\WebSocket\WsServer;
 use Symfony\Component\Routing\Route;
diff --git a/src/WebSockets/Controllers/WebSocketHandler.php b/src/WebSockets/WebSocketHandler.php
similarity index 97%
rename from src/WebSockets/Controllers/WebSocketHandler.php
rename to src/WebSockets/WebSocketHandler.php
index 7ceb1a6..7a6755a 100644
--- a/src/WebSockets/Controllers/WebSocketHandler.php
+++ b/src/WebSockets/WebSocketHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BeyondCode\LaravelWebSockets\WebSockets\Controllers;
+namespace BeyondCode\LaravelWebSockets\WebSockets;
 
 use BeyondCode\LaravelWebSockets\Events\ConnectionEstablished;
 use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\WebSocketException;
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index a278b7d..45c780a 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -5,12 +5,12 @@ namespace BeyondCode\LaravelWebSockets\Tests;
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\InvalidSignature;
 use BeyondCode\LaravelWebSockets\WebSockets\Exceptions\UnknownAppKey;
-use BeyondCode\LaravelWebSockets\WebSockets\Controllers\WebSocketHandler;
+use BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
 
 class ConnectionTest extends TestCase
 {
-    /** @var \BeyondCode\LaravelWebSockets\WebSockets\Controllers\WebSocketHandler */
+    /** @var \BeyondCode\LaravelWebSockets\WebSockets\WebSocketHandler */
     protected $pusherServer;
 
     public function setUp()