diff --git a/src/Activities/AcceptHandler.php b/src/ActivityEventHandlers/AcceptHandler.php
similarity index 99%
rename from src/Activities/AcceptHandler.php
rename to src/ActivityEventHandlers/AcceptHandler.php
index abc757c..7602f5a 100644
--- a/src/Activities/AcceptHandler.php
+++ b/src/ActivityEventHandlers/AcceptHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ContextProvider;
diff --git a/src/Activities/ActivityEvent.php b/src/ActivityEventHandlers/ActivityEvent.php
similarity index 97%
rename from src/Activities/ActivityEvent.php
rename to src/ActivityEventHandlers/ActivityEvent.php
index abbe589..d6fcb8b 100644
--- a/src/Activities/ActivityEvent.php
+++ b/src/ActivityEventHandlers/ActivityEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Entities\ActivityPubObject;
 use Symfony\Component\EventDispatcher\Event;
diff --git a/src/Activities/AddHandler.php b/src/ActivityEventHandlers/AddHandler.php
similarity index 97%
rename from src/Activities/AddHandler.php
rename to src/ActivityEventHandlers/AddHandler.php
index bd2fdbe..677fb34 100644
--- a/src/Activities/AddHandler.php
+++ b/src/ActivityEventHandlers/AddHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ObjectsService;
diff --git a/src/Activities/AnnounceHandler.php b/src/ActivityEventHandlers/AnnounceHandler.php
similarity index 98%
rename from src/Activities/AnnounceHandler.php
rename to src/ActivityEventHandlers/AnnounceHandler.php
index 055368d..b302f79 100644
--- a/src/Activities/AnnounceHandler.php
+++ b/src/ActivityEventHandlers/AnnounceHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Entities\ActivityPubObject;
 use ActivityPub\Objects\CollectionsService;
diff --git a/src/Activities/CreateHandler.php b/src/ActivityEventHandlers/CreateHandler.php
similarity index 98%
rename from src/Activities/CreateHandler.php
rename to src/ActivityEventHandlers/CreateHandler.php
index 9ea1a1c..bb5b86a 100644
--- a/src/Activities/CreateHandler.php
+++ b/src/ActivityEventHandlers/CreateHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\IdProvider;
diff --git a/src/Activities/DeleteHandler.php b/src/ActivityEventHandlers/DeleteHandler.php
similarity index 98%
rename from src/Activities/DeleteHandler.php
rename to src/ActivityEventHandlers/DeleteHandler.php
index 6a72890..16a3987 100644
--- a/src/Activities/DeleteHandler.php
+++ b/src/ActivityEventHandlers/DeleteHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Utils\DateTimeProvider;
diff --git a/src/Activities/FollowHandler.php b/src/ActivityEventHandlers/FollowHandler.php
similarity index 98%
rename from src/Activities/FollowHandler.php
rename to src/ActivityEventHandlers/FollowHandler.php
index ce54aca..f5198a7 100644
--- a/src/Activities/FollowHandler.php
+++ b/src/ActivityEventHandlers/FollowHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\ContextProvider;
 use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/src/Activities/InboxActivityEvent.php b/src/ActivityEventHandlers/InboxActivityEvent.php
