diff --git a/app/Activity/Models/Webhook.php b/app/Activity/Models/Webhook.php
index 3b61ae604..2a80c71a7 100644
--- a/app/Activity/Models/Webhook.php
+++ b/app/Activity/Models/Webhook.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Activity\Models;
 
+use BookStack\Activity\ActivityType;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Activity/Tools/ActivityLogger.php b/app/Activity/Tools/ActivityLogger.php
index 1a1dd929b..105f9c408 100644
--- a/app/Activity/Tools/ActivityLogger.php
+++ b/app/Activity/Tools/ActivityLogger.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Activity\Tools;
 
+use BookStack\Activity\DispatchWebhookJob;
 use BookStack\Activity\Models\Activity;
 use BookStack\Activity\Models\Loggable;
 use BookStack\Activity\Models\Webhook;
diff --git a/database/factories/Actions/CommentFactory.php b/database/factories/Activity/Models/CommentFactory.php
similarity index 92%
rename from database/factories/Actions/CommentFactory.php
rename to database/factories/Activity/Models/CommentFactory.php
index d398bf415..4b76cd11d 100644
--- a/database/factories/Actions/CommentFactory.php
+++ b/database/factories/Activity/Models/CommentFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
diff --git a/database/factories/Actions/TagFactory.php b/database/factories/Activity/Models/TagFactory.php
similarity index 91%
rename from database/factories/Actions/TagFactory.php
rename to database/factories/Activity/Models/TagFactory.php
index 4b047eb2a..8a60c2528 100644
--- a/database/factories/Actions/TagFactory.php
+++ b/database/factories/Activity/Models/TagFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
diff --git a/database/factories/Actions/WebhookFactory.php b/database/factories/Activity/Models/WebhookFactory.php
similarity index 91%
rename from database/factories/Actions/WebhookFactory.php
rename to database/factories/Activity/Models/WebhookFactory.php
index c17cf5a09..721481a8a 100644
--- a/database/factories/Actions/WebhookFactory.php
+++ b/database/factories/Activity/Models/WebhookFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use BookStack\Activity\Models\Webhook;
 use Illuminate\Database\Eloquent\Factories\Factory;
diff --git a/database/factories/Actions/WebhookTrackedEventFactory.php b/database/factories/Activity/Models/WebhookTrackedEventFactory.php
similarity index 91%
rename from database/factories/Actions/WebhookTrackedEventFactory.php
rename to database/factories/Activity/Models/WebhookTrackedEventFactory.php
index 8e7865ff1..61f733a6b 100644
--- a/database/factories/Actions/WebhookTrackedEventFactory.php
+++ b/database/factories/Activity/Models/WebhookTrackedEventFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Actions;
+namespace Database\Factories\Activity\Models;
 
 use BookStack\Activity\ActivityType;
 use BookStack\Activity\Models\Webhook;
diff --git a/database/factories/Auth/RoleFactory.php b/database/factories/Users/Models/RoleFactory.php
similarity index 93%
rename from database/factories/Auth/RoleFactory.php
rename to database/factories/Users/Models/RoleFactory.php
index 60348ff49..2dd202a3a 100644
--- a/database/factories/Auth/RoleFactory.php
+++ b/database/factories/Users/Models/RoleFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Auth;
+namespace Database\Factories\Users\Models;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
diff --git a/database/factories/Auth/UserFactory.php b/database/factories/Users/Models/UserFactory.php
similarity index 94%
rename from database/factories/Auth/UserFactory.php
rename to database/factories/Users/Models/UserFactory.php
index ad1a5629a..83810a92a 100644
--- a/database/factories/Auth/UserFactory.php
+++ b/database/factories/Users/Models/UserFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories\Auth;
+namespace Database\Factories\Users\Models;
 
 use BookStack\Users\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;