diff --git a/sonar-desk-licensing/.gitignore b/sonar-desk-licensing/.gitignore
index 7be55e2..5fa2e97 100755
--- a/sonar-desk-licensing/.gitignore
+++ b/sonar-desk-licensing/.gitignore
@@ -25,3 +25,4 @@ _ide_helper.php
 Homestead.json
 Homestead.yaml
 Thumbs.db
+/.scannerwork/
diff --git a/sonar-desk-licensing/Http/Controllers/Admin/CmsPageController.php b/sonar-desk-licensing/Http/Controllers/Admin/CmsPageController.php
new file mode 100644
index 0000000..e12651d
--- /dev/null
+++ b/sonar-desk-licensing/Http/Controllers/Admin/CmsPageController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\CmsPage;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+
+final class CmsPageController extends Controller
+{
+    public function index() { return view('admin.cms.index', ['pages' => CmsPage::latest()->paginate(25)]); }
+    public function create() { return view('admin.cms.form', ['page' => new CmsPage()]); }
+    public function store(Request $request) { $page = CmsPage::create($this->validated($request)); return redirect()->route('admin.cms.edit', $page)->with('status', 'Page created.'); }
+    public function edit(CmsPage $page) { return view('admin.cms.form', compact('page')); }
+    public function update(Request $request, CmsPage $page) { $page->update($this->validated($request, $page)); return back()->with('status', 'Page updated.'); }
+    public function destroy(CmsPage $page) { $page->delete(); return redirect()->route('admin.cms.index')->with('status', 'Page deleted.'); }
+
+    private function validated(Request $request, ?CmsPage $page = null): array
+    {
+        $request->merge(['slug' => Str::slug($request->input('slug') ?: $request->input('title', ''))]);
+        $data = $request->validate([
+            'title' => ['required','string','max:160'],
+            'slug' => ['required','string','max:180', Rule::unique('cms_pages','slug')->ignore($page?->id)],
+            'excerpt' => ['nullable','string','max:1000'],
+            'body' => ['required','string'],
+            'meta_title' => ['nullable','string','max:160'],
+            'meta_description' => ['nullable','string','max:320'],
+            'meta_keywords' => ['nullable','string','max:500'],
+            'canonical_url' => ['nullable','url:http,https','max:2048'],
+            'og_title' => ['nullable','string','max:160'],
+            'og_description' => ['nullable','string','max:320'],
+            'og_image' => ['nullable','url:http,https','max:2048'],
+            'sitemap_priority' => ['required','numeric','min:0','max:1'],
+            'sitemap_change_frequency' => ['required', Rule::in(['always','hourly','daily','weekly','monthly','yearly','never'])],
+        ]);
+        $data['robots_index'] = $request->boolean('robots_index');
+        $data['robots_follow'] = $request->boolean('robots_follow');
+        $data['include_in_sitemap'] = $request->boolean('include_in_sitemap');
+        $data['is_published'] = $request->boolean('is_published');
+        $data['published_at'] = $data['is_published'] ? ($page?->published_at ?? now()) : null;
+        return $data;
+    }
+}
diff --git a/sonar-desk-licensing/Http/Controllers/Admin/SeoSettingsController.php b/sonar-desk-licensing/Http/Controllers/Admin/SeoSettingsController.php
new file mode 100644
index 0000000..a7f920d
--- /dev/null
+++ b/sonar-desk-licensing/Http/Controllers/Admin/SeoSettingsController.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\SiteSetting;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+final class SeoSettingsController extends Controller
+{
+    private const KEYS = [
+        'seo_site_name', 'seo_title_suffix', 'seo_default_title', 'seo_default_description',
+        'seo_default_keywords', 'seo_canonical_base_url', 'seo_default_og_image', 'seo_twitter_site',
+        'seo_organization_name', 'seo_organization_logo', 'seo_google_site_verification',
+    ];
+
+    public function edit(): View
+    {
+        return view('admin.seo.edit', [
+            'settings' => collect(self::KEYS)->mapWithKeys(fn (string $key) => [$key => SiteSetting::valueFor($key, '')]),
+            'robotsEnabled' => SiteSetting::booleanFor('seo_robots_enabled', true),
+        ]);
+    }
+
+    public function update(Request $request): RedirectResponse
+    {
+        $data = $request->validate([
+            'seo_site_name' => ['required', 'string', 'max:80'],
+            'seo_title_suffix' => ['nullable', 'string', 'max:80'],
+            'seo_default_title' => ['required', 'string', 'max:160'],
+            'seo_default_description' => ['required', 'string', 'max:320'],
+            'seo_default_keywords' => ['nullable', 'string', 'max:500'],
+            'seo_canonical_base_url' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_default_og_image' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_twitter_site' => ['nullable', 'string', 'max:40', 'regex:/^@?[A-Za-z0-9_]{1,15}$/'],
+            'seo_organization_name' => ['nullable', 'string', 'max:120'],
+            'seo_organization_logo' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_google_site_verification' => ['nullable', 'string', 'max:255'],
+        ]);
+
+        foreach (self::KEYS as $key) {
+            SiteSetting::put($key, isset($data[$key]) ? trim((string) $data[$key]) : null);
+        }
+        SiteSetting::put('seo_robots_enabled', $request->boolean('seo_robots_enabled') ? '1' : '0');
+
+        return back()->with('status', 'SEO settings updated.');
+    }
+}
diff --git a/sonar-desk-licensing/Http/Controllers/SeoController.php b/sonar-desk-licensing/Http/Controllers/SeoController.php
new file mode 100644
index 0000000..59603f3
--- /dev/null
+++ b/sonar-desk-licensing/Http/Controllers/SeoController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\CmsPage;
+use App\Models\SiteSetting;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
+
+final class SeoController extends Controller
+{
+    public function sitemap(): Response
+    {
+        $static = collect([
+            ['route' => 'home', 'priority' => '1.0', 'frequency' => 'weekly'],
+            ['route' => 'features', 'priority' => '0.9', 'frequency' => 'monthly'],
+            ['route' => 'buy', 'priority' => '0.9', 'frequency' => 'monthly'],
+            ['route' => 'release', 'priority' => '0.8', 'frequency' => 'weekly'],
+            ['route' => 'support', 'priority' => '0.6', 'frequency' => 'monthly'],
+            ['route' => 'privacy', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'terms', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'refund', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'cookies', 'priority' => '0.3', 'frequency' => 'yearly'],
+        ])->filter(fn (array $item) => Route::has($item['route']))->values();
+
+        $pages = CmsPage::query()
+            ->where('is_published', true)
+            ->where('include_in_sitemap', true)
+            ->where('robots_index', true)
+            ->where(fn ($query) => $query->whereNull('published_at')->orWhere('published_at', '<=', now()))
+            ->orderBy('slug')
+            ->get();
+
+        return response()
+            ->view('seo.sitemap', compact('static', 'pages'))
+            ->header('Content-Type', 'application/xml; charset=UTF-8')
+            ->header('Cache-Control', 'public, max-age=3600');
+    }
+
+    public function robots(): Response
+    {
+        $indexable = app()->environment('production') && SiteSetting::booleanFor('seo_robots_enabled', true);
+
+        $body = $indexable
+            ? "User-agent: *\nAllow: /\nDisallow: /admin/\nDisallow: /portal/\nDisallow: /login\nDisallow: /register\n\nSitemap: ".route('sitemap')."\n"
+            : "User-agent: *\nDisallow: /\n";
+
+        return response($body, 200, [
+            'Content-Type' => 'text/plain; charset=UTF-8',
+            'Cache-Control' => 'public, max-age=3600',
+        ]);
+    }
+}
diff --git a/sonar-desk-licensing/Models/CmsPage.php b/sonar-desk-licensing/Models/CmsPage.php
new file mode 100644
index 0000000..3209346
--- /dev/null
+++ b/sonar-desk-licensing/Models/CmsPage.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+final class CmsPage extends Model
+{
+    protected $fillable = [
+        'title', 'slug', 'excerpt', 'body', 'meta_title', 'meta_description', 'meta_keywords',
+        'canonical_url', 'og_title', 'og_description', 'og_image', 'robots_index', 'robots_follow',
+        'include_in_sitemap', 'sitemap_priority', 'sitemap_change_frequency', 'is_published', 'published_at',
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'is_published' => 'boolean', 'published_at' => 'datetime', 'robots_index' => 'boolean',
+            'robots_follow' => 'boolean', 'include_in_sitemap' => 'boolean', 'sitemap_priority' => 'decimal:1',
+        ];
+    }
+}
diff --git a/sonar-desk-licensing/Models/SiteSetting.php b/sonar-desk-licensing/Models/SiteSetting.php
new file mode 100644
index 0000000..872204e
--- /dev/null
+++ b/sonar-desk-licensing/Models/SiteSetting.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
+
+final class SiteSetting extends Model
+{
+    protected $table = 'sonardesk_site_settings';
+    protected $primaryKey = 'key';
+    public $incrementing = false;
+    protected $keyType = 'string';
+    protected $fillable = ['key', 'value'];
+
+    public static function valueFor(string $key, ?string $default = null): ?string
+    {
+        return Cache::remember('sonardesk.setting.'.$key, 300, fn () => static::query()->find($key)?->value ?? $default);
+    }
+
+    public static function booleanFor(string $key, bool $default = false): bool
+    {
+        $value = static::valueFor($key);
+        return $value === null ? $default : filter_var($value, FILTER_VALIDATE_BOOLEAN);
+    }
+
+    public static function put(string $key, ?string $value): void
+    {
+        static::query()->updateOrCreate(['key' => $key], ['value' => $value]);
+        Cache::forget('sonardesk.setting.'.$key);
+    }
+}
diff --git a/sonar-desk-licensing/app/Console/Commands/SonarDeskAccountsBackfill.php b/sonar-desk-licensing/app/Console/Commands/SonarDeskAccountsBackfill.php
index ecd3464..62798b2 100644
--- a/sonar-desk-licensing/app/Console/Commands/SonarDeskAccountsBackfill.php
+++ b/sonar-desk-licensing/app/Console/Commands/SonarDeskAccountsBackfill.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\License;
+use Modules\Licensing\Models\License;
 use App\Models\User;
 use App\Services\Accounts\PurchasedAccountProvisioner;
 use Illuminate\Console\Command;
diff --git a/sonar-desk-licensing/app/Http/Controllers/Admin/AdminController.php b/sonar-desk-licensing/app/Http/Controllers/Admin/AdminController.php
index 6c2bb25..2609d01 100755
--- a/sonar-desk-licensing/app/Http/Controllers/Admin/AdminController.php
+++ b/sonar-desk-licensing/app/Http/Controllers/Admin/AdminController.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Models\License;
-use App\Models\LicenseActivation;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseActivation;
 use App\Models\User;
 use Illuminate\Http\Request;
 
diff --git a/sonar-desk-licensing/app/Http/Controllers/Admin/CmsPageController.php b/sonar-desk-licensing/app/Http/Controllers/Admin/CmsPageController.php
index b0d53ab..e12651d 100644
--- a/sonar-desk-licensing/app/Http/Controllers/Admin/CmsPageController.php
+++ b/sonar-desk-licensing/app/Http/Controllers/Admin/CmsPageController.php
@@ -27,7 +27,17 @@ final class CmsPageController extends Controller
             'body' => ['required','string'],
             'meta_title' => ['nullable','string','max:160'],
             'meta_description' => ['nullable','string','max:320'],
+            'meta_keywords' => ['nullable','string','max:500'],
+            'canonical_url' => ['nullable','url:http,https','max:2048'],
+            'og_title' => ['nullable','string','max:160'],
+            'og_description' => ['nullable','string','max:320'],
+            'og_image' => ['nullable','url:http,https','max:2048'],
+            'sitemap_priority' => ['required','numeric','min:0','max:1'],
+            'sitemap_change_frequency' => ['required', Rule::in(['always','hourly','daily','weekly','monthly','yearly','never'])],
         ]);
+        $data['robots_index'] = $request->boolean('robots_index');
+        $data['robots_follow'] = $request->boolean('robots_follow');
+        $data['include_in_sitemap'] = $request->boolean('include_in_sitemap');
         $data['is_published'] = $request->boolean('is_published');
         $data['published_at'] = $data['is_published'] ? ($page?->published_at ?? now()) : null;
         return $data;
