diff --git a/README.md b/README.md
index fc0ba3b..203bc2f 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,6 @@ Take a look at `src/Daemon.php` and `src/Http/Server.php` depending on how much
 
 * [ ] WebSocket distributor
   * [ ] WebSocket authentication
-  * [x] Setup subscriptions
-  * [x] Dynamic subscriptions
-  * [x] Distribute events over WS
 * [ ] HTTP middleware unittests
 * [ ] Replay missed events based on event id
 * [ ] Metrics endpoint
diff --git a/src/Broker/SseSubscriber.php b/src/Broker/Subscriber/SseSubscriber.php
similarity index 90%
rename from src/Broker/SseSubscriber.php
rename to src/Broker/Subscriber/SseSubscriber.php
index 2c532e3..b2967f1 100644
--- a/src/Broker/SseSubscriber.php
+++ b/src/Broker/Subscriber/SseSubscriber.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace NoccyLabs\Mercureact\Broker;
+namespace NoccyLabs\Mercureact\Broker\Subscriber;
 
+use NoccyLabs\Mercureact\Broker\Message;
 use NoccyLabs\SimpleJWT\JWTToken;
 use Psr\Http\Message\ServerRequestInterface;
 use React\Stream\WritableStreamInterface;
diff --git a/src/Broker/SubscriberInterface.php b/src/Broker/Subscriber/SubscriberInterface.php
similarity index 70%
rename from src/Broker/SubscriberInterface.php
rename to src/Broker/Subscriber/SubscriberInterface.php
index 4dd9d97..b25e34d 100644
--- a/src/Broker/SubscriberInterface.php
+++ b/src/Broker/Subscriber/SubscriberInterface.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace NoccyLabs\Mercureact\Broker;
+namespace NoccyLabs\Mercureact\Broker\Subscriber;
+
+use NoccyLabs\Mercureact\Broker\Message;
 
 interface SubscriberInterface
 {
diff --git a/src/Broker/WsSubscriber.php b/src/Broker/Subscriber/WsSubscriber.php
similarity index 94%
rename from src/Broker/WsSubscriber.php
rename to src/Broker/Subscriber/WsSubscriber.php
index 7e55ccd..0bb1060 100644
--- a/src/Broker/WsSubscriber.php
+++ b/src/Broker/Subscriber/WsSubscriber.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace NoccyLabs\Mercureact\Broker;
+namespace NoccyLabs\Mercureact\Broker\Subscriber;
 
 use Evenement\EventEmitterInterface;
 use Evenement\EventEmitterTrait;
+use NoccyLabs\Mercureact\Broker\Message;
+use NoccyLabs\Mercureact\Broker\TopicManager;
 use NoccyLabs\React\WebSocket\WebSocketConnection;
 use NoccyLabs\SimpleJWT\JWTToken;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Broker/Topic.php b/src/Broker/Topic.php
index 4d57e06..048ad80 100644
--- a/src/Broker/Topic.php
+++ b/src/Broker/Topic.php
@@ -2,6 +2,7 @@
 
 namespace NoccyLabs\Mercureact\Broker;
 
+use NoccyLabs\Mercureact\Broker\Subscriber\SubscriberInterface;
 use SplObjectStorage;
 
 class Topic
diff --git a/src/Broker/TopicManager.php b/src/Broker/TopicManager.php
index f99ec34..7cf3e8f 100644
--- a/src/Broker/TopicManager.php
+++ b/src/Broker/TopicManager.php
@@ -2,6 +2,7 @@
 
 namespace NoccyLabs\Mercureact\Broker;
 
+use NoccyLabs\Mercureact\Broker\Subscriber\SubscriberInterface;
 use Psr\Log\LoggerInterface;
 use SplObjectStorage;
 
diff --git a/src/Http/Middleware/MercureHandler.php b/src/Http/Middleware/MercureHandler.php
index 2027343..a07fca7 100644
--- a/src/Http/Middleware/MercureHandler.php
+++ b/src/Http/Middleware/MercureHandler.php
@@ -3,7 +3,7 @@
 namespace NoccyLabs\Mercureact\Http\Middleware;
 
 use NoccyLabs\Mercureact\Broker\Message;
-use NoccyLabs\Mercureact\Broker\SseSubscriber;
+use NoccyLabs\Mercureact\Broker\Subscriber\SseSubscriber;
 use NoccyLabs\Mercureact\Broker\TopicManager;
 use NoccyLabs\Mercureact\Configuration;
 use NoccyLabs\Mercureact\Exception\RequestException;
diff --git a/src/Http/Middleware/WebSocketHandler.php b/src/Http/Middleware/WebSocketHandler.php
index 13d5c48..e0bd0e7 100644
--- a/src/Http/Middleware/WebSocketHandler.php
+++ b/src/Http/Middleware/WebSocketHandler.php
@@ -3,7 +3,7 @@
 namespace NoccyLabs\Mercureact\Http\Middleware;
 
 use NoccyLabs\Mercureact\Broker\TopicManager;
-use NoccyLabs\Mercureact\Broker\WsSubscriber;
+use NoccyLabs\Mercureact\Broker\Subscriber\WsSubscriber;
 use NoccyLabs\Mercureact\Configuration;
 use NoccyLabs\React\WebSocket\WebSocketConnection;
 use NoccyLabs\React\WebSocket\WebSocketMiddleware;
diff --git a/tests/Broker/TopicTest.php b/tests/Broker/TopicTest.php
index b8e98ec..e5bf3ff 100644
--- a/tests/Broker/TopicTest.php
+++ b/tests/Broker/TopicTest.php
@@ -2,6 +2,7 @@
 
 namespace NoccyLabs\Mercureact\Broker;
 
+use NoccyLabs\Mercureact\Broker\Subscriber\SubscriberInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 
 #[CoversClass(Topic::class)]