diff --git a/app/Actions/Discounts/OfferCampaign/UI/IndexOfferCampaigns.php b/app/Actions/Discounts/OfferCampaign/UI/IndexOfferCampaigns.php
index 1219ade142..c4db8c381c 100644
--- a/app/Actions/Discounts/OfferCampaign/UI/IndexOfferCampaigns.php
+++ b/app/Actions/Discounts/OfferCampaign/UI/IndexOfferCampaigns.php
@@ -140,7 +140,7 @@ public function htmlResponse(LengthAwarePaginator $campaigns, ActionRequest $req
         $iconRight  = null;
 
         return Inertia::render(
-            'Org/Shop/B2b/Campaigns/Campaigns',
+            'Org/Discounts/Campaigns',
             [
                 'breadcrumbs' => $this->getBreadcrumbs(
                     $request->route()->getName(),
diff --git a/app/Actions/Discounts/OfferCampaign/UI/ShowOfferCampaign.php b/app/Actions/Discounts/OfferCampaign/UI/ShowOfferCampaign.php
index e2f71ecab2..7707923972 100644
--- a/app/Actions/Discounts/OfferCampaign/UI/ShowOfferCampaign.php
+++ b/app/Actions/Discounts/OfferCampaign/UI/ShowOfferCampaign.php
@@ -47,7 +47,7 @@ public function asController(Organisation $organisation, Shop $shop, OfferCampai
     public function htmlResponse(OfferCampaign $offerCampaign, ActionRequest $request): Response
     {
         return Inertia::render(
-            'Org/Shop/B2b/Campaigns/Campaign',
+            'Org/Discounts/Campaign',
             [
                 'title'                                              => __('Offer Campaign'),
                 'breadcrumbs'                                        => $this->getBreadcrumbs($offerCampaign, $request->route()->getName(), $request->route()->originalParameters()),
diff --git a/app/Actions/UI/Dropshipping/Offers/ShowOfferDashboard.php b/app/Actions/Discounts/UI/ShowDiscountsDashboard.php
similarity index 84%
rename from app/Actions/UI/Dropshipping/Offers/ShowOfferDashboard.php
rename to app/Actions/Discounts/UI/ShowDiscountsDashboard.php
index 5d0492c2b4..ee02b0f45c 100644
--- a/app/Actions/UI/Dropshipping/Offers/ShowOfferDashboard.php
+++ b/app/Actions/Discounts/UI/ShowDiscountsDashboard.php
@@ -2,22 +2,22 @@
 
 /*
  * Author: Raul Perusquia <raul@inikoo.com>
- * Created: Mon, 06 Mar 2023 18:44:51 Malaysia Time, Kuala Lumpur, Malaysia
- * Copyright (c) 2023, Raul A Perusquia Flores
+ * Created: Sun, 05 Jan 2025 14:07:49 Malaysia Time, Kuala Lumpur, Malaysia
+ * Copyright (c) 2025, Raul A Perusquia Flores
  */
 
-namespace App\Actions\UI\Dropshipping\Offers;
+namespace App\Actions\Discounts\UI;
 
 use App\Actions\Catalogue\Shop\UI\ShowShop;
 use App\Actions\OrgAction;
-use App\Enums\UI\Dropshipping\OffersTabsEnum;
+use App\Enums\UI\Discounts\DiscountsDashboardTabsEnum;
 use App\Models\Catalogue\Shop;
 use App\Models\SysAdmin\Organisation;
 use Inertia\Inertia;
 use Inertia\Response;
 use Lorisleiva\Actions\ActionRequest;
 
-class ShowOfferDashboard extends OrgAction
+class ShowDiscountsDashboard extends OrgAction
 {
     public function authorize(ActionRequest $request): bool
     {
@@ -36,25 +36,24 @@ public function asController(Organisation $organisation, Shop $shop, ActionReque
     public function htmlResponse(ActionRequest $request): Response
     {
         return Inertia::render(
-            'Org/Shop/Dropshipping/OffersDashboard',
+            'Org/Discounts/DiscountsDashboard',
             [
                 'breadcrumbs'  => $this->getBreadcrumbs($request->route()->originalParameters()),
-                'title'        => __('offers'),
+                'title'        => __('Offers dashboard'),
                 'pageHead'     => [
                     'icon'      => [
                         'icon'  => ['fal', 'fa-badge-percent'],
-                        'title' => __('offer')
+                        'title' => __('Offers dashboard')
                     ],
-                    'model'     => __('Offers'),
                     'iconRight' => [
                         'icon'  => ['fal', 'fa-chart-network'],
                         'title' => __('offer')
                     ],
-                    'title' => __('dashboard'),
+                    'title' => __('Offers dashboard'),
                 ],
                 'tabs' => [
                     'current'    => $this->tab,
-                    'navigation' => OffersTabsEnum::navigation()
+                    'navigation' => DiscountsDashboardTabsEnum::navigation()
                 ],
                 'stats'     => [
                     [
diff --git a/app/Actions/UI/Dropshipping/Marketing/ShowMarketingDashboard.php b/app/Actions/UI/Dropshipping/Marketing/ShowMarketingDashboard.php
index 4802d1a369..c0dbb386cb 100644
--- a/app/Actions/UI/Dropshipping/Marketing/ShowMarketingDashboard.php
+++ b/app/Actions/UI/Dropshipping/Marketing/ShowMarketingDashboard.php
@@ -10,7 +10,7 @@
 
 use App\Actions\Catalogue\Shop\UI\ShowShop;
 use App\Actions\OrgAction;
-use App\Enums\UI\Dropshipping\MarketingTabsEnum;
+use App\Enums\UI\Marketing\MarketingDashboardTabsEnum;
 use App\Models\Catalogue\Shop;
 use App\Models\SysAdmin\Organisation;
 use Inertia\Inertia;
@@ -27,7 +27,7 @@ public function authorize(ActionRequest $request): bool
 
     public function asController(Organisation $organisation, Shop $shop, ActionRequest $request): ActionRequest
     {
-        $this->initialisationFromShop($shop, $request)->withTab(MarketingTabsEnum::values());
+        $this->initialisationFromShop($shop, $request)->withTab(MarketingDashboardTabsEnum::values());
 
         return $request;
     }
@@ -36,7 +36,7 @@ public function asController(Organisation $organisation, Shop $shop, ActionReque
     public function htmlResponse(ActionRequest $request): Response
     {
         return Inertia::render(
-            'Org/Shop/Dropshipping/MarketingDashboard',
+            'Org/Marketing/MarketingDashboard',
             [
                 'breadcrumbs'  => $this->getBreadcrumbs($request->route()->originalParameters()),
                 'title'        =>  __('Marketing Dashboard'),
@@ -53,7 +53,7 @@ public function htmlResponse(ActionRequest $request): Response
                 ],
                 'tabs' => [
                     'current'    => $this->tab,
-                    'navigation' => MarketingTabsEnum::navigation()
+                    'navigation' => MarketingDashboardTabsEnum::navigation()
                 ],
                 'dashboard_stats'   => [
                     [
diff --git a/app/Enums/UI/Dropshipping/MarketingTabsEnum.php b/app/Enums/UI/Discounts/DiscountsDashboardTabsEnum.php
similarity index 61%
rename from app/Enums/UI/Dropshipping/MarketingTabsEnum.php
rename to app/Enums/UI/Discounts/DiscountsDashboardTabsEnum.php
index 5f9905cd41..8385cb04fd 100644
--- a/app/Enums/UI/Dropshipping/MarketingTabsEnum.php
+++ b/app/Enums/UI/Discounts/DiscountsDashboardTabsEnum.php
@@ -2,16 +2,16 @@
 
 /*
  * Author: Raul Perusquia <raul@inikoo.com>
- * Created: Sat, 11 May 2024 20:45:45 British Summer Time, Sheffield, UK
- * Copyright (c) 2024, Raul A Perusquia Flores
+ * Created: Sun, 05 Jan 2025 14:31:39 Malaysia Time, Kuala Lumpur, Malaysia
+ * Copyright (c) 2025, Raul A Perusquia Flores
  */
 
-namespace App\Enums\UI\Dropshipping;
+namespace App\Enums\UI\Discounts;
 
 use App\Enums\EnumHelperTrait;
 use App\Enums\HasTabs;
 
-enum MarketingTabsEnum: string
+enum DiscountsDashboardTabsEnum: string
 {
     use EnumHelperTrait;
     use HasTabs;
@@ -21,7 +21,7 @@ enum MarketingTabsEnum: string
     public function blueprint(): array
     {
         return match ($this) {
-            MarketingTabsEnum::DASHBOARD => [
+            DiscountsDashboardTabsEnum::DASHBOARD => [
                 'title' => __('dashboard'),
                 'icon'  => 'fal fa-tachometer-alt-fast',
             ],
diff --git a/app/Enums/UI/Dropshipping/OffersTabsEnum.php b/app/Enums/UI/Dropshipping/OffersTabsEnum.php
deleted file mode 100644
index 8db95ec220..0000000000
--- a/app/Enums/UI/Dropshipping/OffersTabsEnum.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * Author: Raul Perusquia <raul@inikoo.com>
- * Created: Sat, 11 May 2024 20:45:45 British Summer Time, Sheffield, UK
- * Copyright (c) 2024, Raul A Perusquia Flores
- */
-
-namespace App\Enums\UI\Dropshipping;
-
-use App\Enums\EnumHelperTrait;
-use App\Enums\HasTabs;
-
-enum OffersTabsEnum: string
-{
-    use EnumHelperTrait;
-    use HasTabs;
-
-    case DASHBOARD = 'dashboard';
-
-    // case DEPARTMENTS      = 'departments';
-    // case FAMILIES         = 'families';
-    // case PRODUCTS         = 'products';
-    // case COLLECTIONS = 'collections';
-
-
-
-    public function blueprint(): array
-    {
-        return match ($this) {
-            OffersTabsEnum::DASHBOARD => [
-                'title' => __('dashboard'),
-                'icon'  => 'fal fa-tachometer-alt-fast',
-            ],
-            /*
-            CatalogueTabsEnum::DEPARTMENTS => [
-                'title' => __('departments'),
-                'icon'  => 'fal fa-folder-tree',
-            ],
-            CatalogueTabsEnum::FAMILIES => [
-                'title' => __('families'),
-                'icon'  => 'fal fa-folder',
-            ],
-            CatalogueTabsEnum::PRODUCTS => [
-                'title' => __('products'),
-                'icon'  => 'fal fa-cube',
-            ],
-               CatalogueTabsEnum::COLLECTIONS => [
-                'title' => __('collections'),
-                'icon'  => 'fal fa-clock',
-            ],
-
-            */
-
-
-
-        };
-    }
-}
diff --git a/app/Enums/UI/Marketing/MarketingDashboardTabsEnum.php b/app/Enums/UI/Marketing/MarketingDashboardTabsEnum.php
new file mode 100644
index 0000000000..ba1a95ab04
--- /dev/null
+++ b/app/Enums/UI/Marketing/MarketingDashboardTabsEnum.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Sun, 05 Jan 2025 14:31:08 Malaysia Time, Kuala Lumpur, Malaysia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
+namespace App\Enums\UI\Marketing;
+
+use App\Enums\EnumHelperTrait;
+use App\Enums\HasTabs;
+
+enum MarketingDashboardTabsEnum: string
+{
+    use EnumHelperTrait;
+    use HasTabs;
+
+    case DASHBOARD = 'dashboard';
+
+    public function blueprint(): array
+    {
+        return match ($this) {
+            MarketingDashboardTabsEnum::DASHBOARD => [
+                'title' => __('dashboard'),
+                'icon'  => 'fal fa-tachometer-alt-fast',
+            ],
+        };
+    }
+}
diff --git a/app/Enums/UI/SysAdmin/SysAdminAnalyticsDashboardTabsEnum.php b/app/Enums/UI/SysAdmin/SysAdminAnalyticsDashboardTabsEnum.php
new file mode 100644
index 0000000000..ae10574072
--- /dev/null
+++ b/app/Enums/UI/SysAdmin/SysAdminAnalyticsDashboardTabsEnum.php
@@ -0,0 +1,29 @@
+<?php
+/*
+ * Author: Raul Perusquia <raul@inikoo.com>
+ * Created: Sun, 05 Jan 2025 14:40:20 Malaysia Time, Kuala Lumpur, Malaysia
+ * Copyright (c) 2025, Raul A Perusquia Flores
+ */
+
+namespace App\Enums\UI\SysAdmin;
+
+use App\Enums\EnumHelperTrait;
+use App\Enums\HasTabs;
+
+enum SysAdminAnalyticsDashboardTabsEnum: string
+{
+    use EnumHelperTrait;
+    use HasTabs;
+
+    case DASHBOARD = 'dashboard';
+
+    public function blueprint(): array
+    {
+        return match ($this) {
+            SysAdminAnalyticsDashboardTabsEnum::DASHBOARD => [
+                'title' => __('dashboard'),
+                'icon'  => 'fal fa-tachometer-alt-fast',
+            ],
+        };
+    }
+}
diff --git a/resources/js/Pages/Grp/Org/Shop/B2b/Campaigns/Campaign.vue b/resources/js/Pages/Grp/Org/Discounts/Campaign.vue
similarity index 100%
rename from resources/js/Pages/Grp/Org/Shop/B2b/Campaigns/Campaign.vue
rename to resources/js/Pages/Grp/Org/Discounts/Campaign.vue
diff --git a/resources/js/Pages/Grp/Org/Shop/B2b/Campaigns/Campaigns.vue b/resources/js/Pages/Grp/Org/Discounts/Campaigns.vue
similarity index 100%
rename from resources/js/Pages/Grp/Org/Shop/B2b/Campaigns/Campaigns.vue
rename to resources/js/Pages/Grp/Org/Discounts/Campaigns.vue
diff --git a/resources/js/Pages/Grp/Org/Shop/Dropshipping/OffersDashboard.vue b/resources/js/Pages/Grp/Org/Discounts/DiscountsDashboard.vue
similarity index 84%
rename from resources/js/Pages/Grp/Org/Shop/Dropshipping/OffersDashboard.vue
rename to resources/js/Pages/Grp/Org/Discounts/DiscountsDashboard.vue
index 5216a17b46..fd4358d989 100644
--- a/resources/js/Pages/Grp/Org/Shop/Dropshipping/OffersDashboard.vue
+++ b/resources/js/Pages/Grp/Org/Discounts/DiscountsDashboard.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3'
 import PageHeading from '@/Components/Headings/PageHeading.vue'
-import Tabs from "@/Components/Navigation/Tabs.vue"
 
 import { useTabChange } from "@/Composables/tab-change"
 import { capitalize } from "@/Composables/capitalize"
-import { computed, defineAsyncComponent, inject, ref } from 'vue'
+import { computed, inject, ref } from 'vue'
 import type { Component } from 'vue'
 
 import { PageHeading as TSPageHeading } from '@/types/PageHeading'
@@ -13,13 +12,7 @@ import { Tabs as TSTabs } from '@/types/Tabs'
 import { aikuLocaleStructure } from '@/Composables/useLocaleStructure'
 import SimpleBox from '@/Components/DataDisplay/SimpleBox.vue'
 
-// import FileShowcase from '@/xxxxxxxxxxxx'
-import CountUp from 'vue-countup-v3'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import {  } from '@fas'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { trans } from 'laravel-vue-i18n'
-library.add()
+
 
 const props = defineProps<{
     title: string,
diff --git a/resources/js/Pages/Grp/Org/Shop/B2b/Offers/Offers.vue b/resources/js/Pages/Grp/Org/Discounts/Offers.vue
similarity index 100%
rename from resources/js/Pages/Grp/Org/Shop/B2b/Offers/Offers.vue
rename to resources/js/Pages/Grp/Org/Discounts/Offers.vue
diff --git a/resources/js/Pages/Grp/Org/Shop/Dropshipping/MarketingDashboard.vue b/resources/js/Pages/Grp/Org/Marketing/MarketingDashboard.vue
similarity index 88%
rename from resources/js/Pages/Grp/Org/Shop/Dropshipping/MarketingDashboard.vue
rename to resources/js/Pages/Grp/Org/Marketing/MarketingDashboard.vue
index 5cfc57f25a..5dd8dc1af3 100644
--- a/resources/js/Pages/Grp/Org/Shop/Dropshipping/MarketingDashboard.vue
+++ b/resources/js/Pages/Grp/Org/Marketing/MarketingDashboard.vue
@@ -1,3 +1,9 @@
+<!--
+  - Author: Raul Perusquia <raul@inikoo.com>
+  - Created: Sun, 05 Jan 2025 14:40:55 Malaysia Time, Kuala Lumpur, Malaysia
+  - Copyright (c) 2025, Raul A Perusquia Flores
+  -->
+
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3'
 import PageHeading from '@/Components/Headings/PageHeading.vue'
diff --git a/routes/grp/web/org/shops/discounts.php b/routes/grp/web/org/shops/discounts.php
index 4e13c26857..ca49f0b1e4 100644
--- a/routes/grp/web/org/shops/discounts.php
+++ b/routes/grp/web/org/shops/discounts.php
@@ -9,13 +9,13 @@
 use App\Actions\Discounts\Offer\UI\IndexOffers;
 use App\Actions\Discounts\OfferCampaign\UI\IndexOfferCampaigns;
 use App\Actions\Discounts\OfferCampaign\UI\ShowOfferCampaign;
-use App\Actions\UI\Dropshipping\Offers\ShowOfferDashboard;
+use App\Actions\Discounts\UI\ShowDiscountsDashboard;
 use App\Stubs\UIDummies\CreateDummy;
 use App\Stubs\UIDummies\EditDummy;
 use App\Stubs\UIDummies\ShowDummy;
 use Illuminate\Support\Facades\Route;
 
-Route::get('', ShowOfferDashboard::class)->name('dashboard');
+Route::get('', ShowDiscountsDashboard::class)->name('dashboard');
 Route::name("campaigns.")->prefix('campaigns')
     ->group(function () {
         Route::get('', IndexOfferCampaigns::class)->name('index');
diff --git a/tests/Feature/AikuSections/DiscountsTest.php b/tests/Feature/AikuSections/DiscountsTest.php
index f050182aa6..5c8c0f9c19 100644
--- a/tests/Feature/AikuSections/DiscountsTest.php
+++ b/tests/Feature/AikuSections/DiscountsTest.php
@@ -123,7 +123,7 @@
 
     $response->assertInertia(function (AssertableInertia $page) {
         $page
-            ->component('Org/Shop/B2b/Campaigns/Campaigns')
+            ->component('Org/Discounts/Campaigns')
             ->has('title')
             ->has('pageHead')
             ->has('data')
@@ -137,7 +137,7 @@
 
     $response->assertInertia(function (AssertableInertia $page) use ($offerCampaign) {
         $page
-            ->component('Org/Shop/B2b/Campaigns/Campaign')
+            ->component('Org/Discounts/Campaign')
             ->has('title')
             ->has(
                 'pageHead',
@@ -156,7 +156,7 @@
 
     $response->assertInertia(function (AssertableInertia $page) {
         $page
-            ->component('Org/Shop/B2b/Offers/Offers')
+            ->component('Org/Discounts/Offers')
             ->has('title')
             ->has('pageHead')
             ->has('data')