diff --git a/sonar-desk-licensing/app/Http/Controllers/Admin/SeoSettingsController.php b/sonar-desk-licensing/app/Http/Controllers/Admin/SeoSettingsController.php
new file mode 100644
index 0000000..a7f920d
--- /dev/null
+++ b/sonar-desk-licensing/app/Http/Controllers/Admin/SeoSettingsController.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\SiteSetting;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+final class SeoSettingsController extends Controller
+{
+    private const KEYS = [
+        'seo_site_name', 'seo_title_suffix', 'seo_default_title', 'seo_default_description',
+        'seo_default_keywords', 'seo_canonical_base_url', 'seo_default_og_image', 'seo_twitter_site',
+        'seo_organization_name', 'seo_organization_logo', 'seo_google_site_verification',
+    ];
+
+    public function edit(): View
+    {
+        return view('admin.seo.edit', [
+            'settings' => collect(self::KEYS)->mapWithKeys(fn (string $key) => [$key => SiteSetting::valueFor($key, '')]),
+            'robotsEnabled' => SiteSetting::booleanFor('seo_robots_enabled', true),
+        ]);
+    }
+
+    public function update(Request $request): RedirectResponse
+    {
+        $data = $request->validate([
+            'seo_site_name' => ['required', 'string', 'max:80'],
+            'seo_title_suffix' => ['nullable', 'string', 'max:80'],
+            'seo_default_title' => ['required', 'string', 'max:160'],
+            'seo_default_description' => ['required', 'string', 'max:320'],
+            'seo_default_keywords' => ['nullable', 'string', 'max:500'],
+            'seo_canonical_base_url' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_default_og_image' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_twitter_site' => ['nullable', 'string', 'max:40', 'regex:/^@?[A-Za-z0-9_]{1,15}$/'],
+            'seo_organization_name' => ['nullable', 'string', 'max:120'],
+            'seo_organization_logo' => ['nullable', 'url:http,https', 'max:2048'],
+            'seo_google_site_verification' => ['nullable', 'string', 'max:255'],
+        ]);
+
+        foreach (self::KEYS as $key) {
+            SiteSetting::put($key, isset($data[$key]) ? trim((string) $data[$key]) : null);
+        }
+        SiteSetting::put('seo_robots_enabled', $request->boolean('seo_robots_enabled') ? '1' : '0');
+
+        return back()->with('status', 'SEO settings updated.');
+    }
+}
diff --git a/sonar-desk-licensing/app/Http/Controllers/Admin/UserController.php b/sonar-desk-licensing/app/Http/Controllers/Admin/UserController.php
new file mode 100644
index 0000000..f37a764
--- /dev/null
+++ b/sonar-desk-licensing/app/Http/Controllers/Admin/UserController.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseActivation;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Password;
+use Illuminate\Validation\Rule;
+
+final class UserController extends Controller
+{
+    public function index(Request $request)
+    {
+        $query = User::query()->latest();
+
+        if ($search = trim((string) $request->query('q'))) {
+            $query->where(fn ($q) => $q
+                ->where('name', 'like', "%{$search}%")
+                ->orWhere('email', 'like', "%{$search}%"));
+        }
+
+        if ($request->query('status') === 'admin') {
+            $query->where('is_admin', true);
+        } elseif ($request->query('status') === 'suspended') {
+            $query->whereNotNull('disabled_at');
+        } elseif ($request->query('status') === 'unverified') {
+            $query->whereNull('email_verified_at');
+        }
+
+        $users = $query->paginate(50)->withQueryString();
+        $emails = $users->getCollection()->pluck('email')->map(fn ($email) => strtolower($email))->all();
+        $licenseCounts = License::query()
+            ->selectRaw('LOWER(customer_email) as email_key, COUNT(*) as aggregate')
+            ->whereIn(DB::raw('LOWER(customer_email)'), $emails)
+            ->groupBy(DB::raw('LOWER(customer_email)'))
+            ->pluck('aggregate', 'email_key');
+
+        return view('admin.users.index', compact('users', 'licenseCounts'));
+    }
+
+    public function show(User $user)
+    {
+        $licenses = License::with(['product', 'activations'])
+            ->whereRaw('LOWER(customer_email) = ?', [strtolower($user->email)])
+            ->latest()
+            ->get();
+
+        return view('admin.users.show', compact('user', 'licenses'));
+    }
+
+    public function update(Request $request, User $user)
+    {
+        $data = $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'email', 'max:255', Rule::unique('users', 'email')->ignore($user->id)],
+            'is_admin' => ['nullable', 'boolean'],
+        ]);
+
+        $oldEmail = strtolower($user->email);
+        $newEmail = strtolower(trim($data['email']));
+        $isSelf = $request->user()->is($user);
+
+        DB::transaction(function () use ($user, $data, $oldEmail, $newEmail, $isSelf): void {
+            $user->name = trim($data['name']);
+            $user->email = $newEmail;
+            if (! $isSelf) {
+                $user->is_admin = (bool) ($data['is_admin'] ?? false);
+            }
+            $user->save();
+
+            if ($oldEmail !== $newEmail) {
+                License::whereRaw('LOWER(customer_email) = ?', [$oldEmail])
+                    ->update(['customer_email' => $newEmail]);
+            }
+        });
+
+        return redirect()->route('admin.users.show', $user)->with('status', 'User updated.');
+    }
+
+    public function verify(User $user)
+    {
+        if (! $user->hasVerifiedEmail()) {
+            $user->markEmailAsVerified();
+        }
+
+        return back()->with('status', 'Email marked as verified.');
+    }
+
+    public function resendVerification(User $user)
+    {
+        if (! $user->hasVerifiedEmail()) {
+            $user->sendEmailVerificationNotification();
+        }
+
+        return back()->with('status', 'Verification email sent.');
+    }
+
+    public function sendPasswordReset(User $user)
+    {
+        $status = Password::sendResetLink(['email' => $user->email]);
+
+        return $status === Password::RESET_LINK_SENT
+            ? back()->with('status', 'Password reset link sent.')
+            : back()->withErrors(['email' => __($status)]);
+    }
+
+    public function suspend(Request $request, User $user)
+    {
+        abort_if($request->user()->is($user), 422, 'You cannot suspend your own administrator account.');
+        $user->forceFill(['disabled_at' => now(), 'remember_token' => null])->save();
+
+        return back()->with('status', 'User suspended.');
+    }
+
+    public function restore(User $user)
+    {
+        $user->forceFill(['disabled_at' => null])->save();
+
+        return back()->with('status', 'User restored.');
+    }
+
+    public function destroy(Request $request, User $user)
+    {
+        abort_if($request->user()->is($user), 422, 'You cannot delete your own administrator account.');
+        $user->delete();
+
+        return redirect()->route('admin.users.index')->with('status', 'User deleted. Licences were retained.');
+    }
+
+    public function updateLicense(Request $request, User $user, License $license)
+    {
+        $this->ensureOwnsLicense($user, $license);
+        $data = $request->validate(['activation_limit' => ['required', 'integer', 'min:1', 'max:1000']]);
+        $license->update(['activation_limit' => $data['activation_limit']]);
+
+        return back()->with('status', 'Activation limit updated.');
+    }
+
+    public function deactivate(User $user, License $license, LicenseActivation $activation)
+    {
+        $this->ensureOwnsLicense($user, $license);
+        abort_unless((string) $activation->license_id === (string) $license->id, 404);
+        $activation->update(['deactivated_at' => now()]);
+
+        return back()->with('status', 'Device activation released.');
+    }
+
+    private function ensureOwnsLicense(User $user, License $license): void
+    {
+        abort_unless(strtolower((string) $license->customer_email) === strtolower($user->email), 404);
+    }
+}
diff --git a/sonar-desk-licensing/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/sonar-desk-licensing/app/Http/Controllers/Auth/AuthenticatedSessionController.php
index d63878e..ebe9dc1 100755
--- a/sonar-desk-licensing/app/Http/Controllers/Auth/AuthenticatedSessionController.php
+++ b/sonar-desk-licensing/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -16,7 +16,7 @@ final class AuthenticatedSessionController extends Controller
     public function store(Request $request)
     {
         $credentials = $request->validate(['email' => ['required', 'email'], 'password' => ['required', 'string']]);
-        if (! Auth::attempt(['email' => strtolower($credentials['email']), 'password' => $credentials['password']], $request->boolean('remember'))) {
+        if (! Auth::attempt(['email' => strtolower($credentials['email']), 'password' => $credentials['password'], 'disabled_at' => null], $request->boolean('remember'))) {
             return back()->withErrors(['email' => 'The supplied credentials are invalid.'])->onlyInput('email');
         }
         $request->session()->regenerate();
diff --git a/sonar-desk-licensing/app/Http/Controllers/SeoController.php b/sonar-desk-licensing/app/Http/Controllers/SeoController.php
new file mode 100644
index 0000000..59603f3
--- /dev/null
+++ b/sonar-desk-licensing/app/Http/Controllers/SeoController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\CmsPage;
+use App\Models\SiteSetting;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Route;
+
+final class SeoController extends Controller
+{
+    public function sitemap(): Response
+    {
+        $static = collect([
+            ['route' => 'home', 'priority' => '1.0', 'frequency' => 'weekly'],
+            ['route' => 'features', 'priority' => '0.9', 'frequency' => 'monthly'],
+            ['route' => 'buy', 'priority' => '0.9', 'frequency' => 'monthly'],
+            ['route' => 'release', 'priority' => '0.8', 'frequency' => 'weekly'],
+            ['route' => 'support', 'priority' => '0.6', 'frequency' => 'monthly'],
+            ['route' => 'privacy', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'terms', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'refund', 'priority' => '0.3', 'frequency' => 'yearly'],
+            ['route' => 'cookies', 'priority' => '0.3', 'frequency' => 'yearly'],
+        ])->filter(fn (array $item) => Route::has($item['route']))->values();
+
+        $pages = CmsPage::query()
+            ->where('is_published', true)
+            ->where('include_in_sitemap', true)
+            ->where('robots_index', true)
+            ->where(fn ($query) => $query->whereNull('published_at')->orWhere('published_at', '<=', now()))
+            ->orderBy('slug')
+            ->get();
+
+        return response()
+            ->view('seo.sitemap', compact('static', 'pages'))
+            ->header('Content-Type', 'application/xml; charset=UTF-8')
+            ->header('Cache-Control', 'public, max-age=3600');
+    }
+
+    public function robots(): Response
+    {
+        $indexable = app()->environment('production') && SiteSetting::booleanFor('seo_robots_enabled', true);
+
+        $body = $indexable
+            ? "User-agent: *\nAllow: /\nDisallow: /admin/\nDisallow: /portal/\nDisallow: /login\nDisallow: /register\n\nSitemap: ".route('sitemap')."\n"
+            : "User-agent: *\nDisallow: /\n";
+
+        return response($body, 200, [
+            'Content-Type' => 'text/plain; charset=UTF-8',
+            'Cache-Control' => 'public, max-age=3600',
+        ]);
+    }
+}
diff --git a/sonar-desk-licensing/app/Models/CmsPage.php b/sonar-desk-licensing/app/Models/CmsPage.php
index 180a18e..3209346 100644
--- a/sonar-desk-licensing/app/Models/CmsPage.php
+++ b/sonar-desk-licensing/app/Models/CmsPage.php
@@ -6,10 +6,17 @@ use Illuminate\Database\Eloquent\Model;
 
 final class CmsPage extends Model
 {
-    protected $fillable = ['title', 'slug', 'excerpt', 'body', 'meta_title', 'meta_description', 'is_published', 'published_at'];
+    protected $fillable = [
+        'title', 'slug', 'excerpt', 'body', 'meta_title', 'meta_description', 'meta_keywords',
+        'canonical_url', 'og_title', 'og_description', 'og_image', 'robots_index', 'robots_follow',
+        'include_in_sitemap', 'sitemap_priority', 'sitemap_change_frequency', 'is_published', 'published_at',
+    ];
 
     protected function casts(): array
     {
-        return ['is_published' => 'boolean', 'published_at' => 'datetime'];
+        return [
+            'is_published' => 'boolean', 'published_at' => 'datetime', 'robots_index' => 'boolean',
+            'robots_follow' => 'boolean', 'include_in_sitemap' => 'boolean', 'sitemap_priority' => 'decimal:1',
+        ];
     }
 }
diff --git a/sonar-desk-licensing/app/Models/SiteSetting.php b/sonar-desk-licensing/app/Models/SiteSetting.php
index 83af974..872204e 100644
--- a/sonar-desk-licensing/app/Models/SiteSetting.php
+++ b/sonar-desk-licensing/app/Models/SiteSetting.php
@@ -18,6 +18,12 @@ final class SiteSetting extends Model
         return Cache::remember('sonardesk.setting.'.$key, 300, fn () => static::query()->find($key)?->value ?? $default);
     }
 
+    public static function booleanFor(string $key, bool $default = false): bool
+    {
+        $value = static::valueFor($key);
+        return $value === null ? $default : filter_var($value, FILTER_VALIDATE_BOOLEAN);
+    }
+
     public static function put(string $key, ?string $value): void
     {
         static::query()->updateOrCreate(['key' => $key], ['value' => $value]);
diff --git a/sonar-desk-licensing/app/Models/User.php b/sonar-desk-licensing/app/Models/User.php
index ff6872c..f593607 100755
--- a/sonar-desk-licensing/app/Models/User.php
+++ b/sonar-desk-licensing/app/Models/User.php
@@ -11,12 +11,19 @@ class User extends Authenticatable implements MustVerifyEmail
 {
     use HasFactory, Notifiable;
 
-    protected $fillable = ['name', 'email', 'password', 'is_admin'];
+    protected $fillable = [
+        'name',
+        'email',
+        'email_verified_at',
+        'password',
+        'is_admin',
+        'disabled_at',
+    ];
 
     protected $hidden = ['password', 'remember_token'];
 
     protected function casts(): array
     {
-        return ['email_verified_at' => 'datetime', 'password' => 'hashed', 'is_admin' => 'boolean'];
+        return ['email_verified_at' => 'datetime', 'password' => 'hashed', 'is_admin' => 'boolean', 'disabled_at' => 'datetime'];
     }
 }
diff --git a/sonar-desk-licensing/app/Providers/AppServiceProvider.php b/sonar-desk-licensing/app/Providers/AppServiceProvider.php
new file mode 100644
index 0000000..66ffb66
--- /dev/null
+++ b/sonar-desk-licensing/app/Providers/AppServiceProvider.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+
+class AppServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Blade::anonymousComponentPath(
+            resource_path('views/components/layouts'),
+            'layouts'
+        );
+    }
+}
diff --git a/sonar-desk-licensing/app/Providers/SonarDeskLicensingServiceProvider.php b/sonar-desk-licensing/app/Providers/SonarDeskLicensingServiceProvider.php
deleted file mode 100755
index 3674573..0000000
--- a/sonar-desk-licensing/app/Providers/SonarDeskLicensingServiceProvider.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Cache\RateLimiting\Limit;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\RateLimiter;
-use Illuminate\Support\ServiceProvider;
-
-final class SonarDeskLicensingServiceProvider extends ServiceProvider
-{
-    public function boot(): void
-    {
-        RateLimiter::for('license-activation', function (Request $request): array {
-            return [
-                Limit::perMinute(12)->by($request->ip()),
-                Limit::perMinute(6)->by(hash('sha256', (string) $request->input('installationID'))),
-            ];
-        });
-
-        RateLimiter::for('login', fn (Request $request) => Limit::perMinute(5)
-            ->by(strtolower((string) $request->input('email')).'|'.$request->ip()));
-
-        RateLimiter::for('registration', fn (Request $request) => Limit::perHour(5)->by($request->ip()));
-    }
-}
diff --git a/sonar-desk-licensing/app/Services/Accounts/PurchasedAccountProvisioner.php b/sonar-desk-licensing/app/Services/Accounts/PurchasedAccountProvisioner.php
index 2498f89..96ec7d4 100644
--- a/sonar-desk-licensing/app/Services/Accounts/PurchasedAccountProvisioner.php
+++ b/sonar-desk-licensing/app/Services/Accounts/PurchasedAccountProvisioner.php
@@ -28,7 +28,6 @@ final class PurchasedAccountProvisioner
          * Paddle can deliver several related webhook events concurrently, so
          * this lookup alone cannot guarantee that another request will not
          * create the user between this SELECT and our INSERT.
-         * enure this is pushed
          */
         $user = $this->findByEmail($email);
 
diff --git a/sonar-desk-licensing/bootstrap/providers.php b/sonar-desk-licensing/bootstrap/providers.php
index cfe2c04..38b258d 100755
--- a/sonar-desk-licensing/bootstrap/providers.php
+++ b/sonar-desk-licensing/bootstrap/providers.php
@@ -1,7 +1,5 @@
 <?php
 
-use App\Providers\SonarDeskLicensingServiceProvider;
-
 return [
-    SonarDeskLicensingServiceProvider::class,
+    App\Providers\AppServiceProvider::class,
 ];
diff --git a/sonar-desk-licensing/composer.json b/sonar-desk-licensing/composer.json
index 2d5a306..0f8337f 100755
--- a/sonar-desk-licensing/composer.json
+++ b/sonar-desk-licensing/composer.json
@@ -3,13 +3,31 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
+    "keywords": [
+        "laravel",
+        "framework"
+    ],
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@github.com:MPBA-Ltd/laravel_modules.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@github.com:MPBA-Ltd/laravel_settings.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@github.com:MPBA-Ltd/laravel-charts.git"
+        }
+    ],
     "require": {
         "php": "^8.3",
         "deployer/deployer": "^8.0",
         "laravel/framework": "^13.17",
         "laravel/tinker": "^3.0",
+        "mpba/laravel-modules": "dev-main",
         "predis/predis": "^3.6"
     },
     "require-dev": {
@@ -25,7 +43,8 @@
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
-            "Database\\Seeders\\": "database/seeders/"
+            "Database\\Seeders\\": "database/seeders/",
+            "Modules\\": "modules/"
         }
     },
     "autoload-dev": {
diff --git a/sonar-desk-licensing/composer.lock b/sonar-desk-licensing/composer.lock
index ce5ffcc..03ed902 100755
--- a/sonar-desk-licensing/composer.lock
+++ b/sonar-desk-licensing/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1f5b5a47e5910fdf5b2c47e1bc45e1b0",
+    "content-hash": "d92f21f84e06e667b70468859bfaffd0",
     "packages": [
         {
             "name": "brick/math",
@@ -1542,16 +1542,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.10.1",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "9d489ab67a02960fd8ffe624d93f751daf95439e"
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9d489ab67a02960fd8ffe624d93f751daf95439e",
-                "reference": "9d489ab67a02960fd8ffe624d93f751daf95439e",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6efbd9c472b91db0a3350fcd601c8332c2382e1f",
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f",
                 "shasum": ""
             },
             "require": {
@@ -1645,7 +1645,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-09-07T13:44:26+00:00"
+            "time": "2026-09-21T13:07:34+00:00"
         },
         {
             "name": "league/config",
@@ -2256,6 +2256,101 @@
             ],
             "time": "2026-09-02T12:39:56+00:00"
         },
+        {
+            "name": "mpba/laravel-modules",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MPBA-Ltd/laravel_modules.git",
+                "reference": "55d802560f6404d6b9fd71a89561ed46d32124ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MPBA-Ltd/laravel_modules/zipball/55d802560f6404d6b9fd71a89561ed46d32124ff",
+                "reference": "55d802560f6404d6b9fd71a89561ed46d32124ff",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.16",
+                "laravel/framework": "^8.0",
+                "mockery/mockery": "~1.0",
+                "orchestra/testbench": "^6.0",
+                "phpstan/phpstan": "^0.12.14",
+                "phpunit/phpunit": "^8.5",
+                "spatie/phpunit-snapshot-assertions": "^2.1.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "mpba\\Modules\\LaravelModulesServiceProvider"
+                    ],
+                    "aliases": {
+                        "Module": "mpba\\Modules\\Facades\\Module"
+                    }
+                },
+                "branch-alias": {
+                    "dev-master": "8.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "mpba\\Modules\\": "src"
+                },
+                "files": [
+                    "src/helpers.php"
+                ]
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "mpba\\Modules\\Tests\\": "tests",
+                    "Modules\\Recipe\\": "tests/stubs/valid/Recipe"
+                }
+            },
+            "scripts": {
+                "update-snapshots": [
+                    "./vendor/bin/phpunit --no-coverage -d --update-snapshots"
+                ],
+                "test": [
+                    "vendor/bin/phpunit"
+                ],
+                "test-coverage": [
+                    "vendor/bin/phpunit --debug --coverage-html coverage"
+                ],
+                "pcf": [
+                    "vendor/bin/php-cs-fixer fix --verbose"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Gregory",
+                    "email": "mark.gregory@mpba.co.uk",
+                    "homepage": "https://mpba.co.uk",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Laravel Module management",
+            "keywords": [
+                "laravel",
+                "module",
+                "modules",
+                "mpba",
+                "rad"
+            ],
+            "support": {
+                "source": "https://github.com/MPBA-Ltd/laravel_modules/tree/main",
+                "issues": "https://github.com/MPBA-Ltd/laravel_modules/issues"
+            },
+            "time": "2026-09-30T13:50:27+00:00"
+        },
         {
             "name": "nesbot/carbon",
             "version": "3.13.2",
@@ -4875,16 +4970,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.37.0",
+            "version": "v1.43.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411"
+                "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
-                "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74",
+                "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74",
                 "shasum": ""
             },
             "require": {
@@ -4935,7 +5030,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.43.0"
             },
             "funding": [
                 {
@@ -4955,7 +5050,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-04-10T16:19:22+00:00"
+            "time": "2026-09-25T15:50:05+00:00"
         },
         {
             "name": "symfony/polyfill-php82",
@@ -8709,7 +8804,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "mpba/laravel-modules": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
diff --git a/sonar-desk-licensing/config/sonardesk.php b/sonar-desk-licensing/config/sonardesk.php
index d56d04b..188be39 100644
--- a/sonar-desk-licensing/config/sonardesk.php
+++ b/sonar-desk-licensing/config/sonardesk.php
@@ -28,21 +28,6 @@ return [
         'notify_admin_users' => filter_var(env('SONARDESK_SUPPORT_NOTIFY_ADMINS', true), FILTER_VALIDATE_BOOL),
     ],
 
-    'paddle' => [
-        'api_key' => env('PADDLE_API_KEY'),
-        'client_side_token' => env('PADDLE_CLIENT_SIDE_TOKEN'),
-        'environment' => env('PADDLE_ENVIRONMENT', env('APP_ENV') === 'production' ? 'production' : 'sandbox'),
-        'api_url' => env('PADDLE_API_URL', env('APP_ENV') === 'production' ? 'https://api.paddle.com' : 'https://sandbox-api.paddle.com'),
-        'webhook_secret' => env('PADDLE_WEBHOOK_SECRET'),
-        'timestamp_tolerance' => (int) env('PADDLE_WEBHOOK_TOLERANCE', 300),
-
-        // SonarDesk is one Paddle product with four recurring prices.
-        'product_id' => env('PADDLE_PRODUCT_ID'),
-        'personal_monthly_price_id' => env('PADDLE_PERSONAL_MONTHLY_PRICE_ID'),
-        'personal_annual_price_id' => env('PADDLE_PERSONAL_ANNUAL_PRICE_ID'),
-        'professional_monthly_price_id' => env('PADDLE_PROFESSIONAL_MONTHLY_PRICE_ID'),
-        'professional_annual_price_id' => env('PADDLE_PROFESSIONAL_ANNUAL_PRICE_ID'),
-    ],
 
     'lemon_squeezy' => [
         'webhook_secret' => env('LEMON_SQUEEZY_WEBHOOK_SECRET'),
diff --git a/sonar-desk-licensing/database/factories/UserFactory.php b/sonar-desk-licensing/database/factories/UserFactory.php
new file mode 100644
index 0000000..c411c07
--- /dev/null
+++ b/sonar-desk-licensing/database/factories/UserFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+/**
+ * @extends Factory<\App\Models\User>
+ */
+class UserFactory extends Factory
+{
+    protected static ?string $password;
+
+    public function definition(): array
+    {
+        return [
+            'name' => fake()->name(),
+            'email' => fake()->unique()->safeEmail(),
+            'email_verified_at' => now(),
+            'password' => static::$password ??= Hash::make('password'),
+            'remember_token' => Str::random(10),
+            'is_admin' => false,
+        ];
+    }
+
+    public function unverified(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'email_verified_at' => null,
+        ]);
+    }
+}
diff --git a/sonar-desk-licensing/database/migrations/2026_10_01_100000_add_professional_seo_to_cms_pages.php b/sonar-desk-licensing/database/migrations/2026_10_01_100000_add_professional_seo_to_cms_pages.php
new file mode 100644
index 0000000..5633841
--- /dev/null
+++ b/sonar-desk-licensing/database/migrations/2026_10_01_100000_add_professional_seo_to_cms_pages.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('cms_pages', function (Blueprint $table): void {
+            $table->string('meta_keywords', 500)->nullable()->after('meta_description');
+            $table->string('canonical_url', 2048)->nullable()->after('meta_keywords');
+            $table->string('og_title')->nullable()->after('canonical_url');
+            $table->string('og_description', 320)->nullable()->after('og_title');
+            $table->string('og_image', 2048)->nullable()->after('og_description');
+            $table->boolean('robots_index')->default(true)->after('og_image');
+            $table->boolean('robots_follow')->default(true)->after('robots_index');
+            $table->boolean('include_in_sitemap')->default(true)->after('robots_follow')->index();
+            $table->decimal('sitemap_priority', 2, 1)->default(0.5)->after('include_in_sitemap');
+            $table->string('sitemap_change_frequency', 20)->default('monthly')->after('sitemap_priority');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('cms_pages', function (Blueprint $table): void {
+            $table->dropIndex(['include_in_sitemap']);
+            $table->dropColumn([
+                'meta_keywords', 'canonical_url', 'og_title', 'og_description', 'og_image',
+                'robots_index', 'robots_follow', 'include_in_sitemap', 'sitemap_priority',
+                'sitemap_change_frequency',
+            ]);
+        });
+    }
+};
diff --git a/sonar-desk-licensing/database/migrations/2026_10_02_090000_add_disabled_at_to_users_table.php b/sonar-desk-licensing/database/migrations/2026_10_02_090000_add_disabled_at_to_users_table.php
new file mode 100644
index 0000000..4763179
--- /dev/null
+++ b/sonar-desk-licensing/database/migrations/2026_10_02_090000_add_disabled_at_to_users_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (Schema::hasTable('users') && ! Schema::hasColumn('users', 'disabled_at')) {
+            Schema::table('users', fn (Blueprint $table) => $table->timestamp('disabled_at')->nullable()->index()->after('is_admin'));
+        }
+    }
+
+    public function down(): void
+    {
+        if (Schema::hasTable('users') && Schema::hasColumn('users', 'disabled_at')) {
+            Schema::table('users', fn (Blueprint $table) => $table->dropColumn('disabled_at'));
+        }
+    }
+};
diff --git a/sonar-desk-licensing/database/migrations/2026_10_02_100000_create_failed_jobs_table.php b/sonar-desk-licensing/database/migrations/2026_10_02_100000_create_failed_jobs_table.php
new file mode 100644
index 0000000..d0cebcc
--- /dev/null
+++ b/sonar-desk-licensing/database/migrations/2026_10_02_100000_create_failed_jobs_table.php
@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('failed_jobs', function (Blueprint $table): void {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->text('connection');
+            $table->text('queue');
+            $table->longText('payload');
+            $table->longText('exception');
+            $table->timestamp('failed_at')->useCurrent();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+};
diff --git a/sonar-desk-licensing/deploy.php b/sonar-desk-licensing/deploy.php
index dd96cd1..c7db5c1 100755
--- a/sonar-desk-licensing/deploy.php
+++ b/sonar-desk-licensing/deploy.php
@@ -19,13 +19,13 @@ add('writable_dirs', ['storage', 'bootstrap/cache']);
 
 // Host Definitions
 host('main')
-    ->set('hostname', 'sonardesk.absdev.net')
+    ->set('hostname', '217.154.47.197')
     ->set('remote_user', 'mag')
     ->set('branch', 'main')
-    ->set('deploy_path', '/var/www/sonardesk/main');
+    ->set('deploy_path', '/var/www/sonardesk/prod');
 
 host('stage')
-    ->set('hostname', 'sonardesk.stage.absdev.net')
+    ->set('hostname', '192.168.1.2')
     ->set('remote_user', 'mag')
     ->set('branch', 'stage')
     ->set('deploy_path', '/var/www/sonardesk/stage');
diff --git a/sonar-desk-licensing/AGENTS.md b/sonar-desk-licensing/docs/AGENTS.md
similarity index 100%
rename from sonar-desk-licensing/AGENTS.md
rename to sonar-desk-licensing/docs/AGENTS.md
diff --git a/sonar-desk-licensing/CLAUDE.md b/sonar-desk-licensing/docs/CLAUDE.md
similarity index 100%
rename from sonar-desk-licensing/CLAUDE.md
rename to sonar-desk-licensing/docs/CLAUDE.md
diff --git a/sonar-desk-licensing/sonar_desk b/sonar-desk-licensing/modules/Licensing/Config/.gitkeep
similarity index 100%
rename from sonar-desk-licensing/sonar_desk
rename to sonar-desk-licensing/modules/Licensing/Config/.gitkeep
diff --git a/sonar-desk-licensing/modules/Licensing/Config/config.php b/sonar-desk-licensing/modules/Licensing/Config/config.php
new file mode 100644
index 0000000..3b94eda
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Config/config.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'name' => 'Licensing',
+    'features' =>
+     [
+     ],
+];
diff --git a/sonar-desk-licensing/modules/Licensing/Console/.gitkeep b/sonar-desk-licensing/modules/Licensing/Console/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseDeliver.php b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseDeliver.php
similarity index 86%
rename from sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseDeliver.php
rename to sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseDeliver.php
index 68d5efe..67e5050 100644
--- a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseDeliver.php
+++ b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseDeliver.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Modules\Licensing\Console;
 
