diff --git a/AGENTS.md b/AGENTS.md
index 075fcaa..75c5e02 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,18 +8,22 @@
 
 ## Architecture
 
-This project uses a domain-oriented structure under `app/Domains`.
+This project uses a domain-oriented structure grouped by business area under
+`app/Domains`. Cross-cutting modules live under `app/Shared`.
 
-Each domain must live in:
+Business domains must live in:
 
 ```text
-app/Domains/<DomainName>/
+app/Domains/<Area>/<DomainName>/
 ```
 
+The current areas are `Core`, `Commerce`, and `Ticketing`. Cross-cutting
+modules live in `app/Shared/<ModuleName>/`.
+
 Supported folders inside each domain:
 
 ```text
-app/Domains/<DomainName>/
+app/Domains/<Area>/<DomainName>/
 ├── Models/
 ├── Controllers/
 ├── Requests/
@@ -34,22 +38,28 @@ app/Domains/<DomainName>/
 
 - Root API routes live in `routes/api.php`.
 - `routes/api.php` should act as an aggregator only.
-- Each domain defines its own routes in `app/Domains/<DomainName>/routes/api.php`.
+- Each business domain defines its own routes in
+  `app/Domains/<Area>/<DomainName>/routes/api.php`.
+- Shared modules that expose routes define them in
+  `app/Shared/<ModuleName>/routes/api.php`.
 
 ## Namespaces
 
 Use this namespace pattern:
 
 ```php
