diff --git a/app/Concerns/HasMentions.php b/app/Concerns/HasMentions.php
index 80c438d19..e2ffa3ac5 100644
--- a/app/Concerns/HasMentions.php
+++ b/app/Concerns/HasMentions.php
@@ -2,7 +2,7 @@
 
 namespace App\Concerns;
 
-use App\Models\ReplyAble;
+use App\Contracts\ReplyAble;
 use App\Models\User;
 use Illuminate\Support\Collection;
 
diff --git a/app/Models/MentionAble.php b/app/Contracts/MentionAble.php
similarity index 85%
rename from app/Models/MentionAble.php
rename to app/Contracts/MentionAble.php
index b381cd0ff..16de97ece 100644
--- a/app/Models/MentionAble.php
+++ b/app/Contracts/MentionAble.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Contracts;
 
+use App\Models\User;
 use Illuminate\Support\Collection;
 
 interface MentionAble
diff --git a/app/Models/ReplyAble.php b/app/Contracts/ReplyAble.php
similarity index 95%
rename from app/Models/ReplyAble.php
rename to app/Contracts/ReplyAble.php
index cd463e518..6ba54535d 100644
--- a/app/Models/ReplyAble.php
+++ b/app/Contracts/ReplyAble.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Contracts;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
diff --git a/app/Models/SubscriptionAble.php b/app/Contracts/SubscriptionAble.php
similarity index 86%
rename from app/Models/SubscriptionAble.php
rename to app/Contracts/SubscriptionAble.php
index e7d192737..e5a5edc27 100644
--- a/app/Models/SubscriptionAble.php
+++ b/app/Contracts/SubscriptionAble.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Contracts;
 
+use App\Models\User;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 interface SubscriptionAble
diff --git a/app/Http/Controllers/ReplyController.php b/app/Http/Controllers/ReplyController.php
index c8fd824a2..9d927d186 100644
--- a/app/Http/Controllers/ReplyController.php
+++ b/app/Http/Controllers/ReplyController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Contracts\ReplyAble;
 use App\Http\Requests\CreateReplyRequest;
 use App\Jobs\CreateReply;
 use App\Jobs\DeleteReply;
 use App\Models\Reply;
-use App\Models\ReplyAble;
 use App\Models\Thread;
 use App\Policies\ReplyPolicy;
 use Illuminate\Auth\Middleware\Authenticate;
diff --git a/app/Http/Requests/CreateReplyRequest.php b/app/Http/Requests/CreateReplyRequest.php
index ce2f0b127..ef234b423 100644
--- a/app/Http/Requests/CreateReplyRequest.php
+++ b/app/Http/Requests/CreateReplyRequest.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Models\ReplyAble;
+use App\Contracts\ReplyAble;
 use App\Models\Thread;
 use App\Models\User;
 use App\Rules\HttpImageRule;
diff --git a/app/Jobs/CreateReply.php b/app/Jobs/CreateReply.php
index a0bd3c87f..7979ce89e 100644
--- a/app/Jobs/CreateReply.php
+++ b/app/Jobs/CreateReply.php
@@ -2,12 +2,12 @@
 
 namespace App\Jobs;
 
+use App\Contracts\ReplyAble;
+use App\Contracts\SubscriptionAble;
 use App\Events\ReplyWasCreated;
 use App\Http\Requests\CreateReplyRequest;
 use App\Models\Reply;
-use App\Models\ReplyAble;
 use App\Models\Subscription;
-use App\Models\SubscriptionAble;
 use App\Models\User;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
diff --git a/app/Jobs/SubscribeToSubscriptionAble.php b/app/Jobs/SubscribeToSubscriptionAble.php
index 253931def..018b8b659 100644
--- a/app/Jobs/SubscribeToSubscriptionAble.php
+++ b/app/Jobs/SubscribeToSubscriptionAble.php
@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
+use App\Contracts\SubscriptionAble;
 use App\Models\Subscription;
-use App\Models\SubscriptionAble;
 use App\Models\User;
 use Ramsey\Uuid\Uuid;
 
diff --git a/app/Jobs/UnsubscribeFromSubscriptionAble.php b/app/Jobs/UnsubscribeFromSubscriptionAble.php
index aa4e56d01..a9ea58302 100644
--- a/app/Jobs/UnsubscribeFromSubscriptionAble.php
+++ b/app/Jobs/UnsubscribeFromSubscriptionAble.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Models\SubscriptionAble;
+use App\Contracts\SubscriptionAble;
 use App\Models\User;
 
 final class UnsubscribeFromSubscriptionAble
diff --git a/app/Mail/MentionEmail.php b/app/Mail/MentionEmail.php
index ee816f6a0..e40f2cbf6 100644
--- a/app/Mail/MentionEmail.php
+++ b/app/Mail/MentionEmail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail;
 
-use App\Models\MentionAble;
+use App\Contracts\MentionAble;
 use App\Models\User;
 use Illuminate\Mail\Mailable;
 
diff --git a/app/Models/Reply.php b/app/Models/Reply.php
index c81f1353a..ce7d6e4a5 100644
--- a/app/Models/Reply.php
+++ b/app/Models/Reply.php
@@ -7,6 +7,8 @@
 use App\Concerns\HasMentions;
 use App\Concerns\HasTimestamps;
 use App\Concerns\HasUuid;
+use App\Contracts\MentionAble;
+use App\Contracts\ReplyAble;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index c038dcc46..a8944a094 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Concerns\HasUuid;
+use App\Contracts\SubscriptionAble;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/Thread.php b/app/Models/Thread.php
index 249411119..eca137549 100644
--- a/app/Models/Thread.php
+++ b/app/Models/Thread.php
@@ -12,6 +12,9 @@
 use App\Concerns\PreparesSearch;
 use App\Concerns\ProvidesSubscriptions;
 use App\Concerns\ReceivesReplies;
+use App\Contracts\MentionAble;
+use App\Contracts\ReplyAble;
+use App\Contracts\SubscriptionAble;
 use App\Exceptions\CouldNotMarkReplyAsSolution;
 use Exception;
 use Illuminate\Contracts\Pagination\Paginator;
diff --git a/app/Notifications/MentionNotification.php b/app/Notifications/MentionNotification.php
index 9f8661f12..bccc601b5 100644
--- a/app/Notifications/MentionNotification.php
+++ b/app/Notifications/MentionNotification.php
@@ -2,8 +2,8 @@
 
 namespace App\Notifications;
 
+use App\Contracts\MentionAble;
 use App\Mail\MentionEmail;
-use App\Models\MentionAble;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;