-use App\Services\Licensing\LicenseDeliveryService;
+use Modules\Licensing\Services\LicenseDeliveryService;
 use Illuminate\Console\Command;
 
 final class SonarDeskLicenseDeliver extends Command
diff --git a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseIssue.php b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseIssue.php
similarity index 86%
rename from sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseIssue.php
rename to sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseIssue.php
index 962b540..12469cb 100755
--- a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseIssue.php
+++ b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseIssue.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Modules\Licensing\Console;
 
-use App\Models\LicenseProduct;
-use App\Services\Licensing\LicenseIssuer;
+use Modules\Licensing\Models\LicenseProduct;
+use Modules\Licensing\Services\LicenseIssuer;
 use Illuminate\Console\Command;
 
 class SonarDeskLicenseIssue extends Command
diff --git a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseRevoke.php b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseRevoke.php
similarity index 87%
rename from sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseRevoke.php
rename to sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseRevoke.php
index e6fdecd..ad34c16 100755
--- a/sonar-desk-licensing/app/Console/Commands/SonarDeskLicenseRevoke.php
+++ b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskLicenseRevoke.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Modules\Licensing\Console;
 
-use App\Models\License;
+use Modules\Licensing\Models\License;
 use Illuminate\Console\Command;
 
 class SonarDeskLicenseRevoke extends Command
diff --git a/sonar-desk-licensing/app/Console/Commands/SonarDeskProductCreate.php b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskProductCreate.php
similarity index 92%
rename from sonar-desk-licensing/app/Console/Commands/SonarDeskProductCreate.php
rename to sonar-desk-licensing/modules/Licensing/Console/SonarDeskProductCreate.php
index 9edce35..8622a85 100755
--- a/sonar-desk-licensing/app/Console/Commands/SonarDeskProductCreate.php
+++ b/sonar-desk-licensing/modules/Licensing/Console/SonarDeskProductCreate.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Modules\Licensing\Console;
 
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\LicenseProduct;
 use Illuminate\Console\Command;
 
 class SonarDeskProductCreate extends Command