-App\Domains\<DomainName>\Models
-App\Domains\<DomainName>\Controllers
-App\Domains\<DomainName>\Requests
-App\Domains\<DomainName>\Resources
-App\Domains\<DomainName>\Services
-App\Domains\<DomainName>\Policies
-App\Domains\<DomainName>\Exceptions
+App\Domains\<Area>\<DomainName>\Models
+App\Domains\<Area>\<DomainName>\Controllers
+App\Domains\<Area>\<DomainName>\Requests
+App\Domains\<Area>\<DomainName>\Resources
+App\Domains\<Area>\<DomainName>\Services
+App\Domains\<Area>\<DomainName>\Policies
+App\Domains\<Area>\<DomainName>\Exceptions
 ```
 
+For cross-cutting modules, use `App\Shared\<ModuleName>\...`. Reusable enums
+and rules live directly under `App\Shared`.
+
 ## Responsibilities
 
 - `Models/`: Eloquent models and model relationships.
@@ -80,13 +90,19 @@ App\Domains\<DomainName>\Exceptions
 - Namespace, folder, and class names must stay aligned.
 - Route files should be named `api.php`.
 
-## Current Domains
+## Current Areas and Modules
 
-- `Tenant`
-- `Product`
+- `Core`: `Administrator`, `Auth`, `Authorization`, `Bootstrap`, `Client`,
+  `Menu`, `Staff`, `Tenant`.
+- `Commerce`: `Cart`, `Catalog`, `Purchase`, `Sale`.
+- `Ticketing`: `Desfile`, `Event`, `FiestaFutbolInfantil`, `Ticket`.
+- `Shared`: `Attachable`, `Forms`, `Integration`, `Logging`, `MailTest`,
+  `Notification`, `StorageTest`, plus shared enums and rules.
 
 ## Notes For Future Changes
 
 - New features should be added inside the corresponding domain first.
-- If a concern does not belong to an existing domain, create a new domain under `app/Domains`.
+- Add new business features to the appropriate area under `app/Domains`.
+- Keep generic reusable code in `app/Shared`; do not use it as a catch-all for
+  business features.
 - Avoid placing new business code in `app/Http/Controllers` or `app/Models`.
diff --git a/app/Domains/Commerce/Cart/Controllers/CartController.php b/app/Domains/Commerce/Cart/Controllers/CartController.php
index 368a77c..d576ce6 100644
--- a/app/Domains/Commerce/Cart/Controllers/CartController.php
+++ b/app/Domains/Commerce/Cart/Controllers/CartController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Cart\Controllers;
+namespace App\Domains\Commerce\Cart\Controllers;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Cart\Requests\AddCartItemRequest;
-use App\Domains\Cart\Requests\UpdateCartItemQuantityRequest;
-use App\Domains\Cart\Resources\CartResource;
-use App\Domains\Cart\Services\CartService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Cart\Requests\AddCartItemRequest;
+use App\Domains\Commerce\Cart\Requests\UpdateCartItemQuantityRequest;
+use App\Domains\Commerce\Cart\Resources\CartResource;
+use App\Domains\Commerce\Cart\Services\CartService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Commerce/Cart/Models/Cart.php b/app/Domains/Commerce/Cart/Models/Cart.php
index afdaa79..1e9790f 100644
--- a/app/Domains/Commerce/Cart/Models/Cart.php
+++ b/app/Domains/Commerce/Cart/Models/Cart.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Cart\Models;
+namespace App\Domains\Commerce\Cart\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Cart/Models/CartItem.php b/app/Domains/Commerce/Cart/Models/CartItem.php
index 3841533..96db6f3 100644
--- a/app/Domains/Commerce/Cart/Models/CartItem.php
+++ b/app/Domains/Commerce/Cart/Models/CartItem.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Cart\Models;
+namespace App\Domains\Commerce\Cart\Models;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Cart/Requests/AddCartItemRequest.php b/app/Domains/Commerce/Cart/Requests/AddCartItemRequest.php
index 4ece0a0..6ef46fe 100644
--- a/app/Domains/Commerce/Cart/Requests/AddCartItemRequest.php
+++ b/app/Domains/Commerce/Cart/Requests/AddCartItemRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Cart\Requests;
+namespace App\Domains\Commerce\Cart\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Commerce/Cart/Requests/UpdateCartItemQuantityRequest.php b/app/Domains/Commerce/Cart/Requests/UpdateCartItemQuantityRequest.php
index 5518642..3a14b12 100644
--- a/app/Domains/Commerce/Cart/Requests/UpdateCartItemQuantityRequest.php
+++ b/app/Domains/Commerce/Cart/Requests/UpdateCartItemQuantityRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Cart\Requests;
+namespace App\Domains\Commerce\Cart\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Cart/Resources/CartItemResource.php b/app/Domains/Commerce/Cart/Resources/CartItemResource.php
index 4d960d6..103e97a 100644
--- a/app/Domains/Commerce/Cart/Resources/CartItemResource.php
+++ b/app/Domains/Commerce/Cart/Resources/CartItemResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Cart\Resources;
+namespace App\Domains\Commerce\Cart\Resources;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Cart/Resources/CartResource.php b/app/Domains/Commerce/Cart/Resources/CartResource.php
index b26f5ff..fb12cdb 100644
--- a/app/Domains/Commerce/Cart/Resources/CartResource.php
+++ b/app/Domains/Commerce/Cart/Resources/CartResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Cart\Resources;
+namespace App\Domains\Commerce\Cart\Resources;
 
-use App\Domains\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\Cart;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Cart/Services/CartService.php b/app/Domains/Commerce/Cart/Services/CartService.php
index 9c5f873..caaa136 100644
--- a/app/Domains/Commerce/Cart/Services/CartService.php
+++ b/app/Domains/Commerce/Cart/Services/CartService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\Cart\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Services\ExpireStockReservationsService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Services\ExpireStockReservationsService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Commerce/Cart/Services/CartVariantReplacementService.php b/app/Domains/Commerce/Cart/Services/CartVariantReplacementService.php
index 0dda8eb..2be7256 100644
--- a/app/Domains/Commerce/Cart/Services/CartVariantReplacementService.php
+++ b/app/Domains/Commerce/Cart/Services/CartVariantReplacementService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\Cart\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
 use Illuminate\Validation\ValidationException;
 
 class CartVariantReplacementService
diff --git a/app/Domains/Commerce/Cart/Services/GuestCartMergeService.php b/app/Domains/Commerce/Cart/Services/GuestCartMergeService.php
index 0e600fa..87e8fba 100644
--- a/app/Domains/Commerce/Cart/Services/GuestCartMergeService.php
+++ b/app/Domains/Commerce/Cart/Services/GuestCartMergeService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\Cart\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
 use Illuminate\Support\Facades\DB;
 
 class GuestCartMergeService
diff --git a/app/Domains/Commerce/Cart/Services/InvalidateEventDateCartsService.php b/app/Domains/Commerce/Cart/Services/InvalidateEventDateCartsService.php
index 0d92748..0a4f587 100644
--- a/app/Domains/Commerce/Cart/Services/InvalidateEventDateCartsService.php
+++ b/app/Domains/Commerce/Cart/Services/InvalidateEventDateCartsService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Cart\Services;
+namespace App\Domains\Commerce\Cart\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Domains/Commerce/Cart/routes/api.php b/app/Domains/Commerce/Cart/routes/api.php
index 28488a7..9efefc5 100644
--- a/app/Domains/Commerce/Cart/routes/api.php
+++ b/app/Domains/Commerce/Cart/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Cart\Controllers\CartController;
+use App\Domains\Commerce\Cart\Controllers\CartController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')
diff --git a/app/Domains/Commerce/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php b/app/Domains/Commerce/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php
index b5fbfc3..b689491 100644
--- a/app/Domains/Commerce/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php
+++ b/app/Domains/Commerce/Catalog/Controllers/AdminApp/OnTicketFeaturedGroupController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Catalog\Controllers\AdminApp;
+namespace App\Domains\Commerce\Catalog\Controllers\AdminApp;
 
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Requests\AdminApp\UpsertOnTicketFeaturedGroupRequest;
-use App\Domains\Catalog\Resources\AdminApp\OnTicketFeaturedGroupResource;
-use App\Domains\Catalog\Services\OnTicketFeaturedGroupService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Requests\AdminApp\UpsertOnTicketFeaturedGroupRequest;
+use App\Domains\Commerce\Catalog\Resources\AdminApp\OnTicketFeaturedGroupResource;
+use App\Domains\Commerce\Catalog\Services\OnTicketFeaturedGroupService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Commerce/Catalog/Controllers/CatalogController.php b/app/Domains/Commerce/Catalog/Controllers/CatalogController.php
index e949d00..211c214 100644
--- a/app/Domains/Commerce/Catalog/Controllers/CatalogController.php
+++ b/app/Domains/Commerce/Catalog/Controllers/CatalogController.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace App\Domains\Catalog\Controllers;
+namespace App\Domains\Commerce\Catalog\Controllers;
 
-use App\Domains\Cart\Services\CartService;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Requests\CatalogItemDetailRequest;
-use App\Domains\Catalog\Requests\CatalogVariantOptionsRequest;
-use App\Domains\Catalog\Requests\CategoryPageRequest;
-use App\Domains\Catalog\Requests\FeaturedGroupPageRequest;
-use App\Domains\Catalog\Requests\SearchCatalogItemsRequest;
-use App\Domains\Catalog\Requests\StoreCatalogItemRequest;
-use App\Domains\Catalog\Resources\CatalogFeaturedGroupResource;
-use App\Domains\Catalog\Resources\CatalogItemDetailResource;
-use App\Domains\Catalog\Resources\CatalogItemResource;
-use App\Domains\Catalog\Resources\CatalogSearchItemResource;
-use App\Domains\Catalog\Resources\CatalogVariantOptionsResource;
-use App\Domains\Catalog\Services\CatalogItemAllowanceService;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Catalog\Services\FeaturedGroupService;
-use App\Domains\Catalog\Services\VariantSelectionService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Services\CartService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Requests\CatalogItemDetailRequest;
+use App\Domains\Commerce\Catalog\Requests\CatalogVariantOptionsRequest;
+use App\Domains\Commerce\Catalog\Requests\CategoryPageRequest;
+use App\Domains\Commerce\Catalog\Requests\FeaturedGroupPageRequest;
+use App\Domains\Commerce\Catalog\Requests\SearchCatalogItemsRequest;
+use App\Domains\Commerce\Catalog\Requests\StoreCatalogItemRequest;
+use App\Domains\Commerce\Catalog\Resources\CatalogFeaturedGroupResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogItemDetailResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogItemResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogSearchItemResource;
+use App\Domains\Commerce\Catalog\Resources\CatalogVariantOptionsResource;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Commerce\Catalog\Services\FeaturedGroupService;
+use App\Domains\Commerce\Catalog\Services\VariantSelectionService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Commerce/Catalog/Enums/CatalogItemType.php b/app/Domains/Commerce/Catalog/Enums/CatalogItemType.php
index b9d45b6..cafa547 100644
--- a/app/Domains/Commerce/Catalog/Enums/CatalogItemType.php
+++ b/app/Domains/Commerce/Catalog/Enums/CatalogItemType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum CatalogItemType: string
 {
diff --git a/app/Domains/Commerce/Catalog/Enums/FeaturedGroupSource.php b/app/Domains/Commerce/Catalog/Enums/FeaturedGroupSource.php
index efc7946..93e3f67 100644
--- a/app/Domains/Commerce/Catalog/Enums/FeaturedGroupSource.php
+++ b/app/Domains/Commerce/Catalog/Enums/FeaturedGroupSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum FeaturedGroupSource: string
 {
diff --git a/app/Domains/Commerce/Catalog/Enums/GroupLayout.php b/app/Domains/Commerce/Catalog/Enums/GroupLayout.php
index 3f766ad..a20a388 100644
--- a/app/Domains/Commerce/Catalog/Enums/GroupLayout.php
+++ b/app/Domains/Commerce/Catalog/Enums/GroupLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum GroupLayout: string
 {
diff --git a/app/Domains/Commerce/Catalog/Enums/InventoryPolicy.php b/app/Domains/Commerce/Catalog/Enums/InventoryPolicy.php
index 031bcd4..3759d5b 100644
--- a/app/Domains/Commerce/Catalog/Enums/InventoryPolicy.php
+++ b/app/Domains/Commerce/Catalog/Enums/InventoryPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum InventoryPolicy: string
 {
diff --git a/app/Domains/Commerce/Catalog/Enums/InventorySubject.php b/app/Domains/Commerce/Catalog/Enums/InventorySubject.php
index e7d714f..21eef38 100644
--- a/app/Domains/Commerce/Catalog/Enums/InventorySubject.php
+++ b/app/Domains/Commerce/Catalog/Enums/InventorySubject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum InventorySubject: string
 {
diff --git a/app/Domains/Commerce/Catalog/Enums/ProductLayout.php b/app/Domains/Commerce/Catalog/Enums/ProductLayout.php
index 61fae9d..5c7c5a0 100644
--- a/app/Domains/Commerce/Catalog/Enums/ProductLayout.php
+++ b/app/Domains/Commerce/Catalog/Enums/ProductLayout.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Enums;
+namespace App\Domains\Commerce\Catalog\Enums;
 
 enum ProductLayout: string
 {
diff --git a/app/Domains/Commerce/Catalog/Exceptions/StockReservationExpiredException.php b/app/Domains/Commerce/Catalog/Exceptions/StockReservationExpiredException.php
index 37acd7a..db0e009 100644
--- a/app/Domains/Commerce/Catalog/Exceptions/StockReservationExpiredException.php
+++ b/app/Domains/Commerce/Catalog/Exceptions/StockReservationExpiredException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Exceptions;
+namespace App\Domains\Commerce\Catalog\Exceptions;
 
 use RuntimeException;
 
diff --git a/app/Domains/Commerce/Catalog/Models/Attribute.php b/app/Domains/Commerce/Catalog/Models/Attribute.php
index c4c9dee..106c6e2 100644
--- a/app/Domains/Commerce/Catalog/Models/Attribute.php
+++ b/app/Domains/Commerce/Catalog/Models/Attribute.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/AttributeOption.php b/app/Domains/Commerce/Catalog/Models/AttributeOption.php
index 233e4bc..0476b64 100644
--- a/app/Domains/Commerce/Catalog/Models/AttributeOption.php
+++ b/app/Domains/Commerce/Catalog/Models/AttributeOption.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/Brand.php b/app/Domains/Commerce/Catalog/Models/Brand.php
index d71d88d..39b549d 100644
--- a/app/Domains/Commerce/Catalog/Models/Brand.php
+++ b/app/Domains/Commerce/Catalog/Models/Brand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/BundleComponent.php b/app/Domains/Commerce/Catalog/Models/BundleComponent.php
index 4dec8e0..6a82752 100644
--- a/app/Domains/Commerce/Catalog/Models/BundleComponent.php
+++ b/app/Domains/Commerce/Catalog/Models/BundleComponent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Models/CatalogItem.php b/app/Domains/Commerce/Catalog/Models/CatalogItem.php
index 18309a0..3d801ca 100644
--- a/app/Domains/Commerce/Catalog/Models/CatalogItem.php
+++ b/app/Domains/Commerce/Catalog/Models/CatalogItem.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Models/Category.php b/app/Domains/Commerce/Catalog/Models/Category.php
index c0ed114..7f2d1d2 100644
--- a/app/Domains/Commerce/Catalog/Models/Category.php
+++ b/app/Domains/Commerce/Catalog/Models/Category.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/FeaturedGroup.php b/app/Domains/Commerce/Catalog/Models/FeaturedGroup.php
index fa62e0b..b8fb6cb 100644
--- a/app/Domains/Commerce/Catalog/Models/FeaturedGroup.php
+++ b/app/Domains/Commerce/Catalog/Models/FeaturedGroup.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/FeaturedItem.php b/app/Domains/Commerce/Catalog/Models/FeaturedItem.php
index 0db78df..a2e22f6 100644
--- a/app/Domains/Commerce/Catalog/Models/FeaturedItem.php
+++ b/app/Domains/Commerce/Catalog/Models/FeaturedItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Models/Inventory.php b/app/Domains/Commerce/Catalog/Models/Inventory.php
index ad20142..cc7d6a3 100644
--- a/app/Domains/Commerce/Catalog/Models/Inventory.php
+++ b/app/Domains/Commerce/Catalog/Models/Inventory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Models/ItemAttribute.php b/app/Domains/Commerce/Catalog/Models/ItemAttribute.php
index 6c7ff25..47de251 100644
--- a/app/Domains/Commerce/Catalog/Models/ItemAttribute.php
+++ b/app/Domains/Commerce/Catalog/Models/ItemAttribute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Models/StockReservation.php b/app/Domains/Commerce/Catalog/Models/StockReservation.php
index 8519895..5e62d8a 100644
--- a/app/Domains/Commerce/Catalog/Models/StockReservation.php
+++ b/app/Domains/Commerce/Catalog/Models/StockReservation.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Domains/Commerce/Catalog/Models/StockReservationLine.php b/app/Domains/Commerce/Catalog/Models/StockReservationLine.php
index 763254b..2e136a1 100644
--- a/app/Domains/Commerce/Catalog/Models/StockReservationLine.php
+++ b/app/Domains/Commerce/Catalog/Models/StockReservationLine.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/Variant.php b/app/Domains/Commerce/Catalog/Models/Variant.php
index 0873958..766f8a2 100644
--- a/app/Domains/Commerce/Catalog/Models/Variant.php
+++ b/app/Domains/Commerce/Catalog/Models/Variant.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Catalog/Models/VariantDefinition.php b/app/Domains/Commerce/Catalog/Models/VariantDefinition.php
index 2c4fe38..cbfd104 100644
--- a/app/Domains/Commerce/Catalog/Models/VariantDefinition.php
+++ b/app/Domains/Commerce/Catalog/Models/VariantDefinition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Models;
+namespace App\Domains\Commerce\Catalog\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php b/app/Domains/Commerce/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php
index 9d7423d..01747ff 100644
--- a/app/Domains/Commerce/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/AdminApp/UpsertOnTicketFeaturedGroupRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests\AdminApp;
+namespace App\Domains\Commerce\Catalog\Requests\AdminApp;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/CatalogItemDetailRequest.php b/app/Domains/Commerce/Catalog/Requests/CatalogItemDetailRequest.php
index c4686dd..29c07b0 100644
--- a/app/Domains/Commerce/Catalog/Requests/CatalogItemDetailRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/CatalogItemDetailRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/CatalogVariantOptionsRequest.php b/app/Domains/Commerce/Catalog/Requests/CatalogVariantOptionsRequest.php
index 4f8efc0..d6df177 100644
--- a/app/Domains/Commerce/Catalog/Requests/CatalogVariantOptionsRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/CatalogVariantOptionsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/CategoryPageRequest.php b/app/Domains/Commerce/Catalog/Requests/CategoryPageRequest.php
index 5c12593..8b774db 100644
--- a/app/Domains/Commerce/Catalog/Requests/CategoryPageRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/CategoryPageRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/FeaturedGroupPageRequest.php b/app/Domains/Commerce/Catalog/Requests/FeaturedGroupPageRequest.php
index 596cbe5..8019239 100644
--- a/app/Domains/Commerce/Catalog/Requests/FeaturedGroupPageRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/FeaturedGroupPageRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/SearchCatalogItemsRequest.php b/app/Domains/Commerce/Catalog/Requests/SearchCatalogItemsRequest.php
index be2cca0..059b2fb 100644
--- a/app/Domains/Commerce/Catalog/Requests/SearchCatalogItemsRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/SearchCatalogItemsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Catalog/Requests/StoreCatalogItemRequest.php b/app/Domains/Commerce/Catalog/Requests/StoreCatalogItemRequest.php
index 4827d96..0178517 100644
--- a/app/Domains/Commerce/Catalog/Requests/StoreCatalogItemRequest.php
+++ b/app/Domains/Commerce/Catalog/Requests/StoreCatalogItemRequest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Requests;
+namespace App\Domains\Commerce\Catalog\Requests;
 
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Shared\Rules\ImageOrBase64Rule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php b/app/Domains/Commerce/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php
index 6ef384b..73a68f2 100644
--- a/app/Domains/Commerce/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/AdminApp/OnTicketFeaturedGroupResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Resources\AdminApp;
+namespace App\Domains\Commerce\Catalog\Resources\AdminApp;
 
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedGroupResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedGroupResource.php
index 0bab72e..0c12252 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedGroupResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedGroupResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedItemResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedItemResource.php
index 3aabebe..916b1c2 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedItemResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogFeaturedItemResource.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogItemAllowanceService;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogItemDetailResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogItemDetailResource.php
index d0c1090..ef2dea0 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogItemDetailResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogItemDetailResource.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogItemAllowanceService;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
+use App\Shared\Enums\FieldType;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogItemResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogItemResource.php
index 0012c76..b14b256 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogItemResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogItemResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogSearchItemResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogSearchItemResource.php
index 86e13b0..e02e6a5 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogSearchItemResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogSearchItemResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogItemAllowanceService;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Catalog/Resources/CatalogVariantOptionsResource.php b/app/Domains/Commerce/Catalog/Resources/CatalogVariantOptionsResource.php
index c5ef39c..dba5277 100644
--- a/app/Domains/Commerce/Catalog/Resources/CatalogVariantOptionsResource.php
+++ b/app/Domains/Commerce/Catalog/Resources/CatalogVariantOptionsResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Catalog\Resources;
+namespace App\Domains\Commerce\Catalog\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php
index 34de52f..0f396b6 100644
--- a/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php
+++ b/app/Domains/Commerce/Catalog/Services/CatalogInventoryService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\BundleComponent;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\BundleComponent;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Facades\DB;
 
 class CatalogInventoryService
diff --git a/app/Domains/Commerce/Catalog/Services/CatalogItemAllowanceService.php b/app/Domains/Commerce/Catalog/Services/CatalogItemAllowanceService.php
index 26726f2..25a4fcb 100644
--- a/app/Domains/Commerce/Catalog/Services/CatalogItemAllowanceService.php
+++ b/app/Domains/Commerce/Catalog/Services/CatalogItemAllowanceService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
 use Illuminate\Support\Collection;
 
 class CatalogItemAllowanceService
diff --git a/app/Domains/Commerce/Catalog/Services/CatalogService.php b/app/Domains/Commerce/Catalog/Services/CatalogService.php
index 4cc8989..687f106 100644
--- a/app/Domains/Commerce/Catalog/Services/CatalogService.php
+++ b/app/Domains/Commerce/Catalog/Services/CatalogService.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Commerce/Catalog/Services/ExpireStockReservationsService.php b/app/Domains/Commerce/Catalog/Services/ExpireStockReservationsService.php
index 58bf5a8..565626b 100644
--- a/app/Domains/Commerce/Catalog/Services/ExpireStockReservationsService.php
+++ b/app/Domains/Commerce/Catalog/Services/ExpireStockReservationsService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\Checkout\ReleaseCheckoutService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use RuntimeException;
diff --git a/app/Domains/Commerce/Catalog/Services/FeaturedGroupService.php b/app/Domains/Commerce/Catalog/Services/FeaturedGroupService.php
index b4340cb..05182c9 100644
--- a/app/Domains/Commerce/Catalog/Services/FeaturedGroupService.php
+++ b/app/Domains/Commerce/Catalog/Services/FeaturedGroupService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Resources\CatalogFeaturedItemResource;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Resources\CatalogFeaturedItemResource;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 
diff --git a/app/Domains/Commerce/Catalog/Services/OnTicketFeaturedGroupService.php b/app/Domains/Commerce/Catalog/Services/OnTicketFeaturedGroupService.php
index 6b2300a..e5e99e1 100644
--- a/app/Domains/Commerce/Catalog/Services/OnTicketFeaturedGroupService.php
+++ b/app/Domains/Commerce/Catalog/Services/OnTicketFeaturedGroupService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Domains/Commerce/Catalog/Services/StockReservationService.php b/app/Domains/Commerce/Catalog/Services/StockReservationService.php
index 87228a5..163f42b 100644
--- a/app/Domains/Commerce/Catalog/Services/StockReservationService.php
+++ b/app/Domains/Commerce/Catalog/Services/StockReservationService.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php
index 1b744da..0a210ba 100644
--- a/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php
+++ b/app/Domains/Commerce/Catalog/Services/VariantReplacementService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Models\BundleComponent;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Models\EventDate;
+use App\Domains\Commerce\Catalog\Models\BundleComponent;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
 use Illuminate\Support\Collection;
 
 class VariantReplacementService
diff --git a/app/Domains/Commerce/Catalog/Services/VariantSelectionService.php b/app/Domains/Commerce/Catalog/Services/VariantSelectionService.php
index 581773c..b0b88c3 100644
--- a/app/Domains/Commerce/Catalog/Services/VariantSelectionService.php
+++ b/app/Domains/Commerce/Catalog/Services/VariantSelectionService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Catalog\Services;
+namespace App\Domains\Commerce\Catalog\Services;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Collection;
 
 class VariantSelectionService
diff --git a/app/Domains/Commerce/Catalog/routes/adminapp.php b/app/Domains/Commerce/Catalog/routes/adminapp.php
index 7a63fc2..ac844f0 100644
--- a/app/Domains/Commerce/Catalog/routes/adminapp.php
+++ b/app/Domains/Commerce/Catalog/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
+use App\Domains\Commerce\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Commerce/Catalog/routes/api.php b/app/Domains/Commerce/Catalog/routes/api.php
index 5d7fa84..8d8134a 100644
--- a/app/Domains/Commerce/Catalog/routes/api.php
+++ b/app/Domains/Commerce/Catalog/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Controllers\CatalogController;
+use App\Domains\Commerce\Catalog\Controllers\CatalogController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
diff --git a/app/Domains/Commerce/Purchase/Controllers/PurchaseController.php b/app/Domains/Commerce/Purchase/Controllers/PurchaseController.php
index b175a48..f203613 100644
--- a/app/Domains/Commerce/Purchase/Controllers/PurchaseController.php
+++ b/app/Domains/Commerce/Purchase/Controllers/PurchaseController.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Purchase\Controllers;
+namespace App\Domains\Commerce\Purchase\Controllers;
 
-use App\Domains\Integration\Services\TelepagosIntegrationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Requests\PaymentIntentRequest;
-use App\Domains\Purchase\Requests\StartCheckoutRequest;
-use App\Domains\Purchase\Requests\UpdatePurchaseCustomerRequest;
-use App\Domains\Purchase\Resources\PurchaseResource;
-use App\Domains\Purchase\Services\Checkout\PurchaseResponseLoader;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Integration\Services\TelepagosIntegrationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
+use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
+use App\Domains\Commerce\Purchase\Requests\UpdatePurchaseCustomerRequest;
+use App\Domains\Commerce\Purchase\Resources\PurchaseResource;
+use App\Domains\Commerce\Purchase\Services\Checkout\PurchaseResponseLoader;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Commerce/Purchase/Events/PurchasePaid.php b/app/Domains/Commerce/Purchase/Events/PurchasePaid.php
index 4b72ab2..25bbfd9 100644
--- a/app/Domains/Commerce/Purchase/Events/PurchasePaid.php
+++ b/app/Domains/Commerce/Purchase/Events/PurchasePaid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Events;
+namespace App\Domains\Commerce\Purchase\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Domains/Commerce/Purchase/Exceptions/InsufficientStockException.php b/app/Domains/Commerce/Purchase/Exceptions/InsufficientStockException.php
index 62f7787..e2e851f 100644
--- a/app/Domains/Commerce/Purchase/Exceptions/InsufficientStockException.php
+++ b/app/Domains/Commerce/Purchase/Exceptions/InsufficientStockException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
 use RuntimeException;
 
diff --git a/app/Domains/Commerce/Purchase/Exceptions/PurchaseExpiredException.php b/app/Domains/Commerce/Purchase/Exceptions/PurchaseExpiredException.php
index 629148f..e481b68 100644
--- a/app/Domains/Commerce/Purchase/Exceptions/PurchaseExpiredException.php
+++ b/app/Domains/Commerce/Purchase/Exceptions/PurchaseExpiredException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
 use RuntimeException;
 
diff --git a/app/Domains/Commerce/Purchase/Exceptions/PurchaseLimitExceededException.php b/app/Domains/Commerce/Purchase/Exceptions/PurchaseLimitExceededException.php
index f767db0..49c28e3 100644
--- a/app/Domains/Commerce/Purchase/Exceptions/PurchaseLimitExceededException.php
+++ b/app/Domains/Commerce/Purchase/Exceptions/PurchaseLimitExceededException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Purchase\Exceptions;
+namespace App\Domains\Commerce\Purchase\Exceptions;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Validation\ValidationException;
 
 class PurchaseLimitExceededException extends ValidationException
diff --git a/app/Domains/Commerce/Purchase/Models/Purchase.php b/app/Domains/Commerce/Purchase/Models/Purchase.php
index 9e64608..5c75fa7 100644
--- a/app/Domains/Commerce/Purchase/Models/Purchase.php
+++ b/app/Domains/Commerce/Purchase/Models/Purchase.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Logging\Models\Concerns\LogsValueChanges;
-use App\Domains\Purchase\Events\PurchasePaid;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Shared\Logging\Models\Concerns\LogsValueChanges;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Purchase/Models/PurchaseItem.php b/app/Domains/Commerce/Purchase/Models/PurchaseItem.php
index 7a6d52b..755a567 100644
--- a/app/Domains/Commerce/Purchase/Models/PurchaseItem.php
+++ b/app/Domains/Commerce/Purchase/Models/PurchaseItem.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Purchase/Models/TelepagosPayment.php b/app/Domains/Commerce/Purchase/Models/TelepagosPayment.php
index f91ed21..5bade7c 100644
--- a/app/Domains/Commerce/Purchase/Models/TelepagosPayment.php
+++ b/app/Domains/Commerce/Purchase/Models/TelepagosPayment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Purchase/Models/TelepagosPaymentCandidate.php b/app/Domains/Commerce/Purchase/Models/TelepagosPaymentCandidate.php
index 93152cc..b6ffbdb 100644
--- a/app/Domains/Commerce/Purchase/Models/TelepagosPaymentCandidate.php
+++ b/app/Domains/Commerce/Purchase/Models/TelepagosPaymentCandidate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Commerce/Purchase/Models/TelepagosQr.php b/app/Domains/Commerce/Purchase/Models/TelepagosQr.php
index 8968b67..0d258c7 100644
--- a/app/Domains/Commerce/Purchase/Models/TelepagosQr.php
+++ b/app/Domains/Commerce/Purchase/Models/TelepagosQr.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Models;
+namespace App\Domains\Commerce\Purchase\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Commerce/Purchase/Requests/PaymentIntentRequest.php b/app/Domains/Commerce/Purchase/Requests/PaymentIntentRequest.php
index 61d523b..63fc2e5 100644
--- a/app/Domains/Commerce/Purchase/Requests/PaymentIntentRequest.php
+++ b/app/Domains/Commerce/Purchase/Requests/PaymentIntentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Commerce/Purchase/Requests/StartCheckoutRequest.php b/app/Domains/Commerce/Purchase/Requests/StartCheckoutRequest.php
index d68df2d..af8f185 100644
--- a/app/Domains/Commerce/Purchase/Requests/StartCheckoutRequest.php
+++ b/app/Domains/Commerce/Purchase/Requests/StartCheckoutRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Commerce/Purchase/Requests/UpdatePurchaseCustomerRequest.php b/app/Domains/Commerce/Purchase/Requests/UpdatePurchaseCustomerRequest.php
index 4620461..9411af6 100644
--- a/app/Domains/Commerce/Purchase/Requests/UpdatePurchaseCustomerRequest.php
+++ b/app/Domains/Commerce/Purchase/Requests/UpdatePurchaseCustomerRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Requests;
+namespace App\Domains\Commerce\Purchase\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Commerce/Purchase/Resources/PurchaseItemResource.php b/app/Domains/Commerce/Purchase/Resources/PurchaseItemResource.php
index 1bd67d5..75162a6 100644
--- a/app/Domains/Commerce/Purchase/Resources/PurchaseItemResource.php
+++ b/app/Domains/Commerce/Purchase/Resources/PurchaseItemResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Resources;
+namespace App\Domains\Commerce\Purchase\Resources;
 
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Purchase/Resources/PurchaseResource.php b/app/Domains/Commerce/Purchase/Resources/PurchaseResource.php
index fd119fa..029495f 100644
--- a/app/Domains/Commerce/Purchase/Resources/PurchaseResource.php
+++ b/app/Domains/Commerce/Purchase/Resources/PurchaseResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Resources;
+namespace App\Domains\Commerce\Purchase\Resources;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Purchase\Models\TelepagosPaymentCandidate;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Purchase\Models\TelepagosPaymentCandidate;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/CatalogSelectionResolver.php b/app/Domains/Commerce/Purchase/Services/Checkout/CatalogSelectionResolver.php
index 15e09d2..d531913 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/CatalogSelectionResolver.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/CatalogSelectionResolver.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/CompleteCheckoutService.php b/app/Domains/Commerce/Purchase/Services/Checkout/CompleteCheckoutService.php
index 61a4062..c30f299 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/CompleteCheckoutService.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/CompleteCheckoutService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/EditCheckoutService.php b/app/Domains/Commerce/Purchase/Services/Checkout/EditCheckoutService.php
index cf6018c..b124d80 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/EditCheckoutService.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/EditCheckoutService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/InsufficientStockMessageBuilder.php b/app/Domains/Commerce/Purchase/Services/Checkout/InsufficientStockMessageBuilder.php
index e3c5ea2..9e3aa45 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/InsufficientStockMessageBuilder.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/InsufficientStockMessageBuilder.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 
 class InsufficientStockMessageBuilder
 {
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php b/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php
index 582dfc1..342d18e 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseItemSnapshotFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Support\Collection;
 
 class PurchaseItemSnapshotFactory
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseResponseLoader.php b/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseResponseLoader.php
index 7f9175d..1da4684 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseResponseLoader.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/PurchaseResponseLoader.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 
 class PurchaseResponseLoader
 {
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/ReleaseCheckoutService.php b/app/Domains/Commerce/Purchase/Services/Checkout/ReleaseCheckoutService.php
index e64ef79..e71fbd2 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/ReleaseCheckoutService.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/ReleaseCheckoutService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/SourceCartService.php b/app/Domains/Commerce/Purchase/Services/Checkout/SourceCartService.php
index b29a2f3..8cdfee8 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/SourceCartService.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/SourceCartService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 
 class SourceCartService
 {
diff --git a/app/Domains/Commerce/Purchase/Services/Checkout/StartCheckoutService.php b/app/Domains/Commerce/Purchase/Services/Checkout/StartCheckoutService.php
index 71cc159..de12aa5 100644
--- a/app/Domains/Commerce/Purchase/Services/Checkout/StartCheckoutService.php
+++ b/app/Domains/Commerce/Purchase/Services/Checkout/StartCheckoutService.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Domains\Purchase\Services\Checkout;
+namespace App\Domains\Commerce\Purchase\Services\Checkout;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Cart\Services\CartVariantReplacementService;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Exceptions\InsufficientStockException;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Cart\Services\CartVariantReplacementService;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Exceptions\InsufficientStockException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Commerce/Purchase/Services/CheckoutService.php b/app/Domains/Commerce/Purchase/Services/CheckoutService.php
index 882e235..b13c7c9 100644
--- a/app/Domains/Commerce/Purchase/Services/CheckoutService.php
+++ b/app/Domains/Commerce/Purchase/Services/CheckoutService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\Checkout\CompleteCheckoutService;
-use App\Domains\Purchase\Services\Checkout\EditCheckoutService;
-use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
-use App\Domains\Purchase\Services\Checkout\StartCheckoutService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\Checkout\CompleteCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\EditCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\ReleaseCheckoutService;
+use App\Domains\Commerce\Purchase\Services\Checkout\StartCheckoutService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 
 /**
diff --git a/app/Domains/Commerce/Purchase/Services/DniDistanceService.php b/app/Domains/Commerce/Purchase/Services/DniDistanceService.php
index 44d30d2..0a6c6e1 100644
--- a/app/Domains/Commerce/Purchase/Services/DniDistanceService.php
+++ b/app/Domains/Commerce/Purchase/Services/DniDistanceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
 /**
  * Measures likely DNI typing errors using the optimal-string-alignment
diff --git a/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php b/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php
index 7b67fbc..9c11303 100644
--- a/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php
+++ b/app/Domains/Commerce/Purchase/Services/PurchaseRefundSummaryService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Illuminate\Database\Eloquent\Builder;
 
 class PurchaseRefundSummaryService
diff --git a/app/Domains/Commerce/Purchase/Services/PurchaseStateGuard.php b/app/Domains/Commerce/Purchase/Services/PurchaseStateGuard.php
index 9e43305..0751373 100644
--- a/app/Domains/Commerce/Purchase/Services/PurchaseStateGuard.php
+++ b/app/Domains/Commerce/Purchase/Services/PurchaseStateGuard.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Validation\ValidationException;
 
 class PurchaseStateGuard
diff --git a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php
index cd1d450..4e15105 100644
--- a/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php
+++ b/app/Domains/Commerce/Purchase/Services/TenantTransactionResetService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Commerce/Purchase/Services/UserPurchaseLimitService.php b/app/Domains/Commerce/Purchase/Services/UserPurchaseLimitService.php
index e7d844a..b6b1546 100644
--- a/app/Domains/Commerce/Purchase/Services/UserPurchaseLimitService.php
+++ b/app/Domains/Commerce/Purchase/Services/UserPurchaseLimitService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Purchase\Services;
+namespace App\Domains\Commerce\Purchase\Services;
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Purchase\Exceptions\PurchaseLimitExceededException;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseLimitExceededException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Domains/Commerce/Purchase/routes/api.php b/app/Domains/Commerce/Purchase/routes/api.php
index f8e8d5d..0c2daf1 100644
--- a/app/Domains/Commerce/Purchase/routes/api.php
+++ b/app/Domains/Commerce/Purchase/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Purchase\Controllers\PurchaseController;
+use App\Domains\Commerce\Purchase\Controllers\PurchaseController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')->middleware('auth:sanctum')->group(function (): void {
diff --git a/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php b/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php
index 71fe5f6..bb94f0d 100644
--- a/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php
+++ b/app/Domains/Commerce/Sale/Controllers/AdminApp/SaleController.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Domains\Sale\Controllers\AdminApp;
+namespace App\Domains\Commerce\Sale\Controllers\AdminApp;
 
-use App\Domains\Sale\Requests\AdminAppSaleIndexRequest;
-use App\Domains\Sale\Requests\AdminAppSaleModificationIndexRequest;
-use App\Domains\Sale\Requests\AdminAppSaleModificationPdfRequest;
-use App\Domains\Sale\Requests\AdminAppSalePdfRequest;
-use App\Domains\Sale\Resources\AdminApp\SaleDetailResource;
-use App\Domains\Sale\Resources\AdminApp\SaleModificationResource;
-use App\Domains\Sale\Resources\AdminApp\SaleResource;
-use App\Domains\Sale\Resources\AdminApp\SaleTicketResource;
-use App\Domains\Sale\Services\AdminAppSaleExcelService;
-use App\Domains\Sale\Services\AdminAppSalePdfService;
-use App\Domains\Sale\Services\AdminAppSaleService;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleIndexRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleModificationIndexRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleModificationPdfRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSalePdfRequest;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleDetailResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleModificationResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleResource;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleTicketResource;
+use App\Domains\Commerce\Sale\Services\AdminAppSaleExcelService;
+use App\Domains\Commerce\Sale\Services\AdminAppSalePdfService;
+use App\Domains\Commerce\Sale\Services\AdminAppSaleService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
diff --git a/app/Domains/Commerce/Sale/Requests/AdminAppSaleIndexRequest.php b/app/Domains/Commerce/Sale/Requests/AdminAppSaleIndexRequest.php
index 0462296..5bc648d 100644
--- a/app/Domains/Commerce/Sale/Requests/AdminAppSaleIndexRequest.php
+++ b/app/Domains/Commerce/Sale/Requests/AdminAppSaleIndexRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Requests;
+namespace App\Domains\Commerce\Sale\Requests;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationIndexRequest.php b/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationIndexRequest.php
index a2d21d5..63e3cd7 100644
--- a/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationIndexRequest.php
+++ b/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationIndexRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Sale\Requests;
+namespace App\Domains\Commerce\Sale\Requests;
 
 class AdminAppSaleModificationIndexRequest extends AdminAppSaleIndexRequest
 {
diff --git a/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationPdfRequest.php b/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationPdfRequest.php
index 8ad2fd5..012ba6d 100644
--- a/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationPdfRequest.php
+++ b/app/Domains/Commerce/Sale/Requests/AdminAppSaleModificationPdfRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Requests;
+namespace App\Domains\Commerce\Sale\Requests;
 
-use App\Domains\Shared\Rules\ValidTimezone;
+use App\Shared\Rules\ValidTimezone;
 
 class AdminAppSaleModificationPdfRequest extends AdminAppSaleModificationIndexRequest
 {
diff --git a/app/Domains/Commerce/Sale/Requests/AdminAppSalePdfRequest.php b/app/Domains/Commerce/Sale/Requests/AdminAppSalePdfRequest.php
index 2b6dbdd..30ec179 100644
--- a/app/Domains/Commerce/Sale/Requests/AdminAppSalePdfRequest.php
+++ b/app/Domains/Commerce/Sale/Requests/AdminAppSalePdfRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Requests;
+namespace App\Domains\Commerce\Sale\Requests;
 
-use App\Domains\Shared\Rules\ValidTimezone;
+use App\Shared\Rules\ValidTimezone;
 
 class AdminAppSalePdfRequest extends AdminAppSaleIndexRequest
 {
diff --git a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleDetailResource.php b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleDetailResource.php
index d389d1a..05cc8dc 100644
--- a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleDetailResource.php
+++ b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleDetailResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Sale\Resources\AdminApp;
+namespace App\Domains\Commerce\Sale\Resources\AdminApp;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleModificationResource.php b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleModificationResource.php
index 5554dd1..4b83610 100644
--- a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleModificationResource.php
+++ b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleModificationResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Sale\Resources\AdminApp;
+namespace App\Domains\Commerce\Sale\Resources\AdminApp;
 
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleResource.php b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleResource.php
index 3e23620..6a79ad7 100644
--- a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleResource.php
+++ b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Resources\AdminApp;
+namespace App\Domains\Commerce\Sale\Resources\AdminApp;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleTicketResource.php b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleTicketResource.php
index 33ba09b..e42f079 100644
--- a/app/Domains/Commerce/Sale/Resources/AdminApp/SaleTicketResource.php
+++ b/app/Domains/Commerce/Sale/Resources/AdminApp/SaleTicketResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Sale\Resources\AdminApp;
+namespace App\Domains\Commerce\Sale\Resources\AdminApp;
 
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Commerce/Sale/Services/AdminAppSaleExcelService.php b/app/Domains/Commerce/Sale/Services/AdminAppSaleExcelService.php
index ff77163..dac72d1 100644
--- a/app/Domains/Commerce/Sale/Services/AdminAppSaleExcelService.php
+++ b/app/Domains/Commerce/Sale/Services/AdminAppSaleExcelService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Sale\Services;
+namespace App\Domains\Commerce\Sale\Services;
 
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
diff --git a/app/Domains/Commerce/Sale/Services/AdminAppSalePdfService.php b/app/Domains/Commerce/Sale/Services/AdminAppSalePdfService.php
index cca6f04..6b80c40 100644
--- a/app/Domains/Commerce/Sale/Services/AdminAppSalePdfService.php
+++ b/app/Domains/Commerce/Sale/Services/AdminAppSalePdfService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Sale\Services;
+namespace App\Domains\Commerce\Sale\Services;
 
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\PDF as DomPdf;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php b/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php
index 4003634..79a663e 100644
--- a/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php
+++ b/app/Domains/Commerce/Sale/Services/AdminAppSaleService.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Domains\Sale\Services;
+namespace App\Domains\Commerce\Sale\Services;
 
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Purchase\Services\PurchaseRefundSummaryService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Commerce/Sale/routes/adminapp.php b/app/Domains/Commerce/Sale/routes/adminapp.php
index 4d0076b..028eed3 100644
--- a/app/Domains/Commerce/Sale/routes/adminapp.php
+++ b/app/Domains/Commerce/Sale/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Sale\Controllers\AdminApp\SaleController;
+use App\Domains\Commerce\Sale\Controllers\AdminApp\SaleController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php b/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php
index 5329c12..4c3b6e8 100644
--- a/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php
+++ b/app/Domains/Core/Administrator/Controllers/AdminAppAdministratorController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Administrator\Controllers;
+namespace App\Domains\Core\Administrator\Controllers;
 
-use App\Domains\Administrator\Requests\StoreAdministratorRequest;
-use App\Domains\Administrator\Requests\UpdateAdministratorRequest;
-use App\Domains\Administrator\Resources\AdministratorResource;
-use App\Domains\Administrator\Services\AdministratorService;
+use App\Domains\Core\Administrator\Requests\StoreAdministratorRequest;
+use App\Domains\Core\Administrator\Requests\UpdateAdministratorRequest;
+use App\Domains\Core\Administrator\Resources\AdministratorResource;
+use App\Domains\Core\Administrator\Services\AdministratorService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
diff --git a/app/Domains/Core/Administrator/Requests/StoreAdministratorRequest.php b/app/Domains/Core/Administrator/Requests/StoreAdministratorRequest.php
index 9d49afd..12e03c3 100644
--- a/app/Domains/Core/Administrator/Requests/StoreAdministratorRequest.php
+++ b/app/Domains/Core/Administrator/Requests/StoreAdministratorRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Administrator\Requests;
+namespace App\Domains\Core\Administrator\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Core/Administrator/Requests/UpdateAdministratorRequest.php b/app/Domains/Core/Administrator/Requests/UpdateAdministratorRequest.php
index 9b95a46..e3c2d9e 100644
--- a/app/Domains/Core/Administrator/Requests/UpdateAdministratorRequest.php
+++ b/app/Domains/Core/Administrator/Requests/UpdateAdministratorRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Administrator\Requests;
+namespace App\Domains\Core\Administrator\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Core/Administrator/Resources/AdministratorResource.php b/app/Domains/Core/Administrator/Resources/AdministratorResource.php
index d8879d0..6abf634 100644
--- a/app/Domains/Core/Administrator/Resources/AdministratorResource.php
+++ b/app/Domains/Core/Administrator/Resources/AdministratorResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Administrator\Resources;
+namespace App\Domains\Core\Administrator\Resources;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Administrator/Services/AdministratorService.php b/app/Domains/Core/Administrator/Services/AdministratorService.php
index 932b438..e0a786b 100644
--- a/app/Domains/Core/Administrator/Services/AdministratorService.php
+++ b/app/Domains/Core/Administrator/Services/AdministratorService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Administrator\Services;
+namespace App\Domains\Core\Administrator\Services;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Arr;
diff --git a/app/Domains/Core/Administrator/routes/api.php b/app/Domains/Core/Administrator/routes/api.php
index 428be5d..4c9d8b2 100644
--- a/app/Domains/Core/Administrator/routes/api.php
+++ b/app/Domains/Core/Administrator/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Administrator\Controllers\AdminAppAdministratorController;
+use App\Domains\Core\Administrator\Controllers\AdminAppAdministratorController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Core/Auth/Controllers/AdminAppLoginController.php b/app/Domains/Core/Auth/Controllers/AdminAppLoginController.php
index 8962325..3197044 100644
--- a/app/Domains/Core/Auth/Controllers/AdminAppLoginController.php
+++ b/app/Domains/Core/Auth/Controllers/AdminAppLoginController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\AdminAppLoginRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\PasswordLoginService;
+use App\Domains\Core\Auth\Requests\AdminAppLoginRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\PasswordLoginService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/AdminAppMeController.php b/app/Domains/Core/Auth/Controllers/AdminAppMeController.php
index 129b169..27f9d7d 100644
--- a/app/Domains/Core/Auth/Controllers/AdminAppMeController.php
+++ b/app/Domains/Core/Auth/Controllers/AdminAppMeController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Resources\AdminAppMeResource;
-use App\Domains\Auth\Services\AdminAppContextService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Auth\Resources\AdminAppMeResource;
+use App\Domains\Core\Auth\Services\AdminAppContextService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Domains/Core/Auth/Controllers/CreateAdminAppResetPasswordAttemptController.php b/app/Domains/Core/Auth/Controllers/CreateAdminAppResetPasswordAttemptController.php
index 8432948..b20d9d9 100644
--- a/app/Domains/Core/Auth/Controllers/CreateAdminAppResetPasswordAttemptController.php
+++ b/app/Domains/Core/Auth/Controllers/CreateAdminAppResetPasswordAttemptController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Requests\AdminAppCreateResetPasswordAttemptRequest;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Requests\AdminAppCreateResetPasswordAttemptRequest;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/CreateResetPasswordAttemptController.php b/app/Domains/Core/Auth/Controllers/CreateResetPasswordAttemptController.php
index cc52307..74daf72 100644
--- a/app/Domains/Core/Auth/Controllers/CreateResetPasswordAttemptController.php
+++ b/app/Domains/Core/Auth/Controllers/CreateResetPasswordAttemptController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Requests\CreateResetPasswordAttemptRequest;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Requests\CreateResetPasswordAttemptRequest;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/CreateScannerResetPasswordAttemptController.php b/app/Domains/Core/Auth/Controllers/CreateScannerResetPasswordAttemptController.php
index c6ad46e..3a8b1d3 100644
--- a/app/Domains/Core/Auth/Controllers/CreateScannerResetPasswordAttemptController.php
+++ b/app/Domains/Core/Auth/Controllers/CreateScannerResetPasswordAttemptController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Requests\ScannerCreateResetPasswordAttemptRequest;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Requests\ScannerCreateResetPasswordAttemptRequest;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/GoogleAuthController.php b/app/Domains/Core/Auth/Controllers/GoogleAuthController.php
index 3a0372a..0ce7e3d 100644
--- a/app/Domains/Core/Auth/Controllers/GoogleAuthController.php
+++ b/app/Domains/Core/Auth/Controllers/GoogleAuthController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Services\GoogleAuthService;
+use App\Domains\Core\Auth\Services\GoogleAuthService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Core/Auth/Controllers/GoogleTokenExchangeController.php b/app/Domains/Core/Auth/Controllers/GoogleTokenExchangeController.php
index 1aaa181..36c6811 100644
--- a/app/Domains/Core/Auth/Controllers/GoogleTokenExchangeController.php
+++ b/app/Domains/Core/Auth/Controllers/GoogleTokenExchangeController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\GoogleTokenExchangeRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\GoogleAuthService;
-use App\Domains\Cart\Services\GuestCartMergeService;
+use App\Domains\Core\Auth\Requests\GoogleTokenExchangeRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\GoogleAuthService;
+use App\Domains\Commerce\Cart\Services\GuestCartMergeService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Cookie;
diff --git a/app/Domains/Core/Auth/Controllers/LoginController.php b/app/Domains/Core/Auth/Controllers/LoginController.php
index 2645b44..d89ce1e 100644
--- a/app/Domains/Core/Auth/Controllers/LoginController.php
+++ b/app/Domains/Core/Auth/Controllers/LoginController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\LoginUserRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\PasswordLoginService;
-use App\Domains\Cart\Services\GuestCartMergeService;
+use App\Domains\Core\Auth\Requests\LoginUserRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\PasswordLoginService;
+use App\Domains\Commerce\Cart\Services\GuestCartMergeService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Cookie;
diff --git a/app/Domains/Core/Auth/Controllers/LogoutController.php b/app/Domains/Core/Auth/Controllers/LogoutController.php
index c6b1f78..82ff734 100644
--- a/app/Domains/Core/Auth/Controllers/LogoutController.php
+++ b/app/Domains/Core/Auth/Controllers/LogoutController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Domains/Core/Auth/Controllers/MeController.php b/app/Domains/Core/Auth/Controllers/MeController.php
index 2e2ba0f..41c5b60 100644
--- a/app/Domains/Core/Auth/Controllers/MeController.php
+++ b/app/Domains/Core/Auth/Controllers/MeController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Resources\UserResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Domains/Core/Auth/Controllers/RegisterController.php b/app/Domains/Core/Auth/Controllers/RegisterController.php
index 95dbe29..9efec0c 100644
--- a/app/Domains/Core/Auth/Controllers/RegisterController.php
+++ b/app/Domains/Core/Auth/Controllers/RegisterController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\RegisterUserRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\RegisterUserService;
+use App\Domains\Core\Auth\Requests\RegisterUserRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\RegisterUserService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/ResetPasswordController.php b/app/Domains/Core/Auth/Controllers/ResetPasswordController.php
index 77768eb..c44feae 100644
--- a/app/Domains/Core/Auth/Controllers/ResetPasswordController.php
+++ b/app/Domains/Core/Auth/Controllers/ResetPasswordController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Requests\ResetPasswordRequest;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Requests\ResetPasswordRequest;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Core/Auth/Controllers/ScannerLoginController.php b/app/Domains/Core/Auth/Controllers/ScannerLoginController.php
index 3a6b446..1380e14 100644
--- a/app/Domains/Core/Auth/Controllers/ScannerLoginController.php
+++ b/app/Domains/Core/Auth/Controllers/ScannerLoginController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\ScannerLoginRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\PasswordLoginService;
+use App\Domains\Core\Auth\Requests\ScannerLoginRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\PasswordLoginService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Auth/Controllers/ScannerMeController.php b/app/Domains/Core/Auth/Controllers/ScannerMeController.php
index 6acc33c..a510e86 100644
--- a/app/Domains/Core/Auth/Controllers/ScannerMeController.php
+++ b/app/Domains/Core/Auth/Controllers/ScannerMeController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Resources\ScannerMeResource;
-use App\Domains\Auth\Services\ScannerContextService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Auth\Resources\ScannerMeResource;
+use App\Domains\Core\Auth\Services\ScannerContextService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Domains/Core/Auth/Controllers/UpdateProfileController.php b/app/Domains/Core/Auth/Controllers/UpdateProfileController.php
index bdbccfb..dea2b7c 100644
--- a/app/Domains/Core/Auth/Controllers/UpdateProfileController.php
+++ b/app/Domains/Core/Auth/Controllers/UpdateProfileController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Requests\UpdateProfileRequest;
-use App\Domains\Auth\Resources\UserResource;
-use App\Domains\Auth\Services\ProfileService;
+use App\Domains\Core\Auth\Requests\UpdateProfileRequest;
+use App\Domains\Core\Auth\Resources\UserResource;
+use App\Domains\Core\Auth\Services\ProfileService;
 use Illuminate\Http\JsonResponse;
 
 class UpdateProfileController
diff --git a/app/Domains/Core/Auth/Controllers/ValidateResetPasswordAttemptController.php b/app/Domains/Core/Auth/Controllers/ValidateResetPasswordAttemptController.php
index dbcc479..0bc3e36 100644
--- a/app/Domains/Core/Auth/Controllers/ValidateResetPasswordAttemptController.php
+++ b/app/Domains/Core/Auth/Controllers/ValidateResetPasswordAttemptController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Auth\Controllers;
+namespace App\Domains\Core\Auth\Controllers;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Requests\ValidateResetPasswordAttemptRequest;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Requests\ValidateResetPasswordAttemptRequest;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Core/Auth/Exceptions/AccountLockedException.php b/app/Domains/Core/Auth/Exceptions/AccountLockedException.php
index 3e925f2..564cf79 100644
--- a/app/Domains/Core/Auth/Exceptions/AccountLockedException.php
+++ b/app/Domains/Core/Auth/Exceptions/AccountLockedException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Exceptions;
+namespace App\Domains\Core\Auth\Exceptions;
 
 use Carbon\CarbonImmutable;
 use RuntimeException;
diff --git a/app/Domains/Core/Auth/Models/LoginAttempt.php b/app/Domains/Core/Auth/Models/LoginAttempt.php
index 1abe9d4..b54db7f 100644
--- a/app/Domains/Core/Auth/Models/LoginAttempt.php
+++ b/app/Domains/Core/Auth/Models/LoginAttempt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Models;
+namespace App\Domains\Core\Auth\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Core/Auth/Models/ResetPasswordAttempt.php b/app/Domains/Core/Auth/Models/ResetPasswordAttempt.php
index 98ba329..b1ff1cb 100644
--- a/app/Domains/Core/Auth/Models/ResetPasswordAttempt.php
+++ b/app/Domains/Core/Auth/Models/ResetPasswordAttempt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Models;
+namespace App\Domains\Core\Auth\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
diff --git a/app/Domains/Core/Auth/Models/User.php b/app/Domains/Core/Auth/Models/User.php
index 34f3d49..b01b212 100644
--- a/app/Domains/Core/Auth/Models/User.php
+++ b/app/Domains/Core/Auth/Models/User.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Auth\Models;
+namespace App\Domains\Core\Auth\Models;
 
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Event\Models\EventDateChangeView;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\ScanAttempt;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Ticketing\Event\Models\EventDateChangeView;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
diff --git a/app/Domains/Core/Auth/Requests/AdminAppCreateResetPasswordAttemptRequest.php b/app/Domains/Core/Auth/Requests/AdminAppCreateResetPasswordAttemptRequest.php
index 3a06c56..76fc9e9 100644
--- a/app/Domains/Core/Auth/Requests/AdminAppCreateResetPasswordAttemptRequest.php
+++ b/app/Domains/Core/Auth/Requests/AdminAppCreateResetPasswordAttemptRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/AdminAppLoginRequest.php b/app/Domains/Core/Auth/Requests/AdminAppLoginRequest.php
index 9c89380..f5c74b1 100644
--- a/app/Domains/Core/Auth/Requests/AdminAppLoginRequest.php
+++ b/app/Domains/Core/Auth/Requests/AdminAppLoginRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/CreateResetPasswordAttemptRequest.php b/app/Domains/Core/Auth/Requests/CreateResetPasswordAttemptRequest.php
index 7e554ba..3e7227d 100644
--- a/app/Domains/Core/Auth/Requests/CreateResetPasswordAttemptRequest.php
+++ b/app/Domains/Core/Auth/Requests/CreateResetPasswordAttemptRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/GoogleTokenExchangeRequest.php b/app/Domains/Core/Auth/Requests/GoogleTokenExchangeRequest.php
index a2ded3c..56c1229 100644
--- a/app/Domains/Core/Auth/Requests/GoogleTokenExchangeRequest.php
+++ b/app/Domains/Core/Auth/Requests/GoogleTokenExchangeRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Core/Auth/Requests/LoginUserRequest.php b/app/Domains/Core/Auth/Requests/LoginUserRequest.php
index 899a7e7..274aec7 100644
--- a/app/Domains/Core/Auth/Requests/LoginUserRequest.php
+++ b/app/Domains/Core/Auth/Requests/LoginUserRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/RegisterUserRequest.php b/app/Domains/Core/Auth/Requests/RegisterUserRequest.php
index 155f7b8..67c7864 100644
--- a/app/Domains/Core/Auth/Requests/RegisterUserRequest.php
+++ b/app/Domains/Core/Auth/Requests/RegisterUserRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Password;
diff --git a/app/Domains/Core/Auth/Requests/ResetPasswordRequest.php b/app/Domains/Core/Auth/Requests/ResetPasswordRequest.php
index 98902c6..a0bd6c2 100644
--- a/app/Domains/Core/Auth/Requests/ResetPasswordRequest.php
+++ b/app/Domains/Core/Auth/Requests/ResetPasswordRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/ScannerCreateResetPasswordAttemptRequest.php b/app/Domains/Core/Auth/Requests/ScannerCreateResetPasswordAttemptRequest.php
index 16ce44d..8542020 100644
--- a/app/Domains/Core/Auth/Requests/ScannerCreateResetPasswordAttemptRequest.php
+++ b/app/Domains/Core/Auth/Requests/ScannerCreateResetPasswordAttemptRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Requests/ScannerLoginRequest.php b/app/Domains/Core/Auth/Requests/ScannerLoginRequest.php
index c699282..aeb3450 100644
--- a/app/Domains/Core/Auth/Requests/ScannerLoginRequest.php
+++ b/app/Domains/Core/Auth/Requests/ScannerLoginRequest.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 class ScannerLoginRequest extends AdminAppLoginRequest {}
diff --git a/app/Domains/Core/Auth/Requests/UpdateProfileRequest.php b/app/Domains/Core/Auth/Requests/UpdateProfileRequest.php
index f0a88cb..4fb6e21 100644
--- a/app/Domains/Core/Auth/Requests/UpdateProfileRequest.php
+++ b/app/Domains/Core/Auth/Requests/UpdateProfileRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Core/Auth/Requests/ValidateResetPasswordAttemptRequest.php b/app/Domains/Core/Auth/Requests/ValidateResetPasswordAttemptRequest.php
index 52357e3..799c1c7 100644
--- a/app/Domains/Core/Auth/Requests/ValidateResetPasswordAttemptRequest.php
+++ b/app/Domains/Core/Auth/Requests/ValidateResetPasswordAttemptRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Auth\Requests;
+namespace App\Domains\Core\Auth\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Auth/Resources/AdminAppMeResource.php b/app/Domains/Core/Auth/Resources/AdminAppMeResource.php
index 3fa9226..2c64217 100644
--- a/app/Domains/Core/Auth/Resources/AdminAppMeResource.php
+++ b/app/Domains/Core/Auth/Resources/AdminAppMeResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Auth\Resources;
+namespace App\Domains\Core\Auth\Resources;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Resources\TenantResource;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Resources\TenantResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Auth/Resources/ScannerMeResource.php b/app/Domains/Core/Auth/Resources/ScannerMeResource.php
index 43537f8..30ef1b5 100644
--- a/app/Domains/Core/Auth/Resources/ScannerMeResource.php
+++ b/app/Domains/Core/Auth/Resources/ScannerMeResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Auth\Resources;
+namespace App\Domains\Core\Auth\Resources;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Resources\TenantResource;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Resources\TenantResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Auth/Resources/UserResource.php b/app/Domains/Core/Auth/Resources/UserResource.php
index 661aa09..8a8ddba 100644
--- a/app/Domains/Core/Auth/Resources/UserResource.php
+++ b/app/Domains/Core/Auth/Resources/UserResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Resources;
+namespace App\Domains\Core\Auth\Resources;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Auth/Services/AdminAppContextService.php b/app/Domains/Core/Auth/Services/AdminAppContextService.php
index 29c55ee..b62a55c 100644
--- a/app/Domains/Core/Auth/Services/AdminAppContextService.php
+++ b/app/Domains/Core/Auth/Services/AdminAppContextService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 
 class AdminAppContextService
 {
diff --git a/app/Domains/Core/Auth/Services/AdminCredentialVerifier.php b/app/Domains/Core/Auth/Services/AdminCredentialVerifier.php
index 95619f1..2ac00b5 100644
--- a/app/Domains/Core/Auth/Services/AdminCredentialVerifier.php
+++ b/app/Domains/Core/Auth/Services/AdminCredentialVerifier.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Support\Facades\Hash;
 
 class AdminCredentialVerifier
diff --git a/app/Domains/Core/Auth/Services/GoogleAuthService.php b/app/Domains/Core/Auth/Services/GoogleAuthService.php
index 7b58c36..88368e4 100644
--- a/app/Domains/Core/Auth/Services/GoogleAuthService.php
+++ b/app/Domains/Core/Auth/Services/GoogleAuthService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\UserRegistered;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Shared\Notification\Events\UserRegistered;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
diff --git a/app/Domains/Core/Auth/Services/PasswordLoginService.php b/app/Domains/Core/Auth/Services/PasswordLoginService.php
index 0fa8122..d1be20c 100644
--- a/app/Domains/Core/Auth/Services/PasswordLoginService.php
+++ b/app/Domains/Core/Auth/Services/PasswordLoginService.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Exceptions\AccountLockedException;
-use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Auth\Exceptions\AccountLockedException;
+use App\Domains\Core\Auth\Models\LoginAttempt;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Shared\Notification\Events\PasswordResetRequested;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
diff --git a/app/Domains/Core/Auth/Services/ProfileService.php b/app/Domains/Core/Auth/Services/ProfileService.php
index b99785f..efce46e 100644
--- a/app/Domains/Core/Auth/Services/ProfileService.php
+++ b/app/Domains/Core/Auth/Services/ProfileService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Support\Facades\Hash;
 
 class ProfileService
diff --git a/app/Domains/Core/Auth/Services/RegisterUserService.php b/app/Domains/Core/Auth/Services/RegisterUserService.php
index 65ec58d..952108e 100644
--- a/app/Domains/Core/Auth/Services/RegisterUserService.php
+++ b/app/Domains/Core/Auth/Services/RegisterUserService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Notification\Events\UserRegistered;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Notification\Events\UserRegistered;
 
 class RegisterUserService
 {
diff --git a/app/Domains/Core/Auth/Services/ResetPasswordAttemptService.php b/app/Domains/Core/Auth/Services/ResetPasswordAttemptService.php
index 137cddf..a9a3a09 100644
--- a/app/Domains/Core/Auth/Services/ResetPasswordAttemptService.php
+++ b/app/Domains/Core/Auth/Services/ResetPasswordAttemptService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Shared\Notification\Events\PasswordResetRequested;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Throwable;
diff --git a/app/Domains/Core/Auth/Services/ScannerContextService.php b/app/Domains/Core/Auth/Services/ScannerContextService.php
index 313d0a5..b656e13 100644
--- a/app/Domains/Core/Auth/Services/ScannerContextService.php
+++ b/app/Domains/Core/Auth/Services/ScannerContextService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Auth\Services;
+namespace App\Domains\Core\Auth\Services;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 
 class ScannerContextService
 {
diff --git a/app/Domains/Core/Auth/routes/adminapp.php b/app/Domains/Core/Auth/routes/adminapp.php
index 8425448..faebadb 100644
--- a/app/Domains/Core/Auth/routes/adminapp.php
+++ b/app/Domains/Core/Auth/routes/adminapp.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Domains\Auth\Controllers\AdminAppLoginController;
-use App\Domains\Auth\Controllers\AdminAppMeController;
-use App\Domains\Auth\Controllers\CreateAdminAppResetPasswordAttemptController;
-use App\Domains\Auth\Controllers\ResetPasswordController;
-use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\AdminAppLoginController;
+use App\Domains\Core\Auth\Controllers\AdminAppMeController;
+use App\Domains\Core\Auth\Controllers\CreateAdminAppResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\ResetPasswordController;
+use App\Domains\Core\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp')->group(function (): void {
diff --git a/app/Domains/Core/Auth/routes/api.php b/app/Domains/Core/Auth/routes/api.php
index 5b25226..57287f2 100644
--- a/app/Domains/Core/Auth/routes/api.php
+++ b/app/Domains/Core/Auth/routes/api.php
@@ -1,14 +1,14 @@
 <?php
 
-use App\Domains\Auth\Controllers\CreateResetPasswordAttemptController;
-use App\Domains\Auth\Controllers\GoogleTokenExchangeController;
-use App\Domains\Auth\Controllers\LoginController;
-use App\Domains\Auth\Controllers\LogoutController;
-use App\Domains\Auth\Controllers\MeController;
-use App\Domains\Auth\Controllers\RegisterController;
-use App\Domains\Auth\Controllers\ResetPasswordController;
-use App\Domains\Auth\Controllers\UpdateProfileController;
-use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\CreateResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\GoogleTokenExchangeController;
+use App\Domains\Core\Auth\Controllers\LoginController;
+use App\Domains\Core\Auth\Controllers\LogoutController;
+use App\Domains\Core\Auth\Controllers\MeController;
+use App\Domains\Core\Auth\Controllers\RegisterController;
+use App\Domains\Core\Auth\Controllers\ResetPasswordController;
+use App\Domains\Core\Auth\Controllers\UpdateProfileController;
+use App\Domains\Core\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::post('/register', RegisterController::class);
diff --git a/app/Domains/Core/Auth/routes/scanner.php b/app/Domains/Core/Auth/routes/scanner.php
index 8482a98..cb2d323 100644
--- a/app/Domains/Core/Auth/routes/scanner.php
+++ b/app/Domains/Core/Auth/routes/scanner.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Domains\Auth\Controllers\CreateScannerResetPasswordAttemptController;
-use App\Domains\Auth\Controllers\ResetPasswordController;
-use App\Domains\Auth\Controllers\ScannerLoginController;
-use App\Domains\Auth\Controllers\ScannerMeController;
-use App\Domains\Auth\Controllers\ValidateResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\CreateScannerResetPasswordAttemptController;
+use App\Domains\Core\Auth\Controllers\ResetPasswordController;
+use App\Domains\Core\Auth\Controllers\ScannerLoginController;
+use App\Domains\Core\Auth\Controllers\ScannerMeController;
+use App\Domains\Core\Auth\Controllers\ValidateResetPasswordAttemptController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/scanner')->group(function (): void {
diff --git a/app/Domains/Core/Authorization/Enums/PermissionCode.php b/app/Domains/Core/Authorization/Enums/PermissionCode.php
index fb520d0..435ff9f 100644
--- a/app/Domains/Core/Authorization/Enums/PermissionCode.php
+++ b/app/Domains/Core/Authorization/Enums/PermissionCode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Authorization\Enums;
+namespace App\Domains\Core\Authorization\Enums;
 
 enum PermissionCode: string
 {
diff --git a/app/Domains/Core/Authorization/Enums/RoleCode.php b/app/Domains/Core/Authorization/Enums/RoleCode.php
index 305b297..c23e561 100644
--- a/app/Domains/Core/Authorization/Enums/RoleCode.php
+++ b/app/Domains/Core/Authorization/Enums/RoleCode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Authorization\Enums;
+namespace App\Domains\Core\Authorization\Enums;
 
 enum RoleCode: string
 {
diff --git a/app/Domains/Core/Authorization/Models/Permission.php b/app/Domains/Core/Authorization/Models/Permission.php
index 2c59269..2a836d8 100644
--- a/app/Domains/Core/Authorization/Models/Permission.php
+++ b/app/Domains/Core/Authorization/Models/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Authorization\Models;
+namespace App\Domains\Core\Authorization\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/app/Domains/Core/Authorization/Models/Role.php b/app/Domains/Core/Authorization/Models/Role.php
index 526d32c..553ff99 100644
--- a/app/Domains/Core/Authorization/Models/Role.php
+++ b/app/Domains/Core/Authorization/Models/Role.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Authorization\Models;
+namespace App\Domains\Core\Authorization\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Models\MenuRole;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\MenuRole;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Domains/Core/Authorization/Models/RolePermission.php b/app/Domains/Core/Authorization/Models/RolePermission.php
index c9a8b15..07a7585 100644
--- a/app/Domains/Core/Authorization/Models/RolePermission.php
+++ b/app/Domains/Core/Authorization/Models/RolePermission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Authorization\Models;
+namespace App\Domains\Core\Authorization\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Core/Bootstrap/Controllers/AdminAppBootstrapController.php b/app/Domains/Core/Bootstrap/Controllers/AdminAppBootstrapController.php
index 3cc7bef..9dacf5a 100644
--- a/app/Domains/Core/Bootstrap/Controllers/AdminAppBootstrapController.php
+++ b/app/Domains/Core/Bootstrap/Controllers/AdminAppBootstrapController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Bootstrap\Controllers;
+namespace App\Domains\Core\Bootstrap\Controllers;
 
-use App\Domains\Bootstrap\Requests\AdminAppBootstrapRequest;
-use App\Domains\Bootstrap\Resources\AdminAppBootstrapResource;
-use App\Domains\Bootstrap\Services\AdminAppBootstrapService;
+use App\Domains\Core\Bootstrap\Requests\AdminAppBootstrapRequest;
+use App\Domains\Core\Bootstrap\Resources\AdminAppBootstrapResource;
+use App\Domains\Core\Bootstrap\Services\AdminAppBootstrapService;
 use App\Http\Controllers\Controller;
 
 class AdminAppBootstrapController extends Controller
diff --git a/app/Domains/Core/Bootstrap/Controllers/ScannerBootstrapController.php b/app/Domains/Core/Bootstrap/Controllers/ScannerBootstrapController.php
index 41ef13a..8aa9d6c 100644
--- a/app/Domains/Core/Bootstrap/Controllers/ScannerBootstrapController.php
+++ b/app/Domains/Core/Bootstrap/Controllers/ScannerBootstrapController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Bootstrap\Controllers;
+namespace App\Domains\Core\Bootstrap\Controllers;
 
-use App\Domains\Bootstrap\Requests\ScannerBootstrapRequest;
-use App\Domains\Bootstrap\Resources\ScannerBootstrapResource;
-use App\Domains\Bootstrap\Services\ScannerBootstrapService;
+use App\Domains\Core\Bootstrap\Requests\ScannerBootstrapRequest;
+use App\Domains\Core\Bootstrap\Resources\ScannerBootstrapResource;
+use App\Domains\Core\Bootstrap\Services\ScannerBootstrapService;
 use App\Http\Controllers\Controller;
 
 class ScannerBootstrapController extends Controller
diff --git a/app/Domains/Core/Bootstrap/Controllers/TenantBootstrapController.php b/app/Domains/Core/Bootstrap/Controllers/TenantBootstrapController.php
index 57406f1..59d1628 100644
--- a/app/Domains/Core/Bootstrap/Controllers/TenantBootstrapController.php
+++ b/app/Domains/Core/Bootstrap/Controllers/TenantBootstrapController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Bootstrap\Controllers;
+namespace App\Domains\Core\Bootstrap\Controllers;
 
-use App\Domains\Bootstrap\Requests\TenantBootstrapRequest;
-use App\Domains\Bootstrap\Services\TenantBootstrapService;
-use App\Domains\Tenant\Resources\TenantResource;
+use App\Domains\Core\Bootstrap\Requests\TenantBootstrapRequest;
+use App\Domains\Core\Bootstrap\Services\TenantBootstrapService;
+use App\Domains\Core\Tenant\Resources\TenantResource;
 use App\Http\Controllers\Controller;
 
 class TenantBootstrapController extends Controller
diff --git a/app/Domains/Core/Bootstrap/Requests/AdminAppBootstrapRequest.php b/app/Domains/Core/Bootstrap/Requests/AdminAppBootstrapRequest.php
index 282dad9..301fa7b 100644
--- a/app/Domains/Core/Bootstrap/Requests/AdminAppBootstrapRequest.php
+++ b/app/Domains/Core/Bootstrap/Requests/AdminAppBootstrapRequest.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace App\Domains\Bootstrap\Requests;
+namespace App\Domains\Core\Bootstrap\Requests;
 
 class AdminAppBootstrapRequest extends TenantBootstrapRequest {}
diff --git a/app/Domains/Core/Bootstrap/Requests/ScannerBootstrapRequest.php b/app/Domains/Core/Bootstrap/Requests/ScannerBootstrapRequest.php
index df410e6..2a3f95a 100644
--- a/app/Domains/Core/Bootstrap/Requests/ScannerBootstrapRequest.php
+++ b/app/Domains/Core/Bootstrap/Requests/ScannerBootstrapRequest.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace App\Domains\Bootstrap\Requests;
+namespace App\Domains\Core\Bootstrap\Requests;
 
 class ScannerBootstrapRequest extends TenantBootstrapRequest {}
diff --git a/app/Domains/Core/Bootstrap/Requests/TenantBootstrapRequest.php b/app/Domains/Core/Bootstrap/Requests/TenantBootstrapRequest.php
index e5529aa..56cd074 100644
--- a/app/Domains/Core/Bootstrap/Requests/TenantBootstrapRequest.php
+++ b/app/Domains/Core/Bootstrap/Requests/TenantBootstrapRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Bootstrap\Requests;
+namespace App\Domains\Core\Bootstrap\Requests;
 
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Core/Bootstrap/Resources/AdminAppBootstrapResource.php b/app/Domains/Core/Bootstrap/Resources/AdminAppBootstrapResource.php
index 69383e8..1175312 100644
--- a/app/Domains/Core/Bootstrap/Resources/AdminAppBootstrapResource.php
+++ b/app/Domains/Core/Bootstrap/Resources/AdminAppBootstrapResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Bootstrap\Resources;
+namespace App\Domains\Core\Bootstrap\Resources;
 
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Bootstrap/Resources/ScannerBootstrapResource.php b/app/Domains/Core/Bootstrap/Resources/ScannerBootstrapResource.php
index 74b0e16..810274a 100644
--- a/app/Domains/Core/Bootstrap/Resources/ScannerBootstrapResource.php
+++ b/app/Domains/Core/Bootstrap/Resources/ScannerBootstrapResource.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace App\Domains\Bootstrap\Resources;
+namespace App\Domains\Core\Bootstrap\Resources;
 
 class ScannerBootstrapResource extends AdminAppBootstrapResource {}
diff --git a/app/Domains/Core/Bootstrap/Services/AdminAppBootstrapService.php b/app/Domains/Core/Bootstrap/Services/AdminAppBootstrapService.php
index 01bee6a..0167af5 100644
--- a/app/Domains/Core/Bootstrap/Services/AdminAppBootstrapService.php
+++ b/app/Domains/Core/Bootstrap/Services/AdminAppBootstrapService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Bootstrap\Services;
+namespace App\Domains\Core\Bootstrap\Services;
 
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 
 class AdminAppBootstrapService
 {
diff --git a/app/Domains/Core/Bootstrap/Services/ScannerBootstrapService.php b/app/Domains/Core/Bootstrap/Services/ScannerBootstrapService.php
index 9aaad48..ae5276a 100644
--- a/app/Domains/Core/Bootstrap/Services/ScannerBootstrapService.php
+++ b/app/Domains/Core/Bootstrap/Services/ScannerBootstrapService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Bootstrap\Services;
+namespace App\Domains\Core\Bootstrap\Services;
 
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 
 class ScannerBootstrapService
 {
diff --git a/app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php b/app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php
index b4c6352..72cdbdc 100644
--- a/app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php
+++ b/app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Bootstrap\Services;
+namespace App\Domains\Core\Bootstrap\Services;
 
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Services\TenantInformationService;
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Services\TenantInformationService;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class TenantBootstrapService
diff --git a/app/Domains/Core/Bootstrap/routes/adminapp.php b/app/Domains/Core/Bootstrap/routes/adminapp.php
index 3cf6c66..e5be4bc 100644
--- a/app/Domains/Core/Bootstrap/routes/adminapp.php
+++ b/app/Domains/Core/Bootstrap/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Bootstrap\Controllers\AdminAppBootstrapController;
+use App\Domains\Core\Bootstrap\Controllers\AdminAppBootstrapController;
 use Illuminate\Support\Facades\Route;
 
 Route::get(
diff --git a/app/Domains/Core/Bootstrap/routes/api.php b/app/Domains/Core/Bootstrap/routes/api.php
index bd4265c..d11c1ee 100644
--- a/app/Domains/Core/Bootstrap/routes/api.php
+++ b/app/Domains/Core/Bootstrap/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Bootstrap\Controllers\TenantBootstrapController;
+use App\Domains\Core\Bootstrap\Controllers\TenantBootstrapController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('tenants/bootstrap', TenantBootstrapController::class);
diff --git a/app/Domains/Core/Bootstrap/routes/scanner.php b/app/Domains/Core/Bootstrap/routes/scanner.php
index 1469278..1a05a85 100644
--- a/app/Domains/Core/Bootstrap/routes/scanner.php
+++ b/app/Domains/Core/Bootstrap/routes/scanner.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Bootstrap\Controllers\ScannerBootstrapController;
+use App\Domains\Core\Bootstrap\Controllers\ScannerBootstrapController;
 use Illuminate\Support\Facades\Route;
 
 Route::get(
diff --git a/app/Domains/Core/Client/Controllers/ClientController.php b/app/Domains/Core/Client/Controllers/ClientController.php
index 1ab9da3..e38064f 100644
--- a/app/Domains/Core/Client/Controllers/ClientController.php
+++ b/app/Domains/Core/Client/Controllers/ClientController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Client\Controllers;
+namespace App\Domains\Core\Client\Controllers;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Client\Requests\StoreClientRequest;
-use App\Domains\Client\Requests\UpdateClientRequest;
-use App\Domains\Client\Resources\ClientResource;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Core\Client\Requests\StoreClientRequest;
+use App\Domains\Core\Client\Requests\UpdateClientRequest;
+use App\Domains\Core\Client\Resources\ClientResource;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Core/Client/Models/Client.php b/app/Domains/Core/Client/Models/Client.php
index e0bf9e1..f52054f 100644
--- a/app/Domains/Core/Client/Models/Client.php
+++ b/app/Domains/Core/Client/Models/Client.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Client\Models;
+namespace App\Domains\Core\Client\Models;
 
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Domains/Core/Client/Requests/StoreClientRequest.php b/app/Domains/Core/Client/Requests/StoreClientRequest.php
index b0ab979..da0dd3f 100644
--- a/app/Domains/Core/Client/Requests/StoreClientRequest.php
+++ b/app/Domains/Core/Client/Requests/StoreClientRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Client\Requests;
+namespace App\Domains\Core\Client\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Core/Client/Requests/UpdateClientRequest.php b/app/Domains/Core/Client/Requests/UpdateClientRequest.php
index 513376b..ba1f491 100644
--- a/app/Domains/Core/Client/Requests/UpdateClientRequest.php
+++ b/app/Domains/Core/Client/Requests/UpdateClientRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Client\Requests;
+namespace App\Domains\Core\Client\Requests;
 
-use App\Domains\Client\Models\Client;
+use App\Domains\Core\Client\Models\Client;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Core/Client/Resources/ClientResource.php b/app/Domains/Core/Client/Resources/ClientResource.php
index caf724e..c776f51 100644
--- a/app/Domains/Core/Client/Resources/ClientResource.php
+++ b/app/Domains/Core/Client/Resources/ClientResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Client\Resources;
+namespace App\Domains\Core\Client\Resources;
 
-use App\Domains\Client\Models\Client;
+use App\Domains\Core\Client\Models\Client;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Client/routes/api.php b/app/Domains/Core/Client/routes/api.php
index ee8461c..4d7169b 100644
--- a/app/Domains/Core/Client/routes/api.php
+++ b/app/Domains/Core/Client/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Client\Controllers\ClientController;
+use App\Domains\Core\Client\Controllers\ClientController;
 use Illuminate\Support\Facades\Route;
 
 Route::apiResource('clients', ClientController::class);
diff --git a/app/Domains/Core/Menu/Controllers/MenuController.php b/app/Domains/Core/Menu/Controllers/MenuController.php
index 2c9135e..912355f 100644
--- a/app/Domains/Core/Menu/Controllers/MenuController.php
+++ b/app/Domains/Core/Menu/Controllers/MenuController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Menu\Controllers;
+namespace App\Domains\Core\Menu\Controllers;
 
-use App\Domains\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\Menu;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Core/Menu/Controllers/TenantMenuController.php b/app/Domains/Core/Menu/Controllers/TenantMenuController.php
index bd0a2a1..2182afc 100644
--- a/app/Domains/Core/Menu/Controllers/TenantMenuController.php
+++ b/app/Domains/Core/Menu/Controllers/TenantMenuController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Menu\Controllers;
+namespace App\Domains\Core\Menu\Controllers;
 
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Requests\StoreTenantMenuRequest;
-use App\Domains\Menu\Services\TenantMenuService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Menu\Requests\StoreTenantMenuRequest;
+use App\Domains\Core\Menu\Services\TenantMenuService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Domains/Core/Menu/Models/Menu.php b/app/Domains/Core/Menu/Models/Menu.php
index 9643f9d..5862dec 100644
--- a/app/Domains/Core/Menu/Models/Menu.php
+++ b/app/Domains/Core/Menu/Models/Menu.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Menu\Models;
+namespace App\Domains\Core\Menu\Models;
 
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Core/Menu/Models/MenuRole.php b/app/Domains/Core/Menu/Models/MenuRole.php
index 5c68e86..8cf7deb 100644
--- a/app/Domains/Core/Menu/Models/MenuRole.php
+++ b/app/Domains/Core/Menu/Models/MenuRole.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Menu\Models;
+namespace App\Domains\Core\Menu\Models;
 
-use App\Domains\Authorization\Models\Role;
+use App\Domains\Core\Authorization\Models\Role;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
diff --git a/app/Domains/Core/Menu/Models/TenantMenu.php b/app/Domains/Core/Menu/Models/TenantMenu.php
index 2fb495e..d6f4e93 100644
--- a/app/Domains/Core/Menu/Models/TenantMenu.php
+++ b/app/Domains/Core/Menu/Models/TenantMenu.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Menu\Models;
+namespace App\Domains\Core\Menu\Models;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\Pivot;
 
diff --git a/app/Domains/Core/Menu/Requests/StoreTenantMenuRequest.php b/app/Domains/Core/Menu/Requests/StoreTenantMenuRequest.php
index 0ee9b99..08c4d4d 100644
--- a/app/Domains/Core/Menu/Requests/StoreTenantMenuRequest.php
+++ b/app/Domains/Core/Menu/Requests/StoreTenantMenuRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Menu\Requests;
+namespace App\Domains\Core\Menu\Requests;
 
-use App\Domains\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\Menu;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Domains/Core/Menu/Services/TenantMenuService.php b/app/Domains/Core/Menu/Services/TenantMenuService.php
index 102c498..d8d7c43 100644
--- a/app/Domains/Core/Menu/Services/TenantMenuService.php
+++ b/app/Domains/Core/Menu/Services/TenantMenuService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Menu\Services;
+namespace App\Domains\Core\Menu\Services;
 
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Models\TenantMenu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\TenantMenu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 
 class TenantMenuService
diff --git a/app/Domains/Core/Menu/routes/api.php b/app/Domains/Core/Menu/routes/api.php
index 3d03a24..62c9721 100644
--- a/app/Domains/Core/Menu/routes/api.php
+++ b/app/Domains/Core/Menu/routes/api.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Menu\Controllers\MenuController;
-use App\Domains\Menu\Controllers\TenantMenuController;
+use App\Domains\Core\Menu\Controllers\MenuController;
+use App\Domains\Core\Menu\Controllers\TenantMenuController;
 use Illuminate\Support\Facades\Route;
 
 Route::apiResource('menues', MenuController::class);
diff --git a/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php b/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php
index f6ef5c4..1f1d69c 100644
--- a/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php
+++ b/app/Domains/Core/Staff/Controllers/AdminAppStaffController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Staff\Controllers;
+namespace App\Domains\Core\Staff\Controllers;
 
-use App\Domains\Staff\Requests\StoreStaffRequest;
-use App\Domains\Staff\Requests\UpdateStaffRequest;
-use App\Domains\Staff\Resources\StaffResource;
-use App\Domains\Staff\Services\StaffService;
-use App\Domains\Ticket\Requests\ScanAttemptIndexRequest;
-use App\Domains\Ticket\Resources\Scanner\ScanAttemptResource;
-use App\Domains\Ticket\Services\ScannerTicketService;
+use App\Domains\Core\Staff\Requests\StoreStaffRequest;
+use App\Domains\Core\Staff\Requests\UpdateStaffRequest;
+use App\Domains\Core\Staff\Resources\StaffResource;
+use App\Domains\Core\Staff\Services\StaffService;
+use App\Domains\Ticketing\Ticket\Requests\ScanAttemptIndexRequest;
+use App\Domains\Ticketing\Ticket\Resources\Scanner\ScanAttemptResource;
+use App\Domains\Ticketing\Ticket\Services\ScannerTicketService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
diff --git a/app/Domains/Core/Staff/Requests/StoreStaffRequest.php b/app/Domains/Core/Staff/Requests/StoreStaffRequest.php
index 4237318..4213540 100644
--- a/app/Domains/Core/Staff/Requests/StoreStaffRequest.php
+++ b/app/Domains/Core/Staff/Requests/StoreStaffRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Staff\Requests;
+namespace App\Domains\Core\Staff\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Core/Staff/Requests/UpdateStaffRequest.php b/app/Domains/Core/Staff/Requests/UpdateStaffRequest.php
index fcf6e3f..3b683bc 100644
--- a/app/Domains/Core/Staff/Requests/UpdateStaffRequest.php
+++ b/app/Domains/Core/Staff/Requests/UpdateStaffRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Staff\Requests;
+namespace App\Domains\Core\Staff\Requests;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Core/Staff/Resources/StaffResource.php b/app/Domains/Core/Staff/Resources/StaffResource.php
index 71f7e9d..5892a51 100644
--- a/app/Domains/Core/Staff/Resources/StaffResource.php
+++ b/app/Domains/Core/Staff/Resources/StaffResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Staff\Resources;
+namespace App\Domains\Core\Staff\Resources;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Staff/Services/StaffService.php b/app/Domains/Core/Staff/Services/StaffService.php
index 4039cb5..89ca950 100644
--- a/app/Domains/Core/Staff/Services/StaffService.php
+++ b/app/Domains/Core/Staff/Services/StaffService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Staff\Services;
+namespace App\Domains\Core\Staff\Services;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Arr;
diff --git a/app/Domains/Core/Staff/routes/api.php b/app/Domains/Core/Staff/routes/api.php
index 470f1fc..5ab6916 100644
--- a/app/Domains/Core/Staff/routes/api.php
+++ b/app/Domains/Core/Staff/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Staff\Controllers\AdminAppStaffController;
+use App\Domains\Core\Staff\Controllers\AdminAppStaffController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Core/Tenant/Controllers/AdminApp/WebsiteExtraController.php b/app/Domains/Core/Tenant/Controllers/AdminApp/WebsiteExtraController.php
index cf50a96..d9112c2 100644
--- a/app/Domains/Core/Tenant/Controllers/AdminApp/WebsiteExtraController.php
+++ b/app/Domains/Core/Tenant/Controllers/AdminApp/WebsiteExtraController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Tenant\Controllers\AdminApp;
+namespace App\Domains\Core\Tenant\Controllers\AdminApp;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Requests\AdminApp\UpdateWebsiteExtraRequest;
-use App\Domains\Tenant\Resources\AdminApp\WebsiteExtraResource;
-use App\Domains\Tenant\Resources\AdminApp\WebsiteExtrasResource;
-use App\Domains\Tenant\Services\TenantInformationService;
-use App\Domains\Tenant\Services\WebsiteExtraService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Requests\AdminApp\UpdateWebsiteExtraRequest;
+use App\Domains\Core\Tenant\Resources\AdminApp\WebsiteExtraResource;
+use App\Domains\Core\Tenant\Resources\AdminApp\WebsiteExtrasResource;
+use App\Domains\Core\Tenant\Services\TenantInformationService;
+use App\Domains\Core\Tenant\Services\WebsiteExtraService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Domains/Core/Tenant/Controllers/TenantController.php b/app/Domains/Core/Tenant/Controllers/TenantController.php
index 5b105af..c4d8510 100644
--- a/app/Domains/Core/Tenant/Controllers/TenantController.php
+++ b/app/Domains/Core/Tenant/Controllers/TenantController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Tenant\Controllers;
+namespace App\Domains\Core\Tenant\Controllers;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Requests\StoreTenantRequest;
-use App\Domains\Tenant\Requests\UpdateTenantRequest;
-use App\Domains\Tenant\Resources\TenantResource;
-use App\Domains\Tenant\Services\TenantInformationService;
-use App\Domains\Tenant\Services\TenantService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Requests\StoreTenantRequest;
+use App\Domains\Core\Tenant\Requests\UpdateTenantRequest;
+use App\Domains\Core\Tenant\Resources\TenantResource;
+use App\Domains\Core\Tenant\Services\TenantInformationService;
+use App\Domains\Core\Tenant\Services\TenantService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Core/Tenant/Enums/CartEditingPolicy.php b/app/Domains/Core/Tenant/Enums/CartEditingPolicy.php
index c90fc05..56fed3c 100644
--- a/app/Domains/Core/Tenant/Enums/CartEditingPolicy.php
+++ b/app/Domains/Core/Tenant/Enums/CartEditingPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Enums;
+namespace App\Domains\Core\Tenant\Enums;
 
 enum CartEditingPolicy: string
 {
diff --git a/app/Domains/Core/Tenant/Models/AdminWebsiteType.php b/app/Domains/Core/Tenant/Models/AdminWebsiteType.php
index 0450d16..0f276b6 100644
--- a/app/Domains/Core/Tenant/Models/AdminWebsiteType.php
+++ b/app/Domains/Core/Tenant/Models/AdminWebsiteType.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Integration\Models\AdminWebsiteTypeIntegration;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Core/Tenant/Models/SocialMedia.php b/app/Domains/Core/Tenant/Models/SocialMedia.php
index 616a543..2f2257a 100644
--- a/app/Domains/Core/Tenant/Models/SocialMedia.php
+++ b/app/Domains/Core/Tenant/Models/SocialMedia.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
diff --git a/app/Domains/Core/Tenant/Models/StorefrontWebsiteType.php b/app/Domains/Core/Tenant/Models/StorefrontWebsiteType.php
index efccfba..f0872d9 100644
--- a/app/Domains/Core/Tenant/Models/StorefrontWebsiteType.php
+++ b/app/Domains/Core/Tenant/Models/StorefrontWebsiteType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Core/Tenant/Models/StorefrontWebsiteTypeExtra.php b/app/Domains/Core/Tenant/Models/StorefrontWebsiteTypeExtra.php
index c68bab5..7accc69 100644
--- a/app/Domains/Core/Tenant/Models/StorefrontWebsiteTypeExtra.php
+++ b/app/Domains/Core/Tenant/Models/StorefrontWebsiteTypeExtra.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Core/Tenant/Models/Tenant.php b/app/Domains/Core/Tenant/Models/Tenant.php
index 3f3129c..556a122 100644
--- a/app/Domains/Core/Tenant/Models/Tenant.php
+++ b/app/Domains/Core/Tenant/Models/Tenant.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Client\Models\Client;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Menu\Models\TenantMenu;
-use App\Domains\Tenant\Enums\CartEditingPolicy;
-use App\Domains\Ticket\Models\ScanAttempt;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\TenantMenu;
+use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Domains/Core/Tenant/Models/WebsiteExtra.php b/app/Domains/Core/Tenant/Models/WebsiteExtra.php
index d87c000..fd31391 100644
--- a/app/Domains/Core/Tenant/Models/WebsiteExtra.php
+++ b/app/Domains/Core/Tenant/Models/WebsiteExtra.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Models;
+namespace App\Domains\Core\Tenant\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Core/Tenant/Requests/AdminApp/UpdateWebsiteExtraRequest.php b/app/Domains/Core/Tenant/Requests/AdminApp/UpdateWebsiteExtraRequest.php
index e5e19dd..67dc9eb 100644
--- a/app/Domains/Core/Tenant/Requests/AdminApp/UpdateWebsiteExtraRequest.php
+++ b/app/Domains/Core/Tenant/Requests/AdminApp/UpdateWebsiteExtraRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Tenant\Requests\AdminApp;
+namespace App\Domains\Core\Tenant\Requests\AdminApp;
 
-use App\Domains\Tenant\Services\WebsiteExtraService;
+use App\Domains\Core\Tenant\Services\WebsiteExtraService;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateWebsiteExtraRequest extends FormRequest
diff --git a/app/Domains/Core/Tenant/Requests/StoreTenantRequest.php b/app/Domains/Core/Tenant/Requests/StoreTenantRequest.php
index 5413e01..74ff23c 100644
--- a/app/Domains/Core/Tenant/Requests/StoreTenantRequest.php
+++ b/app/Domains/Core/Tenant/Requests/StoreTenantRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Tenant\Requests;
+namespace App\Domains\Core\Tenant\Requests;
 
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use App\Domains\Tenant\Enums\CartEditingPolicy;
-use App\Domains\Tenant\Services\WebsiteExtraService;
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
+use App\Domains\Core\Tenant\Services\WebsiteExtraService;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Core/Tenant/Requests/UpdateTenantRequest.php b/app/Domains/Core/Tenant/Requests/UpdateTenantRequest.php
index 02ce350..b6a748e 100644
--- a/app/Domains/Core/Tenant/Requests/UpdateTenantRequest.php
+++ b/app/Domains/Core/Tenant/Requests/UpdateTenantRequest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Tenant\Requests;
+namespace App\Domains\Core\Tenant\Requests;
 
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use App\Domains\Tenant\Enums\CartEditingPolicy;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtraResource.php b/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtraResource.php
index 49222a9..482d615 100644
--- a/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtraResource.php
+++ b/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtraResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Tenant\Resources\AdminApp;
+namespace App\Domains\Core\Tenant\Resources\AdminApp;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Tenant\Models\WebsiteExtra;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Domains\Core\Tenant\Models\WebsiteExtra;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtrasResource.php b/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtrasResource.php
index 29dc4a8..b2c02ce 100644
--- a/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtrasResource.php
+++ b/app/Domains/Core/Tenant/Resources/AdminApp/WebsiteExtrasResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Tenant\Resources\AdminApp;
+namespace App\Domains\Core\Tenant\Resources\AdminApp;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Tenant/Resources/CartEditingPolicyResource.php b/app/Domains/Core/Tenant/Resources/CartEditingPolicyResource.php
index aba3b20..e78e41d 100644
--- a/app/Domains/Core/Tenant/Resources/CartEditingPolicyResource.php
+++ b/app/Domains/Core/Tenant/Resources/CartEditingPolicyResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Tenant\Resources;
+namespace App\Domains\Core\Tenant\Resources;
 
-use App\Domains\Tenant\Enums\CartEditingPolicy;
+use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Core/Tenant/Resources/TenantResource.php b/app/Domains/Core/Tenant/Resources/TenantResource.php
index 8d9aa26..dff0e22 100644
--- a/app/Domains/Core/Tenant/Resources/TenantResource.php
+++ b/app/Domains/Core/Tenant/Resources/TenantResource.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Tenant\Resources;
+namespace App\Domains\Core\Tenant\Resources;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Services\EventDateInfoFormatter;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Services\EventDateInfoFormatter;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Core/Tenant/Services/AdminWebsiteTypeService.php b/app/Domains/Core/Tenant/Services/AdminWebsiteTypeService.php
index db65142..5e85bfe 100644
--- a/app/Domains/Core/Tenant/Services/AdminWebsiteTypeService.php
+++ b/app/Domains/Core/Tenant/Services/AdminWebsiteTypeService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Tenant\Services;
+namespace App\Domains\Core\Tenant\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
diff --git a/app/Domains/Core/Tenant/Services/TenantInformationService.php b/app/Domains/Core/Tenant/Services/TenantInformationService.php
index 2e75502..af6561f 100644
--- a/app/Domains/Core/Tenant/Services/TenantInformationService.php
+++ b/app/Domains/Core/Tenant/Services/TenantInformationService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Tenant\Services;
+namespace App\Domains\Core\Tenant\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\WebsiteExtra;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\WebsiteExtra;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Collection;
 
diff --git a/app/Domains/Core/Tenant/Services/TenantService.php b/app/Domains/Core/Tenant/Services/TenantService.php
index da73cb6..25c2126 100644
--- a/app/Domains/Core/Tenant/Services/TenantService.php
+++ b/app/Domains/Core/Tenant/Services/TenantService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Tenant\Services;
+namespace App\Domains\Core\Tenant\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
diff --git a/app/Domains/Core/Tenant/Services/WebsiteExtraService.php b/app/Domains/Core/Tenant/Services/WebsiteExtraService.php
index 922cd23..3ec2a1a 100644
--- a/app/Domains/Core/Tenant/Services/WebsiteExtraService.php
+++ b/app/Domains/Core/Tenant/Services/WebsiteExtraService.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Domains\Tenant\Services;
+namespace App\Domains\Core\Tenant\Services;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Shared\Rules\CroppedImageOrBase64Rule;
-use App\Domains\Shared\Rules\ImageOrBase64Rule;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\WebsiteExtra;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteTypeExtra;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Shared\Rules\CroppedImageOrBase64Rule;
+use App\Shared\Rules\ImageOrBase64Rule;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\WebsiteExtra;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteTypeExtra;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Core/Tenant/Support/TenantDomainNormalizer.php b/app/Domains/Core/Tenant/Support/TenantDomainNormalizer.php
index 4e43a2e..3b3256d 100644
--- a/app/Domains/Core/Tenant/Support/TenantDomainNormalizer.php
+++ b/app/Domains/Core/Tenant/Support/TenantDomainNormalizer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Tenant\Support;
+namespace App\Domains\Core\Tenant\Support;
 
 class TenantDomainNormalizer
 {
diff --git a/app/Domains/Core/Tenant/routes/adminapp.php b/app/Domains/Core/Tenant/routes/adminapp.php
index 0dcc615..7bdcbb9 100644
--- a/app/Domains/Core/Tenant/routes/adminapp.php
+++ b/app/Domains/Core/Tenant/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Tenant\Controllers\AdminApp\WebsiteExtraController;
+use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Core/Tenant/routes/api.php b/app/Domains/Core/Tenant/routes/api.php
index 1deb043..8373d53 100644
--- a/app/Domains/Core/Tenant/routes/api.php
+++ b/app/Domains/Core/Tenant/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Tenant\Controllers\TenantController;
+use App\Domains\Core\Tenant\Controllers\TenantController;
 use Illuminate\Support\Facades\Route;
 
 Route::apiResource('tenants', TenantController::class);
diff --git a/app/Domains/Ticketing/Desfile/Controllers/EntryController.php b/app/Domains/Ticketing/Desfile/Controllers/EntryController.php
index 51e09db..cf5daf9 100644
--- a/app/Domains/Ticketing/Desfile/Controllers/EntryController.php
+++ b/app/Domains/Ticketing/Desfile/Controllers/EntryController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Desfile\Controllers;
+namespace App\Domains\Ticketing\Desfile\Controllers;
 
-use App\Domains\Desfile\Requests\ReplaceEntryImageRequest;
-use App\Domains\Desfile\Requests\SyncEntryRowsRequest;
-use App\Domains\Desfile\Requests\UpdateEntryImageRequest;
-use App\Domains\Desfile\Resources\EntryResource;
-use App\Domains\Desfile\Services\EntryService;
+use App\Domains\Ticketing\Desfile\Requests\ReplaceEntryImageRequest;
+use App\Domains\Ticketing\Desfile\Requests\SyncEntryRowsRequest;
+use App\Domains\Ticketing\Desfile\Requests\UpdateEntryImageRequest;
+use App\Domains\Ticketing\Desfile\Resources\EntryResource;
+use App\Domains\Ticketing\Desfile\Services\EntryService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/Desfile/Requests/ReplaceEntryImageRequest.php b/app/Domains/Ticketing/Desfile/Requests/ReplaceEntryImageRequest.php
index ddc99f6..584511a 100644
--- a/app/Domains/Ticketing/Desfile/Requests/ReplaceEntryImageRequest.php
+++ b/app/Domains/Ticketing/Desfile/Requests/ReplaceEntryImageRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Desfile\Requests;
+namespace App\Domains\Ticketing\Desfile\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Desfile/Requests/SyncEntryRowsRequest.php b/app/Domains/Ticketing/Desfile/Requests/SyncEntryRowsRequest.php
index 4282fa6..320a832 100644
--- a/app/Domains/Ticketing/Desfile/Requests/SyncEntryRowsRequest.php
+++ b/app/Domains/Ticketing/Desfile/Requests/SyncEntryRowsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Desfile\Requests;
+namespace App\Domains\Ticketing\Desfile\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Validator;
diff --git a/app/Domains/Ticketing/Desfile/Requests/UpdateEntryImageRequest.php b/app/Domains/Ticketing/Desfile/Requests/UpdateEntryImageRequest.php
index c00cbd1..bc368a2 100644
--- a/app/Domains/Ticketing/Desfile/Requests/UpdateEntryImageRequest.php
+++ b/app/Domains/Ticketing/Desfile/Requests/UpdateEntryImageRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Desfile\Requests;
+namespace App\Domains\Ticketing\Desfile\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Desfile/Resources/EntryResource.php b/app/Domains/Ticketing/Desfile/Resources/EntryResource.php
index 497a725..c35d3a1 100644
--- a/app/Domains/Ticketing/Desfile/Resources/EntryResource.php
+++ b/app/Domains/Ticketing/Desfile/Resources/EntryResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Desfile\Resources;
+namespace App\Domains\Ticketing\Desfile\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Desfile/Services/EntryService.php b/app/Domains/Ticketing/Desfile/Services/EntryService.php
index 0ddd1d1..c97954d 100644
--- a/app/Domains/Ticketing/Desfile/Services/EntryService.php
+++ b/app/Domains/Ticketing/Desfile/Services/EntryService.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Desfile\Services;
+namespace App\Domains\Ticketing\Desfile\Services;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php
index ad16d37..382fe2d 100644
--- a/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php
+++ b/app/Domains/Ticketing/Desfile/Services/InvitationPurchaseProvisioner.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Desfile\Services;
+namespace App\Domains\Ticketing\Desfile\Services;
 
 use DateTimeInterface;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Domains/Ticketing/Desfile/routes/api.php b/app/Domains/Ticketing/Desfile/routes/api.php
index 7827d3d..9d2429b 100644
--- a/app/Domains/Ticketing/Desfile/routes/api.php
+++ b/app/Domains/Ticketing/Desfile/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Desfile\Controllers\EntryController;
+use App\Domains\Ticketing\Desfile\Controllers\EntryController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant/desfile')
diff --git a/app/Domains/Ticketing/Event/Controllers/AdminApp/EventController.php b/app/Domains/Ticketing/Event/Controllers/AdminApp/EventController.php
index bb1a783..30d31b5 100644
--- a/app/Domains/Ticketing/Event/Controllers/AdminApp/EventController.php
+++ b/app/Domains/Ticketing/Event/Controllers/AdminApp/EventController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Event\Controllers\AdminApp;
+namespace App\Domains\Ticketing\Event\Controllers\AdminApp;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Requests\RescheduleEventDateRequest;
-use App\Domains\Event\Requests\StoreEventDateRequest;
-use App\Domains\Event\Requests\UpdateEventRequest;
-use App\Domains\Event\Resources\EventDateResource;
-use App\Domains\Event\Resources\EventResource;
-use App\Domains\Event\Services\EventService;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Requests\RescheduleEventDateRequest;
+use App\Domains\Ticketing\Event\Requests\StoreEventDateRequest;
+use App\Domains\Ticketing\Event\Requests\UpdateEventRequest;
+use App\Domains\Ticketing\Event\Resources\EventDateResource;
+use App\Domains\Ticketing\Event\Resources\EventResource;
+use App\Domains\Ticketing\Event\Services\EventService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Domains/Ticketing/Event/Controllers/EventDateNoticeController.php b/app/Domains/Ticketing/Event/Controllers/EventDateNoticeController.php
index e427663..6bef887 100644
--- a/app/Domains/Ticketing/Event/Controllers/EventDateNoticeController.php
+++ b/app/Domains/Ticketing/Event/Controllers/EventDateNoticeController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Event\Controllers;
+namespace App\Domains\Ticketing\Event\Controllers;
 
-use App\Domains\Event\Resources\EventDateNoticeResource;
-use App\Domains\Event\Services\EventDateNoticeService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Resources\EventDateNoticeResource;
+use App\Domains\Ticketing\Event\Services\EventDateNoticeService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
diff --git a/app/Domains/Ticketing/Event/Enums/EventDateChangeType.php b/app/Domains/Ticketing/Event/Enums/EventDateChangeType.php
index 1dba386..a3ef1fe 100644
--- a/app/Domains/Ticketing/Event/Enums/EventDateChangeType.php
+++ b/app/Domains/Ticketing/Event/Enums/EventDateChangeType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Enums;
+namespace App\Domains\Ticketing\Event\Enums;
 
 enum EventDateChangeType: string
 {
diff --git a/app/Domains/Ticketing/Event/Enums/EventDateStatus.php b/app/Domains/Ticketing/Event/Enums/EventDateStatus.php
index c06578b..de0b851 100644
--- a/app/Domains/Ticketing/Event/Enums/EventDateStatus.php
+++ b/app/Domains/Ticketing/Event/Enums/EventDateStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Enums;
+namespace App\Domains\Ticketing\Event\Enums;
 
 enum EventDateStatus: string
 {
diff --git a/app/Domains/Ticketing/Event/Events/EventDateRescheduled.php b/app/Domains/Ticketing/Event/Events/EventDateRescheduled.php
index d0c5271..4052b1f 100644
--- a/app/Domains/Ticketing/Event/Events/EventDateRescheduled.php
+++ b/app/Domains/Ticketing/Event/Events/EventDateRescheduled.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Events;
+namespace App\Domains\Ticketing\Event\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 
diff --git a/app/Domains/Ticketing/Event/Events/EventDateSuspended.php b/app/Domains/Ticketing/Event/Events/EventDateSuspended.php
index fe99365..0cff7f8 100644
--- a/app/Domains/Ticketing/Event/Events/EventDateSuspended.php
+++ b/app/Domains/Ticketing/Event/Events/EventDateSuspended.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Events;
+namespace App\Domains\Ticketing\Event\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 
diff --git a/app/Domains/Ticketing/Event/Models/EventDate.php b/app/Domains/Ticketing/Event/Models/EventDate.php
index 02add11..933e9f7 100644
--- a/app/Domains/Ticketing/Event/Models/EventDate.php
+++ b/app/Domains/Ticketing/Event/Models/EventDate.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Event\Models;
+namespace App\Domains\Ticketing\Event\Models;
 
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Enums\EventDateStatus;
-use App\Domains\Event\Services\EffectiveEventDateResolver;
-use App\Domains\Event\Services\EventDateTextFormatter;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Enums\EventDateStatus;
+use App\Domains\Ticketing\Event\Services\EffectiveEventDateResolver;
+use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Ticketing/Event/Models/EventDateChange.php b/app/Domains/Ticketing/Event/Models/EventDateChange.php
index 5fcbfab..1453907 100644
--- a/app/Domains/Ticketing/Event/Models/EventDateChange.php
+++ b/app/Domains/Ticketing/Event/Models/EventDateChange.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Event\Models;
+namespace App\Domains\Ticketing\Event\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Ticketing/Event/Models/EventDateChangeView.php b/app/Domains/Ticketing/Event/Models/EventDateChangeView.php
index 199418f..228365c 100644
--- a/app/Domains/Ticketing/Event/Models/EventDateChangeView.php
+++ b/app/Domains/Ticketing/Event/Models/EventDateChangeView.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Event\Models;
+namespace App\Domains\Ticketing\Event\Models;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Ticketing/Event/Requests/RescheduleEventDateRequest.php b/app/Domains/Ticketing/Event/Requests/RescheduleEventDateRequest.php
index 3573c8a..2bdb9f3 100644
--- a/app/Domains/Ticketing/Event/Requests/RescheduleEventDateRequest.php
+++ b/app/Domains/Ticketing/Event/Requests/RescheduleEventDateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Requests;
+namespace App\Domains\Ticketing\Event\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Event/Requests/StoreEventDateRequest.php b/app/Domains/Ticketing/Event/Requests/StoreEventDateRequest.php
index 74bbe0e..f20e025 100644
--- a/app/Domains/Ticketing/Event/Requests/StoreEventDateRequest.php
+++ b/app/Domains/Ticketing/Event/Requests/StoreEventDateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Requests;
+namespace App\Domains\Ticketing\Event\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Event/Requests/UpdateEventRequest.php b/app/Domains/Ticketing/Event/Requests/UpdateEventRequest.php
index 6867b03..148eb10 100644
--- a/app/Domains/Ticketing/Event/Requests/UpdateEventRequest.php
+++ b/app/Domains/Ticketing/Event/Requests/UpdateEventRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Requests;
+namespace App\Domains\Ticketing\Event\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Ticketing/Event/Resources/EventDateChangeResource.php b/app/Domains/Ticketing/Event/Resources/EventDateChangeResource.php
index 025e053..dbd0b56 100644
--- a/app/Domains/Ticketing/Event/Resources/EventDateChangeResource.php
+++ b/app/Domains/Ticketing/Event/Resources/EventDateChangeResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Event\Resources;
+namespace App\Domains\Ticketing\Event\Resources;
 
-use App\Domains\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Event/Resources/EventDateNoticeResource.php b/app/Domains/Ticketing/Event/Resources/EventDateNoticeResource.php
index dd661b8..a0fc019 100644
--- a/app/Domains/Ticketing/Event/Resources/EventDateNoticeResource.php
+++ b/app/Domains/Ticketing/Event/Resources/EventDateNoticeResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Resources;
+namespace App\Domains\Ticketing\Event\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Domains/Ticketing/Event/Resources/EventDateResource.php b/app/Domains/Ticketing/Event/Resources/EventDateResource.php
index 6ebba0b..44e9b21 100644
--- a/app/Domains/Ticketing/Event/Resources/EventDateResource.php
+++ b/app/Domains/Ticketing/Event/Resources/EventDateResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Event\Resources;
+namespace App\Domains\Ticketing\Event\Resources;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Event/Resources/EventResource.php b/app/Domains/Ticketing/Event/Resources/EventResource.php
index 150dcc7..3f9330e 100644
--- a/app/Domains/Ticketing/Event/Resources/EventResource.php
+++ b/app/Domains/Ticketing/Event/Resources/EventResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Event\Resources;
+namespace App\Domains\Ticketing\Event\Resources;
 
-use App\Domains\Event\Services\EventDateGroupingService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Event/Services/AffectedEventDatePurchaseResolver.php b/app/Domains/Ticketing/Event/Services/AffectedEventDatePurchaseResolver.php
index 23b7e04..3840b77 100644
--- a/app/Domains/Ticketing/Event/Services/AffectedEventDatePurchaseResolver.php
+++ b/app/Domains/Ticketing/Event/Services/AffectedEventDatePurchaseResolver.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 
diff --git a/app/Domains/Ticketing/Event/Services/EffectiveEventDateResolver.php b/app/Domains/Ticketing/Event/Services/EffectiveEventDateResolver.php
index f74db64..6b63259 100644
--- a/app/Domains/Ticketing/Event/Services/EffectiveEventDateResolver.php
+++ b/app/Domains/Ticketing/Event/Services/EffectiveEventDateResolver.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDate;
 
 class EffectiveEventDateResolver
 {
diff --git a/app/Domains/Ticketing/Event/Services/EventDateGroupingService.php b/app/Domains/Ticketing/Event/Services/EventDateGroupingService.php
index 83dff7c..96345b0 100644
--- a/app/Domains/Ticketing/Event/Services/EventDateGroupingService.php
+++ b/app/Domains/Ticketing/Event/Services/EventDateGroupingService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDate;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Collection;
 
diff --git a/app/Domains/Ticketing/Event/Services/EventDateInfoFormatter.php b/app/Domains/Ticketing/Event/Services/EventDateInfoFormatter.php
index 9442d14..20d6cf6 100644
--- a/app/Domains/Ticketing/Event/Services/EventDateInfoFormatter.php
+++ b/app/Domains/Ticketing/Event/Services/EventDateInfoFormatter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
 use Illuminate\Support\Collection;
 
 class EventDateInfoFormatter
diff --git a/app/Domains/Ticketing/Event/Services/EventDateNoticeFormatter.php b/app/Domains/Ticketing/Event/Services/EventDateNoticeFormatter.php
index 0a4c69d..22d6d4d 100644
--- a/app/Domains/Ticketing/Event/Services/EventDateNoticeFormatter.php
+++ b/app/Domains/Ticketing/Event/Services/EventDateNoticeFormatter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
 use Illuminate\Support\Collection;
 
 class EventDateNoticeFormatter
diff --git a/app/Domains/Ticketing/Event/Services/EventDateNoticeService.php b/app/Domains/Ticketing/Event/Services/EventDateNoticeService.php
index 239e3fa..d1f9fba 100644
--- a/app/Domains/Ticketing/Event/Services/EventDateNoticeService.php
+++ b/app/Domains/Ticketing/Event/Services/EventDateNoticeService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Event\Models\EventDateChangeView;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Models\EventDateChangeView;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Facades\DB;
 
 class EventDateNoticeService
diff --git a/app/Domains/Ticketing/Event/Services/EventDateTextFormatter.php b/app/Domains/Ticketing/Event/Services/EventDateTextFormatter.php
index 99d2f31..a36c280 100644
--- a/app/Domains/Ticketing/Event/Services/EventDateTextFormatter.php
+++ b/app/Domains/Ticketing/Event/Services/EventDateTextFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
 use DateTimeImmutable;
 
diff --git a/app/Domains/Ticketing/Event/Services/EventService.php b/app/Domains/Ticketing/Event/Services/EventService.php
index 7cecbd1..41ae189 100644
--- a/app/Domains/Ticketing/Event/Services/EventService.php
+++ b/app/Domains/Ticketing/Event/Services/EventService.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Domains\Event\Services;
+namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Services\InvalidateEventDateCartsService;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Catalog\Services\VariantReplacementService;
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Ticketing/Event/routes/adminapp.php b/app/Domains/Ticketing/Event/routes/adminapp.php
index 529e0b6..a975e98 100644
--- a/app/Domains/Ticketing/Event/routes/adminapp.php
+++ b/app/Domains/Ticketing/Event/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Event\Controllers\AdminApp\EventController;
+use App\Domains\Ticketing\Event\Controllers\AdminApp\EventController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Ticketing/Event/routes/api.php b/app/Domains/Ticketing/Event/routes/api.php
index 19a1261..bfe92e9 100644
--- a/app/Domains/Ticketing/Event/routes/api.php
+++ b/app/Domains/Ticketing/Event/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Event\Controllers\EventDateNoticeController;
+use App\Domains\Ticketing\Event\Controllers\EventDateNoticeController;
 use Illuminate\Support\Facades\Route;
 
 require __DIR__.'/adminapp.php';
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php
index 804c320..fb9ca45 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/AccommodationController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Controllers;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Controllers;
 
-use App\Domains\FiestaFutbolInfantil\Requests\UpsertAccommodationVariantsRequest;
-use App\Domains\FiestaFutbolInfantil\Resources\AccommodationResource;
-use App\Domains\FiestaFutbolInfantil\Services\AccommodationService;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpsertAccommodationVariantsRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Resources\AccommodationResource;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Services\AccommodationService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php
index c67aef4..4810c47 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/CategoryVisibilityController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Controllers;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Controllers;
 
-use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
-use App\Domains\FiestaFutbolInfantil\Requests\UpdateCategoryVisibilityRequest;
-use App\Domains\FiestaFutbolInfantil\Services\CategoryVisibilityService;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpdateCategoryVisibilityRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Services\CategoryVisibilityService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php
index 9203341..68b1163 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/EntryController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Controllers;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Controllers;
 
-use App\Domains\FiestaFutbolInfantil\Requests\UpsertEntriesRequest;
-use App\Domains\FiestaFutbolInfantil\Resources\EntryResource;
-use App\Domains\FiestaFutbolInfantil\Services\EntryService;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpsertEntriesRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Resources\EntryResource;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Services\EntryService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php
index 103bdf0..e580cc8 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/FoodController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Controllers;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Controllers;
 
-use App\Domains\FiestaFutbolInfantil\Requests\UpdateHistoricalFoodStockRequest;
-use App\Domains\FiestaFutbolInfantil\Requests\UpsertFoodVariantsRequest;
-use App\Domains\FiestaFutbolInfantil\Resources\FoodResource;
-use App\Domains\FiestaFutbolInfantil\Services\FoodService;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpdateHistoricalFoodStockRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpsertFoodVariantsRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Resources\FoodResource;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Services\FoodService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php
index cbce5a5..10b0307 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Controllers/MerchandiseController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Controllers;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Controllers;
 
-use App\Domains\FiestaFutbolInfantil\Requests\UpsertMerchandiseRequest;
-use App\Domains\FiestaFutbolInfantil\Resources\MerchandiseResource;
-use App\Domains\FiestaFutbolInfantil\Services\MerchandiseService;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Requests\UpsertMerchandiseRequest;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Resources\MerchandiseResource;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Services\MerchandiseService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Enums/FiestaCategory.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Enums/FiestaCategory.php
index 652e4a8..8a63542 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Enums/FiestaCategory.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Enums/FiestaCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Enums;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Enums;
 
 enum FiestaCategory: string
 {
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php
index 49def22..c8ed922 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateCategoryVisibilityRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php
index b75832d..aa78462 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpdateHistoricalFoodStockRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php
index 61fac42..d275c48 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertAccommodationVariantsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php
index 6a993e9..6827fc4 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertEntriesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php
index 8e6b918..164ca98 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertFoodVariantsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php
index 2283b55..862a59a 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Requests/UpsertMerchandiseRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Requests;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php
index e674ff4..b3cb318 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/AccommodationResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Resources;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php
index 9e32742..efce8a9 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/EntryResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Resources;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php
index e3e854c..436e62d 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/FoodResource.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Resources;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Enums\EventDateStatus;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Models\EventDateChange;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Enums\EventDateStatus;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php
index 68f1c9e..2b6f2a2 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Resources/MerchandiseResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Resources;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Resources;
 
-use App\Domains\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php
index 4acae3f..a299d7c 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/AccommodationService.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Services;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Services;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/CategoryVisibilityService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/CategoryVisibilityService.php
index d1fb4d5..99198ba 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/CategoryVisibilityService.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/CategoryVisibilityService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Services;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Services;
 
-use App\Domains\Catalog\Models\Category;
-use App\Domains\FiestaFutbolInfantil\Enums\FiestaCategory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Enums\FiestaCategory;
+use App\Domains\Core\Tenant\Models\Tenant;
 
 class CategoryVisibilityService
 {
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php
index 26372a2..95a2b33 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/EntryService.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Services;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Services;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php
index d9a4064..1a86cf0 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/FoodService.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Services;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Services;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Event\Enums\EventDateStatus;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Ticketing\Event\Enums\EventDateStatus;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php
index 29111c8..b2a4cb8 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/Services/MerchandiseService.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\FiestaFutbolInfantil\Services;
+namespace App\Domains\Ticketing\FiestaFutbolInfantil\Services;
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php b/app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php
index 242cad0..ff248d9 100644
--- a/app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php
+++ b/app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Domains\FiestaFutbolInfantil\Controllers\AccommodationController;
-use App\Domains\FiestaFutbolInfantil\Controllers\CategoryVisibilityController;
-use App\Domains\FiestaFutbolInfantil\Controllers\EntryController;
-use App\Domains\FiestaFutbolInfantil\Controllers\FoodController;
-use App\Domains\FiestaFutbolInfantil\Controllers\MerchandiseController;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Controllers\AccommodationController;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Controllers\CategoryVisibilityController;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Controllers\EntryController;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Controllers\FoodController;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Controllers\MerchandiseController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php
index d041fe6..6106ddd 100644
--- a/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php
+++ b/app/Domains/Ticketing/Ticket/Controllers/AdminApp/TicketController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Domains\Ticket\Controllers\AdminApp;
+namespace App\Domains\Ticketing\Ticket\Controllers\AdminApp;
 
-use App\Domains\Ticket\Requests\AdminAppTicketExportRequest;
-use App\Domains\Ticket\Requests\AdminAppTicketIndexRequest;
-use App\Domains\Ticket\Requests\AdminAppTicketRefundRequest;
-use App\Domains\Ticket\Resources\AdminApp\AdminAppTicketCollection;
-use App\Domains\Ticket\Resources\AdminApp\AdminAppTicketRefundCalculationResource;
-use App\Domains\Ticket\Resources\AdminApp\AdminAppTicketResource;
-use App\Domains\Ticket\Services\AdminAppTicketExcelService;
-use App\Domains\Ticket\Services\AdminAppTicketPdfService;
-use App\Domains\Ticket\Services\AdminAppTicketService;
+use App\Domains\Ticketing\Ticket\Requests\AdminAppTicketExportRequest;
+use App\Domains\Ticketing\Ticket\Requests\AdminAppTicketIndexRequest;
+use App\Domains\Ticketing\Ticket\Requests\AdminAppTicketRefundRequest;
+use App\Domains\Ticketing\Ticket\Resources\AdminApp\AdminAppTicketCollection;
+use App\Domains\Ticketing\Ticket\Resources\AdminApp\AdminAppTicketRefundCalculationResource;
+use App\Domains\Ticketing\Ticket\Resources\AdminApp\AdminAppTicketResource;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketExcelService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketPdfService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Ticketing/Ticket/Controllers/Scanner/ScanAttemptController.php b/app/Domains/Ticketing/Ticket/Controllers/Scanner/ScanAttemptController.php
index 8ca53df..f4ad5fc 100644
--- a/app/Domains/Ticketing/Ticket/Controllers/Scanner/ScanAttemptController.php
+++ b/app/Domains/Ticketing/Ticket/Controllers/Scanner/ScanAttemptController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Ticket\Controllers\Scanner;
+namespace App\Domains\Ticketing\Ticket\Controllers\Scanner;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Ticket\Requests\ScanAttemptIndexRequest;
-use App\Domains\Ticket\Resources\Scanner\ScanAttemptResource;
-use App\Domains\Ticket\Resources\Scanner\ScannerScanResultResource;
-use App\Domains\Ticket\Services\ScannerTicketService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Ticket\Requests\ScanAttemptIndexRequest;
+use App\Domains\Ticketing\Ticket\Resources\Scanner\ScanAttemptResource;
+use App\Domains\Ticketing\Ticket\Resources\Scanner\ScannerScanResultResource;
+use App\Domains\Ticketing\Ticket\Services\ScannerTicketService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
diff --git a/app/Domains/Ticketing/Ticket/Controllers/Scanner/TicketController.php b/app/Domains/Ticketing/Ticket/Controllers/Scanner/TicketController.php
index d079cd7..6bc0911 100644
--- a/app/Domains/Ticketing/Ticket/Controllers/Scanner/TicketController.php
+++ b/app/Domains/Ticketing/Ticket/Controllers/Scanner/TicketController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Ticket\Controllers\Scanner;
+namespace App\Domains\Ticketing\Ticket\Controllers\Scanner;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Ticket\Resources\Scanner\ScannerScanResultResource;
-use App\Domains\Ticket\Resources\TicketResource;
-use App\Domains\Ticket\Services\ScannerTicketService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Ticket\Resources\Scanner\ScannerScanResultResource;
+use App\Domains\Ticketing\Ticket\Resources\TicketResource;
+use App\Domains\Ticketing\Ticket\Services\ScannerTicketService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/Ticket/Controllers/TicketController.php b/app/Domains/Ticketing/Ticket/Controllers/TicketController.php
index 508a924..6ccc548 100644
--- a/app/Domains/Ticketing/Ticket/Controllers/TicketController.php
+++ b/app/Domains/Ticketing/Ticket/Controllers/TicketController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Domains\Ticket\Controllers;
+namespace App\Domains\Ticketing\Ticket\Controllers;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Requests\DownloadTicketsPdfRequest;
-use App\Domains\Ticket\Resources\TicketResource;
-use App\Domains\Ticket\Services\TicketPdfService;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketNotAvailableException;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Requests\DownloadTicketsPdfRequest;
+use App\Domains\Ticketing\Ticket\Resources\TicketResource;
+use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
+use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Domains/Ticketing/Ticket/Enums/ScanAttemptResult.php b/app/Domains/Ticketing/Ticket/Enums/ScanAttemptResult.php
index 6516803..f386bd2 100644
--- a/app/Domains/Ticketing/Ticket/Enums/ScanAttemptResult.php
+++ b/app/Domains/Ticketing/Ticket/Enums/ScanAttemptResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Enums;
+namespace App\Domains\Ticketing\Ticket\Enums;
 
 enum ScanAttemptResult: string
 {
diff --git a/app/Domains/Ticketing/Ticket/Enums/ValidityTimeType.php b/app/Domains/Ticketing/Ticket/Enums/ValidityTimeType.php
index b17089c..8557feb 100644
--- a/app/Domains/Ticketing/Ticket/Enums/ValidityTimeType.php
+++ b/app/Domains/Ticketing/Ticket/Enums/ValidityTimeType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Enums;
+namespace App\Domains\Ticketing\Ticket\Enums;
 
 enum ValidityTimeType: string
 {
diff --git a/app/Domains/Ticketing/Ticket/Exceptions/TicketGenerationException.php b/app/Domains/Ticketing/Ticket/Exceptions/TicketGenerationException.php
index 77ff60c..95ceb10 100644
--- a/app/Domains/Ticketing/Ticket/Exceptions/TicketGenerationException.php
+++ b/app/Domains/Ticketing/Ticket/Exceptions/TicketGenerationException.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Ticket\Exceptions;
+namespace App\Domains\Ticketing\Ticket\Exceptions;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use RuntimeException;
 
 class TicketGenerationException extends RuntimeException
diff --git a/app/Domains/Ticketing/Ticket/Exceptions/TicketNotAvailableException.php b/app/Domains/Ticketing/Ticket/Exceptions/TicketNotAvailableException.php
index 7fac93e..74e8878 100644
--- a/app/Domains/Ticketing/Ticket/Exceptions/TicketNotAvailableException.php
+++ b/app/Domains/Ticketing/Ticket/Exceptions/TicketNotAvailableException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Exceptions;
+namespace App\Domains\Ticketing\Ticket\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
diff --git a/app/Domains/Ticketing/Ticket/Listeners/GenerateTicketsForPaidPurchase.php b/app/Domains/Ticketing/Ticket/Listeners/GenerateTicketsForPaidPurchase.php
index dfeb404..ddbd85e 100644
--- a/app/Domains/Ticketing/Ticket/Listeners/GenerateTicketsForPaidPurchase.php
+++ b/app/Domains/Ticketing/Ticket/Listeners/GenerateTicketsForPaidPurchase.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Ticket\Listeners;
+namespace App\Domains\Ticketing\Ticket\Listeners;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Purchase\Events\PurchasePaid;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Ticket\Exceptions\TicketGenerationException;
-use App\Domains\Ticket\Services\TicketGeneratorService;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
+use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService;
 
 class GenerateTicketsForPaidPurchase
 {
diff --git a/app/Domains/Ticketing/Ticket/Models/ScanAttempt.php b/app/Domains/Ticketing/Ticket/Models/ScanAttempt.php
index f778e60..a15e284 100644
--- a/app/Domains/Ticketing/Ticket/Models/ScanAttempt.php
+++ b/app/Domains/Ticketing/Ticket/Models/ScanAttempt.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Ticket\Models;
+namespace App\Domains\Ticketing\Ticket\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ScanAttemptResult;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Ticketing/Ticket/Models/Ticket.php b/app/Domains/Ticketing/Ticket/Models/Ticket.php
index 31041db..f4c0311 100644
--- a/app/Domains/Ticketing/Ticket/Models/Ticket.php
+++ b/app/Domains/Ticketing/Ticket/Models/Ticket.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Ticket\Models;
+namespace App\Domains\Ticketing\Ticket\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Logging\Models\Concerns\LogsValueChanges;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Services\ResolvedTicketValidity;
-use App\Domains\Ticket\Services\ResolvedValidityGroup;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Shared\Logging\Models\Concerns\LogsValueChanges;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
+use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;
+use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Domains/Ticketing/Ticket/Models/TicketRefund.php b/app/Domains/Ticketing/Ticket/Models/TicketRefund.php
index 6af68f6..c6760c2 100644
--- a/app/Domains/Ticketing/Ticket/Models/TicketRefund.php
+++ b/app/Domains/Ticketing/Ticket/Models/TicketRefund.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Models;
+namespace App\Domains\Ticketing\Ticket\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Purchase\Models\PurchaseItem;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Domains/Ticketing/Ticket/Models/ValidityTime.php b/app/Domains/Ticketing/Ticket/Models/ValidityTime.php
index 9da996e..a971291 100644
--- a/app/Domains/Ticketing/Ticket/Models/ValidityTime.php
+++ b/app/Domains/Ticketing/Ticket/Models/ValidityTime.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Ticket\Models;
+namespace App\Domains\Ticketing\Ticket\Models;
 
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Enums\ValidityTimeType;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
diff --git a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketExportRequest.php b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketExportRequest.php
index a55a60c..30394bf 100644
--- a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketExportRequest.php
+++ b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketExportRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Requests;
+namespace App\Domains\Ticketing\Ticket\Requests;
 
-use App\Domains\Shared\Rules\ValidTimezone;
+use App\Shared\Rules\ValidTimezone;
 
 class AdminAppTicketExportRequest extends AdminAppTicketIndexRequest
 {
diff --git a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketIndexRequest.php b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketIndexRequest.php
index 90d8e35..4bcf8ed 100644
--- a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketIndexRequest.php
+++ b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketIndexRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Requests;
+namespace App\Domains\Ticketing\Ticket\Requests;
 
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\AdminAppTicketColumnService;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketRefundRequest.php b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketRefundRequest.php
index 4de9323..5d880b8 100644
--- a/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketRefundRequest.php
+++ b/app/Domains/Ticketing/Ticket/Requests/AdminAppTicketRefundRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Requests;
+namespace App\Domains\Ticketing\Ticket\Requests;
 
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Domains/Ticketing/Ticket/Requests/DownloadTicketsPdfRequest.php b/app/Domains/Ticketing/Ticket/Requests/DownloadTicketsPdfRequest.php
index ae540e0..9ed95a7 100644
--- a/app/Domains/Ticketing/Ticket/Requests/DownloadTicketsPdfRequest.php
+++ b/app/Domains/Ticketing/Ticket/Requests/DownloadTicketsPdfRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Requests;
+namespace App\Domains\Ticketing\Ticket\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Ticket/Requests/ScanAttemptIndexRequest.php b/app/Domains/Ticketing/Ticket/Requests/ScanAttemptIndexRequest.php
index 4bb06af..3aaab3a 100644
--- a/app/Domains/Ticketing/Ticket/Requests/ScanAttemptIndexRequest.php
+++ b/app/Domains/Ticketing/Ticket/Requests/ScanAttemptIndexRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Requests;
+namespace App\Domains\Ticketing\Ticket\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketCollection.php b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketCollection.php
index 3b7c0e6..35e01b3 100644
--- a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketCollection.php
+++ b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketCollection.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Resources\AdminApp;
+namespace App\Domains\Ticketing\Ticket\Resources\AdminApp;
 
-use App\Domains\Ticket\Services\AdminAppTicketResult;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketResult;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
diff --git a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketRefundCalculationResource.php b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketRefundCalculationResource.php
index 40ebac4..df2191c 100644
--- a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketRefundCalculationResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketRefundCalculationResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Resources\AdminApp;
+namespace App\Domains\Ticketing\Ticket\Resources\AdminApp;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketResource.php b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketResource.php
index 4205f4e..08b4615 100644
--- a/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/AdminApp/AdminAppTicketResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Ticket\Resources\AdminApp;
+namespace App\Domains\Ticketing\Ticket\Resources\AdminApp;
 
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Resources\TicketResource;
-use App\Domains\Ticket\Services\AdminAppTicketRowService;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Resources\TicketResource;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketRowService;
 use Illuminate\Http\Request;
 
 /** @mixin Ticket */
diff --git a/app/Domains/Ticketing/Ticket/Resources/Scanner/ScanAttemptResource.php b/app/Domains/Ticketing/Ticket/Resources/Scanner/ScanAttemptResource.php
index 0d777b6..5155e7e 100644
--- a/app/Domains/Ticketing/Ticket/Resources/Scanner/ScanAttemptResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/Scanner/ScanAttemptResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Resources\Scanner;
+namespace App\Domains\Ticketing\Ticket\Resources\Scanner;
 
-use App\Domains\Ticket\Enums\ScanAttemptResult;
-use App\Domains\Ticket\Models\ScanAttempt;
+use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Ticket/Resources/Scanner/ScannerScanResultResource.php b/app/Domains/Ticketing/Ticket/Resources/Scanner/ScannerScanResultResource.php
index 1b38a88..6930550 100644
--- a/app/Domains/Ticketing/Ticket/Resources/Scanner/ScannerScanResultResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/Scanner/ScannerScanResultResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Resources\Scanner;
+namespace App\Domains\Ticketing\Ticket\Resources\Scanner;
 
-use App\Domains\Ticket\Models\ScanAttempt;
-use App\Domains\Ticket\Resources\TicketResource;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
+use App\Domains\Ticketing\Ticket\Resources\TicketResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Ticket/Resources/TicketResource.php b/app/Domains/Ticketing/Ticket/Resources/TicketResource.php
index 16f7531..836c19a 100644
--- a/app/Domains/Ticketing/Ticket/Resources/TicketResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/TicketResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Resources;
+namespace App\Domains\Ticketing\Ticket\Resources;
 
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Ticket/Resources/ValidityTimeResource.php b/app/Domains/Ticketing/Ticket/Resources/ValidityTimeResource.php
index 912182c..892073a 100644
--- a/app/Domains/Ticketing/Ticket/Resources/ValidityTimeResource.php
+++ b/app/Domains/Ticketing/Ticket/Resources/ValidityTimeResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Resources;
+namespace App\Domains\Ticketing\Ticket\Resources;
 
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketColumnService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketColumnService.php
index 173db1b..ba2f8b0 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketColumnService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketColumnService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 
 class AdminAppTicketColumnService
 {
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketExcelService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketExcelService.php
index d89024f..b61959d 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketExcelService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketExcelService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Carbon\CarbonInterface;
 use Illuminate\Support\Collection;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketPdfService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketPdfService.php
index 83e85ac..d9b98cb 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketPdfService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketPdfService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\PDF as DomPdf;
 use Illuminate\Http\Response;
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketReportService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketReportService.php
index 4c2accc..7afda6d 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketReportService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketReportService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 
 class AdminAppTicketReportService
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketResult.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketResult.php
index bce92bc..be6137d 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketResult.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketResult.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Pagination\LengthAwarePaginator;
 
 final readonly class AdminAppTicketResult
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketRowService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketRowService.php
index cf831cf..23dc41f 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketRowService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketRowService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 
 class AdminAppTicketRowService
diff --git a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php
index 1c626c9..6c3f3f0 100644
--- a/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php
+++ b/app/Domains/Ticketing/Ticket/Services/AdminAppTicketService.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Purchase\Services\PurchaseRefundSummaryService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php
index 95c0b40..d403ded 100644
--- a/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php
+++ b/app/Domains/Ticketing/Ticket/Services/BackfillRefundedUnitsService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Domains/Ticketing/Ticket/Services/LoadTestTicketDatasetService.php b/app/Domains/Ticketing/Ticket/Services/LoadTestTicketDatasetService.php
index 89bf279..07edadc 100644
--- a/app/Domains/Ticketing/Ticket/Services/LoadTestTicketDatasetService.php
+++ b/app/Domains/Ticketing/Ticket/Services/LoadTestTicketDatasetService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
diff --git a/app/Domains/Ticketing/Ticket/Services/ResolvedTicketValidity.php b/app/Domains/Ticketing/Ticket/Services/ResolvedTicketValidity.php
index ce6e3ca..4ea9312 100644
--- a/app/Domains/Ticketing/Ticket/Services/ResolvedTicketValidity.php
+++ b/app/Domains/Ticketing/Ticket/Services/ResolvedTicketValidity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
 use Carbon\CarbonInterface;
 use Illuminate\Support\Collection;
diff --git a/app/Domains/Ticketing/Ticket/Services/ResolvedValidityGroup.php b/app/Domains/Ticketing/Ticket/Services/ResolvedValidityGroup.php
index fad6d97..8d63db7 100644
--- a/app/Domains/Ticketing/Ticket/Services/ResolvedValidityGroup.php
+++ b/app/Domains/Ticketing/Ticket/Services/ResolvedValidityGroup.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Carbon\CarbonInterface;
 use Illuminate\Support\Collection;
 
diff --git a/app/Domains/Ticketing/Ticket/Services/ScannerTicketService.php b/app/Domains/Ticketing/Ticket/Services/ScannerTicketService.php
index e696de6..9b3b3b8 100644
--- a/app/Domains/Ticketing/Ticket/Services/ScannerTicketService.php
+++ b/app/Domains/Ticketing/Ticket/Services/ScannerTicketService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Ticket\Enums\ScanAttemptResult;
-use App\Domains\Ticket\Models\ScanAttempt;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Pagination\LengthAwarePaginator;
diff --git a/app/Domains/Ticketing/Ticket/Services/TicketGeneratorService.php b/app/Domains/Ticketing/Ticket/Services/TicketGeneratorService.php
index a3d6c7e..4b3b09c 100644
--- a/app/Domains/Ticketing/Ticket/Services/TicketGeneratorService.php
+++ b/app/Domains/Ticketing/Ticket/Services/TicketGeneratorService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Ticket\Exceptions\TicketGenerationException;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/app/Domains/Ticketing/Ticket/Services/TicketPdfService.php b/app/Domains/Ticketing/Ticket/Services/TicketPdfService.php
index 211a4cf..b2fd900 100644
--- a/app/Domains/Ticketing/Ticket/Services/TicketPdfService.php
+++ b/app/Domains/Ticketing/Ticket/Services/TicketPdfService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Barryvdh\DomPDF\PDF as DomPdf;
 use Endroid\QrCode\ErrorCorrectionLevel;
diff --git a/app/Domains/Ticketing/Ticket/Services/TicketPresentationResolver.php b/app/Domains/Ticketing/Ticket/Services/TicketPresentationResolver.php
index f2e7681..642f241 100644
--- a/app/Domains/Ticketing/Ticket/Services/TicketPresentationResolver.php
+++ b/app/Domains/Ticketing/Ticket/Services/TicketPresentationResolver.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Services\EffectiveEventDateResolver;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Services\EffectiveEventDateResolver;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 
 class TicketPresentationResolver
 {
diff --git a/app/Domains/Ticketing/Ticket/Services/TicketValidityResolver.php b/app/Domains/Ticketing/Ticket/Services/TicketValidityResolver.php
index 69714d5..c2942eb 100644
--- a/app/Domains/Ticketing/Ticket/Services/TicketValidityResolver.php
+++ b/app/Domains/Ticketing/Ticket/Services/TicketValidityResolver.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Ticket\Services;
+namespace App\Domains\Ticketing\Ticket\Services;
 
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Models\VariantDefinition;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Services\EffectiveEventDateResolver;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\VariantDefinition;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Services\EffectiveEventDateResolver;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/app/Domains/Ticketing/Ticket/routes/adminapp.php b/app/Domains/Ticketing/Ticket/routes/adminapp.php
index 66abe50..b785612 100644
--- a/app/Domains/Ticketing/Ticket/routes/adminapp.php
+++ b/app/Domains/Ticketing/Ticket/routes/adminapp.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Ticket\Controllers\AdminApp\TicketController;
+use App\Domains\Ticketing\Ticket\Controllers\AdminApp\TicketController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
diff --git a/app/Domains/Ticketing/Ticket/routes/api.php b/app/Domains/Ticketing/Ticket/routes/api.php
index 8bcdb8e..8c6666a 100644
--- a/app/Domains/Ticketing/Ticket/routes/api.php
+++ b/app/Domains/Ticketing/Ticket/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Ticket\Controllers\TicketController;
+use App\Domains\Ticketing\Ticket\Controllers\TicketController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('tenants/{tenant:codigo}')
diff --git a/app/Domains/Ticketing/Ticket/routes/scanner.php b/app/Domains/Ticketing/Ticket/routes/scanner.php
index a92ccbb..e110a23 100644
--- a/app/Domains/Ticketing/Ticket/routes/scanner.php
+++ b/app/Domains/Ticketing/Ticket/routes/scanner.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Ticket\Controllers\Scanner\ScanAttemptController;
-use App\Domains\Ticket\Controllers\Scanner\TicketController;
+use App\Domains\Ticketing\Ticket\Controllers\Scanner\ScanAttemptController;
+use App\Domains\Ticketing\Ticket\Controllers\Scanner\TicketController;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware(['auth:sanctum', 'scanner.tenant'])
diff --git a/app/Http/Middleware/EnsureAdminAppTenant.php b/app/Http/Middleware/EnsureAdminAppTenant.php
index 83c5c68..0ecab48 100644
--- a/app/Http/Middleware/EnsureAdminAppTenant.php
+++ b/app/Http/Middleware/EnsureAdminAppTenant.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Closure;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/EnsureScannerTenant.php b/app/Http/Middleware/EnsureScannerTenant.php
index 3cab1f7..a8f5f00 100644
--- a/app/Http/Middleware/EnsureScannerTenant.php
+++ b/app/Http/Middleware/EnsureScannerTenant.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Closure;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\Request;
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index d528318..cf45c9c 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,19 +2,19 @@
 
 namespace App\Providers;
 
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Policies\IntegrationPolicy;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Notification\Events\UserRegistered;
-use App\Domains\Notification\Listeners\SendEventDateRescheduledEmails;
-use App\Domains\Notification\Listeners\SendEventDateSuspendedEmails;
-use App\Domains\Notification\Listeners\SendPasswordResetEmail;
-use App\Domains\Notification\Listeners\SendPurchaseConfirmedEmail;
-use App\Domains\Notification\Listeners\SendWelcomeEmail;
-use App\Domains\Purchase\Events\PurchasePaid;
-use App\Domains\Ticket\Listeners\GenerateTicketsForPaidPurchase;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Policies\IntegrationPolicy;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Shared\Notification\Events\UserRegistered;
+use App\Shared\Notification\Listeners\SendEventDateRescheduledEmails;
+use App\Shared\Notification\Listeners\SendEventDateSuspendedEmails;
+use App\Shared\Notification\Listeners\SendPasswordResetEmail;
+use App\Shared\Notification\Listeners\SendPurchaseConfirmedEmail;
+use App\Shared\Notification\Listeners\SendWelcomeEmail;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
+use App\Domains\Ticketing\Ticket\Listeners\GenerateTicketsForPaidPurchase;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
diff --git a/app/Shared/Attachable/Enums/AttachmentType.php b/app/Shared/Attachable/Enums/AttachmentType.php
index 3b7237d..04d51fb 100644
--- a/app/Shared/Attachable/Enums/AttachmentType.php
+++ b/app/Shared/Attachable/Enums/AttachmentType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Attachable\Enums;
+namespace App\Shared\Attachable\Enums;
 
 enum AttachmentType: string
 {
diff --git a/app/Shared/Attachable/Exceptions/AttachmentStorageException.php b/app/Shared/Attachable/Exceptions/AttachmentStorageException.php
index 3919f8b..e93a001 100644
--- a/app/Shared/Attachable/Exceptions/AttachmentStorageException.php
+++ b/app/Shared/Attachable/Exceptions/AttachmentStorageException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Attachable\Exceptions;
+namespace App\Shared\Attachable\Exceptions;
 
 use RuntimeException;
 
diff --git a/app/Shared/Attachable/Models/Attachment.php b/app/Shared/Attachable/Models/Attachment.php
index 350d487..df4ad7d 100644
--- a/app/Shared/Attachable/Models/Attachment.php
+++ b/app/Shared/Attachable/Models/Attachment.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Attachable\Models;
+namespace App\Shared\Attachable\Models;
 
-use App\Domains\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Enums\AttachmentType;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Shared/Attachable/Models/AttachmentCrop.php b/app/Shared/Attachable/Models/AttachmentCrop.php
index 7487d25..f789a5b 100644
--- a/app/Shared/Attachable/Models/AttachmentCrop.php
+++ b/app/Shared/Attachable/Models/AttachmentCrop.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Attachable\Models;
+namespace App\Shared\Attachable\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Shared/Attachable/Services/AttachmentService.php b/app/Shared/Attachable/Services/AttachmentService.php
index df0b72f..3df8438 100644
--- a/app/Shared/Attachable/Services/AttachmentService.php
+++ b/app/Shared/Attachable/Services/AttachmentService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Attachable\Services;
+namespace App\Shared\Attachable\Services;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Exceptions\AttachmentStorageException;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Exceptions\AttachmentStorageException;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
diff --git a/app/Shared/Enums/FieldType.php b/app/Shared/Enums/FieldType.php
index eb11b2f..75dc186 100644
--- a/app/Shared/Enums/FieldType.php
+++ b/app/Shared/Enums/FieldType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Shared\Enums;
+namespace App\Shared\Enums;
 
 enum FieldType: string
 {
diff --git a/app/Shared/Forms/Controllers/AdminApp/EntryFormController.php b/app/Shared/Forms/Controllers/AdminApp/EntryFormController.php
index 518425e..0398f8b 100644
--- a/app/Shared/Forms/Controllers/AdminApp/EntryFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/EntryFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\EntryFormResource;
-use App\Domains\Forms\Services\EntryFormService;
+use App\Shared\Forms\Resources\EntryFormResource;
+use App\Shared\Forms\Services\EntryFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/EventFormController.php b/app/Shared/Forms/Controllers/AdminApp/EventFormController.php
index 05a2706..55514d8 100644
--- a/app/Shared/Forms/Controllers/AdminApp/EventFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/EventFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\EventFormResource;
-use App\Domains\Forms\Services\EventFormService;
+use App\Shared\Forms\Resources\EventFormResource;
+use App\Shared\Forms\Services\EventFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/FoodFormController.php b/app/Shared/Forms/Controllers/AdminApp/FoodFormController.php
index cb2380f..92c4ffe 100644
--- a/app/Shared/Forms/Controllers/AdminApp/FoodFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/FoodFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\FoodFormResource;
-use App\Domains\Forms\Services\FoodFormService;
+use App\Shared\Forms\Resources\FoodFormResource;
+use App\Shared\Forms\Services\FoodFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/MerchandiseFormController.php b/app/Shared/Forms/Controllers/AdminApp/MerchandiseFormController.php
index 6b38675..404642b 100644
--- a/app/Shared/Forms/Controllers/AdminApp/MerchandiseFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/MerchandiseFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\MerchandiseFormResource;
-use App\Domains\Forms\Services\MerchandiseFormService;
+use App\Shared\Forms\Resources\MerchandiseFormResource;
+use App\Shared\Forms\Services\MerchandiseFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/SaleFormController.php b/app/Shared/Forms/Controllers/AdminApp/SaleFormController.php
index f17b0a0..b0c265e 100644
--- a/app/Shared/Forms/Controllers/AdminApp/SaleFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/SaleFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\SaleFormResource;
-use App\Domains\Forms\Services\SaleFormService;
+use App\Shared\Forms\Resources\SaleFormResource;
+use App\Shared\Forms\Services\SaleFormService;
 use App\Http\Controllers\Controller;
 
 class SaleFormController extends Controller
diff --git a/app/Shared/Forms/Controllers/AdminApp/StaffFormController.php b/app/Shared/Forms/Controllers/AdminApp/StaffFormController.php
index e46fec6..bcbc9a2 100644
--- a/app/Shared/Forms/Controllers/AdminApp/StaffFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/StaffFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\StaffFormResource;
-use App\Domains\Forms\Services\StaffFormService;
+use App\Shared\Forms\Resources\StaffFormResource;
+use App\Shared\Forms\Services\StaffFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/TicketFilterFormController.php b/app/Shared/Forms/Controllers/AdminApp/TicketFilterFormController.php
index d6c1201..d9c74ab 100644
--- a/app/Shared/Forms/Controllers/AdminApp/TicketFilterFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/TicketFilterFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\TicketFilterFormResource;
-use App\Domains\Forms\Services\TicketFilterFormService;
+use App\Shared\Forms\Resources\TicketFilterFormResource;
+use App\Shared\Forms\Services\TicketFilterFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Controllers/AdminApp/TicketFormController.php b/app/Shared/Forms/Controllers/AdminApp/TicketFormController.php
index 5dc3936..3cb98cf 100644
--- a/app/Shared/Forms/Controllers/AdminApp/TicketFormController.php
+++ b/app/Shared/Forms/Controllers/AdminApp/TicketFormController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Controllers\AdminApp;
+namespace App\Shared\Forms\Controllers\AdminApp;
 
-use App\Domains\Forms\Resources\TicketFormResource;
-use App\Domains\Forms\Services\TicketFormService;
+use App\Shared\Forms\Resources\TicketFormResource;
+use App\Shared\Forms\Services\TicketFormService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
diff --git a/app/Shared/Forms/Resources/EntryFormResource.php b/app/Shared/Forms/Resources/EntryFormResource.php
index 87f2bef..6d45427 100644
--- a/app/Shared/Forms/Resources/EntryFormResource.php
+++ b/app/Shared/Forms/Resources/EntryFormResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Shared/Forms/Resources/EventFormResource.php b/app/Shared/Forms/Resources/EventFormResource.php
index 0cfd51d..1d6898e 100644
--- a/app/Shared/Forms/Resources/EventFormResource.php
+++ b/app/Shared/Forms/Resources/EventFormResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Forms/Resources/FoodFormResource.php b/app/Shared/Forms/Resources/FoodFormResource.php
index 611b2b9..4136c79 100644
--- a/app/Shared/Forms/Resources/FoodFormResource.php
+++ b/app/Shared/Forms/Resources/FoodFormResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
diff --git a/app/Shared/Forms/Resources/MerchandiseFormResource.php b/app/Shared/Forms/Resources/MerchandiseFormResource.php
index c8fa453..bffa9e4 100644
--- a/app/Shared/Forms/Resources/MerchandiseFormResource.php
+++ b/app/Shared/Forms/Resources/MerchandiseFormResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
-use App\Domains\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Collection;
diff --git a/app/Shared/Forms/Resources/SaleFormResource.php b/app/Shared/Forms/Resources/SaleFormResource.php
index 8083a9f..156139a 100644
--- a/app/Shared/Forms/Resources/SaleFormResource.php
+++ b/app/Shared/Forms/Resources/SaleFormResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Forms/Resources/SocialMediaOptionResource.php b/app/Shared/Forms/Resources/SocialMediaOptionResource.php
index c2d5687..8236373 100644
--- a/app/Shared/Forms/Resources/SocialMediaOptionResource.php
+++ b/app/Shared/Forms/Resources/SocialMediaOptionResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
-use App\Domains\Tenant\Models\SocialMedia;
+use App\Domains\Core\Tenant\Models\SocialMedia;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Shared/Forms/Resources/StaffFormResource.php b/app/Shared/Forms/Resources/StaffFormResource.php
index 28df1d4..0177cd6 100644
--- a/app/Shared/Forms/Resources/StaffFormResource.php
+++ b/app/Shared/Forms/Resources/StaffFormResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Forms/Resources/TicketFilterFormResource.php b/app/Shared/Forms/Resources/TicketFilterFormResource.php
index f82513c..0f22c83 100644
--- a/app/Shared/Forms/Resources/TicketFilterFormResource.php
+++ b/app/Shared/Forms/Resources/TicketFilterFormResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Forms/Resources/TicketFormResource.php b/app/Shared/Forms/Resources/TicketFormResource.php
index dcaa7a9..a0b493d 100644
--- a/app/Shared/Forms/Resources/TicketFormResource.php
+++ b/app/Shared/Forms/Resources/TicketFormResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Forms\Resources;
+namespace App\Shared\Forms\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Forms/Services/EntryFormService.php b/app/Shared/Forms/Services/EntryFormService.php
index 33311dc..afa88eb 100644
--- a/app/Shared/Forms/Services/EntryFormService.php
+++ b/app/Shared/Forms/Services/EntryFormService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 
 class EntryFormService
diff --git a/app/Shared/Forms/Services/EventFormService.php b/app/Shared/Forms/Services/EventFormService.php
index 31846de..63a80b2 100644
--- a/app/Shared/Forms/Services/EventFormService.php
+++ b/app/Shared/Forms/Services/EventFormService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Tenant\Models\SocialMedia;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\SocialMedia;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 
 class EventFormService
diff --git a/app/Shared/Forms/Services/FoodFormService.php b/app/Shared/Forms/Services/FoodFormService.php
index 5ed7636..27945af 100644
--- a/app/Shared/Forms/Services/FoodFormService.php
+++ b/app/Shared/Forms/Services/FoodFormService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Event\Enums\EventDateStatus;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Ticketing\Event\Enums\EventDateStatus;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 
 class FoodFormService
diff --git a/app/Shared/Forms/Services/MerchandiseFormService.php b/app/Shared/Forms/Services/MerchandiseFormService.php
index c8aea73..d0ae615 100644
--- a/app/Shared/Forms/Services/MerchandiseFormService.php
+++ b/app/Shared/Forms/Services/MerchandiseFormService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 
 class MerchandiseFormService
diff --git a/app/Shared/Forms/Services/SaleFormService.php b/app/Shared/Forms/Services/SaleFormService.php
index 8ddcead..43ddf33 100644
--- a/app/Shared/Forms/Services/SaleFormService.php
+++ b/app/Shared/Forms/Services/SaleFormService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 
 class SaleFormService
 {
diff --git a/app/Shared/Forms/Services/StaffFormService.php b/app/Shared/Forms/Services/StaffFormService.php
index f2fa7b0..4e24c08 100644
--- a/app/Shared/Forms/Services/StaffFormService.php
+++ b/app/Shared/Forms/Services/StaffFormService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 
diff --git a/app/Shared/Forms/Services/TicketFilterFormService.php b/app/Shared/Forms/Services/TicketFilterFormService.php
index 2089413..52cae67 100644
--- a/app/Shared/Forms/Services/TicketFilterFormService.php
+++ b/app/Shared/Forms/Services/TicketFilterFormService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\AdminAppTicketColumnService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
 
 class TicketFilterFormService
 {
diff --git a/app/Shared/Forms/Services/TicketFormService.php b/app/Shared/Forms/Services/TicketFormService.php
index ff50bb2..cbc293c 100644
--- a/app/Shared/Forms/Services/TicketFormService.php
+++ b/app/Shared/Forms/Services/TicketFormService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\Forms\Services;
+namespace App\Shared\Forms\Services;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Collection;
 
 class TicketFormService
diff --git a/app/Shared/Forms/routes/adminapp.php b/app/Shared/Forms/routes/adminapp.php
index 93c41e5..5afd625 100644
--- a/app/Shared/Forms/routes/adminapp.php
+++ b/app/Shared/Forms/routes/adminapp.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Domains\Forms\Controllers\AdminApp\EntryFormController;
-use App\Domains\Forms\Controllers\AdminApp\EventFormController;
-use App\Domains\Forms\Controllers\AdminApp\FoodFormController;
-use App\Domains\Forms\Controllers\AdminApp\MerchandiseFormController;
-use App\Domains\Forms\Controllers\AdminApp\SaleFormController;
-use App\Domains\Forms\Controllers\AdminApp\StaffFormController;
-use App\Domains\Forms\Controllers\AdminApp\TicketFilterFormController;
-use App\Domains\Forms\Controllers\AdminApp\TicketFormController;
+use App\Shared\Forms\Controllers\AdminApp\EntryFormController;
+use App\Shared\Forms\Controllers\AdminApp\EventFormController;
+use App\Shared\Forms\Controllers\AdminApp\FoodFormController;
+use App\Shared\Forms\Controllers\AdminApp\MerchandiseFormController;
+use App\Shared\Forms\Controllers\AdminApp\SaleFormController;
+use App\Shared\Forms\Controllers\AdminApp\StaffFormController;
+use App\Shared\Forms\Controllers\AdminApp\TicketFilterFormController;
+use App\Shared\Forms\Controllers\AdminApp\TicketFormController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/forms')
diff --git a/app/Shared/Integration/Casts/EncryptedIntegrationData.php b/app/Shared/Integration/Casts/EncryptedIntegrationData.php
index 0c51763..52ea8f5 100644
--- a/app/Shared/Integration/Casts/EncryptedIntegrationData.php
+++ b/app/Shared/Integration/Casts/EncryptedIntegrationData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Casts;
+namespace App\Shared\Integration\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Shared/Integration/Controllers/AdminWebsiteTypeIntegrationController.php b/app/Shared/Integration/Controllers/AdminWebsiteTypeIntegrationController.php
index ef6d19d..31cb940 100644
--- a/app/Shared/Integration/Controllers/AdminWebsiteTypeIntegrationController.php
+++ b/app/Shared/Integration/Controllers/AdminWebsiteTypeIntegrationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Integration\Controllers;
+namespace App\Shared\Integration\Controllers;
 
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\ConfigureIntegrationRequest;
-use App\Domains\Integration\Resources\IntegrationAssociationResource;
-use App\Domains\Integration\Services\IntegrationAssociationService;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Requests\ConfigureIntegrationRequest;
+use App\Shared\Integration\Resources\IntegrationAssociationResource;
+use App\Shared\Integration\Services\IntegrationAssociationService;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use App\Http\Controllers\Controller;
 
 class AdminWebsiteTypeIntegrationController extends Controller
diff --git a/app/Shared/Integration/Controllers/ClientIntegrationController.php b/app/Shared/Integration/Controllers/ClientIntegrationController.php
index bbc3bee..772c499 100644
--- a/app/Shared/Integration/Controllers/ClientIntegrationController.php
+++ b/app/Shared/Integration/Controllers/ClientIntegrationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domains\Integration\Controllers;
+namespace App\Shared\Integration\Controllers;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\ConfigureIntegrationRequest;
-use App\Domains\Integration\Services\ClientIntegrationService;
-use App\Domains\Integration\Services\IntegrationAssociationService;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Requests\ConfigureIntegrationRequest;
+use App\Shared\Integration\Services\ClientIntegrationService;
+use App\Shared\Integration\Services\IntegrationAssociationService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Shared/Integration/Controllers/IntegrationController.php b/app/Shared/Integration/Controllers/IntegrationController.php
index 2d7de19..acf1b3c 100644
--- a/app/Shared/Integration/Controllers/IntegrationController.php
+++ b/app/Shared/Integration/Controllers/IntegrationController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Integration\Controllers;
+namespace App\Shared\Integration\Controllers;
 
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Requests\StoreIntegrationRequest;
-use App\Domains\Integration\Requests\UpdateIntegrationRequest;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Requests\StoreIntegrationRequest;
+use App\Shared\Integration\Requests\UpdateIntegrationRequest;
 use Illuminate\Routing\Controller;
 
 class IntegrationController extends Controller
diff --git a/app/Shared/Integration/Controllers/TelepagosWebhookController.php b/app/Shared/Integration/Controllers/TelepagosWebhookController.php
index b0e90a6..85fa473 100644
--- a/app/Shared/Integration/Controllers/TelepagosWebhookController.php
+++ b/app/Shared/Integration/Controllers/TelepagosWebhookController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Integration\Controllers;
+namespace App\Shared\Integration\Controllers;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Requests\TelepagosWebhookRequest;
-use App\Domains\Integration\Services\TelepagosWebhookService;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Requests\TelepagosWebhookRequest;
+use App\Shared\Integration\Services\TelepagosWebhookService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Shared/Integration/Models/AdminWebsiteTypeIntegration.php b/app/Shared/Integration/Models/AdminWebsiteTypeIntegration.php
index f95efad..682a765 100644
--- a/app/Shared/Integration/Models/AdminWebsiteTypeIntegration.php
+++ b/app/Shared/Integration/Models/AdminWebsiteTypeIntegration.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Integration\Models;
+namespace App\Shared\Integration\Models;
 
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
diff --git a/app/Shared/Integration/Models/ClientIntegration.php b/app/Shared/Integration/Models/ClientIntegration.php
index 999b7ce..d70d672 100644
--- a/app/Shared/Integration/Models/ClientIntegration.php
+++ b/app/Shared/Integration/Models/ClientIntegration.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Integration\Models;
+namespace App\Shared\Integration\Models;
 
-use App\Domains\Client\Models\Client;
+use App\Domains\Core\Client\Models\Client;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
diff --git a/app/Shared/Integration/Models/Integration.php b/app/Shared/Integration/Models/Integration.php
index 28d3b86..858ba66 100644
--- a/app/Shared/Integration/Models/Integration.php
+++ b/app/Shared/Integration/Models/Integration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Models;
+namespace App\Shared\Integration\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Shared/Integration/Models/IntegrationInstance.php b/app/Shared/Integration/Models/IntegrationInstance.php
index 75de6ef..4a5a8a1 100644
--- a/app/Shared/Integration/Models/IntegrationInstance.php
+++ b/app/Shared/Integration/Models/IntegrationInstance.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Integration\Models;
+namespace App\Shared\Integration\Models;
 
-use App\Domains\Integration\Casts\EncryptedIntegrationData;
+use App\Shared\Integration\Casts\EncryptedIntegrationData;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Shared/Integration/Policies/IntegrationPolicy.php b/app/Shared/Integration/Policies/IntegrationPolicy.php
index b4bff7c..ab7b5d1 100644
--- a/app/Shared/Integration/Policies/IntegrationPolicy.php
+++ b/app/Shared/Integration/Policies/IntegrationPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Integration\Policies;
+namespace App\Shared\Integration\Policies;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 
 class IntegrationPolicy
 {
diff --git a/app/Shared/Integration/Requests/ConfigureIntegrationRequest.php b/app/Shared/Integration/Requests/ConfigureIntegrationRequest.php
index dd80bb4..208002d 100644
--- a/app/Shared/Integration/Requests/ConfigureIntegrationRequest.php
+++ b/app/Shared/Integration/Requests/ConfigureIntegrationRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Integration\Requests;
+namespace App\Shared\Integration\Requests;
 
-use App\Domains\Integration\Models\Integration;
+use App\Shared\Integration\Models\Integration;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\ValidationException;
 
diff --git a/app/Shared/Integration/Requests/StoreIntegrationRequest.php b/app/Shared/Integration/Requests/StoreIntegrationRequest.php
index cf19bbe..3745d44 100644
--- a/app/Shared/Integration/Requests/StoreIntegrationRequest.php
+++ b/app/Shared/Integration/Requests/StoreIntegrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Requests;
+namespace App\Shared\Integration\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Shared/Integration/Requests/TelepagosWebhookRequest.php b/app/Shared/Integration/Requests/TelepagosWebhookRequest.php
index 3c97f42..263f06b 100644
--- a/app/Shared/Integration/Requests/TelepagosWebhookRequest.php
+++ b/app/Shared/Integration/Requests/TelepagosWebhookRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Requests;
+namespace App\Shared\Integration\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Shared/Integration/Requests/UpdateIntegrationRequest.php b/app/Shared/Integration/Requests/UpdateIntegrationRequest.php
index a2c466c..abf4d41 100644
--- a/app/Shared/Integration/Requests/UpdateIntegrationRequest.php
+++ b/app/Shared/Integration/Requests/UpdateIntegrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Requests;
+namespace App\Shared\Integration\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Shared/Integration/Resources/IntegrationAssociationResource.php b/app/Shared/Integration/Resources/IntegrationAssociationResource.php
index 1b1853f..2b1d6c2 100644
--- a/app/Shared/Integration/Resources/IntegrationAssociationResource.php
+++ b/app/Shared/Integration/Resources/IntegrationAssociationResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Resources;
+namespace App\Shared\Integration\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Integration/Resources/IntegrationInstanceResource.php b/app/Shared/Integration/Resources/IntegrationInstanceResource.php
index a65f359..067515f 100644
--- a/app/Shared/Integration/Resources/IntegrationInstanceResource.php
+++ b/app/Shared/Integration/Resources/IntegrationInstanceResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Resources;
+namespace App\Shared\Integration\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Shared/Integration/Services/BaseIntegrationService.php b/app/Shared/Integration/Services/BaseIntegrationService.php
index 7fd2374..a024473 100644
--- a/app/Shared/Integration/Services/BaseIntegrationService.php
+++ b/app/Shared/Integration/Services/BaseIntegrationService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Models\AdminWebsiteTypeIntegration;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Support\Facades\Http;
diff --git a/app/Shared/Integration/Services/ClientIntegrationService.php b/app/Shared/Integration/Services/ClientIntegrationService.php
index 2f79d8e..80a76b3 100644
--- a/app/Shared/Integration/Services/ClientIntegrationService.php
+++ b/app/Shared/Integration/Services/ClientIntegrationService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\Integration;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Shared/Integration/Services/IntegrationAssociationService.php b/app/Shared/Integration/Services/IntegrationAssociationService.php
index 0531959..1a05bcb 100644
--- a/app/Shared/Integration/Services/IntegrationAssociationService.php
+++ b/app/Shared/Integration/Services/IntegrationAssociationService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Models\AdminWebsiteTypeIntegration;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Support\Facades\DB;
 
 class IntegrationAssociationService
diff --git a/app/Shared/Integration/Services/IntegrationInstanceService.php b/app/Shared/Integration/Services/IntegrationInstanceService.php
index 7a86d37..b2176bf 100644
--- a/app/Shared/Integration/Services/IntegrationInstanceService.php
+++ b/app/Shared/Integration/Services/IntegrationInstanceService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Models\IntegrationInstance;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Shared/Integration/Services/MailService.php b/app/Shared/Integration/Services/MailService.php
index 491f13a..71682e0 100644
--- a/app/Shared/Integration/Services/MailService.php
+++ b/app/Shared/Integration/Services/MailService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Exception;
 use Illuminate\Contracts\Mail\Factory as MailFactory;
 use Illuminate\Contracts\Mail\Mailer;
diff --git a/app/Shared/Integration/Services/TelepagosIntegrationService.php b/app/Shared/Integration/Services/TelepagosIntegrationService.php
index ef99f7f..83ac810 100644
--- a/app/Shared/Integration/Services/TelepagosIntegrationService.php
+++ b/app/Shared/Integration/Services/TelepagosIntegrationService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
 use Carbon\Carbon;
 use Exception;
diff --git a/app/Shared/Integration/Services/TelepagosWebhookService.php b/app/Shared/Integration/Services/TelepagosWebhookService.php
index 3e4e9c6..8c120cb 100644
--- a/app/Shared/Integration/Services/TelepagosWebhookService.php
+++ b/app/Shared/Integration/Services/TelepagosWebhookService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Domains\Integration\Services;
+namespace App\Shared\Integration\Services;
 
-use App\Domains\Client\Models\Client;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\TelepagosPayment;
-use App\Domains\Purchase\Models\TelepagosQr;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Purchase\Services\DniDistanceService;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
+use App\Domains\Commerce\Purchase\Models\TelepagosQr;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Commerce\Purchase\Services\DniDistanceService;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Shared/Integration/routes/api.php b/app/Shared/Integration/routes/api.php
index 9e1000c..eddccb9 100644
--- a/app/Shared/Integration/routes/api.php
+++ b/app/Shared/Integration/routes/api.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Domains\Integration\Controllers\ClientIntegrationController;
-use App\Domains\Integration\Controllers\TelepagosWebhookController;
-use App\Domains\Integration\Controllers\AdminWebsiteTypeIntegrationController;
-use App\Domains\Integration\Models\Integration;
+use App\Shared\Integration\Controllers\ClientIntegrationController;
+use App\Shared\Integration\Controllers\TelepagosWebhookController;
+use App\Shared\Integration\Controllers\AdminWebsiteTypeIntegrationController;
+use App\Shared\Integration\Models\Integration;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware(['auth:sanctum', 'can:manage,'.Integration::class])->group(function (): void {
diff --git a/app/Shared/Logging/Enums/ValueChangeActorType.php b/app/Shared/Logging/Enums/ValueChangeActorType.php
index 6e3cfcc..784dbe2 100644
--- a/app/Shared/Logging/Enums/ValueChangeActorType.php
+++ b/app/Shared/Logging/Enums/ValueChangeActorType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Logging\Enums;
+namespace App\Shared\Logging\Enums;
 
 enum ValueChangeActorType: string
 {
diff --git a/app/Shared/Logging/Models/Concerns/LogsValueChanges.php b/app/Shared/Logging/Models/Concerns/LogsValueChanges.php
index ec35fb8..0750aca 100644
--- a/app/Shared/Logging/Models/Concerns/LogsValueChanges.php
+++ b/app/Shared/Logging/Models/Concerns/LogsValueChanges.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Logging\Models\Concerns;
+namespace App\Shared\Logging\Models\Concerns;
 
-use App\Domains\Logging\Enums\ValueChangeActorType;
-use App\Domains\Logging\Models\ValueChange;
+use App\Shared\Logging\Enums\ValueChangeActorType;
+use App\Shared\Logging\Models\ValueChange;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Shared/Logging/Models/ValueChange.php b/app/Shared/Logging/Models/ValueChange.php
index d3f81a9..71ff8e4 100644
--- a/app/Shared/Logging/Models/ValueChange.php
+++ b/app/Shared/Logging/Models/ValueChange.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\Logging\Models;
+namespace App\Shared\Logging\Models;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Logging\Enums\ValueChangeActorType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Logging\Enums\ValueChangeActorType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Shared/MailTest/Controllers/MailTestController.php b/app/Shared/MailTest/Controllers/MailTestController.php
index ee0f07e..1597cbd 100644
--- a/app/Shared/MailTest/Controllers/MailTestController.php
+++ b/app/Shared/MailTest/Controllers/MailTestController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domains\MailTest\Controllers;
+namespace App\Shared\MailTest\Controllers;
 
-use App\Domains\MailTest\Requests\SendTestMailRequest;
-use App\Domains\MailTest\Services\MailTestService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\MailTest\Requests\SendTestMailRequest;
+use App\Shared\MailTest\Services\MailTestService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Shared/MailTest/Mailables/TestMail.php b/app/Shared/MailTest/Mailables/TestMail.php
index bff67ab..19aa772 100644
--- a/app/Shared/MailTest/Mailables/TestMail.php
+++ b/app/Shared/MailTest/Mailables/TestMail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\MailTest\Mailables;
+namespace App\Shared\MailTest\Mailables;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
diff --git a/app/Shared/MailTest/Requests/SendTestMailRequest.php b/app/Shared/MailTest/Requests/SendTestMailRequest.php
index ab98d8b..f6e2e04 100644
--- a/app/Shared/MailTest/Requests/SendTestMailRequest.php
+++ b/app/Shared/MailTest/Requests/SendTestMailRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\MailTest\Requests;
+namespace App\Shared\MailTest\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Shared/MailTest/Services/MailTestService.php b/app/Shared/MailTest/Services/MailTestService.php
index 92c269b..40cc400 100644
--- a/app/Shared/MailTest/Services/MailTestService.php
+++ b/app/Shared/MailTest/Services/MailTestService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\MailTest\Services;
+namespace App\Shared\MailTest\Services;
 
-use App\Domains\Integration\Services\MailService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Integration\Services\MailService;
+use App\Domains\Core\Tenant\Models\Tenant;
 
 class MailTestService
 {
diff --git a/app/Shared/MailTest/routes/api.php b/app/Shared/MailTest/routes/api.php
index a75d512..fe27398 100644
--- a/app/Shared/MailTest/routes/api.php
+++ b/app/Shared/MailTest/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\MailTest\Controllers\MailTestController;
+use App\Shared\MailTest\Controllers\MailTestController;
 use Illuminate\Support\Facades\Route;
 
 Route::post('{tenant_code}/mail-test/send', MailTestController::class);
diff --git a/app/Shared/Notification/Events/PasswordResetRequested.php b/app/Shared/Notification/Events/PasswordResetRequested.php
index 3a22e15..6fc5182 100644
--- a/app/Shared/Notification/Events/PasswordResetRequested.php
+++ b/app/Shared/Notification/Events/PasswordResetRequested.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Notification\Events;
+namespace App\Shared\Notification\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Shared/Notification/Events/UserRegistered.php b/app/Shared/Notification/Events/UserRegistered.php
index 8f3dbda..70df54a 100644
--- a/app/Shared/Notification/Events/UserRegistered.php
+++ b/app/Shared/Notification/Events/UserRegistered.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Notification\Events;
+namespace App\Shared\Notification\Events;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
diff --git a/app/Shared/Notification/Listeners/SendEventDateRescheduledEmails.php b/app/Shared/Notification/Listeners/SendEventDateRescheduledEmails.php
index b119489..43588f9 100644
--- a/app/Shared/Notification/Listeners/SendEventDateRescheduledEmails.php
+++ b/app/Shared/Notification/Listeners/SendEventDateRescheduledEmails.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Notification\Listeners;
+namespace App\Shared\Notification\Listeners;
 
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Notification\Services\NotificationMailService;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Shared\Notification\Services\NotificationMailService;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
diff --git a/app/Shared/Notification/Listeners/SendEventDateSuspendedEmails.php b/app/Shared/Notification/Listeners/SendEventDateSuspendedEmails.php
index 93af492..6421412 100644
--- a/app/Shared/Notification/Listeners/SendEventDateSuspendedEmails.php
+++ b/app/Shared/Notification/Listeners/SendEventDateSuspendedEmails.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Notification\Listeners;
+namespace App\Shared\Notification\Listeners;
 
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Notification\Services\NotificationMailService;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Shared\Notification\Services\NotificationMailService;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
diff --git a/app/Shared/Notification/Listeners/SendPasswordResetEmail.php b/app/Shared/Notification/Listeners/SendPasswordResetEmail.php
index 69a4dfe..519d0ff 100644
--- a/app/Shared/Notification/Listeners/SendPasswordResetEmail.php
+++ b/app/Shared/Notification/Listeners/SendPasswordResetEmail.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Notification\Listeners;
+namespace App\Shared\Notification\Listeners;
 
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Notification\Services\NotificationMailService;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Shared\Notification\Services\NotificationMailService;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
diff --git a/app/Shared/Notification/Listeners/SendPurchaseConfirmedEmail.php b/app/Shared/Notification/Listeners/SendPurchaseConfirmedEmail.php
index 231fd35..724e5b4 100644
--- a/app/Shared/Notification/Listeners/SendPurchaseConfirmedEmail.php
+++ b/app/Shared/Notification/Listeners/SendPurchaseConfirmedEmail.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Notification\Listeners;
+namespace App\Shared\Notification\Listeners;
 
-use App\Domains\Notification\Services\NotificationMailService;
-use App\Domains\Purchase\Events\PurchasePaid;
+use App\Shared\Notification\Services\NotificationMailService;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
diff --git a/app/Shared/Notification/Listeners/SendWelcomeEmail.php b/app/Shared/Notification/Listeners/SendWelcomeEmail.php
index 55168d3..18b2d4c 100644
--- a/app/Shared/Notification/Listeners/SendWelcomeEmail.php
+++ b/app/Shared/Notification/Listeners/SendWelcomeEmail.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domains\Notification\Listeners;
+namespace App\Shared\Notification\Listeners;
 
-use App\Domains\Notification\Events\UserRegistered;
-use App\Domains\Notification\Services\NotificationMailService;
+use App\Shared\Notification\Events\UserRegistered;
+use App\Shared\Notification\Services\NotificationMailService;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\InteractsWithQueue;
 
diff --git a/app/Shared/Notification/Models/EmailDelivery.php b/app/Shared/Notification/Models/EmailDelivery.php
index 8b16a6d..4658349 100644
--- a/app/Shared/Notification/Models/EmailDelivery.php
+++ b/app/Shared/Notification/Models/EmailDelivery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Notification\Models;
+namespace App\Shared\Notification\Models;
 
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Shared/Notification/Services/IdempotentEmailDeliveryService.php b/app/Shared/Notification/Services/IdempotentEmailDeliveryService.php
index 48e8c37..60f107e 100644
--- a/app/Shared/Notification/Services/IdempotentEmailDeliveryService.php
+++ b/app/Shared/Notification/Services/IdempotentEmailDeliveryService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domains\Notification\Services;
+namespace App\Shared\Notification\Services;
 
-use App\Domains\Notification\Models\EmailDelivery;
+use App\Shared\Notification\Models\EmailDelivery;
 use Closure;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Str;
diff --git a/app/Shared/Notification/Services/NotificationMailService.php b/app/Shared/Notification/Services/NotificationMailService.php
index f61fd64..707436d 100644
--- a/app/Shared/Notification/Services/NotificationMailService.php
+++ b/app/Shared/Notification/Services/NotificationMailService.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Domains\Notification\Services;
+namespace App\Shared\Notification\Services;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Integration\Services\MailService;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Services\TicketPdfService;
-use App\Domains\Ticket\Services\TicketPresentationResolver;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Integration\Services\MailService;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
+use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Closure;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Shared/Rules/CroppedImageOrBase64Rule.php b/app/Shared/Rules/CroppedImageOrBase64Rule.php
index e26f47e..c0aab5f 100644
--- a/app/Shared/Rules/CroppedImageOrBase64Rule.php
+++ b/app/Shared/Rules/CroppedImageOrBase64Rule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Shared\Rules;
+namespace App\Shared\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Shared/Rules/ImageOrBase64Rule.php b/app/Shared/Rules/ImageOrBase64Rule.php
index 61b2458..037ed94 100644
--- a/app/Shared/Rules/ImageOrBase64Rule.php
+++ b/app/Shared/Rules/ImageOrBase64Rule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Shared\Rules;
+namespace App\Shared\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Shared/Rules/ValidTimezone.php b/app/Shared/Rules/ValidTimezone.php
index ead73f0..c1f4a93 100644
--- a/app/Shared/Rules/ValidTimezone.php
+++ b/app/Shared/Rules/ValidTimezone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\Shared\Rules;
+namespace App\Shared\Rules;
 
 use Closure;
 use DateTimeZone;
diff --git a/app/Shared/StorageTest/Controllers/S3TestController.php b/app/Shared/StorageTest/Controllers/S3TestController.php
index c645947..15d7276 100644
--- a/app/Shared/StorageTest/Controllers/S3TestController.php
+++ b/app/Shared/StorageTest/Controllers/S3TestController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Domains\StorageTest\Controllers;
+namespace App\Shared\StorageTest\Controllers;
 
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\StorageTest\Requests\GenerateS3TemporaryUrlRequest;
-use App\Domains\StorageTest\Requests\StoreS3TestFileRequest;
-use App\Domains\StorageTest\Services\S3TestService;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Shared\StorageTest\Requests\GenerateS3TemporaryUrlRequest;
+use App\Shared\StorageTest\Requests\StoreS3TestFileRequest;
+use App\Shared\StorageTest\Services\S3TestService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Shared/StorageTest/Requests/GenerateS3TemporaryUrlRequest.php b/app/Shared/StorageTest/Requests/GenerateS3TemporaryUrlRequest.php
index b906053..90f0601 100644
--- a/app/Shared/StorageTest/Requests/GenerateS3TemporaryUrlRequest.php
+++ b/app/Shared/StorageTest/Requests/GenerateS3TemporaryUrlRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\StorageTest\Requests;
+namespace App\Shared\StorageTest\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Shared/StorageTest/Requests/StoreS3TestFileRequest.php b/app/Shared/StorageTest/Requests/StoreS3TestFileRequest.php
index d46ea27..d1fa48d 100644
--- a/app/Shared/StorageTest/Requests/StoreS3TestFileRequest.php
+++ b/app/Shared/StorageTest/Requests/StoreS3TestFileRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\StorageTest\Requests;
+namespace App\Shared\StorageTest\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Shared/StorageTest/Services/S3TestService.php b/app/Shared/StorageTest/Services/S3TestService.php
index 5243a85..00e1c6a 100644
--- a/app/Shared/StorageTest/Services/S3TestService.php
+++ b/app/Shared/StorageTest/Services/S3TestService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domains\StorageTest\Services;
+namespace App\Shared\StorageTest\Services;
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Shared/StorageTest/routes/api.php b/app/Shared/StorageTest/routes/api.php
index ef5ff59..78741e7 100644
--- a/app/Shared/StorageTest/routes/api.php
+++ b/app/Shared/StorageTest/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\StorageTest\Controllers\S3TestController;
+use App\Shared\StorageTest\Controllers\S3TestController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('storage-test/s3')->group(function (): void {
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 8102d3b..8f4bb7b 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Domains\Auth\Exceptions\AccountLockedException;
-use App\Domains\Catalog\Exceptions\StockReservationExpiredException;
-use App\Domains\Purchase\Exceptions\InsufficientStockException;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
-use App\Domains\Purchase\Exceptions\PurchaseLimitExceededException;
-use App\Domains\Ticket\Exceptions\TicketNotAvailableException;
+use App\Domains\Core\Auth\Exceptions\AccountLockedException;
+use App\Domains\Commerce\Catalog\Exceptions\StockReservationExpiredException;
+use App\Domains\Commerce\Purchase\Exceptions\InsufficientStockException;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseLimitExceededException;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketNotAvailableException;
 use App\Http\Middleware\EnsureAdminAppTenant;
 use App\Http\Middleware\EnsureScannerTenant;
 use App\Http\Middleware\EnsureTenantHasMenu;
diff --git a/config/auth.php b/config/auth.php
index 6fdf5c4..98127e5 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 
 return [
 
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index e4d9187..64f8233 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,7 +2,7 @@
 
 namespace Database\Factories;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
diff --git a/database/migrations/2026_07_20_000200_create_catalog_items_table.php b/database/migrations/2026_07_20_000200_create_catalog_items_table.php
index 3f87f32..315ca31 100644
--- a/database/migrations/2026_07_20_000200_create_catalog_items_table.php
+++ b/database/migrations/2026_07_20_000200_create_catalog_items_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_07_20_000300_move_inventory_from_catalog_items.php b/database/migrations/2026_07_20_000300_move_inventory_from_catalog_items.php
index 484df33..9635a2d 100644
--- a/database/migrations/2026_07_20_000300_move_inventory_from_catalog_items.php
+++ b/database/migrations/2026_07_20_000300_move_inventory_from_catalog_items.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_07_20_000500_remove_purchase_item_polymorphism.php b/database/migrations/2026_07_20_000500_remove_purchase_item_polymorphism.php
index b877130..ee0aa3c 100644
--- a/database/migrations/2026_07_20_000500_remove_purchase_item_polymorphism.php
+++ b/database/migrations/2026_07_20_000500_remove_purchase_item_polymorphism.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
@@ -15,6 +15,10 @@ return new class extends Migration
 
     private const PREVIOUS_VARIANT = 'App\\Domains\\CatalogNew\\Models\\Variant';
 
+    private const ORIGINAL_CATALOG_ITEM = 'App\\Domains\\Catalog\\Models\\CatalogItem';
+
+    private const ORIGINAL_VARIANT = 'App\\Domains\\Catalog\\Models\\Variant';
+
     public function up(): void
     {
         Schema::table('compra_items', function (Blueprint $table): void {
@@ -29,7 +33,7 @@ return new class extends Migration
         });
 
         DB::table('compra_items')->orderBy('id')->each(function (object $purchaseItem): void {
-            if (in_array($purchaseItem->buyable_type, [CatalogItem::class, self::PREVIOUS_CATALOG_ITEM], true)) {
+            if (in_array($purchaseItem->buyable_type, [CatalogItem::class, self::ORIGINAL_CATALOG_ITEM, self::PREVIOUS_CATALOG_ITEM], true)) {
                 $catalogItem = DB::table('catalog_items')
                     ->where('id', $purchaseItem->buyable_id)
                     ->first();
@@ -48,7 +52,7 @@ return new class extends Migration
                 }
             }
 
-            if (in_array($purchaseItem->buyable_type, [self::LEGACY_PRODUCT_VARIANT, Variant::class, self::PREVIOUS_VARIANT], true)) {
+            if (in_array($purchaseItem->buyable_type, [self::LEGACY_PRODUCT_VARIANT, Variant::class, self::ORIGINAL_VARIANT, self::PREVIOUS_VARIANT], true)) {
                 $variant = DB::table('variantes')
                     ->select(['id', 'catalog_item_id'])
                     ->where('id', $purchaseItem->buyable_id)
diff --git a/database/migrations/2026_07_20_000600_create_catalog_featured_items_tables.php b/database/migrations/2026_07_20_000600_create_catalog_featured_items_tables.php
index bb075ae..d725982 100644
--- a/database/migrations/2026_07_20_000600_create_catalog_featured_items_tables.php
+++ b/database/migrations/2026_07_20_000600_create_catalog_featured_items_tables.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_07_21_000000_add_bundles_to_catalog.php b/database/migrations/2026_07_21_000000_add_bundles_to_catalog.php
index 162e7a2..6ceaffb 100644
--- a/database/migrations/2026_07_21_000000_add_bundles_to_catalog.php
+++ b/database/migrations/2026_07_21_000000_add_bundles_to_catalog.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_07_23_000000_add_group_layout_to_featured_groups_table.php b/database/migrations/2026_07_23_000000_add_group_layout_to_featured_groups_table.php
index 000158c..48643fd 100644
--- a/database/migrations/2026_07_23_000000_add_group_layout_to_featured_groups_table.php
+++ b/database/migrations/2026_07_23_000000_add_group_layout_to_featured_groups_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_07_24_000000_create_account_menu_hierarchy.php b/database/migrations/2026_07_24_000000_create_account_menu_hierarchy.php
index 565ec28..4ed5b04 100644
--- a/database/migrations/2026_07_24_000000_create_account_menu_hierarchy.php
+++ b/database/migrations/2026_07_24_000000_create_account_menu_hierarchy.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Menu\Models\Menu;
+use App\Domains\Core\Menu\Models\Menu;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
diff --git a/database/migrations/2026_07_24_100000_add_catalog_search_layouts_to_tenants_table.php b/database/migrations/2026_07_24_100000_add_catalog_search_layouts_to_tenants_table.php
index 282171b..88c6922 100644
--- a/database/migrations/2026_07_24_100000_add_catalog_search_layouts_to_tenants_table.php
+++ b/database/migrations/2026_07_24_100000_add_catalog_search_layouts_to_tenants_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_07_28_000100_add_role_and_tenant_codes_to_users_table.php b/database/migrations/2026_07_28_000100_add_role_and_tenant_codes_to_users_table.php
index 89a8525..02607be 100644
--- a/database/migrations/2026_07_28_000100_add_role_and_tenant_codes_to_users_table.php
+++ b/database/migrations/2026_07_28_000100_add_role_and_tenant_codes_to_users_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_07_31_000000_remove_tenant_admin_role.php b/database/migrations/2026_07_31_000000_remove_tenant_admin_role.php
index 4d636bc..3a3d06e 100644
--- a/database/migrations/2026_07_31_000000_remove_tenant_admin_role.php
+++ b/database/migrations/2026_07_31_000000_remove_tenant_admin_role.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
diff --git a/database/migrations/2026_08_04_000000_add_tenant_code_to_value_changes_table.php b/database/migrations/2026_08_04_000000_add_tenant_code_to_value_changes_table.php
index 8c5ae52..3220189 100644
--- a/database/migrations/2026_08_04_000000_add_tenant_code_to_value_changes_table.php
+++ b/database/migrations/2026_08_04_000000_add_tenant_code_to_value_changes_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
@@ -21,7 +21,10 @@ return new class extends Migration
         });
 
         DB::table('value_changes')
-            ->where('trackable_type', (new Purchase)->getMorphClass())
+            ->whereIn('trackable_type', [
+                'App\\Domains\\Purchase\\Models\\Purchase',
+                (new Purchase)->getMorphClass(),
+            ])
             ->whereNull('tenant_code')
             ->orderBy('id')
             ->chunkById(500, function ($changes): void {
diff --git a/database/migrations/2026_08_04_000200_add_source_to_featured_groups_table.php b/database/migrations/2026_08_04_000200_add_source_to_featured_groups_table.php
index 309877e..1498884 100644
--- a/database/migrations/2026_08_04_000200_add_source_to_featured_groups_table.php
+++ b/database/migrations/2026_08_04_000200_add_source_to_featured_groups_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_08_10_000000_add_event_date_text_to_tenants.php b/database/migrations/2026_08_10_000000_add_event_date_text_to_tenants.php
index 99a00be..eee7625 100644
--- a/database/migrations/2026_08_10_000000_add_event_date_text_to_tenants.php
+++ b/database/migrations/2026_08_10_000000_add_event_date_text_to_tenants.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Event\Services\EventDateTextFormatter;
+use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_08_12_010000_add_ticket_selector_and_single_catalog_layouts.php b/database/migrations/2026_08_12_010000_add_ticket_selector_and_single_catalog_layouts.php
index 3c659d9..8c2564c 100644
--- a/database/migrations/2026_08_12_010000_add_ticket_selector_and_single_catalog_layouts.php
+++ b/database/migrations/2026_08_12_010000_add_ticket_selector_and_single_catalog_layouts.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
diff --git a/database/migrations/2026_08_12_070000_add_inventory_subject_to_catalog_items.php b/database/migrations/2026_08_12_070000_add_inventory_subject_to_catalog_items.php
index 39c706a..4c74064 100644
--- a/database/migrations/2026_08_12_070000_add_inventory_subject_to_catalog_items.php
+++ b/database/migrations/2026_08_12_070000_add_inventory_subject_to_catalog_items.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_08_19_000100_create_stock_reservations_table.php b/database/migrations/2026_08_19_000100_create_stock_reservations_table.php
index 6529cf6..24fe657 100644
--- a/database/migrations/2026_08_19_000100_create_stock_reservations_table.php
+++ b/database/migrations/2026_08_19_000100_create_stock_reservations_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_08_19_030000_create_desfile_invitation_purchase.php b/database/migrations/2026_08_19_030000_create_desfile_invitation_purchase.php
index a1b6da1..05fb6f0 100644
--- a/database/migrations/2026_08_19_030000_create_desfile_invitation_purchase.php
+++ b/database/migrations/2026_08_19_030000_create_desfile_invitation_purchase.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Desfile\Services\InvitationPurchaseProvisioner;
+use App\Domains\Ticketing\Desfile\Services\InvitationPurchaseProvisioner;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2026_08_22_000000_add_desfile_invitation_seats.php b/database/migrations/2026_08_22_000000_add_desfile_invitation_seats.php
index 7af359f..86cce8d 100644
--- a/database/migrations/2026_08_22_000000_add_desfile_invitation_seats.php
+++ b/database/migrations/2026_08_22_000000_add_desfile_invitation_seats.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Desfile\Services\InvitationPurchaseProvisioner;
+use App\Domains\Ticketing\Desfile\Services\InvitationPurchaseProvisioner;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php b/database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php
index c934b4b..aa483d1 100644
--- a/database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php
+++ b/database/migrations/2026_08_25_010000_add_expires_at_to_reset_password_attempts_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_08_27_010000_add_dni_distance_to_telepagos_payment_candidates.php b/database/migrations/2026_08_27_010000_add_dni_distance_to_telepagos_payment_candidates.php
index 5138717..98bf65d 100644
--- a/database/migrations/2026_08_27_010000_add_dni_distance_to_telepagos_payment_candidates.php
+++ b/database/migrations/2026_08_27_010000_add_dni_distance_to_telepagos_payment_candidates.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Purchase\Services\DniDistanceService;
+use App\Domains\Commerce\Purchase\Services\DniDistanceService;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
diff --git a/database/migrations/2026_09_04_010000_remove_scan_permission_from_adminapp_role.php b/database/migrations/2026_09_04_010000_remove_scan_permission_from_adminapp_role.php
index 10c4f9b..0175fc5 100644
--- a/database/migrations/2026_09_04_010000_remove_scan_permission_from_adminapp_role.php
+++ b/database/migrations/2026_09_04_010000_remove_scan_permission_from_adminapp_role.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
diff --git a/database/migrations/2026_09_18_000400_update_stored_morph_types_for_domain_groups.php b/database/migrations/2026_09_18_000400_update_stored_morph_types_for_domain_groups.php
new file mode 100644
index 0000000..67d2c6e
--- /dev/null
+++ b/database/migrations/2026_09_18_000400_update_stored_morph_types_for_domain_groups.php
@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    private const TYPE_CHANGES = [
+        'personal_access_tokens' => [
+            'tokenable_type' => [
+                'App\\Domains\\Auth\\Models\\User' => 'App\\Domains\\Core\\Auth\\Models\\User',
+            ],
+        ],
+        'value_changes' => [
+            'trackable_type' => [
+                'App\\Domains\\Purchase\\Models\\Purchase' => 'App\\Domains\\Commerce\\Purchase\\Models\\Purchase',
+                'App\\Domains\\Ticket\\Models\\Ticket' => 'App\\Domains\\Ticketing\\Ticket\\Models\\Ticket',
+            ],
+        ],
+    ];
+
+    public function up(): void
+    {
+        $this->rewriteTypes(false);
+    }
+
+    public function down(): void
+    {
+        $this->rewriteTypes(true);
+    }
+
+    private function rewriteTypes(bool $reverse): void
+    {
+        foreach (self::TYPE_CHANGES as $table => $columns) {
+            if (! Schema::hasTable($table)) {
+                continue;
+            }
+
+            foreach ($columns as $column => $changes) {
+                foreach ($changes as $oldType => $newType) {
+                    DB::table($table)
+                        ->where($column, $reverse ? $newType : $oldType)
+                        ->update([$column => $reverse ? $oldType : $newType]);
+                }
+            }
+        }
+    }
+};
diff --git a/database/seeders/AttributeSeeder.php b/database/seeders/AttributeSeeder.php
index 001d26a..f19e67b 100644
--- a/database/seeders/AttributeSeeder.php
+++ b/database/seeders/AttributeSeeder.php
@@ -2,11 +2,11 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Database\Seeder;
 
 class AttributeSeeder extends Seeder
diff --git a/database/seeders/AuthorizationSeeder.php b/database/seeders/AuthorizationSeeder.php
index 3764942..398ec3d 100644
--- a/database/seeders/AuthorizationSeeder.php
+++ b/database/seeders/AuthorizationSeeder.php
@@ -2,10 +2,10 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Permission;
+use App\Domains\Core\Authorization\Models\Role;
 use Illuminate\Database\Seeder;
 
 class AuthorizationSeeder extends Seeder
diff --git a/database/seeders/BrandSeeder.php b/database/seeders/BrandSeeder.php
index 738a3f1..e2e6d22 100644
--- a/database/seeders/BrandSeeder.php
+++ b/database/seeders/BrandSeeder.php
@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Brand;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Seeder;
 
 class BrandSeeder extends Seeder
diff --git a/database/seeders/CategorySeeder.php b/database/seeders/CategorySeeder.php
index 5003970..9ddf2cc 100644
--- a/database/seeders/CategorySeeder.php
+++ b/database/seeders/CategorySeeder.php
@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Seeder;
 
 class CategorySeeder extends Seeder
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 5ac3e1a..119ea39 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
diff --git a/database/seeders/DesfilePuraTendenciaSeeder.php b/database/seeders/DesfilePuraTendenciaSeeder.php
index 3a29bcb..0d90531 100644
--- a/database/seeders/DesfilePuraTendenciaSeeder.php
+++ b/database/seeders/DesfilePuraTendenciaSeeder.php
@@ -2,19 +2,19 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Client\Models\Client;
-use App\Domains\Desfile\Services\InvitationPurchaseProvisioner;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Services\TenantService;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Ticketing\Desfile\Services\InvitationPurchaseProvisioner;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Services\TenantService;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\DB;
diff --git a/database/seeders/EmailIntegrationSeeder.php b/database/seeders/EmailIntegrationSeeder.php
index 1eeff2c..450e867 100644
--- a/database/seeders/EmailIntegrationSeeder.php
+++ b/database/seeders/EmailIntegrationSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Integration\Models\Integration;
+use App\Shared\Integration\Models\Integration;
 use Illuminate\Database\Seeder;
 
 class EmailIntegrationSeeder extends Seeder
diff --git a/database/seeders/FiestaFutbolInfantilProductSeeder.php b/database/seeders/FiestaFutbolInfantilProductSeeder.php
index e60ca10..07a60d2 100644
--- a/database/seeders/FiestaFutbolInfantilProductSeeder.php
+++ b/database/seeders/FiestaFutbolInfantilProductSeeder.php
@@ -2,18 +2,18 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Database\Seeder;
 use RuntimeException;
 
diff --git a/database/seeders/MenuSeeder.php b/database/seeders/MenuSeeder.php
index 3ea8fb3..24b562b 100644
--- a/database/seeders/MenuSeeder.php
+++ b/database/seeders/MenuSeeder.php
@@ -2,10 +2,10 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Seeder;
 
 class MenuSeeder extends Seeder
diff --git a/database/seeders/OnticketImmersiveHeroCarouselSeeder.php b/database/seeders/OnticketImmersiveHeroCarouselSeeder.php
index 0340594..23058cb 100644
--- a/database/seeders/OnticketImmersiveHeroCarouselSeeder.php
+++ b/database/seeders/OnticketImmersiveHeroCarouselSeeder.php
@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Services\WebsiteExtraService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Services\WebsiteExtraService;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use RuntimeException;
diff --git a/database/seeders/ProductCatalogFromImagesSeeder.php b/database/seeders/ProductCatalogFromImagesSeeder.php
index b0a2925..2416eca 100644
--- a/database/seeders/ProductCatalogFromImagesSeeder.php
+++ b/database/seeders/ProductCatalogFromImagesSeeder.php
@@ -2,17 +2,17 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\Brand;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File;
diff --git a/database/seeders/SocialMediaSeeder.php b/database/seeders/SocialMediaSeeder.php
index 97e2b40..95ce89f 100644
--- a/database/seeders/SocialMediaSeeder.php
+++ b/database/seeders/SocialMediaSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Tenant\Models\SocialMedia;
+use App\Domains\Core\Tenant\Models\SocialMedia;
 use Illuminate\Database\Seeder;
 
 class SocialMediaSeeder extends Seeder
diff --git a/database/seeders/TelepagosIntegrationSeeder.php b/database/seeders/TelepagosIntegrationSeeder.php
index bbaf657..2bc13e6 100644
--- a/database/seeders/TelepagosIntegrationSeeder.php
+++ b/database/seeders/TelepagosIntegrationSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Integration\Models\Integration;
+use App\Shared\Integration\Models\Integration;
 use Illuminate\Database\Seeder;
 
 class TelepagosIntegrationSeeder extends Seeder
diff --git a/database/seeders/TenantSeeder.php b/database/seeders/TenantSeeder.php
index 9ef6725..0ec0395 100644
--- a/database/seeders/TenantSeeder.php
+++ b/database/seeders/TenantSeeder.php
@@ -2,13 +2,13 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Services\AttachmentService;
-use App\Domains\Client\Models\Client;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Services\TenantService;
-use App\Domains\Tenant\Services\WebsiteExtraService;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Services\AttachmentService;
+use App\Domains\Core\Client\Models\Client;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Services\TenantService;
+use App\Domains\Core\Tenant\Services\WebsiteExtraService;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use RuntimeException;
diff --git a/database/seeders/WebsiteTypeSeeder.php b/database/seeders/WebsiteTypeSeeder.php
index 20e0a0c..7847d56 100644
--- a/database/seeders/WebsiteTypeSeeder.php
+++ b/database/seeders/WebsiteTypeSeeder.php
@@ -2,8 +2,8 @@
 
 namespace Database\Seeders;
 
-use App\Domains\Tenant\Services\AdminWebsiteTypeService;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Domains\Core\Tenant\Services\AdminWebsiteTypeService;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use RuntimeException;
diff --git a/resources/views/pdf/adminapp/sales.blade.php b/resources/views/pdf/adminapp/sales.blade.php
index 5f35264..8436a0d 100644
--- a/resources/views/pdf/adminapp/sales.blade.php
+++ b/resources/views/pdf/adminapp/sales.blade.php
@@ -47,7 +47,7 @@
                     <td>{{ $sale->created_at?->copy()->timezone($timeZone)->format('d/m/Y H:i') ?? '-' }}</td>
                     <td>{{ $sale->nombre_apellido ?: 'Sin nombre' }}</td>
                     <td class="center">{{ (int) ($sale->quantity ?? 0) }}</td>
-                    <td>{{ \App\Domains\Purchase\Models\Purchase::adminStatusNameFor($sale->status) ?? $sale->status }}</td>
+                    <td>{{ \App\Domains\Commerce\Purchase\Models\Purchase::adminStatusNameFor($sale->status) ?? $sale->status }}</td>
                     <td class="number">${{ number_format((float) $sale->total, 2, ',', '.') }}</td>
                     <td class="center">{{ (int) ($sale->tickets_count ?? 0) }}</td>
                 </tr>
diff --git a/routes/api.php b/routes/api.php
index 57ebc2b..d5b43b3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,21 +1,21 @@
 <?php
 
-require __DIR__.'/../app/Domains/Auth/routes/api.php';
-require __DIR__.'/../app/Domains/Catalog/routes/api.php';
-require __DIR__.'/../app/Domains/Cart/routes/api.php';
-require __DIR__.'/../app/Domains/StorageTest/routes/api.php';
-require __DIR__.'/../app/Domains/MailTest/routes/api.php';
-require __DIR__.'/../app/Domains/Purchase/routes/api.php';
-require __DIR__.'/../app/Domains/Sale/routes/api.php';
-require __DIR__.'/../app/Domains/Bootstrap/routes/api.php';
-require __DIR__.'/../app/Domains/Tenant/routes/api.php';
-require __DIR__.'/../app/Domains/Client/routes/api.php';
-require __DIR__.'/../app/Domains/Integration/routes/api.php';
-require __DIR__.'/../app/Domains/Menu/routes/api.php';
-require __DIR__.'/../app/Domains/Ticket/routes/api.php';
-require __DIR__.'/../app/Domains/Event/routes/api.php';
-require __DIR__.'/../app/Domains/Forms/routes/api.php';
-require __DIR__.'/../app/Domains/Staff/routes/api.php';
-require __DIR__.'/../app/Domains/Administrator/routes/api.php';
-require __DIR__.'/../app/Domains/FiestaFutbolInfantil/routes/api.php';
-require __DIR__.'/../app/Domains/Desfile/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Auth/routes/api.php';
+require __DIR__.'/../app/Domains/Commerce/Catalog/routes/api.php';
+require __DIR__.'/../app/Domains/Commerce/Cart/routes/api.php';
+require __DIR__.'/../app/Shared/StorageTest/routes/api.php';
+require __DIR__.'/../app/Shared/MailTest/routes/api.php';
+require __DIR__.'/../app/Domains/Commerce/Purchase/routes/api.php';
+require __DIR__.'/../app/Domains/Commerce/Sale/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Bootstrap/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Tenant/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Client/routes/api.php';
+require __DIR__.'/../app/Shared/Integration/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Menu/routes/api.php';
+require __DIR__.'/../app/Domains/Ticketing/Ticket/routes/api.php';
+require __DIR__.'/../app/Domains/Ticketing/Event/routes/api.php';
+require __DIR__.'/../app/Shared/Forms/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Staff/routes/api.php';
+require __DIR__.'/../app/Domains/Core/Administrator/routes/api.php';
+require __DIR__.'/../app/Domains/Ticketing/FiestaFutbolInfantil/routes/api.php';
+require __DIR__.'/../app/Domains/Ticketing/Desfile/routes/api.php';
diff --git a/routes/console.php b/routes/console.php
index 3df5861..5164f0d 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Domains\Auth\Services\AdminCredentialVerifier;
-use App\Domains\Catalog\Services\ExpireStockReservationsService;
-use App\Domains\Purchase\Services\TenantTransactionResetService;
-use App\Domains\Ticket\Services\BackfillRefundedUnitsService;
-use App\Domains\Ticket\Services\LoadTestTicketDatasetService;
+use App\Domains\Core\Auth\Services\AdminCredentialVerifier;
+use App\Domains\Commerce\Catalog\Services\ExpireStockReservationsService;
+use App\Domains\Commerce\Purchase\Services\TenantTransactionResetService;
+use App\Domains\Ticketing\Ticket\Services\BackfillRefundedUnitsService;
+use App\Domains\Ticketing\Ticket\Services\LoadTestTicketDatasetService;
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Schedule;
diff --git a/routes/web.php b/routes/web.php
index 28c53d9..b79b678 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Domains\Auth\Controllers\GoogleAuthController;
+use App\Domains\Core\Auth\Controllers\GoogleAuthController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('/auth/google/redirect', [GoogleAuthController::class, 'redirect'])->name('auth.google.redirect');
diff --git a/tests/Concerns/CreatesIntegrationInstances.php b/tests/Concerns/CreatesIntegrationInstances.php
index 8b37c0d..ee54a2e 100644
--- a/tests/Concerns/CreatesIntegrationInstances.php
+++ b/tests/Concerns/CreatesIntegrationInstances.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Concerns;
 
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\IntegrationInstance;
 
 trait CreatesIntegrationInstances
 {
diff --git a/tests/Feature/Administrator/AdministratorControllerTest.php b/tests/Feature/Administrator/AdministratorControllerTest.php
index a36b174..2ef0763 100644
--- a/tests/Feature/Administrator/AdministratorControllerTest.php
+++ b/tests/Feature/Administrator/AdministratorControllerTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests\Feature\Administrator;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Feature/Attachable/AttachmentTest.php b/tests/Feature/Attachable/AttachmentTest.php
index 4cdf184..8a9019d 100644
--- a/tests/Feature/Attachable/AttachmentTest.php
+++ b/tests/Feature/Attachable/AttachmentTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Attachable;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Exceptions\AttachmentStorageException;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Attachable\Services\AttachmentService;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Exceptions\AttachmentStorageException;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Shared\Attachable\Services\AttachmentService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Auth/AdminAppLoginControllerTest.php b/tests/Feature/Auth/AdminAppLoginControllerTest.php
index a5d6070..97eeb3c 100644
--- a/tests/Feature/Auth/AdminAppLoginControllerTest.php
+++ b/tests/Feature/Auth/AdminAppLoginControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\LoginAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/AdminAppMeControllerTest.php b/tests/Feature/Auth/AdminAppMeControllerTest.php
index 6850b07..7bd0282 100644
--- a/tests/Feature/Auth/AdminAppMeControllerTest.php
+++ b/tests/Feature/Auth/AdminAppMeControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/AdminAppResetPasswordControllerTest.php b/tests/Feature/Auth/AdminAppResetPasswordControllerTest.php
index 1e301a1..358878e 100644
--- a/tests/Feature/Auth/AdminAppResetPasswordControllerTest.php
+++ b/tests/Feature/Auth/AdminAppResetPasswordControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php b/tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php
index cd7e241..25b0c09 100644
--- a/tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php
+++ b/tests/Feature/Auth/CreateResetPasswordAttemptControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/EmailUniquenessPerRoleTest.php b/tests/Feature/Auth/EmailUniquenessPerRoleTest.php
index a4e9d8d..255fc8b 100644
--- a/tests/Feature/Auth/EmailUniquenessPerRoleTest.php
+++ b/tests/Feature/Auth/EmailUniquenessPerRoleTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Auth/GoogleTokenExchangeControllerTest.php b/tests/Feature/Auth/GoogleTokenExchangeControllerTest.php
index 4d40de0..85d6eb2 100644
--- a/tests/Feature/Auth/GoogleTokenExchangeControllerTest.php
+++ b/tests/Feature/Auth/GoogleTokenExchangeControllerTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
diff --git a/tests/Feature/Auth/LoginControllerTest.php b/tests/Feature/Auth/LoginControllerTest.php
index ed7cbd8..4368145 100644
--- a/tests/Feature/Auth/LoginControllerTest.php
+++ b/tests/Feature/Auth/LoginControllerTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\LoginAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/RegisterControllerTest.php b/tests/Feature/Auth/RegisterControllerTest.php
index 8dafa91..2f59d86 100644
--- a/tests/Feature/Auth/RegisterControllerTest.php
+++ b/tests/Feature/Auth/RegisterControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Notification\Events\UserRegistered;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Notification\Events\UserRegistered;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/ResetPasswordAttemptTest.php b/tests/Feature/Auth/ResetPasswordAttemptTest.php
index e9ef95f..9156a9f 100644
--- a/tests/Feature/Auth/ResetPasswordAttemptTest.php
+++ b/tests/Feature/Auth/ResetPasswordAttemptTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/ResetPasswordControllerTest.php b/tests/Feature/Auth/ResetPasswordControllerTest.php
index 57f085f..4fc4ab6 100644
--- a/tests/Feature/Auth/ResetPasswordControllerTest.php
+++ b/tests/Feature/Auth/ResetPasswordControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/ScannerLoginControllerTest.php b/tests/Feature/Auth/ScannerLoginControllerTest.php
index 6bb37bc..758cdc1 100644
--- a/tests/Feature/Auth/ScannerLoginControllerTest.php
+++ b/tests/Feature/Auth/ScannerLoginControllerTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\LoginAttempt;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\LoginAttempt;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Permission;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Hash;
diff --git a/tests/Feature/Auth/ScannerMeControllerTest.php b/tests/Feature/Auth/ScannerMeControllerTest.php
index f5ec62b..576725d 100644
--- a/tests/Feature/Auth/ScannerMeControllerTest.php
+++ b/tests/Feature/Auth/ScannerMeControllerTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Permission;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Auth/ScannerResetPasswordControllerTest.php b/tests/Feature/Auth/ScannerResetPasswordControllerTest.php
index a8e80d6..2098201 100644
--- a/tests/Feature/Auth/ScannerResetPasswordControllerTest.php
+++ b/tests/Feature/Auth/ScannerResetPasswordControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Hash;
diff --git a/tests/Feature/Auth/UserAuthorizationRelationsTest.php b/tests/Feature/Auth/UserAuthorizationRelationsTest.php
index 9565d81..d0719b6 100644
--- a/tests/Feature/Auth/UserAuthorizationRelationsTest.php
+++ b/tests/Feature/Auth/UserAuthorizationRelationsTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php b/tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php
index d6bd514..1f4c6c6 100644
--- a/tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php
+++ b/tests/Feature/Auth/ValidateResetPasswordAttemptControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Authorization/RolePermissionModelTest.php b/tests/Feature/Authorization/RolePermissionModelTest.php
index 5bd7d11..64b4348 100644
--- a/tests/Feature/Authorization/RolePermissionModelTest.php
+++ b/tests/Feature/Authorization/RolePermissionModelTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Authorization;
 
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Authorization\Models\RolePermission;
+use App\Domains\Core\Authorization\Models\Permission;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Authorization\Models\RolePermission;
 use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
diff --git a/tests/Feature/Cart/CartControllerTest.php b/tests/Feature/Cart/CartControllerTest.php
index 1a5696a..762a08e 100644
--- a/tests/Feature/Cart/CartControllerTest.php
+++ b/tests/Feature/Cart/CartControllerTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Cart;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/BundleCatalogItemTest.php b/tests/Feature/Catalog/BundleCatalogItemTest.php
index e1e80c5..4ff8532 100644
--- a/tests/Feature/Catalog/BundleCatalogItemTest.php
+++ b/tests/Feature/Catalog/BundleCatalogItemTest.php
@@ -2,20 +2,20 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Resources\CartItemResource;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Services\CatalogInventoryService;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Resources\CartItemResource;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CatalogControllerTest.php b/tests/Feature/Catalog/CatalogControllerTest.php
index 1eaa596..3663b91 100644
--- a/tests/Feature/Catalog/CatalogControllerTest.php
+++ b/tests/Feature/Catalog/CatalogControllerTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CatalogItemControllerTest.php b/tests/Feature/Catalog/CatalogItemControllerTest.php
index c805fe5..8eda289 100644
--- a/tests/Feature/Catalog/CatalogItemControllerTest.php
+++ b/tests/Feature/Catalog/CatalogItemControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CatalogItemDetailControllerTest.php b/tests/Feature/Catalog/CatalogItemDetailControllerTest.php
index b466afb..1a8575c 100644
--- a/tests/Feature/Catalog/CatalogItemDetailControllerTest.php
+++ b/tests/Feature/Catalog/CatalogItemDetailControllerTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CatalogSchemaTest.php b/tests/Feature/Catalog/CatalogSchemaTest.php
index 94cb8a2..6e9d1c6 100644
--- a/tests/Feature/Catalog/CatalogSchemaTest.php
+++ b/tests/Feature/Catalog/CatalogSchemaTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CatalogSearchTest.php b/tests/Feature/Catalog/CatalogSearchTest.php
index ba07c2f..bc9744c 100644
--- a/tests/Feature/Catalog/CatalogSearchTest.php
+++ b/tests/Feature/Catalog/CatalogSearchTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Catalog/CatalogServiceTest.php b/tests/Feature/Catalog/CatalogServiceTest.php
index 89a8b50..ae89767 100644
--- a/tests/Feature/Catalog/CatalogServiceTest.php
+++ b/tests/Feature/Catalog/CatalogServiceTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
diff --git a/tests/Feature/Catalog/CategoryDetailTest.php b/tests/Feature/Catalog/CategoryDetailTest.php
index 0b6ab2a..0eee7db 100644
--- a/tests/Feature/Catalog/CategoryDetailTest.php
+++ b/tests/Feature/Catalog/CategoryDetailTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Catalog/OnTicketFeaturedGroupControllerTest.php b/tests/Feature/Catalog/OnTicketFeaturedGroupControllerTest.php
index 816ac9e..da4fbb7 100644
--- a/tests/Feature/Catalog/OnTicketFeaturedGroupControllerTest.php
+++ b/tests/Feature/Catalog/OnTicketFeaturedGroupControllerTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Feature\Catalog;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Desfile/EntryControllerTest.php b/tests/Feature/Desfile/EntryControllerTest.php
index 820c2e7..7484a2c 100644
--- a/tests/Feature/Desfile/EntryControllerTest.php
+++ b/tests/Feature/Desfile/EntryControllerTest.php
@@ -2,21 +2,21 @@
 
 namespace Tests\Feature\Desfile;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
diff --git a/tests/Feature/Event/AdminAppEventControllerTest.php b/tests/Feature/Event/AdminAppEventControllerTest.php
index ae23b88..489b5fd 100644
--- a/tests/Feature/Event/AdminAppEventControllerTest.php
+++ b/tests/Feature/Event/AdminAppEventControllerTest.php
@@ -2,23 +2,23 @@
 
 namespace Tests\Feature\Event;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Purchase\Services\Checkout\CatalogSelectionResolver;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Domains\Commerce\Purchase\Services\Checkout\CatalogSelectionResolver;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\SocialMediaSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Event/EventDateNoticeControllerTest.php b/tests/Feature/Event/EventDateNoticeControllerTest.php
index 77e3f38..2d9412e 100644
--- a/tests/Feature/Event/EventDateNoticeControllerTest.php
+++ b/tests/Feature/Event/EventDateNoticeControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Event;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php
index 4d7d258..d04907f 100644
--- a/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php
+++ b/tests/Feature/FiestaFutbolInfantil/AccommodationControllerTest.php
@@ -2,17 +2,17 @@
 
 namespace Tests\Feature\FiestaFutbolInfantil;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php
index a74f2de..fb3b59f 100644
--- a/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php
+++ b/tests/Feature/FiestaFutbolInfantil/EntryControllerTest.php
@@ -2,17 +2,17 @@
 
 namespace Tests\Feature\FiestaFutbolInfantil;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php
index 1322a41..bef7436 100644
--- a/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php
+++ b/tests/Feature/FiestaFutbolInfantil/FoodControllerTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\FiestaFutbolInfantil;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Services\EventService;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Services\EventService;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
diff --git a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php
index 2361ee2..09752a4 100644
--- a/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php
+++ b/tests/Feature/FiestaFutbolInfantil/MerchandiseControllerTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Feature\FiestaFutbolInfantil;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppEntryFormControllerTest.php b/tests/Feature/Forms/AdminAppEntryFormControllerTest.php
index dc3dd4b..79150d4 100644
--- a/tests/Feature/Forms/AdminAppEntryFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppEntryFormControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppEventFormControllerTest.php b/tests/Feature/Forms/AdminAppEventFormControllerTest.php
index 4848c98..7897afe 100644
--- a/tests/Feature/Forms/AdminAppEventFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppEventFormControllerTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\SocialMediaSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Forms/AdminAppFoodFormControllerTest.php b/tests/Feature/Forms/AdminAppFoodFormControllerTest.php
index d4d8d96..fede47d 100644
--- a/tests/Feature/Forms/AdminAppFoodFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppFoodFormControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppMerchandiseFormControllerTest.php b/tests/Feature/Forms/AdminAppMerchandiseFormControllerTest.php
index 451b9e9..846fe64 100644
--- a/tests/Feature/Forms/AdminAppMerchandiseFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppMerchandiseFormControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppSaleFormControllerTest.php b/tests/Feature/Forms/AdminAppSaleFormControllerTest.php
index 934ccb6..3b5ec6d 100644
--- a/tests/Feature/Forms/AdminAppSaleFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppSaleFormControllerTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppStaffFormControllerTest.php b/tests/Feature/Forms/AdminAppStaffFormControllerTest.php
index fa0a3a3..a3b5ea7 100644
--- a/tests/Feature/Forms/AdminAppStaffFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppStaffFormControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Forms/AdminAppTicketFilterFormControllerTest.php b/tests/Feature/Forms/AdminAppTicketFilterFormControllerTest.php
index 3174d77..b6d873b 100644
--- a/tests/Feature/Forms/AdminAppTicketFilterFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppTicketFilterFormControllerTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\FiestaFutbolInfantilProductSeeder;
diff --git a/tests/Feature/Forms/AdminAppTicketFormControllerTest.php b/tests/Feature/Forms/AdminAppTicketFormControllerTest.php
index 78c97d7..381f5c3 100644
--- a/tests/Feature/Forms/AdminAppTicketFormControllerTest.php
+++ b/tests/Feature/Forms/AdminAppTicketFormControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Forms;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\FiestaFutbolInfantilProductSeeder;
diff --git a/tests/Feature/Integration/ClientIntegrationControllerTest.php b/tests/Feature/Integration/ClientIntegrationControllerTest.php
index ab808e1..ce4dce9 100644
--- a/tests/Feature/Integration/ClientIntegrationControllerTest.php
+++ b/tests/Feature/Integration/ClientIntegrationControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Integration;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Services\ClientIntegrationService;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Services\ClientIntegrationService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
 use Mockery;
diff --git a/tests/Feature/Integration/IntegrationInstanceTest.php b/tests/Feature/Integration/IntegrationInstanceTest.php
index 5ae1f8b..40ebb57 100644
--- a/tests/Feature/Integration/IntegrationInstanceTest.php
+++ b/tests/Feature/Integration/IntegrationInstanceTest.php
@@ -2,20 +2,20 @@
 
 namespace Tests\Feature\Integration;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Client\Models\Client;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Services\BaseIntegrationService;
-use App\Domains\Integration\Services\ClientIntegrationService;
-use App\Domains\Integration\Services\IntegrationAssociationService;
-use App\Domains\Integration\Services\IntegrationInstanceService;
-use App\Domains\Integration\Services\TelepagosIntegrationService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Client\Models\Client;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Services\BaseIntegrationService;
+use App\Shared\Integration\Services\ClientIntegrationService;
+use App\Shared\Integration\Services\IntegrationAssociationService;
+use App\Shared\Integration\Services\IntegrationInstanceService;
+use App\Shared\Integration\Services\TelepagosIntegrationService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
diff --git a/tests/Feature/Integration/IntegrationServiceTest.php b/tests/Feature/Integration/IntegrationServiceTest.php
index 847a4e6..dc5d886 100644
--- a/tests/Feature/Integration/IntegrationServiceTest.php
+++ b/tests/Feature/Integration/IntegrationServiceTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Integration;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Services\TelepagosIntegrationService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Services\TelepagosIntegrationService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Exception;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\Client\PendingRequest;
diff --git a/tests/Feature/Integration/MailServiceTest.php b/tests/Feature/Integration/MailServiceTest.php
index 5762584..425ba52 100644
--- a/tests/Feature/Integration/MailServiceTest.php
+++ b/tests/Feature/Integration/MailServiceTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Feature\Integration;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Services\ClientIntegrationService;
-use App\Domains\Integration\Services\IntegrationAssociationService;
-use App\Domains\Integration\Services\MailService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Services\ClientIntegrationService;
+use App\Shared\Integration\Services\IntegrationAssociationService;
+use App\Shared\Integration\Services\MailService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailer;
diff --git a/tests/Feature/Integration/TelepagosWebhookTest.php b/tests/Feature/Integration/TelepagosWebhookTest.php
index 0edfed9..17518dc 100644
--- a/tests/Feature/Integration/TelepagosWebhookTest.php
+++ b/tests/Feature/Integration/TelepagosWebhookTest.php
@@ -2,20 +2,20 @@
 
 namespace Tests\Feature\Integration;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\TelepagosPayment;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Shared\Integration\Models\Integration;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
diff --git a/tests/Feature/Logging/LogsValueChangesTest.php b/tests/Feature/Logging/LogsValueChangesTest.php
index 11d6d64..b3edd2d 100644
--- a/tests/Feature/Logging/LogsValueChangesTest.php
+++ b/tests/Feature/Logging/LogsValueChangesTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Logging;
 
-use App\Domains\Logging\Enums\ValueChangeActorType;
-use App\Domains\Logging\Models\Concerns\LogsValueChanges;
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Logging\Enums\ValueChangeActorType;
+use App\Shared\Logging\Models\Concerns\LogsValueChanges;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/tests/Feature/MailTest/MailTestControllerTest.php b/tests/Feature/MailTest/MailTestControllerTest.php
index f30d565..dd338ab 100644
--- a/tests/Feature/MailTest/MailTestControllerTest.php
+++ b/tests/Feature/MailTest/MailTestControllerTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\MailTest;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\MailTest\Mailables\TestMail;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\MailTest\Mailables\TestMail;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
diff --git a/tests/Feature/Menu/TenantMenuControllerTest.php b/tests/Feature/Menu/TenantMenuControllerTest.php
index a5e811b..a322bfb 100644
--- a/tests/Feature/Menu/TenantMenuControllerTest.php
+++ b/tests/Feature/Menu/TenantMenuControllerTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature\Menu;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\MenuSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
diff --git a/tests/Feature/Migrations/AddCheckoutEditingPolicyToTenantsTest.php b/tests/Feature/Migrations/AddCheckoutEditingPolicyToTenantsTest.php
index fcce1c1..502ecee 100644
--- a/tests/Feature/Migrations/AddCheckoutEditingPolicyToTenantsTest.php
+++ b/tests/Feature/Migrations/AddCheckoutEditingPolicyToTenantsTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Migrations;
 
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Notification/IdempotentEmailDeliveryServiceTest.php b/tests/Feature/Notification/IdempotentEmailDeliveryServiceTest.php
index 5b666a1..714520b 100644
--- a/tests/Feature/Notification/IdempotentEmailDeliveryServiceTest.php
+++ b/tests/Feature/Notification/IdempotentEmailDeliveryServiceTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Notification;
 
-use App\Domains\Notification\Models\EmailDelivery;
-use App\Domains\Notification\Services\IdempotentEmailDeliveryService;
+use App\Shared\Notification\Models\EmailDelivery;
+use App\Shared\Notification\Services\IdempotentEmailDeliveryService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use RuntimeException;
 use Tests\TestCase;
diff --git a/tests/Feature/Notification/NotificationMailServiceTest.php b/tests/Feature/Notification/NotificationMailServiceTest.php
index be63aa3..e1b96a4 100644
--- a/tests/Feature/Notification/NotificationMailServiceTest.php
+++ b/tests/Feature/Notification/NotificationMailServiceTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Notification;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Notification\Services\NotificationMailService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Shared\Notification\Services\NotificationMailService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Barryvdh\DomPDF\ServiceProvider as DomPdfServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Mail\Mailable;
diff --git a/tests/Feature/Notification/QueuedNotificationListenerTest.php b/tests/Feature/Notification/QueuedNotificationListenerTest.php
index f9234ce..d77e6e2 100644
--- a/tests/Feature/Notification/QueuedNotificationListenerTest.php
+++ b/tests/Feature/Notification/QueuedNotificationListenerTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature\Notification;
 
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Notification\Listeners\SendEventDateRescheduledEmails;
-use App\Domains\Notification\Listeners\SendEventDateSuspendedEmails;
-use App\Domains\Notification\Listeners\SendPurchaseConfirmedEmail;
-use App\Domains\Notification\Services\NotificationMailService;
-use App\Domains\Purchase\Events\PurchasePaid;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Shared\Notification\Listeners\SendEventDateRescheduledEmails;
+use App\Shared\Notification\Listeners\SendEventDateSuspendedEmails;
+use App\Shared\Notification\Listeners\SendPurchaseConfirmedEmail;
+use App\Shared\Notification\Services\NotificationMailService;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
 use Mockery;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Purchase/PurchaseCatalogItemTest.php b/tests/Feature/Purchase/PurchaseCatalogItemTest.php
index 8d1ac8e..bb44660 100644
--- a/tests/Feature/Purchase/PurchaseCatalogItemTest.php
+++ b/tests/Feature/Purchase/PurchaseCatalogItemTest.php
@@ -2,14 +2,14 @@
 
 namespace Tests\Feature\Purchase;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Purchase/PurchaseExpiredExceptionResponseTest.php b/tests/Feature/Purchase/PurchaseExpiredExceptionResponseTest.php
index 49e4522..705664b 100644
--- a/tests/Feature/Purchase/PurchaseExpiredExceptionResponseTest.php
+++ b/tests/Feature/Purchase/PurchaseExpiredExceptionResponseTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Purchase;
 
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
 use Illuminate\Support\Facades\Route;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Purchase/StorePurchaseTest.php b/tests/Feature/Purchase/StorePurchaseTest.php
index 65ec3f6..f92cb68 100644
--- a/tests/Feature/Purchase/StorePurchaseTest.php
+++ b/tests/Feature/Purchase/StorePurchaseTest.php
@@ -2,22 +2,22 @@
 
 namespace Tests\Feature\Purchase;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Purchase\Services\UserPurchaseLimitService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Commerce\Purchase\Services\UserPurchaseLimitService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Str;
diff --git a/tests/Feature/Sale/AdminAppSaleControllerTest.php b/tests/Feature/Sale/AdminAppSaleControllerTest.php
index 6a9f03d..5f694a6 100644
--- a/tests/Feature/Sale/AdminAppSaleControllerTest.php
+++ b/tests/Feature/Sale/AdminAppSaleControllerTest.php
@@ -2,25 +2,25 @@
 
 namespace Tests\Feature\Sale;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Models\CartItem;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Logging\Enums\ValueChangeActorType;
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Events\PurchasePaid;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Purchase\Services\CheckoutService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Models\CartItem;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Shared\Logging\Enums\ValueChangeActorType;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Events\PurchasePaid;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Purchase\Services\CheckoutService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Feature/Seeders/AuthorizationSeederTest.php b/tests/Feature/Seeders/AuthorizationSeederTest.php
index 4fe9976..36a84ee 100644
--- a/tests/Feature/Seeders/AuthorizationSeederTest.php
+++ b/tests/Feature/Seeders/AuthorizationSeederTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Permission;
-use App\Domains\Authorization\Models\Role;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Permission;
+use App\Domains\Core\Authorization\Models\Role;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
diff --git a/tests/Feature/Seeders/FiestaFutbolInfantilProductSeederTest.php b/tests/Feature/Seeders/FiestaFutbolInfantilProductSeederTest.php
index 98e5071..7d7a82f 100644
--- a/tests/Feature/Seeders/FiestaFutbolInfantilProductSeederTest.php
+++ b/tests/Feature/Seeders/FiestaFutbolInfantilProductSeederTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\FiestaFutbolInfantilProductSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Seeders/MenuSeederTest.php b/tests/Feature/Seeders/MenuSeederTest.php
index d253c8d..0864ce3 100644
--- a/tests/Feature/Seeders/MenuSeederTest.php
+++ b/tests/Feature/Seeders/MenuSeederTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\AuthorizationSeeder;
 use Database\Seeders\MenuSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Seeders/ProductCatalogFromImagesSeederTest.php b/tests/Feature/Seeders/ProductCatalogFromImagesSeederTest.php
index cf2d47f..2373c6b 100644
--- a/tests/Feature/Seeders/ProductCatalogFromImagesSeederTest.php
+++ b/tests/Feature/Seeders/ProductCatalogFromImagesSeederTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\BrandSeeder;
 use Database\Seeders\CategorySeeder;
diff --git a/tests/Feature/Seeders/SocialMediaSeederTest.php b/tests/Feature/Seeders/SocialMediaSeederTest.php
index 6bae057..3e771c9 100644
--- a/tests/Feature/Seeders/SocialMediaSeederTest.php
+++ b/tests/Feature/Seeders/SocialMediaSeederTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Tenant\Models\SocialMedia;
+use App\Domains\Core\Tenant\Models\SocialMedia;
 use Database\Seeders\SocialMediaSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
diff --git a/tests/Feature/Seeders/TenantSeederTest.php b/tests/Feature/Seeders/TenantSeederTest.php
index df4c542..7106a60 100644
--- a/tests/Feature/Seeders/TenantSeederTest.php
+++ b/tests/Feature/Seeders/TenantSeederTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Database\Seeders\SocialMediaSeeder;
 use Database\Seeders\TenantSeeder;
 use Database\Seeders\WebsiteTypeSeeder;
diff --git a/tests/Feature/Seeders/WebsiteTypeSeederTest.php b/tests/Feature/Seeders/WebsiteTypeSeederTest.php
index cff02dc..3851d8a 100644
--- a/tests/Feature/Seeders/WebsiteTypeSeederTest.php
+++ b/tests/Feature/Seeders/WebsiteTypeSeederTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Seeders;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Database\Seeders\WebsiteTypeSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Staff/StaffControllerTest.php b/tests/Feature/Staff/StaffControllerTest.php
index 538144d..0b0a36c 100644
--- a/tests/Feature/Staff/StaffControllerTest.php
+++ b/tests/Feature/Staff/StaffControllerTest.php
@@ -2,19 +2,19 @@
 
 namespace Tests\Feature\Staff;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\ResetPasswordAttempt;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Enums\ScanAttemptResult;
-use App\Domains\Ticket\Models\ScanAttempt;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Feature/Tenant/AdminAppWebsiteExtraControllerTest.php b/tests/Feature/Tenant/AdminAppWebsiteExtraControllerTest.php
index c714567..508f820 100644
--- a/tests/Feature/Tenant/AdminAppWebsiteExtraControllerTest.php
+++ b/tests/Feature/Tenant/AdminAppWebsiteExtraControllerTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
diff --git a/tests/Feature/Tenant/AdminWebsiteTypeServiceTest.php b/tests/Feature/Tenant/AdminWebsiteTypeServiceTest.php
index 7e7f487..3f0dcca 100644
--- a/tests/Feature/Tenant/AdminWebsiteTypeServiceTest.php
+++ b/tests/Feature/Tenant/AdminWebsiteTypeServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Tenant\Services\AdminWebsiteTypeService;
+use App\Domains\Core\Tenant\Services\AdminWebsiteTypeService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Tenant/BootstrapAdminAppControllerTest.php b/tests/Feature/Tenant/BootstrapAdminAppControllerTest.php
index 5e0de5c..1598fdf 100644
--- a/tests/Feature/Tenant/BootstrapAdminAppControllerTest.php
+++ b/tests/Feature/Tenant/BootstrapAdminAppControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Tenant/BootstrapScannerControllerTest.php b/tests/Feature/Tenant/BootstrapScannerControllerTest.php
index a0932bf..399700d 100644
--- a/tests/Feature/Tenant/BootstrapScannerControllerTest.php
+++ b/tests/Feature/Tenant/BootstrapScannerControllerTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Tenant/BootstrapTenantControllerTest.php b/tests/Feature/Tenant/BootstrapTenantControllerTest.php
index 20bd8b4..f56b2de 100644
--- a/tests/Feature/Tenant/BootstrapTenantControllerTest.php
+++ b/tests/Feature/Tenant/BootstrapTenantControllerTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Attachable\Models\AttachmentCrop;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Authorization\Models\Role;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Shared\Attachable\Models\AttachmentCrop;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Authorization\Models\Role;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Database\Seeders\WebsiteTypeSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
diff --git a/tests/Feature/Tenant/StoreTenantWithExtrasTest.php b/tests/Feature/Tenant/StoreTenantWithExtrasTest.php
index 78afeb7..8c89964 100644
--- a/tests/Feature/Tenant/StoreTenantWithExtrasTest.php
+++ b/tests/Feature/Tenant/StoreTenantWithExtrasTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Services\TenantInformationService;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Services\TenantInformationService;
 use Database\Seeders\WebsiteTypeSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Tenant/TenantBootstrapRouteTest.php b/tests/Feature/Tenant/TenantBootstrapRouteTest.php
index 2faaebe..900593d 100644
--- a/tests/Feature/Tenant/TenantBootstrapRouteTest.php
+++ b/tests/Feature/Tenant/TenantBootstrapRouteTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Bootstrap\Controllers\TenantBootstrapController;
+use App\Domains\Core\Bootstrap\Controllers\TenantBootstrapController;
 use Illuminate\Http\Request;
 use Tests\TestCase;
 
diff --git a/tests/Feature/Tenant/TenantRefundConfigurationTest.php b/tests/Feature/Tenant/TenantRefundConfigurationTest.php
index 6091bbb..38c17e9 100644
--- a/tests/Feature/Tenant/TenantRefundConfigurationTest.php
+++ b/tests/Feature/Tenant/TenantRefundConfigurationTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
diff --git a/tests/Feature/Tenant/TenantSocialMediaTest.php b/tests/Feature/Tenant/TenantSocialMediaTest.php
index 0901eb9..464729f 100644
--- a/tests/Feature/Tenant/TenantSocialMediaTest.php
+++ b/tests/Feature/Tenant/TenantSocialMediaTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\SocialMedia;
-use App\Domains\Tenant\Models\Tenant;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\SocialMedia;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Tenant/WebsiteExtrasTest.php b/tests/Feature/Tenant/WebsiteExtrasTest.php
index b5fb1fd..755eece 100644
--- a/tests/Feature/Tenant/WebsiteExtrasTest.php
+++ b/tests/Feature/Tenant/WebsiteExtrasTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature\Tenant;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Tenant\Models\StorefrontWebsiteType;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Schema;
 use Tests\TestCase;
diff --git a/tests/Feature/Ticket/AdminAppTicketControllerTest.php b/tests/Feature/Ticket/AdminAppTicketControllerTest.php
index a2c2bc1..b97b041 100644
--- a/tests/Feature/Ticket/AdminAppTicketControllerTest.php
+++ b/tests/Feature/Ticket/AdminAppTicketControllerTest.php
@@ -2,22 +2,22 @@
 
 namespace Tests\Feature\Ticket;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Menu\Models\Menu;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\TicketRefund;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\TicketRefund;
 use Barryvdh\DomPDF\ServiceProvider as DomPdfServiceProvider;
 use Database\Seeders\AttributeSeeder;
 use Database\Seeders\AuthorizationSeeder;
diff --git a/tests/Feature/Ticket/PrepareLoadTestTicketsCommandTest.php b/tests/Feature/Ticket/PrepareLoadTestTicketsCommandTest.php
index 9866230..4d3d503 100644
--- a/tests/Feature/Ticket/PrepareLoadTestTicketsCommandTest.php
+++ b/tests/Feature/Ticket/PrepareLoadTestTicketsCommandTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\Ticket;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Artisan;
diff --git a/tests/Feature/Ticket/ScannerTicketControllerTest.php b/tests/Feature/Ticket/ScannerTicketControllerTest.php
index 1cce53a..908a606 100644
--- a/tests/Feature/Ticket/ScannerTicketControllerTest.php
+++ b/tests/Feature/Ticket/ScannerTicketControllerTest.php
@@ -2,17 +2,17 @@
 
 namespace Tests\Feature\Ticket;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Authorization\Enums\PermissionCode;
-use App\Domains\Authorization\Enums\RoleCode;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Tenant\Models\AdminWebsiteType;
-use App\Domains\Ticket\Enums\ScanAttemptResult;
-use App\Domains\Ticket\Models\ScanAttempt;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\PermissionCode;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
+use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
+use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
diff --git a/tests/Feature/Ticket/TicketControllerTest.php b/tests/Feature/Ticket/TicketControllerTest.php
index dc9e0a0..fb6fc5e 100644
--- a/tests/Feature/Ticket/TicketControllerTest.php
+++ b/tests/Feature/Ticket/TicketControllerTest.php
@@ -2,18 +2,18 @@
 
 namespace Tests\Feature\Ticket;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Event\Events\EventDateRescheduled;
-use App\Domains\Event\Events\EventDateSuspended;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Services\EventService;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
+use App\Domains\Ticketing\Event\Events\EventDateSuspended;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Services\EventService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
diff --git a/tests/Feature/Ticket/TicketGeneratorServiceTest.php b/tests/Feature/Ticket/TicketGeneratorServiceTest.php
index 5edbf37..a74876f 100644
--- a/tests/Feature/Ticket/TicketGeneratorServiceTest.php
+++ b/tests/Feature/Ticket/TicketGeneratorServiceTest.php
@@ -2,22 +2,22 @@
 
 namespace Tests\Feature\Ticket;
 
-use App\Domains\Attachable\Enums\AttachmentType;
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Services\CatalogService;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Exceptions\TicketGenerationException;
-use App\Domains\Ticket\Models\ValidityTime;
-use App\Domains\Ticket\Services\TicketGeneratorService;
+use App\Shared\Attachable\Enums\AttachmentType;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Services\CatalogService;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Database\QueryException;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Unit/Auth/ResetPasswordAttemptServiceTest.php b/tests/Unit/Auth/ResetPasswordAttemptServiceTest.php
index 0fffb8b..2b58b45 100644
--- a/tests/Unit/Auth/ResetPasswordAttemptServiceTest.php
+++ b/tests/Unit/Auth/ResetPasswordAttemptServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Auth;
 
-use App\Domains\Auth\Services\ResetPasswordAttemptService;
+use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use RuntimeException;
diff --git a/tests/Unit/Bootstrap/AdminAppBootstrapResourceTest.php b/tests/Unit/Bootstrap/AdminAppBootstrapResourceTest.php
index cb12005..edd5299 100644
--- a/tests/Unit/Bootstrap/AdminAppBootstrapResourceTest.php
+++ b/tests/Unit/Bootstrap/AdminAppBootstrapResourceTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Bootstrap;
 
-use App\Domains\Bootstrap\Resources\AdminAppBootstrapResource;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Domains\Core\Bootstrap\Resources\AdminAppBootstrapResource;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Tests\TestCase;
 
 class AdminAppBootstrapResourceTest extends TestCase
diff --git a/tests/Unit/Cart/InvalidateEventDateCartsServiceTest.php b/tests/Unit/Cart/InvalidateEventDateCartsServiceTest.php
index 3d59a4d..4c3fc64 100644
--- a/tests/Unit/Cart/InvalidateEventDateCartsServiceTest.php
+++ b/tests/Unit/Cart/InvalidateEventDateCartsServiceTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Cart;
 
-use App\Domains\Cart\Models\Cart;
-use App\Domains\Cart\Services\InvalidateEventDateCartsService;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Commerce\Cart\Models\Cart;
+use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
diff --git a/tests/Unit/Catalog/CatalogItemAllowanceServiceTest.php b/tests/Unit/Catalog/CatalogItemAllowanceServiceTest.php
index 4d882aa..e88625d 100644
--- a/tests/Unit/Catalog/CatalogItemAllowanceServiceTest.php
+++ b/tests/Unit/Catalog/CatalogItemAllowanceServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Catalog;
 
-use App\Domains\Catalog\Services\CatalogItemAllowanceService;
+use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
 use ReflectionClass;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Catalog/CatalogModelsTest.php b/tests/Unit/Catalog/CatalogModelsTest.php
index 45ca556..8b39c0a 100644
--- a/tests/Unit/Catalog/CatalogModelsTest.php
+++ b/tests/Unit/Catalog/CatalogModelsTest.php
@@ -2,29 +2,29 @@
 
 namespace Tests\Unit\Catalog;
 
-use App\Domains\Attachable\Models\Attachment;
-use App\Domains\Catalog\Enums\CatalogItemType;
-use App\Domains\Catalog\Enums\FeaturedGroupSource;
-use App\Domains\Catalog\Enums\GroupLayout;
-use App\Domains\Catalog\Enums\InventoryPolicy;
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Enums\ProductLayout;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\Brand;
-use App\Domains\Catalog\Models\BundleComponent;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Category;
-use App\Domains\Catalog\Models\FeaturedGroup;
-use App\Domains\Catalog\Models\FeaturedItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Models\VariantDefinition;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\Ticket;
+use App\Shared\Attachable\Models\Attachment;
+use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
+use App\Domains\Commerce\Catalog\Enums\FeaturedGroupSource;
+use App\Domains\Commerce\Catalog\Enums\GroupLayout;
+use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Enums\ProductLayout;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\Brand;
+use App\Domains\Commerce\Catalog\Models\BundleComponent;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Category;
+use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
+use App\Domains\Commerce\Catalog\Models\FeaturedItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\VariantDefinition;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Shared\Enums\FieldType;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Catalog/ExpireStockReservationsServiceTest.php b/tests/Unit/Catalog/ExpireStockReservationsServiceTest.php
index 1abef5c..4ed255d 100644
--- a/tests/Unit/Catalog/ExpireStockReservationsServiceTest.php
+++ b/tests/Unit/Catalog/ExpireStockReservationsServiceTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Catalog;
 
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Catalog\Models\StockReservationLine;
-use App\Domains\Catalog\Services\ExpireStockReservationsService;
-use App\Domains\Catalog\Services\StockReservationService;
-use App\Domains\Purchase\Services\Checkout\ReleaseCheckoutService;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Catalog\Models\StockReservationLine;
+use App\Domains\Commerce\Catalog\Services\ExpireStockReservationsService;
+use App\Domains\Commerce\Catalog\Services\StockReservationService;
+use App\Domains\Commerce\Purchase\Services\Checkout\ReleaseCheckoutService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use RuntimeException;
 use Tests\TestCase;
diff --git a/tests/Unit/Event/EventDateGroupingServiceTest.php b/tests/Unit/Event/EventDateGroupingServiceTest.php
index 2662b4c..5bb0f9f 100644
--- a/tests/Unit/Event/EventDateGroupingServiceTest.php
+++ b/tests/Unit/Event/EventDateGroupingServiceTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Event;
 
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Resources\EventResource;
-use App\Domains\Event\Services\EventDateGroupingService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Resources\EventResource;
+use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Collection;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Event/EventDateInfoFormatterTest.php b/tests/Unit/Event/EventDateInfoFormatterTest.php
index 0742a73..e4d77a2 100644
--- a/tests/Unit/Event/EventDateInfoFormatterTest.php
+++ b/tests/Unit/Event/EventDateInfoFormatterTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Event;
 
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Event\Services\EventDateInfoFormatter;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Services\EventDateInfoFormatter;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Event/EventDateNoticeFormatterTest.php b/tests/Unit/Event/EventDateNoticeFormatterTest.php
index 8ff0c73..551be21 100644
--- a/tests/Unit/Event/EventDateNoticeFormatterTest.php
+++ b/tests/Unit/Event/EventDateNoticeFormatterTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Event;
 
-use App\Domains\Event\Enums\EventDateChangeType;
-use App\Domains\Event\Models\EventDateChange;
-use App\Domains\Event\Services\EventDateNoticeFormatter;
-use App\Domains\Event\Services\EventDateTextFormatter;
+use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
+use App\Domains\Ticketing\Event\Models\EventDateChange;
+use App\Domains\Ticketing\Event\Services\EventDateNoticeFormatter;
+use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
 use Tests\TestCase;
 
 class EventDateNoticeFormatterTest extends TestCase
diff --git a/tests/Unit/Event/EventDateTextFormatterTest.php b/tests/Unit/Event/EventDateTextFormatterTest.php
index a5f1f7b..818e242 100644
--- a/tests/Unit/Event/EventDateTextFormatterTest.php
+++ b/tests/Unit/Event/EventDateTextFormatterTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Event;
 
-use App\Domains\Event\Services\EventDateTextFormatter;
+use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Event/EventModelsTest.php b/tests/Unit/Event/EventModelsTest.php
index 7dc90d2..b93e05a 100644
--- a/tests/Unit/Event/EventModelsTest.php
+++ b/tests/Unit/Event/EventModelsTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Event;
 
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Enums\EventDateStatus;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Enums\EventDateStatus;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 
diff --git a/tests/Unit/FiestaFutbolInfantil/EntryResourceTest.php b/tests/Unit/FiestaFutbolInfantil/EntryResourceTest.php
index 3bbf8d1..c23bfef 100644
--- a/tests/Unit/FiestaFutbolInfantil/EntryResourceTest.php
+++ b/tests/Unit/FiestaFutbolInfantil/EntryResourceTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\FiestaFutbolInfantil;
 
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Inventory;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\FiestaFutbolInfantil\Resources\EntryResource;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Inventory;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Domains\Ticketing\FiestaFutbolInfantil\Resources\EntryResource;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
diff --git a/tests/Unit/Forms/SaleFormServiceTest.php b/tests/Unit/Forms/SaleFormServiceTest.php
index 741e2d4..ff94288 100644
--- a/tests/Unit/Forms/SaleFormServiceTest.php
+++ b/tests/Unit/Forms/SaleFormServiceTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Forms;
 
-use App\Domains\Forms\Services\SaleFormService;
-use App\Domains\Purchase\Models\Purchase;
+use App\Shared\Forms\Services\SaleFormService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use PHPUnit\Framework\TestCase;
 
 class SaleFormServiceTest extends TestCase
diff --git a/tests/Unit/IntegrationInstanceSchemaTest.php b/tests/Unit/IntegrationInstanceSchemaTest.php
index 53660d0..a63a0a2 100644
--- a/tests/Unit/IntegrationInstanceSchemaTest.php
+++ b/tests/Unit/IntegrationInstanceSchemaTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit;
 
-use App\Domains\Integration\Models\ClientIntegration;
-use App\Domains\Integration\Models\Integration;
-use App\Domains\Integration\Models\IntegrationInstance;
-use App\Domains\Integration\Models\AdminWebsiteTypeIntegration;
-use App\Domains\Tenant\Models\AdminWebsiteType;
+use App\Shared\Integration\Models\ClientIntegration;
+use App\Shared\Integration\Models\Integration;
+use App\Shared\Integration\Models\IntegrationInstance;
+use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
+use App\Domains\Core\Tenant\Models\AdminWebsiteType;
 use Illuminate\Config\Repository;
 use Illuminate\Container\Container;
 use Illuminate\Database\Capsule\Manager;
diff --git a/tests/Unit/Logging/ValueChangeTest.php b/tests/Unit/Logging/ValueChangeTest.php
index 8add79d..ea51cf9 100644
--- a/tests/Unit/Logging/ValueChangeTest.php
+++ b/tests/Unit/Logging/ValueChangeTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Logging;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Logging\Enums\ValueChangeActorType;
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Logging\Enums\ValueChangeActorType;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Notification/NotificationMailServiceLoggingTest.php b/tests/Unit/Notification/NotificationMailServiceLoggingTest.php
index 9f69677..df9808d 100644
--- a/tests/Unit/Notification/NotificationMailServiceLoggingTest.php
+++ b/tests/Unit/Notification/NotificationMailServiceLoggingTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Notification;
 
-use App\Domains\Integration\Services\MailService;
-use App\Domains\Notification\Services\IdempotentEmailDeliveryService;
-use App\Domains\Notification\Services\NotificationMailService;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Ticket\Services\TicketPdfService;
+use App\Shared\Integration\Services\MailService;
+use App\Shared\Notification\Services\IdempotentEmailDeliveryService;
+use App\Shared\Notification\Services\NotificationMailService;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
diff --git a/tests/Unit/Notification/SendPasswordResetEmailTest.php b/tests/Unit/Notification/SendPasswordResetEmailTest.php
index 41a5ec7..4df15fa 100644
--- a/tests/Unit/Notification/SendPasswordResetEmailTest.php
+++ b/tests/Unit/Notification/SendPasswordResetEmailTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Notification;
 
-use App\Domains\Notification\Events\PasswordResetRequested;
-use App\Domains\Notification\Listeners\SendPasswordResetEmail;
-use App\Domains\Notification\Services\NotificationMailService;
+use App\Shared\Notification\Events\PasswordResetRequested;
+use App\Shared\Notification\Listeners\SendPasswordResetEmail;
+use App\Shared\Notification\Services\NotificationMailService;
 use RuntimeException;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Purchase/DniDistanceServiceTest.php b/tests/Unit/Purchase/DniDistanceServiceTest.php
index 2e531f7..1615d3b 100644
--- a/tests/Unit/Purchase/DniDistanceServiceTest.php
+++ b/tests/Unit/Purchase/DniDistanceServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Purchase;
 
-use App\Domains\Purchase\Services\DniDistanceService;
+use App\Domains\Commerce\Purchase\Services\DniDistanceService;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Purchase/InsufficientStockMessageBuilderTest.php b/tests/Unit/Purchase/InsufficientStockMessageBuilderTest.php
index 90b8eda..9cf2c44 100644
--- a/tests/Unit/Purchase/InsufficientStockMessageBuilderTest.php
+++ b/tests/Unit/Purchase/InsufficientStockMessageBuilderTest.php
@@ -2,15 +2,15 @@
 
 namespace Tests\Unit\Purchase;
 
-use App\Domains\Catalog\Enums\InventorySubject;
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Models\VariantDefinition;
-use App\Domains\Purchase\Exceptions\InsufficientStockException;
-use App\Domains\Purchase\Services\Checkout\InsufficientStockMessageBuilder;
+use App\Domains\Commerce\Catalog\Enums\InventorySubject;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\VariantDefinition;
+use App\Domains\Commerce\Purchase\Exceptions\InsufficientStockException;
+use App\Domains\Commerce\Purchase\Services\Checkout\InsufficientStockMessageBuilder;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Facades\App;
 use Tests\TestCase;
diff --git a/tests/Unit/Purchase/PurchaseAdminStatusTest.php b/tests/Unit/Purchase/PurchaseAdminStatusTest.php
index f1fa7f5..875c6d1 100644
--- a/tests/Unit/Purchase/PurchaseAdminStatusTest.php
+++ b/tests/Unit/Purchase/PurchaseAdminStatusTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Purchase;
 
-use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\Purchase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Purchase/PurchaseResourceTest.php b/tests/Unit/Purchase/PurchaseResourceTest.php
index a7f09f9..f7b1788 100644
--- a/tests/Unit/Purchase/PurchaseResourceTest.php
+++ b/tests/Unit/Purchase/PurchaseResourceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Purchase;
 
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Resources\PurchaseResource;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Resources\PurchaseResource;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
diff --git a/tests/Unit/Purchase/PurchaseStateGuardTest.php b/tests/Unit/Purchase/PurchaseStateGuardTest.php
index 9cead5d..0b45e66 100644
--- a/tests/Unit/Purchase/PurchaseStateGuardTest.php
+++ b/tests/Unit/Purchase/PurchaseStateGuardTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Purchase;
 
-use App\Domains\Catalog\Models\StockReservation;
-use App\Domains\Purchase\Exceptions\PurchaseExpiredException;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Services\PurchaseStateGuard;
+use App\Domains\Commerce\Catalog\Models\StockReservation;
+use App\Domains\Commerce\Purchase\Exceptions\PurchaseExpiredException;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
 use Tests\TestCase;
 
 class PurchaseStateGuardTest extends TestCase
diff --git a/tests/Unit/Sale/AdminAppSaleExcelServiceTest.php b/tests/Unit/Sale/AdminAppSaleExcelServiceTest.php
index 34676b0..09182fe 100644
--- a/tests/Unit/Sale/AdminAppSaleExcelServiceTest.php
+++ b/tests/Unit/Sale/AdminAppSaleExcelServiceTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Sale;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Sale\Services\AdminAppSaleExcelService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Sale\Services\AdminAppSaleExcelService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Illuminate\Support\Carbon;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use Symfony\Component\HttpFoundation\StreamedResponse;
diff --git a/tests/Unit/Sale/AdminAppSalePdfRequestTest.php b/tests/Unit/Sale/AdminAppSalePdfRequestTest.php
index 4852211..577fb98 100644
--- a/tests/Unit/Sale/AdminAppSalePdfRequestTest.php
+++ b/tests/Unit/Sale/AdminAppSalePdfRequestTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Sale;
 
-use App\Domains\Sale\Requests\AdminAppSaleModificationPdfRequest;
-use App\Domains\Sale\Requests\AdminAppSalePdfRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSaleModificationPdfRequest;
+use App\Domains\Commerce\Sale\Requests\AdminAppSalePdfRequest;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Validator;
 use Tests\TestCase;
diff --git a/tests/Unit/Sale/AdminAppSalePdfServiceTest.php b/tests/Unit/Sale/AdminAppSalePdfServiceTest.php
index ea80138..ebb8d1b 100644
--- a/tests/Unit/Sale/AdminAppSalePdfServiceTest.php
+++ b/tests/Unit/Sale/AdminAppSalePdfServiceTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Sale;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Sale\Services\AdminAppSalePdfService;
-use App\Domains\Tenant\Models\Tenant;
+use App\Domains\Core\Auth\Models\User;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Sale\Services\AdminAppSalePdfService;
+use App\Domains\Core\Tenant\Models\Tenant;
 use Barryvdh\DomPDF\ServiceProvider;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
diff --git a/tests/Unit/Sale/SaleDetailResourceTest.php b/tests/Unit/Sale/SaleDetailResourceTest.php
index 21838f7..8c57bd3 100644
--- a/tests/Unit/Sale/SaleDetailResourceTest.php
+++ b/tests/Unit/Sale/SaleDetailResourceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Sale;
 
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Purchase\Models\PurchaseItem;
-use App\Domains\Sale\Resources\AdminApp\SaleDetailResource;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Purchase\Models\PurchaseItem;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleDetailResource;
 use Illuminate\Http\Request;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Sale/SaleModificationResourceTest.php b/tests/Unit/Sale/SaleModificationResourceTest.php
index 3f2e3a4..2fbb3ba 100644
--- a/tests/Unit/Sale/SaleModificationResourceTest.php
+++ b/tests/Unit/Sale/SaleModificationResourceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Sale;
 
-use App\Domains\Logging\Models\ValueChange;
-use App\Domains\Purchase\Models\Purchase;
-use App\Domains\Sale\Resources\AdminApp\SaleModificationResource;
+use App\Shared\Logging\Models\ValueChange;
+use App\Domains\Commerce\Purchase\Models\Purchase;
+use App\Domains\Commerce\Sale\Resources\AdminApp\SaleModificationResource;
 use Carbon\CarbonImmutable;
 use Illuminate\Http\Request;
 use Tests\TestCase;
diff --git a/tests/Unit/Tenant/TenantDomainNormalizerTest.php b/tests/Unit/Tenant/TenantDomainNormalizerTest.php
index b736424..0eaa230 100644
--- a/tests/Unit/Tenant/TenantDomainNormalizerTest.php
+++ b/tests/Unit/Tenant/TenantDomainNormalizerTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Tenant;
 
-use App\Domains\Tenant\Support\TenantDomainNormalizer;
+use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/Ticket/AdminAppTicketExportServiceTest.php b/tests/Unit/Ticket/AdminAppTicketExportServiceTest.php
index fd352b5..c61011f 100644
--- a/tests/Unit/Ticket/AdminAppTicketExportServiceTest.php
+++ b/tests/Unit/Ticket/AdminAppTicketExportServiceTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Ticket;
 
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Services\AdminAppTicketColumnService;
-use App\Domains\Ticket\Services\AdminAppTicketExcelService;
-use App\Domains\Ticket\Services\AdminAppTicketPdfService;
-use App\Domains\Ticket\Services\AdminAppTicketReportService;
-use App\Domains\Ticket\Services\AdminAppTicketRowService;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketExcelService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketPdfService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketReportService;
+use App\Domains\Ticketing\Ticket\Services\AdminAppTicketRowService;
 use Barryvdh\DomPDF\ServiceProvider;
 use Illuminate\Support\Carbon;
 use Mockery;
diff --git a/tests/Unit/Ticket/TicketTest.php b/tests/Unit/Ticket/TicketTest.php
index dc0b663..0bce1fe 100644
--- a/tests/Unit/Ticket/TicketTest.php
+++ b/tests/Unit/Ticket/TicketTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Unit\Ticket;
 
-use App\Domains\Auth\Models\User;
-use App\Domains\Catalog\Models\CatalogItem;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Tenant\Models\Tenant;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\Ticket;
-use App\Domains\Ticket\Models\ValidityTime;
-use App\Domains\Ticket\Services\ResolvedTicketValidity;
-use App\Domains\Ticket\Services\ResolvedValidityGroup;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Commerce\Catalog\Models\CatalogItem;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\Ticket;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
+use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Illuminate\Support\Carbon;
 use Illuminate\Validation\ValidationException;
 use Tests\TestCase;
diff --git a/tests/Unit/Ticket/TicketValidityResolverTest.php b/tests/Unit/Ticket/TicketValidityResolverTest.php
index 2401523..7333c95 100644
--- a/tests/Unit/Ticket/TicketValidityResolverTest.php
+++ b/tests/Unit/Ticket/TicketValidityResolverTest.php
@@ -2,16 +2,16 @@
 
 namespace Tests\Unit\Ticket;
 
-use App\Domains\Catalog\Models\Attribute;
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Catalog\Models\ItemAttribute;
-use App\Domains\Catalog\Models\Variant;
-use App\Domains\Catalog\Models\VariantDefinition;
-use App\Domains\Event\Models\EventDate;
-use App\Domains\Shared\Enums\FieldType;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
-use App\Domains\Ticket\Services\TicketValidityResolver;
+use App\Domains\Commerce\Catalog\Models\Attribute;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Commerce\Catalog\Models\ItemAttribute;
+use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Commerce\Catalog\Models\VariantDefinition;
+use App\Domains\Ticketing\Event\Models\EventDate;
+use App\Shared\Enums\FieldType;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
diff --git a/tests/Unit/Ticket/ValidityTimeResourceTest.php b/tests/Unit/Ticket/ValidityTimeResourceTest.php
index 34f202a..c2056f3 100644
--- a/tests/Unit/Ticket/ValidityTimeResourceTest.php
+++ b/tests/Unit/Ticket/ValidityTimeResourceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Ticket;
 
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
-use App\Domains\Ticket\Resources\ValidityTimeResource;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
+use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Ticket/ValidityTimeTest.php b/tests/Unit/Ticket/ValidityTimeTest.php
index 41766e0..b0516d0 100644
--- a/tests/Unit/Ticket/ValidityTimeTest.php
+++ b/tests/Unit/Ticket/ValidityTimeTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Ticket;
 
-use App\Domains\Catalog\Models\AttributeOption;
-use App\Domains\Ticket\Enums\ValidityTimeType;
-use App\Domains\Ticket\Models\ValidityTime;
+use App\Domains\Commerce\Catalog\Models\AttributeOption;
+use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
+use App\Domains\Ticketing\Ticket\Models\ValidityTime;
 use Illuminate\Support\Carbon;
 use Tests\TestCase;