diff --git a/composer.json b/composer.json
index 7604c8e..f269718 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/contracts": ">=10.0 <14.0",
+        "illuminate/contracts": "^10.0 || ^11.0 || ^12.0",
         "laravel/helpers": "^1.7.0",
         "spatie/laravel-package-tools": "^1.15.0"
     },
@@ -41,13 +41,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Backstage\\Mails\\": "src",
-            "Backstage\\Mails\\Database\\Factories\\": "database/factories"
+            "Backstage\\Mails\\Laravel\\": "src",
+            "Backstage\\Mails\\Laravel\\Database\\Factories\\": "database/factories"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Backstage\\Mails\\Tests\\": "tests"
+            "Backstage\\Mails\\Laravel\\Tests\\": "tests"
         },
         "files": [
             "helpers.php"
@@ -74,7 +74,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Backstage\\Mails\\MailsServiceProvider"
+                "Backstage\\Mails\\Laravel\\MailsServiceProvider"
             ]
         }
     },
diff --git a/config/mails.php b/config/mails.php
index a4483d1..934e322 100644
--- a/config/mails.php
+++ b/config/mails.php
@@ -1,8 +1,8 @@
 <?php
 
-use Backstage\Mails\Models\Mail;
-use Backstage\Mails\Models\MailAttachment;
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\Mail;
+use Backstage\Mails\Laravel\Models\MailAttachment;
+use Backstage\Mails\Laravel\Models\MailEvent;
 
 return [
 
diff --git a/database/factories/MailAttachmentFactory.php b/database/factories/MailAttachmentFactory.php
index 15649b3..eb425de 100644
--- a/database/factories/MailAttachmentFactory.php
+++ b/database/factories/MailAttachmentFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Database\Factories;
+namespace Backstage\Mails\Laravel\Database\Factories;
 
-use Backstage\Mails\Models\MailAttachment;
+use Backstage\Mails\Laravel\Models\MailAttachment;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class MailAttachmentFactory extends Factory
diff --git a/database/factories/MailEventFactory.php b/database/factories/MailEventFactory.php
index 8b2308c..d37c903 100644
--- a/database/factories/MailEventFactory.php
+++ b/database/factories/MailEventFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Database\Factories;
+namespace Backstage\Mails\Laravel\Database\Factories;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class MailEventFactory extends Factory
diff --git a/database/factories/MailFactory.php b/database/factories/MailFactory.php
index 068eb6d..595cc61 100644
--- a/database/factories/MailFactory.php
+++ b/database/factories/MailFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Database\Factories;
+namespace Backstage\Mails\Laravel\Database\Factories;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class MailFactory extends Factory
diff --git a/helpers.php b/helpers.php
index 076fa85..7cce709 100644
--- a/helpers.php
+++ b/helpers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails;
+namespace Backstage\Mails\Laravel;
 
-use Backstage\Mails\Shared\Terminal;
+use Backstage\Mails\Laravel\Shared\Terminal;
 
 if (! function_exists('console')) {
     function console(): Terminal
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 4b6b16d..b878bfe 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -1,6 +1,6 @@
 <?php
 
-use Backstage\Mails\Controllers\WebhookController;
+use Backstage\Mails\Laravel\Controllers\WebhookController;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Support\Facades\Route;
 
diff --git a/src/Actions/AttachUuid.php b/src/Actions/AttachUuid.php
index 1657bce..cbb315c 100644
--- a/src/Actions/AttachUuid.php
+++ b/src/Actions/AttachUuid.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
-use Backstage\Mails\Facades\MailProvider;
-use Backstage\Mails\Shared\AsAction;
+use Backstage\Mails\Laravel\Facades\MailProvider;
+use Backstage\Mails\Laravel\Shared\AsAction;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Support\Str;
 
@@ -13,7 +13,9 @@ class AttachUuid
 
     public function handle(MessageSending $messageSending): MessageSending
     {
-        if (! config('mails.logging.enabled')) {
+        $provider = $this->getProvider($messageSending);
+
+        if (! $this->shouldTrackMails($provider)) {
             return $messageSending;
         }
 
@@ -21,12 +23,6 @@ public function handle(MessageSending $messageSending): MessageSending
 
         $messageSending->message->getHeaders()->addTextHeader(config('mails.headers.uuid'), $uuid);
 
-        $provider = $this->getProvider($messageSending);
-
-        if (! $this->shouldTrackMails($provider)) {
-            return $messageSending;
-        }
-
         return MailProvider::with($provider)->attachUuidToMail($messageSending, $uuid);
     }
 
diff --git a/src/Actions/LogMail.php b/src/Actions/LogMail.php
index 0b581d1..e75d45b 100644
--- a/src/Actions/LogMail.php
+++ b/src/Actions/LogMail.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Models\Mail;
-use Backstage\Mails\Shared\AsAction;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Models\Mail;
+use Backstage\Mails\Laravel\Shared\AsAction;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Mail\Events\MessageSent;
 use Illuminate\Support\Collection;
@@ -98,7 +98,7 @@ public function getMandatoryAttributes(MessageSending|MessageSent $event): array
     {
         return [
             'uuid' => $this->getCustomUuid($event),
-            'mail_class' => $event->data['__laravel_mailable'] ?? null,
+            // 'mail_class' => $this->getMailClassHeaderValue($event),
             'sent_at' => $event instanceof MessageSent ? now() : null,
             'mailer' => $event->data['mailer'],
             'stream_id' => $this->getStreamId($event),
diff --git a/src/Actions/RegisterWebhooks.php b/src/Actions/RegisterWebhooks.php
index 420e468..9cb7cf4 100644
--- a/src/Actions/RegisterWebhooks.php
+++ b/src/Actions/RegisterWebhooks.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
-use Backstage\Mails\Facades\MailProvider;
-use Backstage\Mails\Shared\AsAction;
+use Backstage\Mails\Laravel\Facades\MailProvider;
+use Backstage\Mails\Laravel\Shared\AsAction;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\View\Components\Factory;
 
diff --git a/src/Actions/RelateMailToModels.php b/src/Actions/RelateMailToModels.php
index d76301c..088951c 100644
--- a/src/Actions/RelateMailToModels.php
+++ b/src/Actions/RelateMailToModels.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
 class RelateMailToModels
 {
diff --git a/src/Actions/ResendMail.php b/src/Actions/ResendMail.php
index 4403c80..6b4af1e 100644
--- a/src/Actions/ResendMail.php
+++ b/src/Actions/ResendMail.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
-use Backstage\Mails\Jobs\ResendMailJob;
-use Backstage\Mails\Models\Mail as Mailable;
-use Backstage\Mails\Shared\AsAction;
+use Backstage\Mails\Laravel\Jobs\ResendMailJob;
+use Backstage\Mails\Laravel\Models\Mail as Mailable;
+use Backstage\Mails\Laravel\Shared\AsAction;
 
 class ResendMail
 {
diff --git a/src/Actions/SendHighBounceRateNotifications.php b/src/Actions/SendHighBounceRateNotifications.php
index 900b992..1dc57b9 100644
--- a/src/Actions/SendHighBounceRateNotifications.php
+++ b/src/Actions/SendHighBounceRateNotifications.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Actions;
+namespace Backstage\Mails\Laravel\Actions;
 
-use Backstage\Mails\Notifications\HighBounceRateNotification;
-use Backstage\Mails\Shared\AsAction;
-use Backstage\Mails\Traits\SendsNotifications;
+use Backstage\Mails\Laravel\Notifications\HighBounceRateNotification;
+use Backstage\Mails\Laravel\Shared\AsAction;
+use Backstage\Mails\Laravel\Traits\SendsNotifications;
 
 class SendHighBounceRateNotifications
 {
diff --git a/src/Commands/CheckBounceRateCommand.php b/src/Commands/CheckBounceRateCommand.php
index 020866a..aadd112 100644
--- a/src/Commands/CheckBounceRateCommand.php
+++ b/src/Commands/CheckBounceRateCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Commands;
+namespace Backstage\Mails\Laravel\Commands;
 
-use Backstage\Mails\Actions\SendHighBounceRateNotifications;
+use Backstage\Mails\Laravel\Actions\SendHighBounceRateNotifications;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Commands/MonitorMailCommand.php b/src/Commands/MonitorMailCommand.php
index b0d2a94..bd01e41 100644
--- a/src/Commands/MonitorMailCommand.php
+++ b/src/Commands/MonitorMailCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Commands;
+namespace Backstage\Mails\Laravel\Commands;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Console\Command;
 
 class MonitorMailCommand extends Command
diff --git a/src/Commands/PruneMailCommand.php b/src/Commands/PruneMailCommand.php
index be1fae9..dd97154 100644
--- a/src/Commands/PruneMailCommand.php
+++ b/src/Commands/PruneMailCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Commands;
+namespace Backstage\Mails\Laravel\Commands;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Console\Command;
 
 class PruneMailCommand extends Command
diff --git a/src/Commands/ResendMailCommand.php b/src/Commands/ResendMailCommand.php
index bb6e86b..a110df2 100644
--- a/src/Commands/ResendMailCommand.php
+++ b/src/Commands/ResendMailCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Commands;
+namespace Backstage\Mails\Laravel\Commands;
 
-use Backstage\Mails\Jobs\ResendMailJob;
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Jobs\ResendMailJob;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 
diff --git a/src/Commands/WebhooksMailCommand.php b/src/Commands/WebhooksMailCommand.php
index 17c5b95..eaddc3c 100644
--- a/src/Commands/WebhooksMailCommand.php
+++ b/src/Commands/WebhooksMailCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Commands;
+namespace Backstage\Mails\Laravel\Commands;
 
-use Backstage\Mails\Actions\RegisterWebhooks;
+use Backstage\Mails\Laravel\Actions\RegisterWebhooks;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
 
diff --git a/src/Contracts/HasAssociatedMails.php b/src/Contracts/HasAssociatedMails.php
index cc28a3d..f653561 100644
--- a/src/Contracts/HasAssociatedMails.php
+++ b/src/Contracts/HasAssociatedMails.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Contracts;
+namespace Backstage\Mails\Laravel\Contracts;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
diff --git a/src/Contracts/MailDriverContract.php b/src/Contracts/MailDriverContract.php
index 45f43c6..4cdb644 100644
--- a/src/Contracts/MailDriverContract.php
+++ b/src/Contracts/MailDriverContract.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Contracts;
+namespace Backstage\Mails\Laravel\Contracts;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Http\Client\Response;
 use Illuminate\Mail\Events\MessageSending;
 
diff --git a/src/Contracts/MailProviderContract.php b/src/Contracts/MailProviderContract.php
index 466344d..96df498 100644
--- a/src/Contracts/MailProviderContract.php
+++ b/src/Contracts/MailProviderContract.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Contracts;
+namespace Backstage\Mails\Laravel\Contracts;
 
 interface MailProviderContract
 {
diff --git a/src/Controllers/WebhookController.php b/src/Controllers/WebhookController.php
index 37a7185..0da9944 100644
--- a/src/Controllers/WebhookController.php
+++ b/src/Controllers/WebhookController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Controllers;
+namespace Backstage\Mails\Laravel\Controllers;
 
-use Backstage\Mails\Jobs\ProcessWebhookJob;
+use Backstage\Mails\Laravel\Jobs\ProcessWebhookJob;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/src/Drivers/MailDriver.php b/src/Drivers/MailDriver.php
index e985753..22eb7a4 100644
--- a/src/Drivers/MailDriver.php
+++ b/src/Drivers/MailDriver.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Drivers;
+namespace Backstage\Mails\Laravel\Drivers;
 
-use Backstage\Mails\Exceptions\LaravelMailException;
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Exceptions\LaravelMailException;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Support\Str;
 
 abstract class MailDriver
diff --git a/src/Drivers/MailgunDriver.php b/src/Drivers/MailgunDriver.php
index f99b6cb..f756550 100644
--- a/src/Drivers/MailgunDriver.php
+++ b/src/Drivers/MailgunDriver.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Drivers;
+namespace Backstage\Mails\Laravel\Drivers;
 
-use Backstage\Mails\Contracts\MailDriverContract;
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
+use Backstage\Mails\Laravel\Contracts\MailDriverContract;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Enums\Provider;
 use Illuminate\Http\Client\Response;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Support\Facades\Http;
diff --git a/src/Drivers/PostmarkDriver.php b/src/Drivers/PostmarkDriver.php
index 5c4bc26..38d3242 100644
--- a/src/Drivers/PostmarkDriver.php
+++ b/src/Drivers/PostmarkDriver.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Backstage\Mails\Drivers;
+namespace Backstage\Mails\Laravel\Drivers;
 
-use Backstage\Mails\Contracts\MailDriverContract;
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Contracts\MailDriverContract;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Http\Client\Response;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Support\Facades\Http;
diff --git a/src/Drivers/ResendDriver.php b/src/Drivers/ResendDriver.php
index c27522c..c37a5fe 100644
--- a/src/Drivers/ResendDriver.php
+++ b/src/Drivers/ResendDriver.php
@@ -1,136 +1,28 @@
 <?php
 
-namespace Backstage\Mails\Drivers;
+namespace Backstage\Mails\Laravel\Drivers;
 
-use Backstage\Mails\Contracts\MailDriverContract;
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
+use Backstage\Mails\Laravel\Contracts\MailDriverContract;
+use Backstage\Mails\Laravel\Enums\EventType;
 use Illuminate\Http\Client\Response;
 use Illuminate\Mail\Events\MessageSending;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\URL;
 
 class ResendDriver extends MailDriver implements MailDriverContract
 {
     public function registerWebhooks($components): void
     {
-        $trackingConfig = (array) config('mails.logging.tracking');
-
-        $apiKey = (string) config('services.resend.key');
-        $webhookUrl = URL::signedRoute('mails.webhook', ['provider' => Provider::RESEND]);
-
-        $events = [];
-
-        if ((bool) $trackingConfig['deliveries']) {
-            $events[] = 'email.sent';
-            $events[] = 'email.delivered';
-        }
-
-        if ((bool) $trackingConfig['opens']) {
-            $events[] = 'email.opened';
-        }
-
-        if ((bool) $trackingConfig['clicks']) {
-            $events[] = 'email.clicked';
-        }
-
-        if ((bool) $trackingConfig['bounces']) {
-            $events[] = 'email.bounced';
-            $events[] = 'email.delivery_delayed';
-        }
-
-        if ((bool) $trackingConfig['complaints']) {
-            $events[] = 'email.complained';
-        }
-
-        $existingWebhooks = Http::withToken($apiKey)
-            ->get('https://api.resend.com/webhooks');
-
-        $existing = collect($existingWebhooks->json('data') ?? [])
-            ->firstWhere('endpoint', $webhookUrl);
-
-        if ($existing) {
-            $components->info('Resend webhook already exists for this endpoint.');
-            $components->info('Webhook ID: '.$existing['id']);
-
-            return;
-        }
-
-        $response = Http::withToken($apiKey)
-            ->post('https://api.resend.com/webhooks', [
-                'endpoint' => $webhookUrl,
-                'events' => $events,
-            ]);
-
-        if ($response->successful()) {
-            $signingSecret = $response->json('signing_secret');
-
-            $components->info('Created Resend webhook successfully.');
-            $components->warn('Save this signing secret to your config as services.resend.webhook_signing_secret:');
-            $components->info($signingSecret);
-        } else {
-            $components->error('Failed to create Resend webhook.');
-            $components->error($response->json('message') ?? $response->body());
-        }
+        $components->warn("Resend doesn't allow registering webhooks via the API. ");
+        $components->info('Please register your webhooks manually in the Resend dashboard.');
     }
 
     public function verifyWebhookSignature(array $payload): bool
     {
-        if (app()->runningUnitTests()) {
-            return true;
-        }
-
-        $secret = (string) config('services.resend.webhook_signing_secret');
-
-        if (empty($secret)) {
-            return true;
-        }
-
-        $request = request();
-
-        $svixId = $request->header('svix-id');
-        $svixTimestamp = $request->header('svix-timestamp');
-        $svixSignature = $request->header('svix-signature');
-
-        if (empty($svixId) || empty($svixTimestamp) || empty($svixSignature)) {
-            return false;
-        }
-
-        // Verify timestamp is within tolerance (5 minutes)
-        $tolerance = 5 * 60;
-        if (abs(time() - (int) $svixTimestamp) > $tolerance) {
-            return false;
-        }
-
-        // Strip the whsec_ prefix and base64 decode the secret
-        $secretBytes = base64_decode(str_replace('whsec_', '', $secret));
-
-        // Construct the signed content: msg_id.timestamp.body
-        $body = (string) $request->getContent();
-        $signedContent = "{$svixId}.{$svixTimestamp}.{$body}";
-
-        // Compute expected signature using HMAC-SHA256
-        $expectedSignature = base64_encode(hash_hmac('sha256', $signedContent, $secretBytes, true));
-
-        // The svix-signature header may contain multiple signatures separated by spaces
-        $signatures = explode(' ', $svixSignature);
-
-        foreach ($signatures as $signature) {
-            // Strip version prefix (v1,)
-            $parts = explode(',', $signature, 2);
-            $signatureValue = $parts[1] ?? $parts[0];
-
-            if (hash_equals($expectedSignature, $signatureValue)) {
-                return true;
-            }
-        }
-
-        return false;
+        return true;
     }
 
     public function getUuidFromPayload(array $payload): ?string
     {
-        return collect($payload['data']['headers'] ?? [])
+        return collect($payload['data']['headers'])
             ->where('name', config('mails.headers.uuid'))
             ->first()['value'] ?? null;
     }
@@ -159,7 +51,6 @@ public function dataMapping(): array
             'ip_address' => 'data.click.ipAddress',
             'link' => 'data.click.link',
             'user_agent' => 'data.click.userAgent',
-            'tag' => 'data.tags',
         ];
     }
 
diff --git a/src/Enums/EventType.php b/src/Enums/EventType.php
index b585662..1b90dd0 100644
--- a/src/Enums/EventType.php
+++ b/src/Enums/EventType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Enums;
+namespace Backstage\Mails\Laravel\Enums;
 
 enum EventType: string
 {
diff --git a/src/Enums/Provider.php b/src/Enums/Provider.php
index 4e0a5b5..9c56056 100644
--- a/src/Enums/Provider.php
+++ b/src/Enums/Provider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Enums;
+namespace Backstage\Mails\Laravel\Enums;
 
 enum Provider: string
 {
diff --git a/src/Events/MailAccepted.php b/src/Events/MailAccepted.php
index cddb5bf..739b528 100644
--- a/src/Events/MailAccepted.php
+++ b/src/Events/MailAccepted.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailClicked.php b/src/Events/MailClicked.php
index 9146077..f8c7782 100644
--- a/src/Events/MailClicked.php
+++ b/src/Events/MailClicked.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailComplained.php b/src/Events/MailComplained.php
index 1073c88..29c29fa 100644
--- a/src/Events/MailComplained.php
+++ b/src/Events/MailComplained.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailDelivered.php b/src/Events/MailDelivered.php
index e82a609..20b6c6b 100644
--- a/src/Events/MailDelivered.php
+++ b/src/Events/MailDelivered.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailEvent.php b/src/Events/MailEvent.php
index f28c399..a301123 100644
--- a/src/Events/MailEvent.php
+++ b/src/Events/MailEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/src/Events/MailEventLogged.php b/src/Events/MailEventLogged.php
index 1ff4cf1..5f0547c 100644
--- a/src/Events/MailEventLogged.php
+++ b/src/Events/MailEventLogged.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailHardBounced.php b/src/Events/MailHardBounced.php
index 6be96bf..c0c54f3 100644
--- a/src/Events/MailHardBounced.php
+++ b/src/Events/MailHardBounced.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailLogged.php b/src/Events/MailLogged.php
index a58d0ce..3bc005c 100644
--- a/src/Events/MailLogged.php
+++ b/src/Events/MailLogged.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailOpened.php b/src/Events/MailOpened.php
index e65d6a2..2a95425 100644
--- a/src/Events/MailOpened.php
+++ b/src/Events/MailOpened.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailResent.php b/src/Events/MailResent.php
index 8a49f1d..8232184 100644
--- a/src/Events/MailResent.php
+++ b/src/Events/MailResent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/src/Events/MailSoftBounced.php b/src/Events/MailSoftBounced.php
index 09ddd5c..cf4f922 100644
--- a/src/Events/MailSoftBounced.php
+++ b/src/Events/MailSoftBounced.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailUnsubscribed.php b/src/Events/MailUnsubscribed.php
index 8bb3368..b03c8fe 100644
--- a/src/Events/MailUnsubscribed.php
+++ b/src/Events/MailUnsubscribed.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/src/Events/MailUnsuppressed.php b/src/Events/MailUnsuppressed.php
index b0cfd49..ff24d15 100644
--- a/src/Events/MailUnsuppressed.php
+++ b/src/Events/MailUnsuppressed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Events;
+namespace Backstage\Mails\Laravel\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/src/Exceptions/LaravelMailException.php b/src/Exceptions/LaravelMailException.php
index e343da6..d1a4549 100644
--- a/src/Exceptions/LaravelMailException.php
+++ b/src/Exceptions/LaravelMailException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Exceptions;
+namespace Backstage\Mails\Laravel\Exceptions;
 
 use Exception;
 
diff --git a/src/Facades/MailProvider.php b/src/Facades/MailProvider.php
index eee0a43..91b32b6 100644
--- a/src/Facades/MailProvider.php
+++ b/src/Facades/MailProvider.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Facades;
+namespace Backstage\Mails\Laravel\Facades;
 
-use Backstage\Mails\Contracts\MailDriverContract;
-use Backstage\Mails\Contracts\MailProviderContract;
+use Backstage\Mails\Laravel\Contracts\MailDriverContract;
+use Backstage\Mails\Laravel\Contracts\MailProviderContract;
 use Illuminate\Support\Facades\Facade;
 
 /**
diff --git a/src/Jobs/ProcessWebhookJob.php b/src/Jobs/ProcessWebhookJob.php
index a0706aa..b0aef33 100644
--- a/src/Jobs/ProcessWebhookJob.php
+++ b/src/Jobs/ProcessWebhookJob.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Jobs;
+namespace Backstage\Mails\Laravel\Jobs;
 
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Events\MailEvent;
-use Backstage\Mails\Facades\MailProvider;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Events\MailEvent;
+use Backstage\Mails\Laravel\Facades\MailProvider;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/src/Jobs/ResendMailJob.php b/src/Jobs/ResendMailJob.php
index c5f6f94..43747c0 100644
--- a/src/Jobs/ResendMailJob.php
+++ b/src/Jobs/ResendMailJob.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Jobs;
+namespace Backstage\Mails\Laravel\Jobs;
 
-use Backstage\Mails\Models\Mail as Mailable;
+use Backstage\Mails\Laravel\Models\Mail as Mailable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/src/Listeners/AttachMailLogUuid.php b/src/Listeners/AttachMailLogUuid.php
index 2c1c54b..5d5d906 100644
--- a/src/Listeners/AttachMailLogUuid.php
+++ b/src/Listeners/AttachMailLogUuid.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Actions\AttachUuid;
+use Backstage\Mails\Laravel\Actions\AttachUuid;
 use Illuminate\Mail\Events\MessageSending;
 
 class AttachMailLogUuid
diff --git a/src/Listeners/LogMailEvent.php b/src/Listeners/LogMailEvent.php
index 35c007c..c0f73f9 100644
--- a/src/Listeners/LogMailEvent.php
+++ b/src/Listeners/LogMailEvent.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Events\MailEvent;
-use Backstage\Mails\Facades\MailProvider;
+use Backstage\Mails\Laravel\Events\MailEvent;
+use Backstage\Mails\Laravel\Facades\MailProvider;
 
 class LogMailEvent
 {
diff --git a/src/Listeners/LogSendingMail.php b/src/Listeners/LogSendingMail.php
index f658910..6a0afdd 100644
--- a/src/Listeners/LogSendingMail.php
+++ b/src/Listeners/LogSendingMail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Actions\LogMail;
+use Backstage\Mails\Laravel\Actions\LogMail;
 use Illuminate\Mail\Events\MessageSending;
 
 class LogSendingMail
diff --git a/src/Listeners/LogSentMail.php b/src/Listeners/LogSentMail.php
index c362711..0848469 100644
--- a/src/Listeners/LogSentMail.php
+++ b/src/Listeners/LogSentMail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Actions\LogMail;
+use Backstage\Mails\Laravel\Actions\LogMail;
 use Illuminate\Mail\Events\MessageSent;
 
 class LogSentMail
diff --git a/src/Listeners/NotifyOnBounce.php b/src/Listeners/NotifyOnBounce.php
index 993ebb5..3510539 100644
--- a/src/Listeners/NotifyOnBounce.php
+++ b/src/Listeners/NotifyOnBounce.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Events\MailHardBounced;
-use Backstage\Mails\Notifications\BounceNotification;
-use Backstage\Mails\Traits\SendsNotifications;
+use Backstage\Mails\Laravel\Events\MailHardBounced;
+use Backstage\Mails\Laravel\Notifications\BounceNotification;
+use Backstage\Mails\Laravel\Traits\SendsNotifications;
 
 class NotifyOnBounce
 {
diff --git a/src/Listeners/NotifyOnSpamComplaint.php b/src/Listeners/NotifyOnSpamComplaint.php
index 0b2821a..567b4f5 100644
--- a/src/Listeners/NotifyOnSpamComplaint.php
+++ b/src/Listeners/NotifyOnSpamComplaint.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Events\MailComplained;
-use Backstage\Mails\Notifications\SpamComplaintNotification;
-use Backstage\Mails\Traits\SendsNotifications;
+use Backstage\Mails\Laravel\Events\MailComplained;
+use Backstage\Mails\Laravel\Notifications\SpamComplaintNotification;
+use Backstage\Mails\Laravel\Traits\SendsNotifications;
 
 class NotifyOnSpamComplaint
 {
diff --git a/src/Listeners/StoreMailRelations.php b/src/Listeners/StoreMailRelations.php
index 874cdd5..a12cd26 100644
--- a/src/Listeners/StoreMailRelations.php
+++ b/src/Listeners/StoreMailRelations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Mail\Events\MessageSending;
diff --git a/src/Listeners/UnsuppressEmailAddress.php b/src/Listeners/UnsuppressEmailAddress.php
index 7fe5b45..df7a817 100644
--- a/src/Listeners/UnsuppressEmailAddress.php
+++ b/src/Listeners/UnsuppressEmailAddress.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Listeners;
+namespace Backstage\Mails\Laravel\Listeners;
 
-use Backstage\Mails\Events\MailUnsuppressed;
-use Backstage\Mails\Facades\MailProvider;
+use Backstage\Mails\Laravel\Events\MailUnsuppressed;
+use Backstage\Mails\Laravel\Facades\MailProvider;
 
 class UnsuppressEmailAddress
 {
diff --git a/src/MailsServiceProvider.php b/src/MailsServiceProvider.php
index 66e6d94..6fc7e6f 100644
--- a/src/MailsServiceProvider.php
+++ b/src/MailsServiceProvider.php
@@ -1,24 +1,24 @@
 <?php
 
-namespace Backstage\Mails;
+namespace Backstage\Mails\Laravel;
 
-use Backstage\Mails\Commands\CheckBounceRateCommand;
-use Backstage\Mails\Commands\MonitorMailCommand;
-use Backstage\Mails\Commands\PruneMailCommand;
-use Backstage\Mails\Commands\ResendMailCommand;
-use Backstage\Mails\Commands\WebhooksMailCommand;
-use Backstage\Mails\Contracts\MailProviderContract;
-use Backstage\Mails\Events\MailEvent;
-use Backstage\Mails\Events\MailHardBounced;
-use Backstage\Mails\Events\MailUnsuppressed;
-use Backstage\Mails\Listeners\AttachMailLogUuid;
-use Backstage\Mails\Listeners\LogMailEvent;
-use Backstage\Mails\Listeners\LogSendingMail;
-use Backstage\Mails\Listeners\LogSentMail;
-use Backstage\Mails\Listeners\NotifyOnBounce;
-use Backstage\Mails\Listeners\StoreMailRelations;
-use Backstage\Mails\Listeners\UnsuppressEmailAddress;
-use Backstage\Mails\Managers\MailProviderManager;
+use Backstage\Mails\Laravel\Commands\CheckBounceRateCommand;
+use Backstage\Mails\Laravel\Commands\MonitorMailCommand;
+use Backstage\Mails\Laravel\Commands\PruneMailCommand;
+use Backstage\Mails\Laravel\Commands\ResendMailCommand;
+use Backstage\Mails\Laravel\Commands\WebhooksMailCommand;
+use Backstage\Mails\Laravel\Contracts\MailProviderContract;
+use Backstage\Mails\Laravel\Events\MailEvent;
+use Backstage\Mails\Laravel\Events\MailHardBounced;
+use Backstage\Mails\Laravel\Events\MailUnsuppressed;
+use Backstage\Mails\Laravel\Listeners\AttachMailLogUuid;
+use Backstage\Mails\Laravel\Listeners\LogMailEvent;
+use Backstage\Mails\Laravel\Listeners\LogSendingMail;
+use Backstage\Mails\Laravel\Listeners\LogSentMail;
+use Backstage\Mails\Laravel\Listeners\NotifyOnBounce;
+use Backstage\Mails\Laravel\Listeners\StoreMailRelations;
+use Backstage\Mails\Laravel\Listeners\UnsuppressEmailAddress;
+use Backstage\Mails\Laravel\Managers\MailProviderManager;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Mail\Events\MessageSent;
diff --git a/src/Managers/MailProviderManager.php b/src/Managers/MailProviderManager.php
index 363fd71..f9f709e 100644
--- a/src/Managers/MailProviderManager.php
+++ b/src/Managers/MailProviderManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Managers;
+namespace Backstage\Mails\Laravel\Managers;
 
-use Backstage\Mails\Drivers\MailgunDriver;
-use Backstage\Mails\Drivers\PostmarkDriver;
-use Backstage\Mails\Drivers\ResendDriver;
+use Backstage\Mails\Laravel\Drivers\MailgunDriver;
+use Backstage\Mails\Laravel\Drivers\PostmarkDriver;
+use Backstage\Mails\Laravel\Drivers\ResendDriver;
 use Illuminate\Support\Manager;
 
 class MailProviderManager extends Manager
diff --git a/src/Models/Mail.php b/src/Models/Mail.php
index a5aa32d..dd51d36 100644
--- a/src/Models/Mail.php
+++ b/src/Models/Mail.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Models;
+namespace Backstage\Mails\Laravel\Models;
 
-use Backstage\Mails\Database\Factories\MailFactory;
-use Backstage\Mails\Events\MailLogged;
+use Backstage\Mails\Laravel\Database\Factories\MailFactory;
+use Backstage\Mails\Laravel\Events\MailLogged;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -198,16 +198,6 @@ public function scopeUnsent(Builder $builder): Builder
         return $builder->whereNull('sent_at');
     }
 
-    public function scopeForUuid(Builder $builder, string $uuid): Builder
-    {
-        return $builder->where('uuid', $uuid);
-    }
-
-    public function scopeForMailClass(Builder $builder, string $mailClass): Builder
-    {
-        return $builder->where('mail_class', $mailClass);
-    }
-
     protected function status(): Attribute
     {
         return Attribute::make(get: function () {
diff --git a/src/Models/MailAttachment.php b/src/Models/MailAttachment.php
index e901600..fddc88e 100644
--- a/src/Models/MailAttachment.php
+++ b/src/Models/MailAttachment.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Backstage\Mails\Models;
+namespace Backstage\Mails\Laravel\Models;
 
-use Backstage\Mails\Database\Factories\MailAttachmentFactory;
+use Backstage\Mails\Laravel\Database\Factories\MailAttachmentFactory;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * @property-read string $disk
@@ -68,15 +69,29 @@ protected function fileData(): Attribute
         return Attribute::make(get: fn () => Storage::disk($this->disk)->get($this->storagePath));
     }
 
-    public function downloadFileFromStorage(?string $filename = null): string
+    public function downloadFileFromStorage(?string $filename = null): StreamedResponse
     {
-        return Storage::disk($this->disk)
-            ->download(
-                $this->storagePath,
-                $filename ?? $this->filename,
-                [
-                    'Content-Type' => $this->mime,
-                ]
-            );
+        $disk = Storage::disk($this->disk);
+
+        if (! $disk->exists($this->storagePath)) {
+            abort(404);
+        }
+
+        $downloadFilename = $filename ?? $this->filename;
+
+        return response()->streamDownload(
+            function () use ($disk) {
+                $stream = $disk->readStream($this->storagePath);
+
+                if ($stream !== null) {
+                    fpassthru($stream);
+                    fclose($stream);
+                }
+            },
+            $downloadFilename,
+            [
+                'Content-Type' => $this->mime,
+            ]
+        );
     }
 }
diff --git a/src/Models/MailEvent.php b/src/Models/MailEvent.php
index ef27c33..0f1a0e5 100644
--- a/src/Models/MailEvent.php
+++ b/src/Models/MailEvent.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Backstage\Mails\Models;
+namespace Backstage\Mails\Laravel\Models;
 
-use Backstage\Mails\Database\Factories\MailEventFactory;
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Events\MailEventLogged;
+use Backstage\Mails\Laravel\Database\Factories\MailEventFactory;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Events\MailEventLogged;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -98,6 +98,6 @@ public function scopeSuppressed(Builder $builder): void
 
     protected function eventClass(): Attribute
     {
-        return Attribute::make(get: fn (): string => 'Backstage\Mails\Events\Mail'.Str::studly($this->type->value));
+        return Attribute::make(get: fn (): string => 'Backstage\Mails\Laravel\Events\Mail'.Str::studly($this->type->value));
     }
 }
diff --git a/src/Notifications/BounceNotification.php b/src/Notifications/BounceNotification.php
index 55ee3d9..096f63d 100644
--- a/src/Notifications/BounceNotification.php
+++ b/src/Notifications/BounceNotification.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Notifications;
+namespace Backstage\Mails\Laravel\Notifications;
 
-use Backstage\Mails\Models\Mail;
-use Backstage\Mails\Traits\HasDynamicDrivers;
+use Backstage\Mails\Laravel\Models\Mail;
+use Backstage\Mails\Laravel\Traits\HasDynamicDrivers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
diff --git a/src/Notifications/HighBounceRateNotification.php b/src/Notifications/HighBounceRateNotification.php
index 488bced..90f1b6d 100644
--- a/src/Notifications/HighBounceRateNotification.php
+++ b/src/Notifications/HighBounceRateNotification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Notifications;
+namespace Backstage\Mails\Laravel\Notifications;
 
-use Backstage\Mails\Traits\HasDynamicDrivers;
+use Backstage\Mails\Laravel\Traits\HasDynamicDrivers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
diff --git a/src/Notifications/SpamComplaintNotification.php b/src/Notifications/SpamComplaintNotification.php
index 08a7b38..1777b82 100644
--- a/src/Notifications/SpamComplaintNotification.php
+++ b/src/Notifications/SpamComplaintNotification.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Backstage\Mails\Notifications;
+namespace Backstage\Mails\Laravel\Notifications;
 
-use Backstage\Mails\Models\Mail;
-use Backstage\Mails\Traits\HasDynamicDrivers;
+use Backstage\Mails\Laravel\Models\Mail;
+use Backstage\Mails\Laravel\Traits\HasDynamicDrivers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\SlackMessage;
diff --git a/src/Shared/AsAction.php b/src/Shared/AsAction.php
index 448a1c2..0d62858 100644
--- a/src/Shared/AsAction.php
+++ b/src/Shared/AsAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Shared;
+namespace Backstage\Mails\Laravel\Shared;
 
 trait AsAction
 {
diff --git a/src/Shared/Terminal.php b/src/Shared/Terminal.php
index 8054f2f..2c139c2 100644
--- a/src/Shared/Terminal.php
+++ b/src/Shared/Terminal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Shared;
+namespace Backstage\Mails\Laravel\Shared;
 
 use Illuminate\Console\Command;
 use Illuminate\Console\OutputStyle;
diff --git a/src/Traits/AssociatesModels.php b/src/Traits/AssociatesModels.php
index 0d4bbcc..1891286 100644
--- a/src/Traits/AssociatesModels.php
+++ b/src/Traits/AssociatesModels.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Traits;
+namespace Backstage\Mails\Laravel\Traits;
 
-use Backstage\Mails\Contracts\HasAssociatedMails;
+use Backstage\Mails\Laravel\Contracts\HasAssociatedMails;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Arr;
diff --git a/src/Traits/HasDynamicDrivers.php b/src/Traits/HasDynamicDrivers.php
index f191120..521f925 100644
--- a/src/Traits/HasDynamicDrivers.php
+++ b/src/Traits/HasDynamicDrivers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Traits;
+namespace Backstage\Mails\Laravel\Traits;
 
 use Illuminate\Notifications\Channels\MailChannel;
 use NotificationChannels\Discord\DiscordChannel;
diff --git a/src/Traits/HasMails.php b/src/Traits/HasMails.php
index f107990..de75f59 100644
--- a/src/Traits/HasMails.php
+++ b/src/Traits/HasMails.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Traits;
+namespace Backstage\Mails\Laravel\Traits;
 
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
diff --git a/src/Traits/SendsNotifications.php b/src/Traits/SendsNotifications.php
index 1337650..15c2880 100644
--- a/src/Traits/SendsNotifications.php
+++ b/src/Traits/SendsNotifications.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Backstage\Mails\Traits;
+namespace Backstage\Mails\Laravel\Traits;
 
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Notification as Notifications;
diff --git a/tests/EventTest.php b/tests/EventTest.php
index 3912274..41d5016 100644
--- a/tests/EventTest.php
+++ b/tests/EventTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Backstage\Mails\Events\MailEventLogged;
-use Backstage\Mails\Events\MailHardBounced;
-use Backstage\Mails\Models\Mail;
+use Backstage\Mails\Laravel\Events\MailEventLogged;
+use Backstage\Mails\Laravel\Events\MailHardBounced;
+use Backstage\Mails\Laravel\Models\Mail;
 use Illuminate\Support\Facades\Event;
 
 it('dispatches events when an mail is logged', function (): void {
diff --git a/tests/Fixtures/TestMailable.php b/tests/Fixtures/TestMailable.php
deleted file mode 100644
index d0b331f..0000000
--- a/tests/Fixtures/TestMailable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Backstage\Mails\Tests\Fixtures;
-
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-
-class TestMailable extends Mailable
-{
-    public function envelope(): Envelope
-    {
-        return new Envelope(
-            from: 'from@example.com',
-            subject: 'Test Mailable',
-        );
-    }
-
-    public function content(): Content
-    {
-        return new Content(
-            htmlString: '<p>Test HTML content</p>',
-        );
-    }
-}
diff --git a/tests/MailClassTest.php b/tests/MailClassTest.php
deleted file mode 100644
index ce9365d..0000000
--- a/tests/MailClassTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-use Backstage\Mails\Models\Mail as MailModel;
-use Backstage\Mails\Tests\Fixtures\TestMailable;
-use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Mail;
-
-it('stores mail_class as FQCN when sending a Mailable class', function (): void {
-    Mail::to('recipient@example.com')->send(new TestMailable);
-
-    $mail = MailModel::latest()->first();
-
-    expect($mail)->not->toBeNull();
-    expect($mail->mail_class)->toBe(TestMailable::class);
-});
-
-it('stores mail_class as null when sending with a closure', function (): void {
-    Mail::send([], [], function (Message $message): void {
-        $message->to('recipient@example.com')
-            ->from('from@example.com')
-            ->subject('Closure Mail')
-            ->html('<p>HTML</p>');
-    });
-
-    $mail = MailModel::latest()->first();
-
-    expect($mail)->not->toBeNull();
-    expect($mail->mail_class)->toBeNull();
-});
-
-it('can query mails by mail_class using forMailClass scope', function (): void {
-    Mail::to('recipient@example.com')->send(new TestMailable);
-
-    Mail::send([], [], function (Message $message): void {
-        $message->to('other@example.com')
-            ->from('from@example.com')
-            ->subject('Closure Mail')
-            ->html('<p>HTML</p>');
-    });
-
-    expect(MailModel::count())->toBe(2);
-    expect(MailModel::forMailClass(TestMailable::class)->count())->toBe(1);
-    expect(MailModel::forMailClass(TestMailable::class)->first()->subject)->toBe('Test Mailable');
-});
diff --git a/tests/MailLogTest.php b/tests/MailLogTest.php
index 51185ac..b1aa3a5 100644
--- a/tests/MailLogTest.php
+++ b/tests/MailLogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use Backstage\Mails\Models\Mail as MailModel;
+use Backstage\Mails\Laravel\Models\Mail as MailModel;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Mail;
 
diff --git a/tests/MailgunTest.php b/tests/MailgunTest.php
index 61046b5..e7e5a9b 100644
--- a/tests/MailgunTest.php
+++ b/tests/MailgunTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Models\Mail as MailModel;
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Models\Mail as MailModel;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\URL;
@@ -41,7 +41,6 @@
                 'transport' => 'smtp',
             ],
             'user-variables' => [
-                config('mails.headers.uuid') => $mail?->uuid,
                 'url' => [
                     'link' => 'https://example.com',
                     'title' => 'Omnivery',
@@ -160,9 +159,6 @@
                 'transport' => 'smtp',
             ],
             'recipient' => 'nosuchemail@omnivery.com',
-            'user-variables' => [
-                config('mails.headers.uuid') => $mail?->uuid,
-            ],
             'message' => [
                 'size' => 5597,
                 'headers' => [
@@ -222,9 +218,6 @@
                 'transport' => 'smtp',
             ],
             'recipient' => 'nosuchemail@omnivery.com',
-            'user-variables' => [
-                config('mails.headers.uuid') => $mail?->uuid,
-            ],
             'message' => [
                 'size' => 5597,
                 'headers' => [
@@ -361,9 +354,6 @@
             ],
             'ip' => '123.123.123.123',
             'recipient' => 'test@omnivery.com',
-            'user-variables' => [
-                config('mails.headers.uuid') => $mail?->uuid,
-            ],
             'id' => 'OTk6MTA1MDI6b3BlbmVkOjE2NDk0MDgzMTE=',
             'event' => 'opened',
             'geolocation' => [
diff --git a/tests/NotificationTest.php b/tests/NotificationTest.php
index ed47959..4adf2f3 100644
--- a/tests/NotificationTest.php
+++ b/tests/NotificationTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Backstage\Mails\Models\Mail;
-use Backstage\Mails\Notifications\BounceNotification;
+use Backstage\Mails\Laravel\Models\Mail;
+use Backstage\Mails\Laravel\Notifications\BounceNotification;
 use Illuminate\Support\Facades\Notification;
 
 beforeEach(fn () => config([
diff --git a/tests/Pest.php b/tests/Pest.php
index b4f52d0..391fb01 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -1,13 +1,8 @@
 <?php
 
-use Backstage\Mails\Tests\TestCase;
+use Backstage\Mails\Laravel\Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Mail;
 
 uses(TestCase::class)
     ->use(RefreshDatabase::class)
     ->in(__DIR__);
-
-beforeEach(function (): void {
-    Mail::fake();
-});
diff --git a/tests/PostmarkTest.php b/tests/PostmarkTest.php
index 46e4cd2..dbc2bdb 100644
--- a/tests/PostmarkTest.php
+++ b/tests/PostmarkTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Models\Mail as MailModel;
-use Backstage\Mails\Models\MailEvent;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Models\Mail as MailModel;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\URL;
diff --git a/tests/ResendTest.php b/tests/ResendTest.php
index a104ed7..3bf6fb3 100644
--- a/tests/ResendTest.php
+++ b/tests/ResendTest.php
@@ -1,17 +1,12 @@
 <?php
 
-use Backstage\Mails\Drivers\ResendDriver;
-use Backstage\Mails\Enums\EventType;
-use Backstage\Mails\Enums\Provider;
-use Backstage\Mails\Models\Mail as MailModel;
-use Backstage\Mails\Models\MailEvent;
-use Illuminate\Console\View\Components\Factory;
-use Illuminate\Http\Request;
+use Backstage\Mails\Laravel\Enums\EventType;
+use Backstage\Mails\Laravel\Enums\Provider;
+use Backstage\Mails\Laravel\Models\Mail as MailModel;
+use Backstage\Mails\Laravel\Models\MailEvent;
 use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\URL;
-use Symfony\Component\Console\Output\BufferedOutput;
 
 use function Pest\Laravel\assertDatabaseHas;
 use function Pest\Laravel\post;
@@ -54,40 +49,6 @@
     ]);
 });
 
-it('can receive incoming sent webhook from resend', function (): void {
-    Mail::send([], [], function (Message $message): void {
-        $message->to('hey@danielhe4rt.dev')
-            ->from('local@computer.nl')
-            ->subject('Test')
-            ->text('Text')
-            ->html('<p>HTML</p>');
-    });
-
-    $mail = MailModel::latest()->first();
-
-    post(URL::signedRoute('mails.webhook', ['provider' => Provider::RESEND]), [
-        'created_at' => '2023-05-19T22:09:32Z',
-        'data' => [
-            'created_at' => '2025-01-09 14:17:29.059104+00',
-            'email_id' => 'dummy-id',
-            'headers' => [
-                [
-                    'name' => config('mails.headers.uuid'),
-                    'value' => $mail->uuid,
-                ],
-            ],
-            'from' => 'local@computer.nl',
-            'subject' => 'Test',
-            'to' => ['hey@danielhe4rt.dev'],
-        ],
-        'type' => 'email.sent',
-    ])->assertAccepted();
-
-    assertDatabaseHas((new MailEvent)->getTable(), [
-        'type' => EventType::ACCEPTED->value,
-    ]);
-});
-
 it('can receive incoming hard bounce webhook from resend', function (): void {
     Mail::send([], [], function (Message $message): void {
         $message->to('hey@danielhe4rt.dev')
@@ -284,168 +245,3 @@
         'link' => 'https://resend.com',
     ]);
 });
-
-it('can register webhooks via resend api', function (): void {
-    config()->set('services.resend.key', 're_test_123');
-
-    Http::fake([
-        'api.resend.com/webhooks' => Http::sequence()
-            ->push(['object' => 'list', 'data' => []])
-            ->push([
-                'object' => 'webhook',
-                'id' => 'wh_test_123',
-                'signing_secret' => 'whsec_test_signing_secret',
-            ]),
-    ]);
-
-    $driver = new ResendDriver;
-
-    $output = new BufferedOutput;
-    $factory = new Factory($output);
-
-    $driver->registerWebhooks($factory);
-
-    Http::assertSentCount(2);
-    Http::assertSent(fn ($request) => $request->method() === 'GET' && $request->url() === 'https://api.resend.com/webhooks');
-    Http::assertSent(fn ($request) => $request->method() === 'POST'
-        && $request->url() === 'https://api.resend.com/webhooks'
-        && ! empty($request['endpoint'])
-        && ! empty($request['events'])
-    );
-});
-
-it('skips webhook registration when resend webhook already exists', function (): void {
-    config()->set('services.resend.key', 're_test_123');
-
-    $webhookUrl = URL::signedRoute('mails.webhook', ['provider' => Provider::RESEND]);
-
-    Http::fake([
-        'api.resend.com/webhooks' => Http::response([
-            'object' => 'list',
-            'data' => [
-                [
-                    'id' => 'wh_existing_123',
-                    'endpoint' => $webhookUrl,
-                    'events' => ['email.delivered'],
-                    'status' => 'enabled',
-                ],
-            ],
-        ]),
-    ]);
-
-    $driver = new ResendDriver;
-
-    $output = new BufferedOutput;
-    $factory = new Factory($output);
-
-    $driver->registerWebhooks($factory);
-
-    Http::assertSentCount(1);
-});
-
-it('verifies svix webhook signature correctly', function (): void {
-    $secret = 'whsec_MfKQ9r8GKYqrTwjUPD8ILPZIo2LaLaSw';
-    $secretBytes = base64_decode(str_replace('whsec_', '', $secret));
-
-    $body = json_encode(['type' => 'email.delivered', 'data' => ['email_id' => 'test']]);
-    $msgId = 'msg_test_123';
-    $timestamp = (string) time();
-    $signedContent = "{$msgId}.{$timestamp}.{$body}";
-    $signature = base64_encode(hash_hmac('sha256', $signedContent, $secretBytes, true));
-
-    config()->set('services.resend.webhook_signing_secret', $secret);
-
-    $driver = new ResendDriver;
-
-    // Simulate a request with Svix headers
-    $request = Request::create(
-        '/webhooks/mails/resend',
-        'POST',
-        [],
-        [],
-        [],
-        [
-            'HTTP_SVIX_ID' => $msgId,
-            'HTTP_SVIX_TIMESTAMP' => $timestamp,
-            'HTTP_SVIX_SIGNATURE' => "v1,{$signature}",
-            'CONTENT_TYPE' => 'application/json',
-        ],
-        $body,
-    );
-
-    app()->instance('request', $request);
-
-    // Override runningUnitTests to actually test verification
-    $this->app->detectEnvironment(fn () => 'production');
-
-    expect($driver->verifyWebhookSignature(json_decode($body, true)))->toBeTrue();
-});
-
-it('rejects invalid svix webhook signature', function (): void {
-    $secret = 'whsec_MfKQ9r8GKYqrTwjUPD8ILPZIo2LaLaSw';
-
-    $body = json_encode(['type' => 'email.delivered', 'data' => ['email_id' => 'test']]);
-    $msgId = 'msg_test_123';
-    $timestamp = (string) time();
-
-    config()->set('services.resend.webhook_signing_secret', $secret);
-
-    $driver = new ResendDriver;
-
-    $request = Request::create(
-        '/webhooks/mails/resend',
-        'POST',
-        [],
-        [],
-        [],
-        [
-            'HTTP_SVIX_ID' => $msgId,
-            'HTTP_SVIX_TIMESTAMP' => $timestamp,
-            'HTTP_SVIX_SIGNATURE' => 'v1,invalidsignature',
-            'CONTENT_TYPE' => 'application/json',
-        ],
-        $body,
-    );
-
-    app()->instance('request', $request);
-
-    $this->app->detectEnvironment(fn () => 'production');
-
-    expect($driver->verifyWebhookSignature(json_decode($body, true)))->toBeFalse();
-});
-
-it('rejects svix webhook with expired timestamp', function (): void {
-    $secret = 'whsec_MfKQ9r8GKYqrTwjUPD8ILPZIo2LaLaSw';
-    $secretBytes = base64_decode(str_replace('whsec_', '', $secret));
-
-    $body = json_encode(['type' => 'email.delivered', 'data' => ['email_id' => 'test']]);
-    $msgId = 'msg_test_123';
-    $timestamp = (string) (time() - 600); // 10 minutes ago
-    $signedContent = "{$msgId}.{$timestamp}.{$body}";
-    $signature = base64_encode(hash_hmac('sha256', $signedContent, $secretBytes, true));
-
-    config()->set('services.resend.webhook_signing_secret', $secret);
-
-    $driver = new ResendDriver;
-
-    $request = Request::create(
-        '/webhooks/mails/resend',
-        'POST',
-        [],
-        [],
-        [],
-        [
-            'HTTP_SVIX_ID' => $msgId,
-            'HTTP_SVIX_TIMESTAMP' => $timestamp,
-            'HTTP_SVIX_SIGNATURE' => "v1,{$signature}",
-            'CONTENT_TYPE' => 'application/json',
-        ],
-        $body,
-    );
-
-    app()->instance('request', $request);
-
-    $this->app->detectEnvironment(fn () => 'production');
-
-    expect($driver->verifyWebhookSignature(json_decode($body, true)))->toBeFalse();
-});
diff --git a/tests/SmtpTest.php b/tests/SmtpTest.php
deleted file mode 100644
index 243bf04..0000000
--- a/tests/SmtpTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-use Backstage\Mails\Models\Mail as MailModel;
-use Illuminate\Mail\Message;
-use Illuminate\Support\Facades\Mail;
-
-beforeEach(function (): void {
-    config()->set('mail.mailers.smtp', [
-        'transport' => 'smtp',
-    ]);
-});
-
-it('attaches uuid to smtp mails when logging is enabled', function (): void {
-    Mail::send([], [], function (Message $message): void {
-        $message->to('mark@vormkracht10.nl')
-            ->from('local@computer.nl')
-            ->subject('Test')
-            ->text('Text');
-    });
-
-    $mail = MailModel::latest()->first();
-
-    expect($mail)->not->toBeNull();
-    expect($mail->uuid)->not->toBeNull();
-});
-
-it('sets sent_at for smtp mails', function (): void {
-    Mail::send([], [], function (Message $message): void {
-        $message->to('mark@vormkracht10.nl')
-            ->from('local@computer.nl')
-            ->subject('Test')
-            ->text('Text');
-    });
-
-    $mail = MailModel::latest()->first();
-
-    expect($mail)->not->toBeNull();
-    expect($mail->sent_at)->not->toBeNull();
-});
-
-it('logs smtp mail with correct attributes', function (): void {
-    Mail::send([], [], function (Message $message): void {
-        $message->to('mark@vormkracht10.nl')
-            ->from('local@computer.nl')
-            ->cc('cc@vk10.nl')
-            ->bcc('bcc@vk10.nl')
-            ->subject('Test')
-            ->text('Text')
-            ->html('<p>HTML</p>');
-    });
-
-    $mail = MailModel::latest()->first();
-
-    expect($mail)->not->toBeNull();
-    expect($mail->uuid)->not->toBeNull();
-    expect($mail->sent_at)->not->toBeNull();
-    expect($mail->from)->toEqual(['local@computer.nl' => null]);
-    expect($mail->to)->toEqual(['mark@vormkracht10.nl' => null]);
-    expect($mail->cc)->toEqual(['cc@vk10.nl' => null]);
-    expect($mail->bcc)->toEqual(['bcc@vk10.nl' => null]);
-    expect($mail->subject)->toBe('Test');
-    expect($mail->html)->toBe('<p>HTML</p>');
-    expect($mail->text)->toBe('Text');
-});
-
-it('does not attach uuid to smtp mails when logging is disabled', function (): void {
-    config()->set('mails.logging.enabled', false);
-
-    Mail::send([], [], function (Message $message): void {
-        $message->to('mark@vormkracht10.nl')
-            ->from('local@computer.nl')
-            ->subject('Test')
-            ->text('Text');
-    });
-
-    expect(MailModel::count())->toBe(0);
-});
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 7d59d1b..d778624 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Backstage\Mails\Tests;
+namespace Backstage\Mails\Laravel\Tests;
 
-use Backstage\Mails\MailsServiceProvider;
+use Backstage\Mails\Laravel\MailsServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application;
@@ -26,10 +26,15 @@ protected function setUp(): void
 
     protected function getPackageProviders($app): array
     {
-        return [
-            DiscordServiceProvider::class,
+        $providers = [
             MailsServiceProvider::class,
         ];
+
+        if (class_exists(DiscordServiceProvider::class)) {
+            $providers[] = DiscordServiceProvider::class;
+        }
+
+        return $providers;
     }
 
     /**