diff --git a/sonar-desk-licensing/modules/Licensing/Database/Migrations/.gitkeep b/sonar-desk-licensing/modules/Licensing/Database/Migrations/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_200000_create_sonardesk_licensing_tables.php b/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_200000_create_sonardesk_licensing_tables.php
new file mode 100755
index 0000000..babc7a3
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_200000_create_sonardesk_licensing_tables.php
@@ -0,0 +1,92 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('license_products', function (Blueprint $table) {
+            $table->id();
+            $table->string('code')->unique();
+            $table->string('name');
+            $table->string('edition')->default('Professional');
+            $table->unsignedInteger('activation_limit')->default(1);
+            $table->unsignedInteger('max_major_version')->nullable();
+            $table->string('payment_provider')->nullable();
+            $table->string('external_product_id')->nullable();
+            $table->string('external_price_id')->nullable();
+            $table->boolean('active')->default(true);
+            $table->timestamps();
+            $table->unique(['payment_provider', 'external_price_id']);
+        });
+
+        Schema::create('licenses', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->foreignId('license_product_id')->constrained('license_products');
+            $table->string('license_key_hash', 64)->unique();
+            $table->string('license_key_last4', 4);
+            $table->string('customer_name')->nullable();
+            $table->string('customer_email')->nullable()->index();
+            $table->string('edition');
+            $table->unsignedInteger('activation_limit');
+            $table->unsignedInteger('max_major_version')->nullable();
+            $table->timestamp('expires_at')->nullable();
+            $table->timestamp('revoked_at')->nullable();
+            $table->string('revoke_reason')->nullable();
+            $table->string('payment_provider')->nullable();
+            $table->string('external_order_id')->nullable();
+            $table->string('external_customer_id')->nullable();
+            $table->timestamps();
+            $table->unique(['payment_provider', 'external_order_id']);
+        });
+
+        Schema::create('license_delivery_outbox', function (Blueprint $table) {
+            $table->id();
+            $table->uuid('license_id')->unique();
+            $table->text('encrypted_license_key');
+            $table->string('recipient_email')->nullable();
+            $table->timestamp('delivered_at')->nullable();
+            $table->timestamps();
+            $table->foreign('license_id')->references('id')->on('licenses')->cascadeOnDelete();
+        });
+
+        Schema::create('license_activations', function (Blueprint $table) {
+            $table->id();
+            $table->uuid('license_id');
+            $table->uuid('installation_id');
+            $table->string('platform', 32)->nullable();
+            $table->string('app_version', 32)->nullable();
+            $table->timestamp('activated_at');
+            $table->timestamp('last_seen_at')->nullable();
+            $table->timestamp('deactivated_at')->nullable();
+            $table->foreign('license_id')->references('id')->on('licenses')->cascadeOnDelete();
+            $table->unique(['license_id', 'installation_id']);
+            $table->index(['license_id', 'deactivated_at']);
+        });
+
+        Schema::create('license_webhook_events', function (Blueprint $table) {
+            $table->id();
+            $table->string('provider');
+            $table->string('external_event_id');
+            $table->string('event_type');
+            $table->string('payload_sha256', 64);
+            $table->json('payload');
+            $table->timestamp('processed_at')->nullable();
+            $table->text('processing_error')->nullable();
+            $table->timestamps();
+            $table->unique(['provider', 'external_event_id']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('license_webhook_events');
+        Schema::dropIfExists('license_activations');
+        Schema::dropIfExists('license_delivery_outbox');
+        Schema::dropIfExists('licenses');
+        Schema::dropIfExists('license_products');
+    }
+};
diff --git a/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_210000_add_sonardesk_portal_fields.php b/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_210000_add_sonardesk_portal_fields.php
new file mode 100755
index 0000000..b302e12
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Database/Migrations/2026_09_08_210000_add_sonardesk_portal_fields.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (Schema::hasTable('users') && ! Schema::hasColumn('users', 'is_admin')) {
+            Schema::table('users', fn (Blueprint $table) => $table->boolean('is_admin')->default(false)->index());
+        }
+
+        if (Schema::hasTable('license_activations') && ! Schema::hasColumn('license_activations', 'installation_name')) {
+            Schema::table('license_activations', fn (Blueprint $table) => $table->string('installation_name')->nullable()->after('installation_id'));
+        }
+    }
+
+    public function down(): void
+    {
+        if (Schema::hasTable('license_activations') && Schema::hasColumn('license_activations', 'installation_name')) {
+            Schema::table('license_activations', fn (Blueprint $table) => $table->dropColumn('installation_name'));
+        }
+
+        if (Schema::hasTable('users') && Schema::hasColumn('users', 'is_admin')) {
+            Schema::table('users', fn (Blueprint $table) => $table->dropColumn('is_admin'));
+        }
+    }
+};
diff --git a/sonar-desk-licensing/modules/Licensing/Database/Seeders/.gitkeep b/sonar-desk-licensing/modules/Licensing/Database/Seeders/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Database/Seeders/LicensingDatabaseSeeder.php b/sonar-desk-licensing/modules/Licensing/Database/Seeders/LicensingDatabaseSeeder.php
new file mode 100644
index 0000000..fbb0b58
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Database/Seeders/LicensingDatabaseSeeder.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\Licensing\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+
+class LicensingDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Model::unguard();
+
+        // $this->call("OthersTableSeeder");
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/Database/factories/.gitkeep b/sonar-desk-licensing/modules/Licensing/Database/factories/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Helpers/.gitkeep b/sonar-desk-licensing/modules/Licensing/Helpers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Helpers/Helper.php b/sonar-desk-licensing/modules/Licensing/Helpers/Helper.php
new file mode 100644
index 0000000..7607c60
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Helpers/Helper.php
@@ -0,0 +1,12 @@
+<?php
+use Modules\Licensing\Support\ModuleInfo;
+
+if (! function_exists('licensing_feature_enabled')) {
+    /**
+     * Check if a feature is enabled in the config.
+     */
+    function licensing_feature_enabled(string $key): bool
+    {
+        return (bool) config(ModuleInfo::nameLower().".features.{$key}", false);
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/Http/Controllers/.gitkeep b/sonar-desk-licensing/modules/Licensing/Http/Controllers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/app/Http/Controllers/Api/LicenseActivationController.php b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/LicenseActivationController.php
similarity index 95%
rename from sonar-desk-licensing/app/Http/Controllers/Api/LicenseActivationController.php
rename to sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/LicenseActivationController.php
index d4e1aba..7580871 100755
--- a/sonar-desk-licensing/app/Http/Controllers/Api/LicenseActivationController.php
+++ b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/LicenseActivationController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Api;
+namespace Modules\Licensing\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
-use App\Models\License;
-use App\Models\LicenseActivation;
-use App\Services\Licensing\LicenseKey;
-use App\Services\Licensing\LicenseSigner;
-use App\Services\Licensing\LicenseTokenVerifier;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseActivation;
+use Modules\Licensing\Services\LicenseKey;
+use Modules\Licensing\Services\LicenseSigner;
+use Modules\Licensing\Services\LicenseTokenVerifier;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
diff --git a/sonar-desk-licensing/app/Http/Controllers/Api/PaymentWebhookController.php b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/PaymentWebhookController.php
similarity index 95%
rename from sonar-desk-licensing/app/Http/Controllers/Api/PaymentWebhookController.php
rename to sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/PaymentWebhookController.php
index 502f650..61d9512 100755
--- a/sonar-desk-licensing/app/Http/Controllers/Api/PaymentWebhookController.php
+++ b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Api/PaymentWebhookController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Api;
+namespace Modules\Licensing\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
-use App\Models\LicenseWebhookEvent;
-use App\Services\Licensing\LicenseDeliveryService;
+use Modules\Licensing\Models\LicenseWebhookEvent;
+use Modules\Licensing\Services\LicenseDeliveryService;
 use App\Services\Payments\LemonSqueezyWebhookVerifier;
-use App\Services\Payments\PaddleWebhookVerifier;
-use App\Services\Payments\PurchaseProvisioner;
+use Modules\Paddle\Services\PaddleWebhookVerifier;
+use Modules\Paddle\Services\PurchaseProvisioner;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
diff --git a/sonar-desk-licensing/modules/Licensing/Http/Controllers/LicensingController.php b/sonar-desk-licensing/modules/Licensing/Http/Controllers/LicensingController.php
new file mode 100644
index 0000000..8ece907
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Http/Controllers/LicensingController.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Modules\Licensing\Http\Controllers;
+
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class LicensingController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     * @return Renderable
+     */
+    public function index()
+    {
+        return view('licensing::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     * @return Renderable
+     */
+    public function create()
+    {
+        return view('licensing::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     * @param Request $request
+     * @return Renderable
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function show($id)
+    {
+        return view('licensing::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function edit($id)
+    {
+        return view('licensing::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     * @param Request $request
+     * @param int $id
+     * @return Renderable
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     * @param int $id
+     * @return Renderable
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/sonar-desk-licensing/app/Http/Controllers/Portal/PortalController.php b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Portal/PortalController.php
similarity index 94%
rename from sonar-desk-licensing/app/Http/Controllers/Portal/PortalController.php
rename to sonar-desk-licensing/modules/Licensing/Http/Controllers/Portal/PortalController.php
index 0f7c8dd..9f9d6bf 100755
--- a/sonar-desk-licensing/app/Http/Controllers/Portal/PortalController.php
+++ b/sonar-desk-licensing/modules/Licensing/Http/Controllers/Portal/PortalController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Portal;
+namespace Modules\Licensing\Http\Controllers\Portal;
 
 use App\Http\Controllers\Controller;
-use App\Models\License;
-use App\Models\LicenseDeliveryOutbox;
-use App\Models\LicenseProduct;
-use App\Services\Payments\PaddleClient;
-use App\Services\Licensing\LicenseDeliveryService;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseDeliveryOutbox;
+use Modules\Licensing\Models\LicenseProduct;
+use Modules\Paddle\Services\PaddleClient;
+use Modules\Licensing\Services\LicenseDeliveryService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use RuntimeException;
@@ -131,7 +131,7 @@ final class PortalController extends Controller
 
     private function professionalPriceFor(License $license): string
     {
-        $paddle = config('sonardesk.paddle');
+        $paddle = config('paddle');
         $current = (string) $license->external_price_id;
 
         if ($current === (string) ($paddle['personal_annual_price_id'] ?? '')) {
diff --git a/sonar-desk-licensing/modules/Licensing/Http/Middleware/.gitkeep b/sonar-desk-licensing/modules/Licensing/Http/Middleware/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Http/Requests/.gitkeep b/sonar-desk-licensing/modules/Licensing/Http/Requests/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Models/.gitkeep b/sonar-desk-licensing/modules/Licensing/Models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/app/Models/License.php b/sonar-desk-licensing/modules/Licensing/Models/License.php
similarity index 97%
rename from sonar-desk-licensing/app/Models/License.php
rename to sonar-desk-licensing/modules/Licensing/Models/License.php
index c3dcc56..86e5c6a 100755
--- a/sonar-desk-licensing/app/Models/License.php
+++ b/sonar-desk-licensing/modules/Licensing/Models/License.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace Modules\Licensing\Models;
 
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Model;
diff --git a/sonar-desk-licensing/app/Models/LicenseActivation.php b/sonar-desk-licensing/modules/Licensing/Models/LicenseActivation.php
similarity index 91%
rename from sonar-desk-licensing/app/Models/LicenseActivation.php
rename to sonar-desk-licensing/modules/Licensing/Models/LicenseActivation.php
index 8562d4b..fb454a0 100755
--- a/sonar-desk-licensing/app/Models/LicenseActivation.php
+++ b/sonar-desk-licensing/modules/Licensing/Models/LicenseActivation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace Modules\Licensing\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/sonar-desk-licensing/app/Models/LicenseDeliveryOutbox.php b/sonar-desk-licensing/modules/Licensing/Models/LicenseDeliveryOutbox.php
similarity index 92%
rename from sonar-desk-licensing/app/Models/LicenseDeliveryOutbox.php
rename to sonar-desk-licensing/modules/Licensing/Models/LicenseDeliveryOutbox.php
index ac7fb94..89d1d5f 100755
--- a/sonar-desk-licensing/app/Models/LicenseDeliveryOutbox.php
+++ b/sonar-desk-licensing/modules/Licensing/Models/LicenseDeliveryOutbox.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace Modules\Licensing\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/sonar-desk-licensing/app/Models/LicenseProduct.php b/sonar-desk-licensing/modules/Licensing/Models/LicenseProduct.php
similarity index 91%
rename from sonar-desk-licensing/app/Models/LicenseProduct.php
rename to sonar-desk-licensing/modules/Licensing/Models/LicenseProduct.php
index 85ac9f5..eb8a4cc 100755
--- a/sonar-desk-licensing/app/Models/LicenseProduct.php
+++ b/sonar-desk-licensing/modules/Licensing/Models/LicenseProduct.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace Modules\Licensing\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/sonar-desk-licensing/app/Models/LicenseWebhookEvent.php b/sonar-desk-licensing/modules/Licensing/Models/LicenseWebhookEvent.php
similarity index 89%
rename from sonar-desk-licensing/app/Models/LicenseWebhookEvent.php
rename to sonar-desk-licensing/modules/Licensing/Models/LicenseWebhookEvent.php
index 38fea30..a8cc130 100755
--- a/sonar-desk-licensing/app/Models/LicenseWebhookEvent.php
+++ b/sonar-desk-licensing/modules/Licensing/Models/LicenseWebhookEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace Modules\Licensing\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/sonar-desk-licensing/modules/Licensing/Providers/.gitkeep b/sonar-desk-licensing/modules/Licensing/Providers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Providers/LicensingServiceProvider.php b/sonar-desk-licensing/modules/Licensing/Providers/LicensingServiceProvider.php
new file mode 100644
index 0000000..c514a59
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Providers/LicensingServiceProvider.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace Modules\Licensing\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Database\Eloquent\Factory;
+use Illuminate\Support\Facades\File;
+use Modules\Licensing\Support\ModuleInfo;
+use Config;
+
+class LicensingServiceProvider extends ServiceProvider
+{
+    /**
+     * @var string $moduleName
+     */
+    protected string $moduleName = 'Licensing';
+
+    /**
+     * @var string $moduleNameLower
+     */
+    protected string $moduleNameLower = 'licensing';
+
+
+     /**
+      * Get the services provided by the provider.
+      *
+      * @return array
+      */
+    public function provides():array
+    {
+        return [];
+    }
+
+    /**
+     * Boot the application events.
+     *
+     * @return void
+     */
+    public function boot() : void
+    {
+        RateLimiter::for('login', fn (Request $request) => Limit::perMinute(5)
+            ->by(strtolower((string) $request->input('email')).'|'.$request->ip()));
+
+        RateLimiter::for('registration', fn (Request $request) =>
+            Limit::perHour(5)->by($request->ip())
+        );
+
+        RateLimiter::for('license-activation', function (Request $request): array {
+            return [
+                Limit::perMinute(12)->by($request->ip()),
+                Limit::perMinute(6)->by(hash('sha256', (string) $request->input('installationID'))),
+            ];
+        });
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->registerHelpers();
+        $this->registerCommands();
+        $this->loadMigrationsFrom(module_path(ModuleInfo::name(), 'Database/Migrations'));
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register the helpers.
+     *
+     * @return void
+     */
+    protected function registerHelpers(): void
+    {
+        foreach (glob(__DIR__.'/../Helpers/*.php') as $filename) {
+            require_once $filename;
+        }
+    }
+
+     /**
+     * Dynamically Register Commands.
+     *
+     * @return void
+     */
+    public function registerCommands(): void
+       {
+           if (!$this->app->runningInConsole()) {
+               return;
+           }
+           $commandPath = __DIR__ . '/../Console';
+            $commands = collect(File::allFiles($commandPath))
+                 ->map(function ($file) {
+                     $class = 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
+                     return $class;
+                })
+                ->filter(function ($class) {
+                    return class_exists($class);
+                })
+                ->values()
+                ->all();
+            $this->commands($commands);
+        }
+
+    /**
+     * Register config.
+     *
+     * @return void
+     */
+    protected function registerConfig(): void
+    {
+        $this->publishes([
+            module_path(ModuleInfo::name(), 'Config/config.php') => config_path( ModuleInfo::nameLower(). '.php'),
+        ], 'config');
+        $this->mergeConfigFrom(
+            module_path(ModuleInfo::name(), 'Config/config.php'),  ModuleInfo::nameLower()
+        );
+    }
+
+    /**
+     * Register views.
+     *
+     * @return void
+     */
+    public function registerViews(): void
+    {
+        $viewPath = resource_path('views/modules/' . ModuleInfo::nameLower());
+        $sourcePath = module_path(ModuleInfo::name(), 'Resources/views');
+        $this->publishes([
+            $sourcePath => $viewPath
+        ], ['views',  ModuleInfo::nameLower() . '-module-views']);
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]),  ModuleInfo::nameLower());
+    }
+
+    /**
+     * Register translations.
+     *
+     * @return void
+     */
+    public function registerTranslations(): void
+    {
+        $langPath = resource_path('lang/modules/' .  ModuleInfo::nameLower());
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath,  ModuleInfo::nameLower());
+        } else {
+            $this->loadTranslationsFrom(module_path(ModuleInfo::name(), 'Resources/lang'), ModuleInfo::nameLower());
+        }
+    }
+
+    /**
+     * Regsiter View Paths
+     * @return array
+     */
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (Config::get('view.paths') as $path) {
+            if (is_dir($path . '/modules/' . ModuleInfo::nameLower())) {
+                $paths[] = $path . '/modules/' . ModuleInfo::nameLower();
+            }
+        }
+        return $paths;
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/Providers/RouteServiceProvider.php b/sonar-desk-licensing/modules/Licensing/Providers/RouteServiceProvider.php
new file mode 100644
index 0000000..c691ba8
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Providers/RouteServiceProvider.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Modules\Licensing\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The module namespace to assume when generating URLs to actions.
+     *
+     * @var string
+     */
+    protected $moduleNamespace = 'Modules\Licensing\Http\Controllers';
+
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @return void
+     */
+    public function map()
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::middleware('web')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Licensing', '/Routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Licensing', '/Routes/api.php'));
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/assets/.gitkeep b/sonar-desk-licensing/modules/Licensing/Resources/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/assets/js/app.js b/sonar-desk-licensing/modules/Licensing/Resources/assets/js/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/assets/sass/app.scss b/sonar-desk-licensing/modules/Licensing/Resources/assets/sass/app.scss
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/lang/.gitkeep b/sonar-desk-licensing/modules/Licensing/Resources/lang/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/views/.gitkeep b/sonar-desk-licensing/modules/Licensing/Resources/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/views/index.blade.php b/sonar-desk-licensing/modules/Licensing/Resources/views/index.blade.php
new file mode 100644
index 0000000..4277b06
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Resources/views/index.blade.php
@@ -0,0 +1,9 @@
+@extends('licensing::layouts.master')
+
+@section('content')
+    <h1>Hello World</h1>
+
+    <p>
+        This view is loaded from module: {!! config('licensing.name') !!}
+    </p>
+@endsection
diff --git a/sonar-desk-licensing/modules/Licensing/Resources/views/layouts/master.blade.php b/sonar-desk-licensing/modules/Licensing/Resources/views/layouts/master.blade.php
new file mode 100644
index 0000000..1e51f1c
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Resources/views/layouts/master.blade.php
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Module Licensing</title>
+
+       {{-- Laravel Mix - CSS File --}}
+       {{-- <link rel="stylesheet" href="{{ mix('css/licensing.css') }}"> --}}
+
+    </head>
+    <body>
+        @yield('content')
+
+        {{-- Laravel Mix - JS File --}}
+        {{-- <script src="{{ mix('js/licensing.js') }}"></script> --}}
+    </body>
+</html>
diff --git a/sonar-desk-licensing/modules/Licensing/Routes/.gitkeep b/sonar-desk-licensing/modules/Licensing/Routes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Routes/api.php b/sonar-desk-licensing/modules/Licensing/Routes/api.php
new file mode 100644
index 0000000..a923714
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Routes/api.php
@@ -0,0 +1,12 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Licensing\Http\Controllers\Api\LicenseActivationController;
+use Modules\Licensing\Http\Controllers\Api\PaymentWebhookController;
+
+Route::prefix('v1')->group(function (): void {
+    Route::post('/activate', [LicenseActivationController::class, 'activate'])->middleware('throttle:license-activation');
+    Route::post('/validate', [LicenseActivationController::class, 'validateInstallation'])->middleware('throttle:license-activation');
+    Route::post('/deactivate', [LicenseActivationController::class, 'deactivate'])->middleware('throttle:license-activation');
+    Route::post('/webhooks/{provider}', PaymentWebhookController::class)->whereIn('provider', ['paddle', 'lemon-squeezy']);
+});
diff --git a/sonar-desk-licensing/modules/Licensing/Routes/web.php b/sonar-desk-licensing/modules/Licensing/Routes/web.php
new file mode 100644
index 0000000..cfe4d88
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Routes/web.php
@@ -0,0 +1,13 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Licensing\Http\Controllers\Portal\PortalController;
+
+Route::middleware(['auth', 'verified'])->prefix('portal')->name('portal.')->group(function (): void {
+    Route::get('/', [PortalController::class, 'index'])->name('index');
+    Route::get('/licences/{license}', [PortalController::class, 'show'])->name('show');
+    Route::post('/licences/{license}/upgrade', [PortalController::class, 'upgrade'])->middleware('throttle:5,1')->name('upgrade');
+    Route::delete('/licences/{license}/subscription', [PortalController::class, 'cancel'])->middleware('throttle:5,1')->name('cancel');
+    Route::post('/licences/{license}/resend', [PortalController::class, 'resend'])->middleware('throttle:3,10')->name('resend');
+    Route::delete('/licences/{license}/activations/{activation}', [PortalController::class, 'deactivate'])->name('deactivate');
+});
diff --git a/sonar-desk-licensing/app/Services/Licensing/LicenseDeliveryService.php b/sonar-desk-licensing/modules/Licensing/Services/LicenseDeliveryService.php
similarity index 94%
rename from sonar-desk-licensing/app/Services/Licensing/LicenseDeliveryService.php
rename to sonar-desk-licensing/modules/Licensing/Services/LicenseDeliveryService.php
index 0c1e584..053600d 100755
--- a/sonar-desk-licensing/app/Services/Licensing/LicenseDeliveryService.php
+++ b/sonar-desk-licensing/modules/Licensing/Services/LicenseDeliveryService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Licensing;
+namespace Modules\Licensing\Services;
 
-use App\Models\LicenseDeliveryOutbox;
+use Modules\Licensing\Models\LicenseDeliveryOutbox;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Mail;
 
diff --git a/sonar-desk-licensing/app/Services/Licensing/LicenseIssuer.php b/sonar-desk-licensing/modules/Licensing/Services/LicenseIssuer.php
similarity index 91%
rename from sonar-desk-licensing/app/Services/Licensing/LicenseIssuer.php
rename to sonar-desk-licensing/modules/Licensing/Services/LicenseIssuer.php
index ec51713..7171dd8 100755
--- a/sonar-desk-licensing/app/Services/Licensing/LicenseIssuer.php
+++ b/sonar-desk-licensing/modules/Licensing/Services/LicenseIssuer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Licensing;
+namespace Modules\Licensing\Services;
 
-use App\Models\License;
-use App\Models\LicenseDeliveryOutbox;
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseDeliveryOutbox;
+use Modules\Licensing\Models\LicenseProduct;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 
diff --git a/sonar-desk-licensing/app/Services/Licensing/LicenseKey.php b/sonar-desk-licensing/modules/Licensing/Services/LicenseKey.php
similarity index 94%
rename from sonar-desk-licensing/app/Services/Licensing/LicenseKey.php
rename to sonar-desk-licensing/modules/Licensing/Services/LicenseKey.php
index 3e42361..4e2501f 100755
--- a/sonar-desk-licensing/app/Services/Licensing/LicenseKey.php
+++ b/sonar-desk-licensing/modules/Licensing/Services/LicenseKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Licensing;
+namespace Modules\Licensing\Services;
 
 final class LicenseKey
 {
diff --git a/sonar-desk-licensing/app/Services/Licensing/LicenseSigner.php b/sonar-desk-licensing/modules/Licensing/Services/LicenseSigner.php
similarity index 96%
rename from sonar-desk-licensing/app/Services/Licensing/LicenseSigner.php
rename to sonar-desk-licensing/modules/Licensing/Services/LicenseSigner.php
index 32e2858..404cef6 100755
--- a/sonar-desk-licensing/app/Services/Licensing/LicenseSigner.php
+++ b/sonar-desk-licensing/modules/Licensing/Services/LicenseSigner.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Licensing;
+namespace Modules\Licensing\Services;
 
-use App\Models\License;
+use Modules\Licensing\Models\License;
 use Carbon\CarbonInterface;
 use RuntimeException;
 
diff --git a/sonar-desk-licensing/app/Services/Licensing/LicenseTokenVerifier.php b/sonar-desk-licensing/modules/Licensing/Services/LicenseTokenVerifier.php
similarity index 98%
rename from sonar-desk-licensing/app/Services/Licensing/LicenseTokenVerifier.php
rename to sonar-desk-licensing/modules/Licensing/Services/LicenseTokenVerifier.php
index a13ba47..052f633 100755
--- a/sonar-desk-licensing/app/Services/Licensing/LicenseTokenVerifier.php
+++ b/sonar-desk-licensing/modules/Licensing/Services/LicenseTokenVerifier.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Licensing;
+namespace Modules\Licensing\Services;
 
 use RuntimeException;
 
diff --git a/sonar-desk-licensing/modules/Licensing/Support/.gitkeep b/sonar-desk-licensing/modules/Licensing/Support/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Support/ModuleInfo.php b/sonar-desk-licensing/modules/Licensing/Support/ModuleInfo.php
new file mode 100644
index 0000000..28b9983
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/Support/ModuleInfo.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Licensing\Support;
+
+class ModuleInfo
+{
+    protected static string $moduleName =  'Licensing';
+
+    /**
+     * defines the Module Name
+     * @return string
+     */
+    public static function name(): string
+    {
+        return static::$moduleName;
+    }
+
+    /**
+     * define the lowercase version
+     * @return string
+     */
+    public static function nameLower(): string
+    {
+        return strtolower(static::$moduleName);
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/Tests/Browser/.gitkeep b/sonar-desk-licensing/modules/Licensing/Tests/Browser/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Tests/Feature/.gitkeep b/sonar-desk-licensing/modules/Licensing/Tests/Feature/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Tests/Unit/.gitkeep b/sonar-desk-licensing/modules/Licensing/Tests/Unit/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/Traits/.gitkeep b/sonar-desk-licensing/modules/Licensing/Traits/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/View/.gitkeep b/sonar-desk-licensing/modules/Licensing/View/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Licensing/composer.json b/sonar-desk-licensing/modules/Licensing/composer.json
new file mode 100644
index 0000000..8faea5f
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "mpba/licensing",
+    "description": "SonarDesk Licensing module",
+    "type": "library",
+    "autoload": {
+        "psr-4": {
+            "Modules\\Licensing\\": ""
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Licensing\\Tests\\": "Tests/"
+        }
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/module.json b/sonar-desk-licensing/modules/Licensing/module.json
new file mode 100644
index 0000000..ea89a26
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/module.json
@@ -0,0 +1,14 @@
+{
+    "name": "Licensing",
+    "alias": "licensing",
+    "version": "1.0.0",
+    "description": "SonarDesk Licensing module",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\Licensing\\Providers\\LicensingServiceProvider"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": []
+}
diff --git a/sonar-desk-licensing/modules/Licensing/package.json b/sonar-desk-licensing/modules/Licensing/package.json
new file mode 100644
index 0000000..4599509
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/package.json
@@ -0,0 +1,17 @@
+{
+    "private": true,
+    "scripts": {
+        "dev": "npm run development",
+        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch-poll": "npm run watch -- --watch-poll",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "prod": "npm run production",
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    },
+    "devDependencies": {
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
+        "laravel-mix-merge-manifest": "^0.1.2"
+    }
+}
diff --git a/sonar-desk-licensing/modules/Licensing/webpack.mix.js b/sonar-desk-licensing/modules/Licensing/webpack.mix.js
new file mode 100644
index 0000000..f66c5f2
--- /dev/null
+++ b/sonar-desk-licensing/modules/Licensing/webpack.mix.js
@@ -0,0 +1,11 @@
+const dotenvExpand = require('dotenv-expand');
+dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/}));
+
+const mix = require('laravel-mix');
+
+mix.js(__dirname + '/Resources/assets/js/app.js', 'js/licensing.js')
+    .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/licensing.css');
+
+if (mix.inProduction()) {
+    mix.version();
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Config/.gitkeep b/sonar-desk-licensing/modules/Paddle/Config/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Config/config.php b/sonar-desk-licensing/modules/Paddle/Config/config.php
new file mode 100644
index 0000000..3c0fea0
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Config/config.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'name' => 'Paddle',
+    'api_key' => env('PADDLE_API_KEY'),
+    'client_side_token' => env('PADDLE_CLIENT_SIDE_TOKEN'),
+    'environment' => env('PADDLE_ENVIRONMENT', env('APP_ENV') === 'production' ? 'production' : 'sandbox'),
+    'api_url' => env('PADDLE_API_URL', env('APP_ENV') === 'production' ? 'https://api.paddle.com' : 'https://sandbox-api.paddle.com'),
+    'webhook_secret' => env('PADDLE_WEBHOOK_SECRET'),
+    'timestamp_tolerance' => (int) env('PADDLE_WEBHOOK_TOLERANCE', 300),
+    'product_id' => env('PADDLE_PRODUCT_ID'),
+    'personal_monthly_price_id' => env('PADDLE_PERSONAL_MONTHLY_PRICE_ID'),
+    'personal_annual_price_id' => env('PADDLE_PERSONAL_ANNUAL_PRICE_ID'),
+    'professional_monthly_price_id' => env('PADDLE_PROFESSIONAL_MONTHLY_PRICE_ID'),
+    'professional_annual_price_id' => env('PADDLE_PROFESSIONAL_ANNUAL_PRICE_ID'),
+];
diff --git a/sonar-desk-licensing/modules/Paddle/Console/.gitkeep b/sonar-desk-licensing/modules/Paddle/Console/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Database/Migrations/.gitkeep b/sonar-desk-licensing/modules/Paddle/Database/Migrations/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Database/Migrations/2026_09_09_100000_add_paddle_subscription_fields.php b/sonar-desk-licensing/modules/Paddle/Database/Migrations/2026_09_09_100000_add_paddle_subscription_fields.php
new file mode 100755
index 0000000..ef60b76
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Database/Migrations/2026_09_09_100000_add_paddle_subscription_fields.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->string('external_subscription_id')->nullable()->after('external_customer_id');
+            $table->string('external_price_id')->nullable()->after('external_subscription_id');
+            $table->string('subscription_status')->nullable()->after('external_price_id');
+            $table->timestamp('current_period_ends_at')->nullable()->after('subscription_status');
+            $table->timestamp('cancel_scheduled_at')->nullable()->after('current_period_ends_at');
+            $table->unique(['payment_provider', 'external_subscription_id']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->dropUnique(['payment_provider', 'external_subscription_id']);
+            $table->dropColumn([
+                'external_subscription_id',
+                'external_price_id',
+                'subscription_status',
+                'current_period_ends_at',
+                'cancel_scheduled_at',
+            ]);
+        });
+    }
+};
diff --git a/sonar-desk-licensing/modules/Paddle/Database/Seeders/.gitkeep b/sonar-desk-licensing/modules/Paddle/Database/Seeders/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/database/seeders/PaddleCatalogSeeder.php b/sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleCatalogSeeder.php
similarity index 61%
rename from sonar-desk-licensing/database/seeders/PaddleCatalogSeeder.php
rename to sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleCatalogSeeder.php
index 1c23d60..203ffe5 100755
--- a/sonar-desk-licensing/database/seeders/PaddleCatalogSeeder.php
+++ b/sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleCatalogSeeder.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Database\Seeders;
+namespace Modules\Paddle\Database\Seeders;
 
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\LicenseProduct;
 use Illuminate\Database\Seeder;
 
 class PaddleCatalogSeeder extends Seeder
@@ -10,10 +10,10 @@ class PaddleCatalogSeeder extends Seeder
     public function run(): void
     {
         $products = [
-            ['code' => 'personal-monthly', 'name' => 'SonarDesk Personal Monthly', 'edition' => 'Personal', 'activation_limit' => 1, 'external_product_id' => config('sonardesk.paddle.product_id'), 'external_price_id' => config('sonardesk.paddle.personal_monthly_price_id')],
-            ['code' => 'personal-annual', 'name' => 'SonarDesk Personal Annual', 'edition' => 'Personal', 'activation_limit' => 1, 'external_product_id' => config('sonardesk.paddle.product_id'), 'external_price_id' => config('sonardesk.paddle.personal_annual_price_id')],
-            ['code' => 'professional-monthly', 'name' => 'SonarDesk Professional Monthly', 'edition' => 'Professional', 'activation_limit' => 3, 'external_product_id' => config('sonardesk.paddle.product_id'), 'external_price_id' => config('sonardesk.paddle.professional_monthly_price_id')],
-            ['code' => 'professional-annual', 'name' => 'SonarDesk Professional Annual', 'edition' => 'Professional', 'activation_limit' => 3, 'external_product_id' => config('sonardesk.paddle.product_id'), 'external_price_id' => config('sonardesk.paddle.professional_annual_price_id')],
+            ['code' => 'personal-monthly', 'name' => 'SonarDesk Personal Monthly', 'edition' => 'Personal', 'activation_limit' => 1, 'external_product_id' => config('paddle.product_id'), 'external_price_id' => config('paddle.personal_monthly_price_id')],
+            ['code' => 'personal-annual', 'name' => 'SonarDesk Personal Annual', 'edition' => 'Personal', 'activation_limit' => 1, 'external_product_id' => config('paddle.product_id'), 'external_price_id' => config('paddle.personal_annual_price_id')],
+            ['code' => 'professional-monthly', 'name' => 'SonarDesk Professional Monthly', 'edition' => 'Professional', 'activation_limit' => 3, 'external_product_id' => config('paddle.product_id'), 'external_price_id' => config('paddle.professional_monthly_price_id')],
+            ['code' => 'professional-annual', 'name' => 'SonarDesk Professional Annual', 'edition' => 'Professional', 'activation_limit' => 3, 'external_product_id' => config('paddle.product_id'), 'external_price_id' => config('paddle.professional_annual_price_id')],
         ];
 
         foreach ($products as $data) {
diff --git a/sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleDatabaseSeeder.php b/sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleDatabaseSeeder.php
new file mode 100644
index 0000000..b413999
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Database/Seeders/PaddleDatabaseSeeder.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\Paddle\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Illuminate\Database\Eloquent\Model;
+
+class PaddleDatabaseSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Model::unguard();
+
+        // $this->call("OthersTableSeeder");
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Database/factories/.gitkeep b/sonar-desk-licensing/modules/Paddle/Database/factories/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Helpers/.gitkeep b/sonar-desk-licensing/modules/Paddle/Helpers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Helpers/Helper.php b/sonar-desk-licensing/modules/Paddle/Helpers/Helper.php
new file mode 100644
index 0000000..4e6aad8
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Helpers/Helper.php
@@ -0,0 +1,12 @@
+<?php
+use Modules\Paddle\Support\ModuleInfo;
+
+if (! function_exists('paddle_feature_enabled')) {
+    /**
+     * Check if a feature is enabled in the config.
+     */
+    function paddle_feature_enabled(string $key): bool
+    {
+        return (bool) config(ModuleInfo::nameLower().".features.{$key}", false);
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Http/Controllers/.gitkeep b/sonar-desk-licensing/modules/Paddle/Http/Controllers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/app/Http/Controllers/CheckoutController.php b/sonar-desk-licensing/modules/Paddle/Http/Controllers/CheckoutController.php
similarity index 93%
rename from sonar-desk-licensing/app/Http/Controllers/CheckoutController.php
rename to sonar-desk-licensing/modules/Paddle/Http/Controllers/CheckoutController.php
index 9c8d5c5..008c07d 100755
--- a/sonar-desk-licensing/app/Http/Controllers/CheckoutController.php
+++ b/sonar-desk-licensing/modules/Paddle/Http/Controllers/CheckoutController.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Modules\Paddle\Http\Controllers;
+
+use App\Http\Controllers\Controller;
 
 use Illuminate\Contracts\View\View;
 use RuntimeException;
@@ -9,7 +11,7 @@ final class CheckoutController extends Controller
 {
     public function __invoke(): View
     {
-        $paddle = config('sonardesk.paddle');
+        $paddle = config('paddle');
         $token = trim((string) ($paddle['client_side_token'] ?? ''));
 
         if ($token === '') {
diff --git a/sonar-desk-licensing/modules/Paddle/Http/Controllers/PaddleController.php b/sonar-desk-licensing/modules/Paddle/Http/Controllers/PaddleController.php
new file mode 100644
index 0000000..cbb633c
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Http/Controllers/PaddleController.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Modules\Paddle\Http\Controllers;
+
+use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class PaddleController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     * @return Renderable
+     */
+    public function index()
+    {
+        return view('paddle::index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     * @return Renderable
+     */
+    public function create()
+    {
+        return view('paddle::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     * @param Request $request
+     * @return Renderable
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function show($id)
+    {
+        return view('paddle::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     * @param int $id
+     * @return Renderable
+     */
+    public function edit($id)
+    {
+        return view('paddle::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     * @param Request $request
+     * @param int $id
+     * @return Renderable
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     * @param int $id
+     * @return Renderable
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Http/Middleware/.gitkeep b/sonar-desk-licensing/modules/Paddle/Http/Middleware/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Http/Requests/.gitkeep b/sonar-desk-licensing/modules/Paddle/Http/Requests/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Models/.gitkeep b/sonar-desk-licensing/modules/Paddle/Models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Providers/.gitkeep b/sonar-desk-licensing/modules/Paddle/Providers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Providers/PaddleServiceProvider.php b/sonar-desk-licensing/modules/Paddle/Providers/PaddleServiceProvider.php
new file mode 100644
index 0000000..def349c
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Providers/PaddleServiceProvider.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Modules\Paddle\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Database\Eloquent\Factory;
+use Illuminate\Support\Facades\File;
+use Modules\Paddle\Support\ModuleInfo;
+use Config;
+
+class PaddleServiceProvider extends ServiceProvider
+{
+    /**
+     * @var string $moduleName
+     */
+    protected string $moduleName = 'Paddle';
+
+    /**
+     * @var string $moduleNameLower
+     */
+    protected string $moduleNameLower = 'paddle';
+
+
+     /**
+      * Get the services provided by the provider.
+      *
+      * @return array
+      */
+    public function provides():array
+    {
+        return [];
+    }
+
+    /**
+     * Boot the application events.
+     *
+     * @return void
+     */
+    public function boot() : void
+    {
+        $this->registerTranslations();
+        $this->registerConfig();
+        $this->registerViews();
+        $this->registerHelpers();
+        $this->registerCommands();
+        $this->loadMigrationsFrom(module_path(ModuleInfo::name(), 'Database/Migrations'));
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        $this->app->register(RouteServiceProvider::class);
+    }
+
+    /**
+     * Register the helpers.
+     *
+     * @return void
+     */
+    protected function registerHelpers(): void
+    {
+        foreach (glob(__DIR__.'/../Helpers/*.php') as $filename) {
+            require_once $filename;
+        }
+    }
+
+     /**
+     * Dynamically Register Commands.
+     *
+     * @return void
+     */
+    public function registerCommands(): void
+       {
+           if (!$this->app->runningInConsole()) {
+               return;
+           }
+           $commandPath = __DIR__ . '/../Console';
+            $commands = collect(File::allFiles($commandPath))
+                 ->map(function ($file) {
+                     $class = 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
+                     return $class;
+                })
+                ->filter(function ($class) {
+                    return class_exists($class);
+                })
+                ->values()
+                ->all();
+            $this->commands($commands);
+        }
+
+    /**
+     * Register config.
+     *
+     * @return void
+     */
+    protected function registerConfig(): void
+    {
+        $this->publishes([
+            module_path(ModuleInfo::name(), 'Config/config.php') => config_path( ModuleInfo::nameLower(). '.php'),
+        ], 'config');
+        $this->mergeConfigFrom(
+            module_path(ModuleInfo::name(), 'Config/config.php'),  ModuleInfo::nameLower()
+        );
+    }
+
+    /**
+     * Register views.
+     *
+     * @return void
+     */
+    public function registerViews(): void
+    {
+        $viewPath = resource_path('views/modules/' . ModuleInfo::nameLower());
+        $sourcePath = module_path(ModuleInfo::name(), 'Resources/views');
+        $this->publishes([
+            $sourcePath => $viewPath
+        ], ['views',  ModuleInfo::nameLower() . '-module-views']);
+        $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]),  ModuleInfo::nameLower());
+    }
+
+    /**
+     * Register translations.
+     *
+     * @return void
+     */
+    public function registerTranslations(): void
+    {
+        $langPath = resource_path('lang/modules/' .  ModuleInfo::nameLower());
+
+        if (is_dir($langPath)) {
+            $this->loadTranslationsFrom($langPath,  ModuleInfo::nameLower());
+        } else {
+            $this->loadTranslationsFrom(module_path(ModuleInfo::name(), 'Resources/lang'), ModuleInfo::nameLower());
+        }
+    }
+
+    /**
+     * Regsiter View Paths
+     * @return array
+     */
+    private function getPublishableViewPaths(): array
+    {
+        $paths = [];
+        foreach (Config::get('view.paths') as $path) {
+            if (is_dir($path . '/modules/' . ModuleInfo::nameLower())) {
+                $paths[] = $path . '/modules/' . ModuleInfo::nameLower();
+            }
+        }
+        return $paths;
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Providers/RouteServiceProvider.php b/sonar-desk-licensing/modules/Paddle/Providers/RouteServiceProvider.php
new file mode 100644
index 0000000..3ef031c
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Providers/RouteServiceProvider.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Modules\Paddle\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * The module namespace to assume when generating URLs to actions.
+     *
+     * @var string
+     */
+    protected $moduleNamespace = 'Modules\Paddle\Http\Controllers';
+
+    /**
+     * Called before routes are registered.
+     *
+     * Register any model bindings or pattern based filters.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        parent::boot();
+    }
+
+    /**
+     * Define the routes for the application.
+     *
+     * @return void
+     */
+    public function map()
+    {
+        $this->mapApiRoutes();
+
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::middleware('web')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Paddle', '/Routes/web.php'));
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->moduleNamespace)
+            ->group(module_path('Paddle', '/Routes/api.php'));
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/assets/.gitkeep b/sonar-desk-licensing/modules/Paddle/Resources/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/assets/js/app.js b/sonar-desk-licensing/modules/Paddle/Resources/assets/js/app.js
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/assets/sass/app.scss b/sonar-desk-licensing/modules/Paddle/Resources/assets/sass/app.scss
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/lang/.gitkeep b/sonar-desk-licensing/modules/Paddle/Resources/lang/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/views/.gitkeep b/sonar-desk-licensing/modules/Paddle/Resources/views/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/views/index.blade.php b/sonar-desk-licensing/modules/Paddle/Resources/views/index.blade.php
new file mode 100644
index 0000000..658045d
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Resources/views/index.blade.php
@@ -0,0 +1,9 @@
+@extends('paddle::layouts.master')
+
+@section('content')
+    <h1>Hello World</h1>
+
+    <p>
+        This view is loaded from module: {!! config('paddle.name') !!}
+    </p>
+@endsection
diff --git a/sonar-desk-licensing/modules/Paddle/Resources/views/layouts/master.blade.php b/sonar-desk-licensing/modules/Paddle/Resources/views/layouts/master.blade.php
new file mode 100644
index 0000000..b42fb10
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Resources/views/layouts/master.blade.php
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Module Paddle</title>
+
+       {{-- Laravel Mix - CSS File --}}
+       {{-- <link rel="stylesheet" href="{{ mix('css/paddle.css') }}"> --}}
+
+    </head>
+    <body>
+        @yield('content')
+
+        {{-- Laravel Mix - JS File --}}
+        {{-- <script src="{{ mix('js/paddle.js') }}"></script> --}}
+    </body>
+</html>
diff --git a/sonar-desk-licensing/modules/Paddle/Routes/.gitkeep b/sonar-desk-licensing/modules/Paddle/Routes/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Routes/api.php b/sonar-desk-licensing/modules/Paddle/Routes/api.php
new file mode 100644
index 0000000..dbc50ef
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Routes/api.php
@@ -0,0 +1,18 @@
+<?php
+
+use Illuminate\Http\Request;
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register API routes for your application. These
+| routes are loaded by the RouteServiceProvider within a group which
+| is assigned the "api" middleware group. Enjoy building your API!
+|
+*/
+
+Route::middleware('auth:api')->get('/paddle', function (Request $request) {
+    return $request->user();
+});
\ No newline at end of file
diff --git a/sonar-desk-licensing/modules/Paddle/Routes/web.php b/sonar-desk-licensing/modules/Paddle/Routes/web.php
new file mode 100644
index 0000000..a623b34
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Routes/web.php
@@ -0,0 +1,6 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+use Modules\Paddle\Http\Controllers\CheckoutController;
+
+Route::get('/buy', CheckoutController::class)->name('buy');
diff --git a/sonar-desk-licensing/app/Services/Payments/PaddleClient.php b/sonar-desk-licensing/modules/Paddle/Services/PaddleClient.php
similarity index 93%
rename from sonar-desk-licensing/app/Services/Payments/PaddleClient.php
rename to sonar-desk-licensing/modules/Paddle/Services/PaddleClient.php
index f2f23aa..3585df4 100755
--- a/sonar-desk-licensing/app/Services/Payments/PaddleClient.php
+++ b/sonar-desk-licensing/modules/Paddle/Services/PaddleClient.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Services\Payments;
+namespace Modules\Paddle\Services;
 
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
 use RuntimeException;
 
-final class PaddleClient
+class PaddleClient
 {
     public function customer(?string $customerID): ?array
     {
-        if (! $customerID || ! config('sonardesk.paddle.api_key')) {
+        if (! $customerID || ! config('paddle.api_key')) {
             return null;
         }
 
@@ -118,10 +118,10 @@ final class PaddleClient
     private function request(): PendingRequest
     {
         return Http::baseUrl(
-            (string) config('sonardesk.paddle.api_url')
+            (string) config('paddle.api_url')
         )
             ->withToken(
-                (string) config('sonardesk.paddle.api_key')
+                (string) config('paddle.api_key')
             )
             ->acceptJson()
             ->timeout(15);
@@ -131,7 +131,7 @@ final class PaddleClient
     {
         if (
             trim(
-                (string) config('sonardesk.paddle.api_key')
+                (string) config('paddle.api_key')
             ) === ''
         ) {
             throw new RuntimeException(
diff --git a/sonar-desk-licensing/app/Services/Payments/PaddleWebhookVerifier.php b/sonar-desk-licensing/modules/Paddle/Services/PaddleWebhookVerifier.php
similarity index 93%
rename from sonar-desk-licensing/app/Services/Payments/PaddleWebhookVerifier.php
rename to sonar-desk-licensing/modules/Paddle/Services/PaddleWebhookVerifier.php
index 477bcb7..5ba1ba2 100755
--- a/sonar-desk-licensing/app/Services/Payments/PaddleWebhookVerifier.php
+++ b/sonar-desk-licensing/modules/Paddle/Services/PaddleWebhookVerifier.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Services\Payments;
+namespace Modules\Paddle\Services;
+
+use App\Services\Payments\WebhookVerifier;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -10,7 +12,7 @@ final class PaddleWebhookVerifier implements WebhookVerifier
 {
     public function verify(Request $request, string $rawBody): void
     {
-        $secret = trim((string) config('sonardesk.paddle.webhook_secret'));
+        $secret = trim((string) config('paddle.webhook_secret'));
         $header = trim((string) $request->header('Paddle-Signature'));
 
         if ($secret === '') {
@@ -55,7 +57,7 @@ final class PaddleWebhookVerifier implements WebhookVerifier
 
         $tolerance = max(
             1,
-            (int) config('sonardesk.paddle.timestamp_tolerance', 300)
+            (int) config('paddle.timestamp_tolerance', 300)
         );
 
         $age = abs(time() - $timestamp);
diff --git a/sonar-desk-licensing/app/Services/Payments/PurchaseProvisioner.php b/sonar-desk-licensing/modules/Paddle/Services/PurchaseProvisioner.php
similarity index 97%
rename from sonar-desk-licensing/app/Services/Payments/PurchaseProvisioner.php
rename to sonar-desk-licensing/modules/Paddle/Services/PurchaseProvisioner.php
index 03b231b..2209f9c 100755
--- a/sonar-desk-licensing/app/Services/Payments/PurchaseProvisioner.php
+++ b/sonar-desk-licensing/modules/Paddle/Services/PurchaseProvisioner.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Services\Payments;
+namespace Modules\Paddle\Services;
 
-use App\Models\License;
-use App\Models\LicenseDeliveryOutbox;
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseDeliveryOutbox;
+use Modules\Licensing\Models\LicenseProduct;
 use App\Services\Accounts\PurchasedAccountProvisioner;
-use App\Services\Licensing\LicenseIssuer;
+use Modules\Licensing\Services\LicenseIssuer;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use RuntimeException;
@@ -743,6 +743,16 @@ final class PurchaseProvisioner
          * prevents provider supplied identifiers from creating unusual
          * lock names.
          */
+        /*
+         * MySQL advisory locks are only available when using MySQL/MariaDB.
+         *
+         * Tests use SQLite in-memory, where GET_LOCK() and RELEASE_LOCK()
+         * do not exist.
+         */
+        if (DB::connection()->getDriverName() !== 'mysql') {
+            return $callback();
+        }
+
         $lockName = 'sd:'.substr(hash('sha256', $name), 0, 61);
 
         $row = DB::selectOne(
diff --git a/sonar-desk-licensing/modules/Paddle/Support/.gitkeep b/sonar-desk-licensing/modules/Paddle/Support/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Support/ModuleInfo.php b/sonar-desk-licensing/modules/Paddle/Support/ModuleInfo.php
new file mode 100644
index 0000000..a64f0c0
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/Support/ModuleInfo.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Paddle\Support;
+
+class ModuleInfo
+{
+    protected static string $moduleName =  'Paddle';
+
+    /**
+     * defines the Module Name
+     * @return string
+     */
+    public static function name(): string
+    {
+        return static::$moduleName;
+    }
+
+    /**
+     * define the lowercase version
+     * @return string
+     */
+    public static function nameLower(): string
+    {
+        return strtolower(static::$moduleName);
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/Tests/Browser/.gitkeep b/sonar-desk-licensing/modules/Paddle/Tests/Browser/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Tests/Feature/.gitkeep b/sonar-desk-licensing/modules/Paddle/Tests/Feature/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Tests/Unit/.gitkeep b/sonar-desk-licensing/modules/Paddle/Tests/Unit/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/Traits/.gitkeep b/sonar-desk-licensing/modules/Paddle/Traits/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/View/.gitkeep b/sonar-desk-licensing/modules/Paddle/View/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/sonar-desk-licensing/modules/Paddle/composer.json b/sonar-desk-licensing/modules/Paddle/composer.json
new file mode 100644
index 0000000..eee3cac
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "mpba/paddle",
+    "description": "SonarDesk Paddle module",
+    "type": "library",
+    "autoload": {
+        "psr-4": {
+            "Modules\\Paddle\\": ""
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Paddle\\Tests\\": "Tests/"
+        }
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/module.json b/sonar-desk-licensing/modules/Paddle/module.json
new file mode 100644
index 0000000..0430866
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/module.json
@@ -0,0 +1,16 @@
+{
+    "name": "Paddle",
+    "alias": "paddle",
+    "version": "1.0.0",
+    "description": "SonarDesk Paddle module",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\Paddle\\Providers\\PaddleServiceProvider"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": [
+        "Licensing"
+    ]
+}
diff --git a/sonar-desk-licensing/modules/Paddle/package.json b/sonar-desk-licensing/modules/Paddle/package.json
new file mode 100644
index 0000000..4599509
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/package.json
@@ -0,0 +1,17 @@
+{
+    "private": true,
+    "scripts": {
+        "dev": "npm run development",
+        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch-poll": "npm run watch -- --watch-poll",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "prod": "npm run production",
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    },
+    "devDependencies": {
+        "cross-env": "^7.0",
+        "laravel-mix": "^5.0.1",
+        "laravel-mix-merge-manifest": "^0.1.2"
+    }
+}
diff --git a/sonar-desk-licensing/modules/Paddle/webpack.mix.js b/sonar-desk-licensing/modules/Paddle/webpack.mix.js
new file mode 100644
index 0000000..62dbf0a
--- /dev/null
+++ b/sonar-desk-licensing/modules/Paddle/webpack.mix.js
@@ -0,0 +1,11 @@
+const dotenvExpand = require('dotenv-expand');
+dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/}));
+
+const mix = require('laravel-mix');
+
+mix.js(__dirname + '/Resources/assets/js/app.js', 'js/paddle.js')
+    .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/paddle.css');
+
+if (mix.inProduction()) {
+    mix.version();
+}
diff --git a/sonar-desk-licensing/public/google4480b6ae001d37b6.html b/sonar-desk-licensing/public/google4480b6ae001d37b6.html
new file mode 100644
index 0000000..d0b886e
--- /dev/null
+++ b/sonar-desk-licensing/public/google4480b6ae001d37b6.html
@@ -0,0 +1 @@
+google-site-verification: google4480b6ae001d37b6.html
\ No newline at end of file
diff --git a/sonar-desk-licensing/public/robots.txt b/sonar-desk-licensing/public/robots.txt
index eb05362..c2a49f4 100755
--- a/sonar-desk-licensing/public/robots.txt
+++ b/sonar-desk-licensing/public/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Allow: /
diff --git a/sonar-desk-licensing/resources/views/admin/cms/form.blade.php b/sonar-desk-licensing/resources/views/admin/cms/form.blade.php
index 2ba7d36..9df446c 100644
--- a/sonar-desk-licensing/resources/views/admin/cms/form.blade.php
+++ b/sonar-desk-licensing/resources/views/admin/cms/form.blade.php
@@ -6,7 +6,17 @@
 <label>Slug<input name="slug" value="{{ old('slug',$page->slug) }}" placeholder="generated-from-title" maxlength="180"></label>
 <label>Excerpt<textarea name="excerpt" rows="3" maxlength="1000">{{ old('excerpt',$page->excerpt) }}</textarea></label>
 <label>Body<textarea name="body" rows="18" required>{{ old('body',$page->body) }}</textarea><small>Plain text is rendered safely with paragraphs and line breaks.</small></label>
-<div class="form-grid two"><label>SEO title<input name="meta_title" value="{{ old('meta_title',$page->meta_title) }}" maxlength="160"></label><label>SEO description<textarea name="meta_description" rows="3" maxlength="320">{{ old('meta_description',$page->meta_description) }}</textarea></label></div>
+<section class="seo-section" style="padding:24px 0 4px;border-top:1px solid var(--line);margin-top:24px">
+<div class="seo-section-head"><div><span class="eyebrow">Search appearance</span><h2>Page SEO</h2><p>Override global defaults only where this page needs specific search or social metadata.</p></div><a class="btn btn-secondary" href="{{ route('admin.seo.edit') }}">Global SEO settings</a></div>
+<div class="form-grid two"><label>SEO title<input name="meta_title" value="{{ old('meta_title',$page->meta_title) }}" maxlength="160" placeholder="Defaults to the page title"></label><label>Canonical URL<input type="url" name="canonical_url" value="{{ old('canonical_url',$page->canonical_url) }}" maxlength="2048" placeholder="Leave blank for this page URL"></label></div>
+<label>SEO description<textarea name="meta_description" rows="3" maxlength="320" placeholder="Defaults to the excerpt">{{ old('meta_description',$page->meta_description) }}</textarea></label>
+<label>Keywords<input name="meta_keywords" value="{{ old('meta_keywords',$page->meta_keywords) }}" maxlength="500" placeholder="Optional comma-separated search topics"></label>
+<div class="form-grid two"><label>Open Graph title<input name="og_title" value="{{ old('og_title',$page->og_title) }}" maxlength="160" placeholder="Defaults to SEO title"></label><label>Open Graph image URL<input type="url" name="og_image" value="{{ old('og_image',$page->og_image) }}" maxlength="2048" placeholder="Defaults to global social image"></label></div>
+<label>Open Graph description<textarea name="og_description" rows="3" maxlength="320" placeholder="Defaults to SEO description">{{ old('og_description',$page->og_description) }}</textarea></label>
+<div class="form-grid two"><label>Sitemap priority<input type="number" name="sitemap_priority" value="{{ old('sitemap_priority',$page->sitemap_priority ?? '0.5') }}" min="0" max="1" step="0.1" required></label><label>Change frequency<select name="sitemap_change_frequency" required>@foreach(['always','hourly','daily','weekly','monthly','yearly','never'] as $frequency)<option value="{{ $frequency }}" @selected(old('sitemap_change_frequency',$page->sitemap_change_frequency ?? 'monthly') === $frequency)>{{ ucfirst($frequency) }}</option>@endforeach</select></label></div>
+<div class="form-grid two"><label class="consent-check"><input type="checkbox" name="robots_index" value="1" @checked(old('robots_index',$page->exists ? $page->robots_index : true))><span>Allow search engines to index this page</span></label><label class="consent-check"><input type="checkbox" name="robots_follow" value="1" @checked(old('robots_follow',$page->exists ? $page->robots_follow : true))><span>Allow crawlers to follow links</span></label></div>
+<label class="consent-check"><input type="checkbox" name="include_in_sitemap" value="1" @checked(old('include_in_sitemap',$page->exists ? $page->include_in_sitemap : true))><span>Include this page in sitemap.xml</span></label>
+</section>
 <label class="consent-check"><input type="checkbox" name="is_published" value="1" @checked(old('is_published',$page->is_published))><span>Published</span></label>
 <div class="support-actions"><button type="submit">Save page</button>@if($page->exists && $page->is_published)<a class="btn btn-secondary" target="_blank" href="{{ route('cms.show',$page->slug) }}">View page</a>@endif</div>
 </form></div>
diff --git a/sonar-desk-licensing/resources/views/admin/index.blade.php b/sonar-desk-licensing/resources/views/admin/index.blade.php
index f4198c6..61766a6 100755
--- a/sonar-desk-licensing/resources/views/admin/index.blade.php
+++ b/sonar-desk-licensing/resources/views/admin/index.blade.php
@@ -2,5 +2,5 @@
 @section('content')
 <section class="portal-header"><div><span class="eyebrow">Admin</span><h1>Licensing administration</h1><p class="lead compact">Manage licences, activations and customer support.</p></div></section>
 <div class="grid"><div class="card"><strong>{{ $licenseCount }}</strong><p>Licences</p></div><div class="card"><strong>{{ $activeCount }}</strong><p>Not revoked</p></div><div class="card"><strong>{{ $activationCount }}</strong><p>Active installations</p></div><div class="card"><strong>{{ $userCount }}</strong><p>Portal users</p></div></div>
-<div style="display:flex;gap:10px;flex-wrap:wrap;margin-top:18px"><a class="btn btn-primary" href="{{ route('admin.releases.index') }}">Manage releases</a><a class="btn" href="{{ route('admin.licenses') }}">Manage licences</a><a class="btn btn-secondary" href="{{ route('admin.cms.index') }}">Manage content</a><a class="btn btn-secondary" href="{{ route('admin.support.index') }}">Support inbox</a></div>
+<div style="display:flex;gap:10px;flex-wrap:wrap;margin-top:18px"><a class="btn btn-primary" href="{{ route('admin.releases.index') }}">Manage releases</a><a class="btn" href="{{ route('admin.licenses') }}">Manage licences</a><a class="btn" href="{{ route('admin.users.index') }}">Manage users</a><a class="btn btn-secondary" href="{{ route('admin.cms.index') }}">Manage content</a><a class="btn btn-secondary" href="{{ route('admin.seo.edit') }}">SEO & search</a><a class="btn btn-secondary" href="{{ route('admin.support.index') }}">Support inbox</a></div>
 @endsection
diff --git a/sonar-desk-licensing/resources/views/admin/seo/edit.blade.php b/sonar-desk-licensing/resources/views/admin/seo/edit.blade.php
new file mode 100644
index 0000000..67fcb35
--- /dev/null
+++ b/sonar-desk-licensing/resources/views/admin/seo/edit.blade.php
@@ -0,0 +1,39 @@
+@extends('layouts.app')
+@section('content')
+<section class="portal-header admin-release-head">
+    <div><span class="eyebrow">Search & discovery</span><h1>SEO settings</h1><p class="lead compact">Control how SonarDesk appears in search engines and when pages are shared.</p></div>
+    <div class="support-actions"><a class="btn btn-secondary" target="_blank" href="{{ route('sitemap') }}">View sitemap</a><a class="btn btn-secondary" target="_blank" href="{{ route('robots') }}">View robots.txt</a></div>
+</section>
+<form method="post" action="{{ route('admin.seo.update') }}" class="seo-admin-form">@csrf @method('PUT')
+    <section class="panel seo-section">
+        <div class="seo-section-head"><div><span class="eyebrow">Search appearance</span><h2>Site defaults</h2><p>Fallback metadata used whenever a page does not provide its own SEO values.</p></div><span class="seo-badge">Global</span></div>
+        <div class="form-grid two">
+            <label>Site name<input name="seo_site_name" value="{{ old('seo_site_name',$settings['seo_site_name'] ?: 'SonarDesk') }}" required maxlength="80"></label>
+            <label>Title suffix<input name="seo_title_suffix" value="{{ old('seo_title_suffix',$settings['seo_title_suffix'] ?: 'SonarDesk') }}" maxlength="80"><small>Appended to page titles where appropriate.</small></label>
+        </div>
+        <label>Default SEO title<input name="seo_default_title" value="{{ old('seo_default_title',$settings['seo_default_title'] ?: 'SonarDesk — Native SonarQube Monitoring for macOS') }}" required maxlength="160"></label>
+        <label>Default meta description<textarea name="seo_default_description" rows="3" maxlength="320" required>{{ old('seo_default_description',$settings['seo_default_description'] ?: 'Native SonarQube monitoring for macOS. Track projects, quality gates, bugs, vulnerabilities and code smells from one professional desktop app.') }}</textarea></label>
+        <label>Default keywords<input name="seo_default_keywords" value="{{ old('seo_default_keywords',$settings['seo_default_keywords']) }}" maxlength="500" placeholder="SonarQube, macOS, code quality, developer tools"></label>
+        <label>Canonical base URL<input type="url" name="seo_canonical_base_url" value="{{ old('seo_canonical_base_url',$settings['seo_canonical_base_url']) }}" maxlength="2048" placeholder="https://sonardesk.app"><small>Leave blank to use the application URL. Use the public production origin only.</small></label>
+    </section>
+
+    <section class="panel seo-section">
+        <div class="seo-section-head"><div><span class="eyebrow">Social sharing</span><h2>Open Graph & social</h2><p>Professional defaults for link previews across social networks and messaging applications.</p></div></div>
+        <label>Default social image URL<input type="url" name="seo_default_og_image" value="{{ old('seo_default_og_image',$settings['seo_default_og_image']) }}" maxlength="2048" placeholder="https://…/og-sonardesk.png"><small>Recommended: 1200 × 630 px.</small></label>
+        <div class="form-grid two"><label>Organization name<input name="seo_organization_name" value="{{ old('seo_organization_name',$settings['seo_organization_name'] ?: 'SonarDesk') }}" maxlength="120"></label><label>Organization logo URL<input type="url" name="seo_organization_logo" value="{{ old('seo_organization_logo',$settings['seo_organization_logo']) }}" maxlength="2048"></label></div>
+        <label>X / Twitter account<input name="seo_twitter_site" value="{{ old('seo_twitter_site',$settings['seo_twitter_site']) }}" maxlength="40" placeholder="@SonarDesk"></label>
+    </section>
+
+    <section class="panel seo-section">
+        <div class="seo-section-head"><div><span class="eyebrow">Google Search Console</span><h2>Domain verification</h2><p>Use a Domain property in Google Search Console. Google will provide a TXT value that you add at your DNS provider.</p></div><span class="seo-badge success">DNS TXT</span></div>
+        <div class="seo-dns-callout"><strong>Recommended verification method</strong><span>Add Google’s <code>google-site-verification=…</code> TXT record to the root domain. DNS verification covers all protocols and subdomains.</span></div>
+        <label>Optional Google verification token<input name="seo_google_site_verification" value="{{ old('seo_google_site_verification',$settings['seo_google_site_verification']) }}" maxlength="255" placeholder="Only needed if you also choose HTML-tag verification"><small>DNS TXT verification does not require this field. It is available as a secondary verification method.</small></label>
+    </section>
+
+    <section class="panel seo-section">
+        <div class="seo-section-head"><div><span class="eyebrow">Crawler control</span><h2>Indexing</h2><p>Production crawler controls. Non-production environments remain blocked automatically.</p></div></div>
+        <label class="consent-check"><input type="checkbox" name="seo_robots_enabled" value="1" @checked(old('seo_robots_enabled',$robotsEnabled))><span><strong>Allow production search-engine indexing</strong><small>When disabled, robots.txt blocks crawling and pages emit noindex.</small></span></label>
+    </section>
+    <div class="seo-savebar"><div><strong>Search configuration</strong><span>Changes apply to public metadata immediately.</span></div><button type="submit" class="btn btn-primary">Save SEO settings</button></div>
+</form>
+@endsection
diff --git a/sonar-desk-licensing/resources/views/admin/users/index.blade.php b/sonar-desk-licensing/resources/views/admin/users/index.blade.php
new file mode 100644
index 0000000..9b6d9ef
--- /dev/null
+++ b/sonar-desk-licensing/resources/views/admin/users/index.blade.php
@@ -0,0 +1,31 @@
+@extends('layouts.app')
+@section('content')
+<section class="portal-header">
+    <div><span class="eyebrow">Admin</span><h1>Users</h1><p class="lead compact">Manage portal accounts, access and customer licences.</p></div>
+    <a class="btn btn-secondary" href="{{ route('admin.index') }}">Admin dashboard</a>
+</section>
+
+<form method="get" class="card" style="display:flex;gap:10px;align-items:end;flex-wrap:wrap;margin-bottom:18px">
+    <label style="flex:1;min-width:240px">Search<input name="q" value="{{ request('q') }}" placeholder="Name or email"></label>
+    <label>Status<select name="status"><option value="">All users</option><option value="admin" @selected(request('status')==='admin')>Administrators</option><option value="suspended" @selected(request('status')==='suspended')>Suspended</option><option value="unverified" @selected(request('status')==='unverified')>Unverified</option></select></label>
+    <button>Search</button>
+    @if(request()->hasAny(['q','status']))<a class="btn btn-secondary" href="{{ route('admin.users.index') }}">Clear</a>@endif
+</form>
+
+<div class="admin-table-card">
+    <div class="admin-table-title"><div><h2>Portal users</h2><p>{{ $users->total() }} account{{ $users->total() === 1 ? '' : 's' }}</p></div></div>
+    <div class="table-scroll"><table class="pro-table"><thead><tr><th>User</th><th>Access</th><th>Email</th><th>Licences</th><th>Joined</th><th></th></tr></thead><tbody>
+    @forelse($users as $user)
+        <tr>
+            <td><strong>{{ $user->name }}</strong><small>#{{ $user->id }}</small></td>
+            <td>@if($user->disabled_at)<span class="status-chip muted">Suspended</span>@elseif($user->is_admin)<span class="status-chip">Admin</span>@else<span class="status-chip success">Active</span>@endif</td>
+            <td><strong>{{ $user->email }}</strong><small>{{ $user->hasVerifiedEmail() ? 'Verified' : 'Not verified' }}</small></td>
+            <td>{{ $licenseCounts[strtolower($user->email)] ?? 0 }}</td>
+            <td>{{ $user->created_at?->format('d M Y') }}</td>
+            <td><div class="table-actions"><a class="btn btn-secondary" href="{{ route('admin.users.show',$user) }}">Manage</a></div></td>
+        </tr>
+    @empty<tr><td colspan="6" class="empty-cell">No users found.</td></tr>@endforelse
+    </tbody></table></div>
+</div>
+<div style="margin-top:18px">{{ $users->links() }}</div>
+@endsection
diff --git a/sonar-desk-licensing/resources/views/admin/users/show.blade.php b/sonar-desk-licensing/resources/views/admin/users/show.blade.php
new file mode 100644
index 0000000..825a9e1
--- /dev/null
+++ b/sonar-desk-licensing/resources/views/admin/users/show.blade.php
@@ -0,0 +1,57 @@
+@extends('layouts.app')
+@section('content')
+<section class="portal-header">
+    <div><span class="eyebrow">Admin · User</span><h1>{{ $user->name }}</h1><p class="lead compact">{{ $user->email }}</p></div>
+    <a class="btn btn-secondary" href="{{ route('admin.users.index') }}">Back to users</a>
+</section>
+
+@if($errors->any())<div class="card" style="border-color:#fda29b;margin-bottom:18px"><strong>Could not save changes</strong><ul>@foreach($errors->all() as $error)<li>{{ $error }}</li>@endforeach</ul></div>@endif
+
+<div class="release-editor">
+    <div class="editor-main">
+        <div class="editor-card">
+            <div class="editor-card-head"><span>01</span><div><h2>Account details</h2><p>Edit the portal identity and administrator access.</p></div></div>
+            <form method="post" action="{{ route('admin.users.update',$user) }}">@csrf @method('PUT')
+                <div class="form-grid"><label>Name<input name="name" value="{{ old('name',$user->name) }}" required></label><label>Email<input type="email" name="email" value="{{ old('email',$user->email) }}" required></label></div>
+                <label class="toggle-row"><input type="checkbox" name="is_admin" value="1" @checked($user->is_admin) @disabled(auth()->user()->is($user))><span><strong>Administrator</strong><small>Allows access to SonarDesk administration.</small></span></label>
+                @if(auth()->user()->is($user))<input type="hidden" name="is_admin" value="1"><p><small>Your own administrator access is protected.</small></p>@endif
+                <button>Save user</button>
+            </form>
+        </div>
+
+        <div class="editor-card">
+            <div class="editor-card-head"><span>02</span><div><h2>Licences</h2><p>Licences linked to this user's email address.</p></div></div>
+            @forelse($licenses as $license)
+                <div style="padding:18px 0;border-top:1px solid #eef2f6">
+                    <div style="display:flex;justify-content:space-between;gap:16px;align-items:flex-start;flex-wrap:wrap">
+                        <div><strong>{{ $license->edition }} · •••• {{ $license->license_key_last4 }}</strong><small style="display:block;color:#667085;margin-top:4px">{{ $license->subscription_status ?: 'No subscription status' }} · {{ $license->payment_provider ?: 'manual' }}</small></div>
+                        <div><a class="btn btn-secondary" href="{{ route('admin.license',$license) }}">Full licence</a></div>
+                    </div>
+                    <form method="post" action="{{ route('admin.users.licences.update',[$user,$license]) }}" style="display:flex;gap:10px;align-items:end;margin-top:14px;flex-wrap:wrap">@csrf @method('PATCH')<label>Activation limit<input type="number" min="1" max="1000" name="activation_limit" value="{{ $license->activation_limit }}" style="max-width:120px"></label><button>Update limit</button></form>
+                    @if($license->activations->isNotEmpty())
+                        <div class="table-scroll" style="margin-top:14px"><table class="pro-table"><thead><tr><th>Device</th><th>Platform</th><th>Version</th><th>Status</th><th></th></tr></thead><tbody>
+                        @foreach($license->activations as $activation)<tr><td>{{ $activation->installation_name ?: $activation->installation_id }}</td><td>{{ $activation->platform ?: '—' }}</td><td>{{ $activation->app_version ?: '—' }}</td><td>{{ $activation->deactivated_at ? 'Released' : 'Active' }}</td><td>@if(!$activation->deactivated_at)<form method="post" action="{{ route('admin.users.activations.destroy',[$user,$license,$activation]) }}">@csrf @method('DELETE')<button class="btn btn-secondary">Release</button></form>@endif</td></tr>@endforeach
+                        </tbody></table></div>
+                    @endif
+                </div>
+            @empty<p>No licences are linked to this email address.</p>@endforelse
+        </div>
+    </div>
+
+    <aside class="editor-main">
+        <div class="editor-card sticky-card">
+            <div class="editor-card-head"><span>03</span><div><h2>Account actions</h2><p>Security and access controls.</p></div></div>
+            <p><strong>Email</strong><br><span class="status-chip {{ $user->hasVerifiedEmail() ? 'success' : 'muted' }}">{{ $user->hasVerifiedEmail() ? 'Verified' : 'Not verified' }}</span></p>
+            @if(!$user->hasVerifiedEmail())
+                <form method="post" action="{{ route('admin.users.verification-email',$user) }}" style="margin-bottom:10px">@csrf<button class="btn btn-secondary" style="width:100%">Send verification email</button></form>
+                <form method="post" action="{{ route('admin.users.verify',$user) }}" style="margin-bottom:10px">@csrf<button class="btn btn-secondary" style="width:100%">Mark verified</button></form>
+            @endif
+            <form method="post" action="{{ route('admin.users.password-reset',$user) }}" style="margin-bottom:10px">@csrf<button class="btn btn-secondary" style="width:100%">Send password reset</button></form>
+            @unless(auth()->user()->is($user))
+                @if($user->disabled_at)<form method="post" action="{{ route('admin.users.restore',$user) }}" style="margin-bottom:10px">@csrf<button style="width:100%">Restore account</button></form>@else<form method="post" action="{{ route('admin.users.suspend',$user) }}" style="margin-bottom:10px">@csrf<button class="btn btn-secondary" style="width:100%">Suspend account</button></form>@endif
+                <form method="post" action="{{ route('admin.users.destroy',$user) }}" onsubmit="return confirm('Delete this portal user? Their licences will be retained.')">@csrf @method('DELETE')<button class="danger" style="width:100%">Delete user</button></form>
+            @endunless
+        </div>
+    </aside>
+</div>
+@endsection
diff --git a/sonar-desk-licensing/resources/views/checkout/buy.blade.php b/sonar-desk-licensing/resources/views/checkout/buy.blade.php
index cb36c03..525fc4c 100755
--- a/sonar-desk-licensing/resources/views/checkout/buy.blade.php
+++ b/sonar-desk-licensing/resources/views/checkout/buy.blade.php
@@ -1,91 +1,301 @@
 @extends('layouts.app')
+
 @section('content')
-<div class="hero-card">
-    <span class="eyebrow">SonarDesk</span>
-    <h1>Choose your licence</h1>
-    <p class="lead">Every subscription starts with a 7-day free trial. Cancel before the trial ends and you won't be charged.</p>
-    @if($paddleEnvironment === 'sandbox')<div class="sandbox-badge">Sandbox checkout — no real payment is taken</div>@endif
-</div>
+    <div class="hero-card">
+        <span class="eyebrow">SonarDesk</span>
+        <h1>Choose your licence</h1>
+        <p class="lead">
+            Every subscription starts with a 7-day free trial.
+            Cancel before the trial ends and you won't be charged.
+        </p>
 
-<div class="pricing-grid">
-@foreach($plans as $code => $plan)
-    <article class="price-card {{ str_starts_with($code, 'professional') ? 'featured' : '' }}">
-        <div>
-            <div class="plan-heading">
-                <div>
-                    <h2>{{ $plan['name'] }}</h2>
-                    <div class="muted">{{ $plan['billing'] }} billing</div>
-                </div>
-                @if($plan['billing'] === 'Annual')<span class="pill">Best value</span>@endif
+        @if($paddleEnvironment === 'sandbox')
+            <div class="sandbox-badge">
+                Sandbox checkout — no real payment is taken
             </div>
-            <div class="price" data-price-display="{{ $plan['price_id'] }}" data-billing="{{ strtolower($plan['billing']) }}">{{ $plan['display_price'] }}</div>
-            <ul class="features">
-                <li>7-day free trial</li>
-                <li>{{ $plan['activation_limit'] }} active Mac{{ $plan['activation_limit'] === 1 ? '' : 's' }}</li>
-                <li>Secure online activation</li>
-                <li>Licence management portal</li>
-            </ul>
-        </div>
-        <button class="checkout-button" type="button" data-price-id="{{ $plan['price_id'] }}" data-plan="{{ $plan['name'] }} {{ $plan['billing'] }}">Start free trial</button>
-    </article>
-@endforeach
-</div>
+        @endif
+    </div>
 
-<div class="card checkout-status" id="checkout-status" hidden>
-    <h2>Purchase received</h2>
-    <p>Paddle is confirming your subscription. Your SonarDesk licence key is generated by our licensing server and emailed to the address used at checkout. You can then activate it in <strong>SonarDesk → Settings → Licence</strong>.</p>
-    <p class="muted">Delivery normally follows the subscription webhook within moments. Check your junk folder if needed. You can also create a portal account with the same email address and resend the key from My licences.</p>
-    <a class="btn" href="{{ route('register') }}">Create portal account</a>
-</div>
+    <div class="pricing-grid">
+        @foreach($plans as $code => $plan)
+            <article class="price-card {{ str_starts_with($code, 'professional') ? 'featured' : '' }}">
+                <div>
+                    <div class="plan-heading">
+                        <div>
+                            <h2>{{ $plan['name'] }}</h2>
+                            <div class="muted">{{ $plan['billing'] }} billing</div>
+                        </div>
 
-<script src="https://cdn.paddle.com/paddle/v2/paddle.js"></script>
-<script>
-(() => {
-    const token = @json($paddleToken);
-    const environment = @json($paddleEnvironment);
-    if (environment === 'sandbox') Paddle.Environment.set('sandbox');
-    Paddle.Initialize({
-        token,
-        eventCallback(event) {
-            if (event && event.name === 'checkout.completed') {
-                document.getElementById('checkout-status').hidden = false;
-                document.getElementById('checkout-status').scrollIntoView({behavior: 'smooth', block: 'center'});
-            }
-        }
-    });
+                        @if($plan['billing'] === 'Annual')
+                            <span class="pill">Best value</span>
+                        @endif
+                    </div>
 
-    const priceElements = new Map(
-        Array.from(document.querySelectorAll('[data-price-display]')).map(element => [element.dataset.priceDisplay, element])
-    );
-    const previewItems = Array.from(priceElements.keys()).map(priceId => ({priceId, quantity: 1}));
-    Paddle.PricePreview({items: previewItems}).then(result => {
-        for (const item of (result?.data?.details?.lineItems ?? [])) {
-            const element = priceElements.get(item?.price?.id);
-            const formatted = item?.formattedTotals?.total ?? item?.formattedUnitTotals?.total;
-            if (!element || !formatted) continue;
-            const suffix = element.dataset.billing === 'annual' ? ' / year' : ' / month';
-            element.textContent = formatted + suffix;
-        }
-    }).catch(() => {
-        // Keep the server-rendered GBP fallback if Paddle pricing preview is unavailable.
-    });
+                    <div
+                        class="price"
+                        data-price-display="{{ $plan['price_id'] }}"
+                        data-billing="{{ strtolower($plan['billing']) }}"
+                    >
+                        {{ $plan['display_price'] }}
+                    </div>
 
-    document.querySelectorAll('.checkout-button').forEach(button => {
-        button.addEventListener('click', () => {
-            Paddle.Checkout.open({
-                items: [{priceId: button.dataset.priceId, quantity: 1}],
-                settings: {
-                    displayMode: 'overlay',
-                    theme: window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light',
-                    allowLogout: false
-                },
-                customData: {
-                    source: 'sonardesk-buy-page',
-                    plan: button.dataset.plan
+                    <ul class="features">
+                        <li>7-day free trial</li>
+                        <li>
+                            {{ $plan['activation_limit'] }}
+                            active Mac{{ $plan['activation_limit'] === 1 ? '' : 's' }}
+                        </li>
+                        <li>Secure online activation</li>
+                        <li>Licence management portal</li>
+                    </ul>
+                </div>
+
+                <button
+                    class="checkout-button"
+                    type="button"
+                    data-price-id="{{ $plan['price_id'] }}"
+                    data-plan="{{ $plan['name'] }} {{ $plan['billing'] }}"
+                >
+                    Start free trial
+                </button>
+            </article>
+        @endforeach
+    </div>
+
+    <div class="card checkout-status" id="checkout-status" hidden>
+        <h2>Purchase received</h2>
+
+        <p>
+            Paddle is confirming your subscription. Your SonarDesk licence key
+            is generated by our licensing server and emailed to the address used
+            at checkout. You can then activate it in
+            <strong>SonarDesk → Settings → Licence</strong>.
+        </p>
+
+        <p class="muted">
+            Delivery normally follows the subscription webhook within moments.
+            Check your junk folder if needed. You can also create a portal account
+            with the same email address and resend the key from My licences.
+        </p>
+
+        <a class="btn" href="{{ route('register') }}">
+            Create portal account
+        </a>
+    </div>
+
+    <div class="card" id="checkout-error" hidden>
+        <h2>Checkout unavailable</h2>
+
+        <p>
+            Paddle could not start the checkout. Please try again.
+        </p>
+
+        <p class="muted" id="checkout-error-detail"></p>
+    </div>
+
+    <script src="https://cdn.paddle.com/paddle/v2/paddle.js"></script>
+
+    <script>
+        (() => {
+            'use strict';
+
+            const token = @json($paddleToken);
+            const environment = @json($paddleEnvironment);
+
+            const errorPanel = document.getElementById('checkout-error');
+            const errorDetail = document.getElementById('checkout-error-detail');
+
+            function showCheckoutError(message) {
+                console.error('SONARDESK CHECKOUT ERROR:', message);
+
+                if (errorDetail) {
+                    errorDetail.textContent = message || 'Unknown checkout error.';
                 }
+
+                if (errorPanel) {
+                    errorPanel.hidden = false;
+
+                    errorPanel.scrollIntoView({
+                        behavior: 'smooth',
+                        block: 'center'
+                    });
+                }
+            }
+
+            function logPaddleEvent(event) {
+                console.log('PADDLE EVENT:', event);
+
+                if (
+                    event?.name === 'checkout.error' ||
+                    event?.name === 'checkout.warning' ||
+                    event?.name === 'checkout.payment.error'
+                ) {
+                    console.error('PADDLE ERROR:', {
+                        name: event?.name,
+                        type: event?.type,
+                        code: event?.code,
+                        detail: event?.detail,
+                        documentation_url: event?.documentation_url,
+                        errors: event?.errors,
+                        event: event
+                    });
+
+                    const code = event?.code
+                        ? `Code: ${event.code}`
+                        : 'Paddle checkout error';
+
+                    const detail = event?.detail
+                        ? ` — ${event.detail}`
+                        : '';
+
+                    showCheckoutError(code + detail);
+                }
+
+                if (event?.name === 'checkout.completed') {
+                    const status = document.getElementById('checkout-status');
+
+                    if (status) {
+                        status.hidden = false;
+
+                        status.scrollIntoView({
+                            behavior: 'smooth',
+                            block: 'center'
+                        });
+                    }
+                }
+            }
+
+            if (typeof Paddle === 'undefined') {
+                showCheckoutError('Paddle.js failed to load.');
+                return;
+            }
+
+            console.log('SONARDESK PADDLE CONFIG:', {
+                environment: environment,
+                tokenPresent: Boolean(token),
+                tokenPrefix: token ? token.substring(0, 5) : null
             });
-        });
-    });
-})();
-</script>
+
+            try {
+                if (environment === 'sandbox') {
+                    Paddle.Environment.set('sandbox');
+                }
+
+                Paddle.Initialize({
+                    token: token,
+                    eventCallback: logPaddleEvent
+                });
+
+                console.log('Paddle initialized successfully.');
+            } catch (error) {
+                console.error('PADDLE INITIALIZATION ERROR:', error);
+
+                showCheckoutError(
+                    error?.message || 'Paddle could not be initialized.'
+                );
+
+                return;
+            }
+
+            const priceElements = new Map(
+                Array.from(
+                    document.querySelectorAll('[data-price-display]')
+                ).map(element => [
+                    element.dataset.priceDisplay,
+                    element
+                ])
+            );
+
+            const previewItems = Array.from(priceElements.keys()).map(priceId => ({
+                priceId: priceId,
+                quantity: 1
+            }));
+
+            console.log('PADDLE PRICE PREVIEW ITEMS:', previewItems);
+
+            Paddle.PricePreview({
+                items: previewItems
+            })
+                .then(result => {
+                    console.log('PADDLE PRICE PREVIEW RESULT:', result);
+
+                    for (const item of (result?.data?.details?.lineItems ?? [])) {
+                        const element = priceElements.get(item?.price?.id);
+
+                        const formatted =
+                            item?.formattedTotals?.total ??
+                            item?.formattedUnitTotals?.total;
+
+                        if (!element || !formatted) {
+                            continue;
+                        }
+
+                        const suffix =
+                            element.dataset.billing === 'annual'
+                                ? ' / year'
+                                : ' / month';
+
+                        element.textContent = formatted + suffix;
+                    }
+                })
+                .catch(error => {
+                    console.error('PADDLE PRICE PREVIEW ERROR:', error);
+
+                    // Server-rendered GBP price remains visible.
+                });
+
+            document
+                .querySelectorAll('.checkout-button')
+                .forEach(button => {
+                    button.addEventListener('click', () => {
+                        const priceId = button.dataset.priceId;
+                        const plan = button.dataset.plan;
+
+                        console.log('OPENING PADDLE CHECKOUT:', {
+                            environment: environment,
+                            priceId: priceId,
+                            plan: plan
+                        });
+
+                        errorPanel.hidden = true;
+
+                        try {
+                            Paddle.Checkout.open({
+                                items: [
+                                    {
+                                        priceId: priceId,
+                                        quantity: 1
+                                    }
+                                ],
+
+                                settings: {
+                                    displayMode: 'overlay',
+                                    theme: window.matchMedia(
+                                        '(prefers-color-scheme: dark)'
+                                    ).matches
+                                        ? 'dark'
+                                        : 'light',
+                                    allowLogout: false
+                                },
+
+                                customData: {
+                                    source: 'sonardesk-buy-page',
+                                    plan: plan
+                                }
+                            });
+                        } catch (error) {
+                            console.error(
+                                'PADDLE CHECKOUT OPEN ERROR:',
+                                error
+                            );
+
+                            showCheckoutError(
+                                error?.message ||
+                                'Paddle could not open the checkout.'
+                            );
+                        }
+                    });
+                });
+        })();
+    </script>
 @endsection
diff --git a/sonar-desk-licensing/resources/views/cms/show.blade.php b/sonar-desk-licensing/resources/views/cms/show.blade.php
index 909e3cf..35da777 100644
--- a/sonar-desk-licensing/resources/views/cms/show.blade.php
+++ b/sonar-desk-licensing/resources/views/cms/show.blade.php
@@ -1,4 +1,14 @@
-@extends('layouts.app', ['title' => $page->meta_title ?: $page->title.' — SonarDesk', 'description' => $page->meta_description ?: $page->excerpt])
+@extends('layouts.app', [
+    'title' => $page->meta_title ?: $page->title.' — '.\App\Models\SiteSetting::valueFor('seo_site_name', 'SonarDesk'),
+    'description' => $page->meta_description ?: $page->excerpt,
+    'keywords' => $page->meta_keywords,
+    'canonical' => $page->canonical_url ?: null,
+    'ogTitle' => $page->og_title ?: null,
+    'ogDescription' => $page->og_description ?: null,
+    'ogImage' => $page->og_image ?: null,
+    'robotsIndex' => $page->robots_index,
+    'robotsFollow' => $page->robots_follow,
+])
 @section('content')
 <article class="legal-page"><header class="legal-head"><span class="eyebrow">SonarDesk</span><h1>{{ $page->title }}</h1>@if($page->excerpt)<p>{{ $page->excerpt }}</p>@endif</header><div class="cms-body">{!! nl2br(e($page->body)) !!}</div></article>
 @endsection
diff --git a/sonar-desk-licensing/resources/views/components/layouts/app.blade.php b/sonar-desk-licensing/resources/views/components/layouts/app.blade.php
new file mode 100644
index 0000000..8f13014
--- /dev/null
+++ b/sonar-desk-licensing/resources/views/components/layouts/app.blade.php
@@ -0,0 +1,9 @@
+@props(['title' => null])
+
+@extends('layouts.app')
+
+@section('title', $title ?? config('app.name'))
+
+@section('content')
+    {{ $slot }}
+@endsection
diff --git a/sonar-desk-licensing/resources/views/downloads/appcast.blade.php b/sonar-desk-licensing/resources/views/downloads/appcast.blade.php
index ca21258..a7060d9 100644
--- a/sonar-desk-licensing/resources/views/downloads/appcast.blade.php
+++ b/sonar-desk-licensing/resources/views/downloads/appcast.blade.php
@@ -1,2 +1,2 @@
-{!! '<?xml version="1.0" encoding="utf-8"?>' !!}
+@php echo '<?xml version="1.0" encoding="utf-8"?>'; @endphp
 <rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"><channel><title>SonarDesk Updates</title><link>{{ route('updates.appcast') }}</link><description>SonarDesk stable release feed</description>@foreach($releases as $release)<item><title>SonarDesk {{ $release->version }}</title><pubDate>{{ $release->published_at?->toRfc2822String() }}</pubDate><sparkle:version>{{ $release->build_number }}</sparkle:version><sparkle:shortVersionString>{{ $release->version }}</sparkle:shortVersionString>@if($release->minimum_macos)<sparkle:minimumSystemVersion>{{ $release->minimum_macos }}</sparkle:minimumSystemVersion>@endif<description><![CDATA[{!! nl2br(e($release->release_notes ?: 'SonarDesk update')) !!}]]></description><enclosure url="{{ route('download.release',$release) }}" length="{{ $release->file_size }}" type="application/octet-stream"@if($release->sparkle_signature) sparkle:edSignature="{{ $release->sparkle_signature }}"@endif /></item>@endforeach</channel></rss>
diff --git a/sonar-desk-licensing/resources/views/layouts/app.blade.php b/sonar-desk-licensing/resources/views/layouts/app.blade.php
index 4dbe278..99d2e8f 100755
--- a/sonar-desk-licensing/resources/views/layouts/app.blade.php
+++ b/sonar-desk-licensing/resources/views/layouts/app.blade.php
@@ -6,26 +6,45 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     @php
-        $pageTitle = $title ?? 'SonarDesk';
-        $pageDescription = $description ?? 'Native SonarQube monitoring for macOS. Track projects, quality gates, bugs, vulnerabilities and code smells from one professional desktop app.';
-        $canonicalUrl = url()->current();
-        $socialImage = url('/icons/og-sonardesk.png');
+        $seoSiteName = \App\Models\SiteSetting::valueFor('seo_site_name', 'SonarDesk');
+        $seoDefaultTitle = \App\Models\SiteSetting::valueFor('seo_default_title', 'SonarDesk — Native SonarQube Monitoring for macOS');
+        $seoDefaultDescription = \App\Models\SiteSetting::valueFor('seo_default_description', 'Native SonarQube monitoring for macOS. Track projects, quality gates, bugs, vulnerabilities and code smells from one professional desktop app.');
+        $pageTitle = $title ?? $seoDefaultTitle;
+        $pageDescription = $description ?? $seoDefaultDescription;
+        $pageKeywords = $keywords ?? \App\Models\SiteSetting::valueFor('seo_default_keywords');
+        $canonicalBase = rtrim(\App\Models\SiteSetting::valueFor('seo_canonical_base_url', config('app.url')), '/');
+        $canonicalUrl = $canonical ?? ($canonicalBase . request()->getPathInfo());
+        $socialImage = $ogImage ?? \App\Models\SiteSetting::valueFor('seo_default_og_image', url('/icons/og-sonardesk.png'));
+        $ogTitle = $ogTitle ?? $pageTitle;
+        $ogDescription = $ogDescription ?? $pageDescription;
+        $robotsIndex = $robotsIndex ?? true;
+        $robotsFollow = $robotsFollow ?? true;
+        $productionIndexing = app()->environment('production') && \App\Models\SiteSetting::booleanFor('seo_robots_enabled', true);
+        $robots = $productionIndexing ? (($robotsIndex ? 'index' : 'noindex').','.($robotsFollow ? 'follow' : 'nofollow').',max-image-preview:large,max-snippet:-1,max-video-preview:-1') : 'noindex,nofollow';
+        $twitterSite = \App\Models\SiteSetting::valueFor('seo_twitter_site');
+        $googleVerification = \App\Models\SiteSetting::valueFor('seo_google_site_verification');
+        $organizationName = \App\Models\SiteSetting::valueFor('seo_organization_name', $seoSiteName);
+        $organizationLogo = \App\Models\SiteSetting::valueFor('seo_organization_logo', url('/icons/sonardesk-icon-512.png'));
+        $schema = [
+            '@context' => 'https://schema.org', '@type' => 'SoftwareApplication', 'name' => $seoSiteName,
+            'applicationCategory' => 'DeveloperApplication', 'operatingSystem' => 'macOS', 'url' => route('home'),
+            'description' => $seoDefaultDescription, 'publisher' => ['@type' => 'Organization', 'name' => $organizationName, 'logo' => ['@type' => 'ImageObject', 'url' => $organizationLogo]],
+        ];
     @endphp
 
     <title>{{ $pageTitle }}</title>
     <meta name="description" content="{{ $pageDescription }}">
+    @if($pageKeywords)<meta name="keywords" content="{{ $pageKeywords }}">@endif
+    <meta name="robots" content="{{ $robots }}">
+    <meta name="googlebot" content="{{ $robots }}">
+    @if($googleVerification)<meta name="google-site-verification" content="{{ $googleVerification }}">@endif
     <meta name="theme-color" content="#0b1220">
-    <meta name="application-name" content="SonarDesk">
-    <meta name="apple-mobile-web-app-title" content="SonarDesk">
+    <meta name="application-name" content="{{ $seoSiteName }}">
+    <meta name="apple-mobile-web-app-title" content="{{ $seoSiteName }}">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <meta name="msapplication-TileColor" content="#2563eb">
     <meta name="msapplication-config" content="{{ asset('browserconfig.xml') }}">
-    @if(app()->environment('production'))
-        <meta name="robots" content="index,follow,max-image-preview:large">
-    @else
-        <meta name="robots" content="noindex,nofollow">
-    @endif
 
     <link rel="canonical" href="{{ $canonicalUrl }}">
     <link rel="icon" href="{{ asset('favicon.ico') }}" sizes="any">
@@ -36,17 +55,18 @@
     <link rel="manifest" href="{{ asset('site.webmanifest') }}">
 
     <meta property="og:type" content="website">
-    <meta property="og:site_name" content="SonarDesk">
-    <meta property="og:title" content="{{ $pageTitle }}">
-    <meta property="og:description" content="{{ $pageDescription }}">
+    <meta property="og:site_name" content="{{ $seoSiteName }}">
+    <meta property="og:title" content="{{ $ogTitle }}">
+    <meta property="og:description" content="{{ $ogDescription }}">
     <meta property="og:url" content="{{ $canonicalUrl }}">
     <meta property="og:image" content="{{ $socialImage }}">
-    <meta property="og:image:width" content="512">
-    <meta property="og:image:height" content="512">
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:title" content="{{ $pageTitle }}">
-    <meta name="twitter:description" content="{{ $pageDescription }}">
+    <meta property="og:image:alt" content="{{ $ogTitle }}">
+    <meta name="twitter:card" content="summary_large_image">
+    @if($twitterSite)<meta name="twitter:site" content="{{ str_starts_with($twitterSite, '@') ? $twitterSite : '@'.$twitterSite }}">@endif
+    <meta name="twitter:title" content="{{ $ogTitle }}">
+    <meta name="twitter:description" content="{{ $ogDescription }}">
     <meta name="twitter:image" content="{{ $socialImage }}">
+    <script type="application/ld+json">{!! json_encode($schema, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE) !!}</script>
 
     <style>
         :root{
@@ -176,6 +196,8 @@
         @media(max-width:900px){.download-hero .download-shell{grid-template-columns:1fr}.product-visual{display:none}.download-copy h1{font-size:52px}.confidence-grid{grid-template-columns:repeat(2,1fr);gap:20px}.confidence-grid div{border:0;padding:0}.download-content,.release-editor{grid-template-columns:1fr}.sticky-card{position:static}.download-support .download-shell,.admin-release-head{align-items:flex-start;flex-direction:column}}@media(max-width:600px){.download-hero{padding:64px 0}.download-copy h1{font-size:42px}.download-actions,.release-heading{flex-direction:column}.download-primary,.download-secondary{width:100%}.confidence-grid{grid-template-columns:1fr}.release-history-list article{align-items:flex-start;gap:12px;flex-direction:column}.download-content{padding-top:40px;padding-bottom:40px}.release-notes-panel,.requirements-panel{padding:22px}.form-grid{grid-template-columns:1fr}.download-support .download-shell{align-items:stretch}}
 .portal-download-banner{display:flex;align-items:center;justify-content:space-between;gap:20px;padding:18px 20px;margin-bottom:22px;background:linear-gradient(135deg,#0f172a,#172554);color:#fff;border-radius:14px;box-shadow:var(--shadow-md)}.portal-download-banner strong,.portal-download-banner small{display:block}.portal-download-banner strong{font-size:18px;margin:3px 0}.portal-download-banner small{color:#cbd5e1}.portal-download-banner .eyebrow{color:#93c5fd}@media(max-width:650px){.portal-download-banner{align-items:stretch;flex-direction:column}}
 .home-download-showcase{display:grid;grid-template-columns:1.25fr .75fr;gap:36px;align-items:center;margin:0 0 64px;padding:38px;background:linear-gradient(135deg,#f8fafc,#eff6ff);border:1px solid #dbeafe;border-radius:22px}.home-download-copy h2{font-size:38px;letter-spacing:-.035em;margin:7px 0 10px}.home-download-copy p{color:#667085;font-size:16px;max-width:680px}.home-download-meta{background:#0b1220;color:#fff;border-radius:16px;padding:24px;box-shadow:0 18px 40px rgba(15,23,42,.16)}.home-download-meta>span{display:block;color:#93c5fd;text-transform:uppercase;font-size:9px;font-weight:900;letter-spacing:.12em}.home-download-meta>strong{display:block;font-size:24px;margin:7px 0 3px}.home-download-meta>small{color:#94a3b8}.home-download-meta>div{margin-top:20px;padding-top:16px;border-top:1px solid rgba(255,255,255,.1)}.home-download-meta b,.home-download-meta code{display:block}.home-download-meta b{font-size:9px;color:#64748b;letter-spacing:.1em}.home-download-meta code{font-size:10px;color:#cbd5e1;margin-top:5px}@media(max-width:760px){.home-download-showcase{grid-template-columns:1fr;padding:24px}}
+
+.seo-admin-form{display:grid;gap:18px}.seo-section{padding:28px}.seo-section h2{margin:4px 0 4px;font-size:22px;letter-spacing:-.02em}.seo-section-head{display:flex;justify-content:space-between;align-items:flex-start;gap:20px;padding-bottom:20px;margin-bottom:22px;border-bottom:1px solid var(--line)}.seo-section-head p{margin:0;color:var(--muted);max-width:680px}.seo-badge{display:inline-flex;align-items:center;padding:6px 10px;border-radius:999px;background:var(--blue-soft);color:var(--blue-dark);font-size:11px;font-weight:850;text-transform:uppercase;letter-spacing:.08em;white-space:nowrap}.seo-badge.success{background:var(--green-soft);color:var(--green)}.seo-dns-callout{display:grid;gap:5px;margin-bottom:22px;padding:16px 18px;border:1px solid #bfdbfe;border-radius:12px;background:#eff6ff;color:#1e3a8a}.seo-dns-callout span{color:#475569}.seo-dns-callout code{font-weight:800}.seo-savebar{position:sticky;bottom:18px;z-index:20;display:flex;align-items:center;justify-content:space-between;gap:18px;padding:15px 18px;border:1px solid var(--line);border-radius:14px;background:rgba(255,255,255,.96);backdrop-filter:blur(14px);box-shadow:0 14px 38px rgba(15,23,42,.14)}.seo-savebar strong,.seo-savebar span{display:block}.seo-savebar span{font-size:12px;color:var(--muted);margin-top:2px}.seo-preview{border:1px solid var(--line);border-radius:12px;padding:18px;background:#fff}.seo-preview-label{font-size:10px;font-weight:850;text-transform:uppercase;letter-spacing:.1em;color:var(--muted);margin-bottom:10px}.seo-preview-title{color:#1a0dab;font-size:19px;line-height:1.3}.seo-preview-url{color:#188038;font-size:12px;margin:4px 0}.seo-preview-description{color:#4d5156;font-size:13px;line-height:1.45}@media(max-width:700px){.seo-section-head,.seo-savebar{align-items:stretch;flex-direction:column}.seo-savebar .btn{width:100%}}
 </style>
     @stack('head')
 </head>
@@ -207,6 +229,7 @@
                     @endphp
 
                     <a href="{{ route('admin.index') }}">Admin</a>
+                    <a href="{{ route('admin.users.index') }}">Users</a>
                     <a href="{{ route('admin.releases.index') }}">Releases</a>
                     <a href="{{ route('admin.support.index') }}">
                         Support
diff --git a/sonar-desk-licensing/resources/views/seo/sitemap.blade.php b/sonar-desk-licensing/resources/views/seo/sitemap.blade.php
new file mode 100644
index 0000000..517eb1c
--- /dev/null
+++ b/sonar-desk-licensing/resources/views/seo/sitemap.blade.php
@@ -0,0 +1,18 @@
+{!! '<?xml version="1.0" encoding="UTF-8"?>' !!}
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+@foreach($static as $item)
+    <url>
+        <loc>{{ route($item['route']) }}</loc>
+        <changefreq>{{ $item['frequency'] }}</changefreq>
+        <priority>{{ $item['priority'] }}</priority>
+    </url>
+@endforeach
+@foreach($pages as $page)
+    <url>
+        <loc>{{ route('cms.show', $page->slug) }}</loc>
+        <lastmod>{{ $page->updated_at->toAtomString() }}</lastmod>
+        <changefreq>{{ $page->sitemap_change_frequency }}</changefreq>
+        <priority>{{ number_format((float) $page->sitemap_priority, 1, '.', '') }}</priority>
+    </url>
+@endforeach
+</urlset>
diff --git a/sonar-desk-licensing/routes/api.php b/sonar-desk-licensing/routes/api.php
index 9548279..deb587a 100755
--- a/sonar-desk-licensing/routes/api.php
+++ b/sonar-desk-licensing/routes/api.php
@@ -1,12 +1,3 @@
 <?php
 
-use App\Http\Controllers\Api\LicenseActivationController;
-use App\Http\Controllers\Api\PaymentWebhookController;
-use Illuminate\Support\Facades\Route;
-
-Route::prefix('v1')->group(function () {
-    Route::post('/activate', [LicenseActivationController::class, 'activate'])->middleware('throttle:license-activation');
-    Route::post('/validate', [LicenseActivationController::class, 'validateInstallation'])->middleware('throttle:license-activation');
-    Route::post('/deactivate', [LicenseActivationController::class, 'deactivate'])->middleware('throttle:license-activation');
-    Route::post('/webhooks/{provider}', PaymentWebhookController::class)->whereIn('provider', ['paddle', 'lemon-squeezy']);
-});
+// Module-owned API routes are loaded by their RouteServiceProviders.
diff --git a/sonar-desk-licensing/routes/console.php b/sonar-desk-licensing/routes/console.php
index 6fff514..d790415 100755
--- a/sonar-desk-licensing/routes/console.php
+++ b/sonar-desk-licensing/routes/console.php
@@ -6,5 +6,5 @@ use Illuminate\Support\Facades\Schedule;
 Schedule::command('model:prune')->dailyAt('03:20')->withoutOverlapping();
 
 Schedule::call(function (): void {
-    app(\App\Services\Licensing\LicenseDeliveryService::class)->deliverPending(50);
+    app(\Modules\Licensing\Services\LicenseDeliveryService::class)->deliverPending(50);
 })->name('license-delivery')->everyMinute()->withoutOverlapping();
diff --git a/sonar-desk-licensing/routes/web.php b/sonar-desk-licensing/routes/web.php
index 0438c31..a3e6d6f 100755
--- a/sonar-desk-licensing/routes/web.php
+++ b/sonar-desk-licensing/routes/web.php
@@ -4,20 +4,23 @@ use App\Http\Controllers\Admin\AdminController;
 use App\Http\Controllers\Admin\SupportTicketController;
 use App\Http\Controllers\Admin\ReleaseController as AdminReleaseController;
 use App\Http\Controllers\Admin\CmsPageController as AdminCmsPageController;
+use App\Http\Controllers\Admin\SeoSettingsController;
+use App\Http\Controllers\Admin\UserController;
+use App\Http\Controllers\SeoController;
 use App\Http\Controllers\CmsPageController;
 use App\Http\Controllers\Auth\AuthenticatedSessionController;
 use App\Http\Controllers\Auth\EmailVerificationController;
 use App\Http\Controllers\Auth\PasswordController;
 use App\Http\Controllers\Auth\RegisteredUserController;
-use App\Http\Controllers\CheckoutController;
 use App\Http\Controllers\ReleaseController;
-use App\Http\Controllers\Portal\PortalController;
 use App\Http\Controllers\Support\SupportController;
 use App\Http\Middleware\AdminOnly;
 use Illuminate\Support\Facades\Route;
 
+Route::get('/sitemap.xml', [SeoController::class, 'sitemap'])->name('sitemap');
+Route::get('/robots.txt', [SeoController::class, 'robots'])->name('robots');
+
 Route::get('/', fn () => view('portal.welcome', ['latestRelease' => \App\Models\SonarDeskRelease::published()->where('channel', 'stable')->latest('published_at')->first()]))->name('home');
-Route::get('/buy', CheckoutController::class)->name('buy');
 Route::view('/features', 'features')->name('features');
 Route::get('/release', [ReleaseController::class, 'index'])->name('release');
 Route::get('/download', [ReleaseController::class, 'latest'])->name('download.latest');
@@ -45,20 +48,25 @@ Route::middleware('auth')->group(function () {
     Route::get('/verify-email/{id}/{hash}', [EmailVerificationController::class, 'verify'])->middleware(['signed', 'throttle:6,1'])->name('verification.verify');
     Route::post('/email/verification-notification', [EmailVerificationController::class, 'resend'])->middleware('throttle:6,1')->name('verification.send');
 });
-Route::middleware(['auth', 'verified'])->prefix('portal')->name('portal.')->group(function () {
-    Route::get('/', [PortalController::class, 'index'])->name('index');
-    Route::get('/licences/{license}', [PortalController::class, 'show'])->name('show');
-    Route::post('/licences/{license}/upgrade', [PortalController::class, 'upgrade'])->middleware('throttle:5,1')->name('upgrade');
-    Route::delete('/licences/{license}/subscription', [PortalController::class, 'cancel'])->middleware('throttle:5,1')->name('cancel');
-    Route::post('/licences/{license}/resend', [PortalController::class, 'resend'])->middleware('throttle:3,10')->name('resend');
-    Route::delete('/licences/{license}/activations/{activation}', [PortalController::class, 'deactivate'])->name('deactivate');
-});
 Route::middleware(['auth', 'verified', AdminOnly::class])->prefix('admin')->name('admin.')->group(function () {
     Route::get('/', [AdminController::class, 'index'])->name('index');
     Route::get('/licences', [AdminController::class, 'licenses'])->name('licenses');
     Route::get('/licences/{license}', [AdminController::class, 'show'])->name('license');
     Route::post('/licences/{license}/revoke', [AdminController::class, 'revoke'])->name('revoke');
     Route::post('/licences/{license}/restore', [AdminController::class, 'restore'])->name('restore');
+    Route::get('/users', [UserController::class, 'index'])->name('users.index');
+    Route::get('/users/{user}', [UserController::class, 'show'])->name('users.show');
+    Route::put('/users/{user}', [UserController::class, 'update'])->name('users.update');
+    Route::post('/users/{user}/verify', [UserController::class, 'verify'])->name('users.verify');
+    Route::post('/users/{user}/verification-email', [UserController::class, 'resendVerification'])->name('users.verification-email');
+    Route::post('/users/{user}/password-reset', [UserController::class, 'sendPasswordReset'])->name('users.password-reset');
+    Route::post('/users/{user}/suspend', [UserController::class, 'suspend'])->name('users.suspend');
+    Route::post('/users/{user}/restore', [UserController::class, 'restore'])->name('users.restore');
+    Route::delete('/users/{user}', [UserController::class, 'destroy'])->name('users.destroy');
+    Route::patch('/users/{user}/licences/{license}', [UserController::class, 'updateLicense'])->name('users.licences.update');
+    Route::delete('/users/{user}/licences/{license}/activations/{activation}', [UserController::class, 'deactivate'])->name('users.activations.destroy');
+    Route::get('/seo', [SeoSettingsController::class, 'edit'])->name('seo.edit');
+    Route::put('/seo', [SeoSettingsController::class, 'update'])->name('seo.update');
     Route::get('/cms', [AdminCmsPageController::class, 'index'])->name('cms.index');
     Route::get('/cms/create', [AdminCmsPageController::class, 'create'])->name('cms.create');
     Route::post('/cms', [AdminCmsPageController::class, 'store'])->name('cms.store');
diff --git a/sonar-desk-licensing/scripts/scan.sh b/sonar-desk-licensing/scripts/scan.sh
new file mode 100644
index 0000000..e708714
--- /dev/null
+++ b/sonar-desk-licensing/scripts/scan.sh
@@ -0,0 +1,5 @@
+sonar-scanner \
+  -Dsonar.projectKey=SonarDesk \
+  -Dsonar.sources=. \
+  -Dsonar.host.url=https://sonarcube.absdev.net \
+  -Dsonar.token=sqp_b215d121d857a0014bdad688bc76f31986a882c5
diff --git a/sonar-desk-licensing/tests/Feature/CheckoutPageTest.php b/sonar-desk-licensing/tests/Feature/CheckoutPageTest.php
index 1fd31b8..b8dff77 100755
--- a/sonar-desk-licensing/tests/Feature/CheckoutPageTest.php
+++ b/sonar-desk-licensing/tests/Feature/CheckoutPageTest.php
@@ -2,18 +2,20 @@
 
 namespace Tests\Feature;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 final class CheckoutPageTest extends TestCase
 {
+    use RefreshDatabase;
     public function test_buy_page_contains_all_four_configured_paddle_prices(): void
     {
-        config()->set('sonardesk.paddle.client_side_token', 'test_example');
-        config()->set('sonardesk.paddle.environment', 'sandbox');
-        config()->set('sonardesk.paddle.personal_monthly_price_id', 'pri_personal_monthly');
-        config()->set('sonardesk.paddle.personal_annual_price_id', 'pri_personal_annual');
-        config()->set('sonardesk.paddle.professional_monthly_price_id', 'pri_professional_monthly');
-        config()->set('sonardesk.paddle.professional_annual_price_id', 'pri_professional_annual');
+        config()->set('paddle.client_side_token', 'test_example');
+        config()->set('paddle.environment', 'sandbox');
+        config()->set('paddle.personal_monthly_price_id', 'pri_personal_monthly');
+        config()->set('paddle.personal_annual_price_id', 'pri_personal_annual');
+        config()->set('paddle.professional_monthly_price_id', 'pri_professional_monthly');
+        config()->set('paddle.professional_annual_price_id', 'pri_professional_annual');
 
         $this->get('/buy')
             ->assertOk()
diff --git a/sonar-desk-licensing/tests/Feature/LicenseActivationTest.php b/sonar-desk-licensing/tests/Feature/LicenseActivationTest.php
index 7d81a87..ebb0b4e 100755
--- a/sonar-desk-licensing/tests/Feature/LicenseActivationTest.php
+++ b/sonar-desk-licensing/tests/Feature/LicenseActivationTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature;
 
-use App\Models\LicenseActivation;
-use App\Models\LicenseProduct;
-use App\Services\Licensing\LicenseIssuer;
+use Modules\Licensing\Models\LicenseActivation;
+use Modules\Licensing\Models\LicenseProduct;
+use Modules\Licensing\Services\LicenseIssuer;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/sonar-desk-licensing/tests/Feature/PaddleSubscriptionProvisioningTest.php b/sonar-desk-licensing/tests/Feature/PaddleSubscriptionProvisioningTest.php
index a2c1f07..1c062e1 100755
--- a/sonar-desk-licensing/tests/Feature/PaddleSubscriptionProvisioningTest.php
+++ b/sonar-desk-licensing/tests/Feature/PaddleSubscriptionProvisioningTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use App\Models\License;
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseProduct;
 use App\Models\User;
-use App\Services\Payments\PurchaseProvisioner;
+use Modules\Paddle\Services\PurchaseProvisioner;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
@@ -84,7 +84,7 @@ class PaddleSubscriptionProvisioningTest extends TestCase
         $this->product('pri_personal_monthly', 'Personal', 1);
         app(PurchaseProvisioner::class)->provision('paddle', $this->subscription(
             'subscription.updated', 'active', 'pri_personal_monthly', 'pro_personal',
-            ['data' => ['scheduled_change' => ['action' => 'cancel', 'effective_at' => '2026-10-09T00:00:00Z']]]
+            ['scheduled_change' => ['action' => 'cancel', 'effective_at' => '2026-10-09T00:00:00Z']]
         ));
 
         $license = License::firstOrFail();
@@ -97,7 +97,7 @@ class PaddleSubscriptionProvisioningTest extends TestCase
         $this->product('pri_personal_monthly', 'Personal', 1);
         $service = app(PurchaseProvisioner::class);
         $service->provision('paddle', $this->subscription('subscription.created', 'active', 'pri_personal_monthly', 'pro_personal'));
-        $service->provision('paddle', $this->subscription('subscription.canceled', 'canceled', 'pri_personal_monthly', 'pro_personal', ['data' => ['current_billing_period' => null]]));
+        $service->provision('paddle', $this->subscription('subscription.canceled', 'canceled', 'pri_personal_monthly', 'pro_personal', ['current_billing_period' => null]));
 
         $license = License::firstOrFail();
         $this->assertNotNull($license->revoked_at);
diff --git a/sonar-desk-licensing/tests/Feature/PortalSubscriptionManagementTest.php b/sonar-desk-licensing/tests/Feature/PortalSubscriptionManagementTest.php
index 5fd08de..8e23027 100755
--- a/sonar-desk-licensing/tests/Feature/PortalSubscriptionManagementTest.php
+++ b/sonar-desk-licensing/tests/Feature/PortalSubscriptionManagementTest.php
@@ -2,11 +2,12 @@
 
 namespace Tests\Feature;
 
-use App\Models\License;
-use App\Models\LicenseProduct;
+use Modules\Licensing\Models\License;
+use Modules\Licensing\Models\LicenseProduct;
 use App\Models\User;
-use App\Services\Payments\PaddleClient;
+use Modules\Paddle\Services\PaddleClient;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Http\Middleware\PreventRequestForgery;
 use Mockery\MockInterface;
 use Tests\TestCase;
 
@@ -31,8 +32,10 @@ class PortalSubscriptionManagementTest extends TestCase
 
     public function test_personal_subscription_is_upgraded_in_place(): void
     {
-        config()->set('sonardesk.paddle.personal_monthly_price_id', 'pri_personal_monthly');
-        config()->set('sonardesk.paddle.professional_monthly_price_id', 'pri_professional_monthly');
+        $this->withoutMiddleware(PreventRequestForgery::class);
+
+        config()->set('paddle.personal_monthly_price_id', 'pri_personal_monthly');
+        config()->set('paddle.professional_monthly_price_id', 'pri_professional_monthly');
 
         $personal = $this->product('personal-monthly', 'Personal', 'pri_personal_monthly', 1);
         $professional = $this->product('professional-monthly', 'Professional', 'pri_professional_monthly', 3);
diff --git a/sonar-desk-licensing/tests/TestCase.php b/sonar-desk-licensing/tests/TestCase.php
new file mode 100644
index 0000000..fe1ffc2
--- /dev/null
+++ b/sonar-desk-licensing/tests/TestCase.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Tests;
+
+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+
+abstract class TestCase extends BaseTestCase
+{
+    //
+}
diff --git a/sonar-desk-licensing/tests/Unit/.gitkeep b/sonar-desk-licensing/tests/Unit/.gitkeep
new file mode 100644
index 0000000..e69de29