similarity index 67%
rename from src/Activities/InboxActivityEvent.php
rename to src/ActivityEventHandlers/InboxActivityEvent.php
index 9869519..bcdd5bd 100644
--- a/src/Activities/InboxActivityEvent.php
+++ b/src/ActivityEventHandlers/InboxActivityEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 class InboxActivityEvent extends ActivityEvent
 {
diff --git a/src/Activities/LikeHandler.php b/src/ActivityEventHandlers/LikeHandler.php
similarity index 98%
rename from src/Activities/LikeHandler.php
rename to src/ActivityEventHandlers/LikeHandler.php
index b5df205..29c74d7 100644
--- a/src/Activities/LikeHandler.php
+++ b/src/ActivityEventHandlers/LikeHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Entities\ActivityPubObject;
 use ActivityPub\Objects\CollectionsService;
diff --git a/src/Activities/NonActivityHandler.php b/src/ActivityEventHandlers/NonActivityHandler.php
similarity index 98%
rename from src/Activities/NonActivityHandler.php
rename to src/ActivityEventHandlers/NonActivityHandler.php
index e7834d6..ea34465 100644
--- a/src/Activities/NonActivityHandler.php
+++ b/src/ActivityEventHandlers/NonActivityHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Entities\ActivityPubObject;
 use ActivityPub\Objects\ContextProvider;
diff --git a/src/Activities/OutboxActivityEvent.php b/src/ActivityEventHandlers/OutboxActivityEvent.php
similarity index 68%
rename from src/Activities/OutboxActivityEvent.php
rename to src/ActivityEventHandlers/OutboxActivityEvent.php
index d77ee20..6b0cd89 100644
--- a/src/Activities/OutboxActivityEvent.php
+++ b/src/ActivityEventHandlers/OutboxActivityEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 class OutboxActivityEvent extends ActivityEvent
 {
diff --git a/src/Activities/RemoveHandler.php b/src/ActivityEventHandlers/RemoveHandler.php
similarity index 97%
rename from src/Activities/RemoveHandler.php
rename to src/ActivityEventHandlers/RemoveHandler.php
index 44989c8..67b2a73 100644
--- a/src/Activities/RemoveHandler.php
+++ b/src/ActivityEventHandlers/RemoveHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ObjectsService;
diff --git a/src/Activities/UpdateHandler.php b/src/ActivityEventHandlers/UpdateHandler.php
similarity index 98%
rename from src/Activities/UpdateHandler.php
rename to src/ActivityEventHandlers/UpdateHandler.php
index 69dc08f..b675f76 100644
--- a/src/Activities/UpdateHandler.php
+++ b/src/ActivityEventHandlers/UpdateHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use ActivityPub\Objects\ObjectsService;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/src/Activities/ValidationHandler.php b/src/ActivityEventHandlers/ValidationHandler.php
similarity index 98%
rename from src/Activities/ValidationHandler.php
rename to src/ActivityEventHandlers/ValidationHandler.php
index 268b832..b1382e5 100644
--- a/src/Activities/ValidationHandler.php
+++ b/src/ActivityEventHandlers/ValidationHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActivityPub\Activities;
+namespace ActivityPub\ActivityEventHandlers;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
diff --git a/src/ActivityPub.php b/src/ActivityPub.php
index 978db0c..e853137 100644
--- a/src/ActivityPub.php
+++ b/src/ActivityPub.php
@@ -4,14 +4,14 @@
 
 namespace ActivityPub;
 
-use ActivityPub\Activities\AcceptHandler;
-use ActivityPub\Activities\AddHandler;
-use ActivityPub\Activities\CreateHandler;
-use ActivityPub\Activities\DeleteHandler;
-use ActivityPub\Activities\FollowHandler;
-use ActivityPub\Activities\NonActivityHandler;
-use ActivityPub\Activities\UpdateHandler;
-use ActivityPub\Activities\ValidationHandler;
+use ActivityPub\ActivityEventHandlers\AcceptHandler;
+use ActivityPub\ActivityEventHandlers\AddHandler;
+use ActivityPub\ActivityEventHandlers\CreateHandler;
+use ActivityPub\ActivityEventHandlers\DeleteHandler;
+use ActivityPub\ActivityEventHandlers\FollowHandler;
+use ActivityPub\ActivityEventHandlers\NonActivityHandler;
+use ActivityPub\ActivityEventHandlers\UpdateHandler;
+use ActivityPub\ActivityEventHandlers\ValidationHandler;
 use ActivityPub\Auth\AuthListener;
 use ActivityPub\Auth\SignatureListener;
 use ActivityPub\Config\ActivityPubConfig;
diff --git a/src/Config/ActivityPubModule.php b/src/Config/ActivityPubModule.php
index fdbefc6..331307f 100644
--- a/src/Config/ActivityPubModule.php
+++ b/src/Config/ActivityPubModule.php
@@ -4,14 +4,14 @@
 
 namespace ActivityPub\Config;
 
-use ActivityPub\Activities\AcceptHandler;
-use ActivityPub\Activities\AddHandler;
-use ActivityPub\Activities\CreateHandler;
-use ActivityPub\Activities\DeleteHandler;
-use ActivityPub\Activities\FollowHandler;
-use ActivityPub\Activities\NonActivityHandler;
-use ActivityPub\Activities\UpdateHandler;
-use ActivityPub\Activities\ValidationHandler;
+use ActivityPub\ActivityEventHandlers\AcceptHandler;
+use ActivityPub\ActivityEventHandlers\AddHandler;
+use ActivityPub\ActivityEventHandlers\CreateHandler;
+use ActivityPub\ActivityEventHandlers\DeleteHandler;
+use ActivityPub\ActivityEventHandlers\FollowHandler;
+use ActivityPub\ActivityEventHandlers\NonActivityHandler;
+use ActivityPub\ActivityEventHandlers\UpdateHandler;
+use ActivityPub\ActivityEventHandlers\ValidationHandler;
 use ActivityPub\Auth\AuthListener;
 use ActivityPub\Auth\AuthService;
 use ActivityPub\Auth\SignatureListener;
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index 81e687d..fae08f3 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -2,8 +2,8 @@
 
 namespace ActivityPub\Controllers;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Entities\ActivityPubObject;
 use ActivityPub\Objects\ObjectsService;
 use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/test/Activities/AcceptHandlerTest.php b/test/Activities/AcceptHandlerTest.php
index 0cc822b..c561e5c 100644
--- a/test/Activities/AcceptHandlerTest.php
+++ b/test/Activities/AcceptHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\AcceptHandler;
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\AcceptHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ContextProvider;
 use ActivityPub\Objects\ObjectsService;
diff --git a/test/Activities/AddHandlerTest.php b/test/Activities/AddHandlerTest.php
index c57a95f..1325419 100644
--- a/test/Activities/AddHandlerTest.php
+++ b/test/Activities/AddHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\AddHandler;
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\AddHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Test\TestConfig\APTestCase;
diff --git a/test/Activities/AnnounceHandlerTest.php b/test/Activities/AnnounceHandlerTest.php
index c3bf110..11dc366 100644
--- a/test/Activities/AnnounceHandlerTest.php
+++ b/test/Activities/AnnounceHandlerTest.php
@@ -2,8 +2,8 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\AnnounceHandler;
-use ActivityPub\Activities\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\AnnounceHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ContextProvider;
 use ActivityPub\Objects\ObjectsService;
diff --git a/test/Activities/CreateHandlerTest.php b/test/Activities/CreateHandlerTest.php
index d384b21..3c24939 100644
--- a/test/Activities/CreateHandlerTest.php
+++ b/test/Activities/CreateHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\CreateHandler;
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\CreateHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Auth\AuthService;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ContextProvider;
diff --git a/test/Activities/DeleteHandlerTest.php b/test/Activities/DeleteHandlerTest.php
index 7ab8ed6..bd6f033 100644
--- a/test/Activities/DeleteHandlerTest.php
+++ b/test/Activities/DeleteHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\DeleteHandler;
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\DeleteHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Test\TestConfig\APTestCase;
 use ActivityPub\Test\TestUtils\TestActivityPubObject;
diff --git a/test/Activities/FollowHandlerTest.php b/test/Activities/FollowHandlerTest.php
index 670240a..626ce8f 100644
--- a/test/Activities/FollowHandlerTest.php
+++ b/test/Activities/FollowHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\FollowHandler;
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\FollowHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\ContextProvider;
 use ActivityPub\Test\TestConfig\APTestCase;
 use ActivityPub\Test\TestUtils\TestActivityPubObject;
diff --git a/test/Activities/LikeHandlerTest.php b/test/Activities/LikeHandlerTest.php
index 8c971bc..4115c6b 100644
--- a/test/Activities/LikeHandlerTest.php
+++ b/test/Activities/LikeHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\LikeHandler;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\LikeHandler;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ContextProvider;
 use ActivityPub\Objects\ObjectsService;
diff --git a/test/Activities/NonActivityHandlerTest.php b/test/Activities/NonActivityHandlerTest.php
index 6998820..addccb5 100644
--- a/test/Activities/NonActivityHandlerTest.php
+++ b/test/Activities/NonActivityHandlerTest.php
@@ -2,8 +2,8 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\NonActivityHandler;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\NonActivityHandler;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Objects\ContextProvider;
 use ActivityPub\Test\TestConfig\APTestCase;
 use ActivityPub\Test\TestUtils\TestActivityPubObject;
diff --git a/test/Activities/RemoveHandlerTest.php b/test/Activities/RemoveHandlerTest.php
index 48456c8..f373bdd 100644
--- a/test/Activities/RemoveHandlerTest.php
+++ b/test/Activities/RemoveHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
-use ActivityPub\Activities\RemoveHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\RemoveHandler;
 use ActivityPub\Objects\CollectionsService;
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Test\TestConfig\APTestCase;
diff --git a/test/Activities/UpdateHandlerTest.php b/test/Activities/UpdateHandlerTest.php
index be20dd9..29f61ca 100644
--- a/test/Activities/UpdateHandlerTest.php
+++ b/test/Activities/UpdateHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
-use ActivityPub\Activities\UpdateHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\UpdateHandler;
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Test\TestConfig\APTestCase;
 use ActivityPub\Test\TestUtils\TestActivityPubObject;
diff --git a/test/Activities/ValidationHandlerTest.php b/test/Activities/ValidationHandlerTest.php
index f1f9888..980a187 100644
--- a/test/Activities/ValidationHandlerTest.php
+++ b/test/Activities/ValidationHandlerTest.php
@@ -2,9 +2,9 @@
 
 namespace ActivityPub\Test\Activities;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
-use ActivityPub\Activities\ValidationHandler;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\ValidationHandler;
 use ActivityPub\Test\TestConfig\APTestCase;
 use ActivityPub\Test\TestUtils\TestActivityPubObject;
 use Symfony\Component\EventDispatcher\EventDispatcher;
diff --git a/test/Controllers/PostControllerTest.php b/test/Controllers/PostControllerTest.php
index 5ed30e9..1f9efd7 100644
--- a/test/Controllers/PostControllerTest.php
+++ b/test/Controllers/PostControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace ActivityPub\Test\Controllers;
 
-use ActivityPub\Activities\InboxActivityEvent;
-use ActivityPub\Activities\OutboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\InboxActivityEvent;
+use ActivityPub\ActivityEventHandlers\OutboxActivityEvent;
 use ActivityPub\Controllers\PostController;
 use ActivityPub\Objects\ObjectsService;
 use ActivityPub\Test\TestConfig\APTestCase;