diff --git a/backend/_ide_helper_models.php b/backend/_ide_helper_models.php
index 968ee2c..e027a56 100644
--- a/backend/_ide_helper_models.php
+++ b/backend/_ide_helper_models.php
@@ -46,7 +46,7 @@ class IdeHelperAddress {}
 /**
  * @property int $id
  * @property int $user_id
- * @property \App\Enums\CartStatus $status
+ * @property \App\Enums\Cart\CartStatus $status
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Order|null $order
@@ -87,6 +87,7 @@ class IdeHelperCart {}
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Payment> $payments
  * @property-read int|null $payments_count
  * @property-read \App\Models\StripeSession|null $stripeSession
+ * @property-read mixed $total_amount
  * @property-read \App\Models\User $user
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Order newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Order newQuery()
@@ -272,7 +273,7 @@ class IdeHelperStripeSession {}
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property string $mobile_number
  * @property string $city
- * @property \App\Enums\UserRoles $role
+ * @property \App\Enums\User\UserRoles $role
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Address> $addresses
  * @property-read int|null $addresses_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Cart> $carts
diff --git a/backend/app/Actions/DeleteUserAddressAction.php b/backend/app/Actions/Address/DeleteUserAddressAction.php
similarity index 90%
rename from backend/app/Actions/DeleteUserAddressAction.php
rename to backend/app/Actions/Address/DeleteUserAddressAction.php
index 40e0239..e9d28b5 100644
--- a/backend/app/Actions/DeleteUserAddressAction.php
+++ b/backend/app/Actions/Address/DeleteUserAddressAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Address;
 
 use App\Models\Address;
 
diff --git a/backend/app/Actions/SaveUserAddressAction.php b/backend/app/Actions/Address/SaveUserAddressAction.php
similarity index 74%
rename from backend/app/Actions/SaveUserAddressAction.php
rename to backend/app/Actions/Address/SaveUserAddressAction.php
index 96d2014..d07152b 100644
--- a/backend/app/Actions/SaveUserAddressAction.php
+++ b/backend/app/Actions/Address/SaveUserAddressAction.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Address;
 
-use App\Data\AddUserAddressRequestDTO;
-use App\Data\UserAddressResponseDTO;
+use App\Data\Address\AddUserAddressRequestDTO;
+use App\Data\Address\UserAddressResponseDTO;
 use App\Models\User;
 
 final readonly class SaveUserAddressAction
diff --git a/backend/app/Actions/UpdateUserAddressAction.php b/backend/app/Actions/Address/UpdateUserAddressAction.php
similarity index 73%
rename from backend/app/Actions/UpdateUserAddressAction.php
rename to backend/app/Actions/Address/UpdateUserAddressAction.php
index ec8442d..60d23ae 100644
--- a/backend/app/Actions/UpdateUserAddressAction.php
+++ b/backend/app/Actions/Address/UpdateUserAddressAction.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Address;
 
-use App\Data\UpdateUserAddressRequestDTO;
-use App\Data\UserAddressResponseDTO;
+use App\Data\Address\UpdateUserAddressRequestDTO;
+use App\Data\Address\UserAddressResponseDTO;
 use App\Models\Address;
 
 final readonly class UpdateUserAddressAction
diff --git a/backend/app/Actions/AddProductToCartAction.php b/backend/app/Actions/Cart/AddProductToCartAction.php
similarity index 90%
rename from backend/app/Actions/AddProductToCartAction.php
rename to backend/app/Actions/Cart/AddProductToCartAction.php
index 99aac55..ef9ed57 100644
--- a/backend/app/Actions/AddProductToCartAction.php
+++ b/backend/app/Actions/Cart/AddProductToCartAction.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Cart;
 
-use App\Data\AddToCartDTO;
-use App\Data\CartDTO;
-use App\Enums\CartStatus;
+use App\Data\Cart\AddToCartDTO;
+use App\Data\Cart\CartDTO;
+use App\Enums\Cart\CartStatus;
 use App\Models\Product;
 use App\Models\User;
 
diff --git a/backend/app/Actions/GetActiveUserCartAction.php b/backend/app/Actions/Cart/GetActiveUserCartAction.php
similarity index 82%
rename from backend/app/Actions/GetActiveUserCartAction.php
rename to backend/app/Actions/Cart/GetActiveUserCartAction.php
index 9fd8a7b..1ec6ceb 100644
--- a/backend/app/Actions/GetActiveUserCartAction.php
+++ b/backend/app/Actions/Cart/GetActiveUserCartAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Cart;
 
-use App\Data\CartDTO;
+use App\Data\Cart\CartDTO;
 use App\Models\User;
 
 final readonly class GetActiveUserCartAction
diff --git a/backend/app/Actions/MarkCartAsConvertedAction.php b/backend/app/Actions/Cart/MarkCartAsConvertedAction.php
similarity index 82%
rename from backend/app/Actions/MarkCartAsConvertedAction.php
rename to backend/app/Actions/Cart/MarkCartAsConvertedAction.php
index bf409be..0d63d5e 100644
--- a/backend/app/Actions/MarkCartAsConvertedAction.php
+++ b/backend/app/Actions/Cart/MarkCartAsConvertedAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Cart;
 
-use App\Enums\CartStatus;
+use App\Enums\Cart\CartStatus;
 use App\Models\Cart;
 
 final readonly class MarkCartAsConvertedAction
diff --git a/backend/app/Actions/RemoveProductFromCartAction.php b/backend/app/Actions/Cart/RemoveProductFromCartAction.php
similarity index 93%
rename from backend/app/Actions/RemoveProductFromCartAction.php
rename to backend/app/Actions/Cart/RemoveProductFromCartAction.php
index b9ddceb..b281542 100644
--- a/backend/app/Actions/RemoveProductFromCartAction.php
+++ b/backend/app/Actions/Cart/RemoveProductFromCartAction.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Cart;
 
 use App\Models\User;
 
diff --git a/backend/app/Actions/UpdateProductInCartAction.php b/backend/app/Actions/Cart/UpdateProductInCartAction.php
similarity index 89%
rename from backend/app/Actions/UpdateProductInCartAction.php
rename to backend/app/Actions/Cart/UpdateProductInCartAction.php
index 9bb4d8f..47f4bec 100644
--- a/backend/app/Actions/UpdateProductInCartAction.php
+++ b/backend/app/Actions/Cart/UpdateProductInCartAction.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Cart;
 
-use App\Data\AddToCartDTO;
-use App\Data\CartDTO;
+use App\Data\Cart\AddToCartDTO;
+use App\Data\Cart\CartDTO;
 use App\Models\User;
 use InvalidArgumentException;
 
diff --git a/backend/app/Actions/CreateOrderAction.php b/backend/app/Actions/Order/CreateOrderAction.php
similarity index 93%
rename from backend/app/Actions/CreateOrderAction.php
rename to backend/app/Actions/Order/CreateOrderAction.php
index a1078cd..690a540 100644
--- a/backend/app/Actions/CreateOrderAction.php
+++ b/backend/app/Actions/Order/CreateOrderAction.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Order;
 
-use App\Data\OrderRequestDTO;
-use App\Enums\CartStatus;
+use App\Data\Order\OrderRequestDTO;
+use App\Enums\Cart\CartStatus;
 use App\Exceptions\StaleCartException;
 use App\Models\Address;
 use App\Models\Cart;
diff --git a/backend/app/Actions/MarkPaymentAsPaidAction.php b/backend/app/Actions/Payment/MarkPaymentAsPaidAction.php
similarity index 91%
rename from backend/app/Actions/MarkPaymentAsPaidAction.php
rename to backend/app/Actions/Payment/MarkPaymentAsPaidAction.php
index 9baa89e..54d5af7 100644
--- a/backend/app/Actions/MarkPaymentAsPaidAction.php
+++ b/backend/app/Actions/Payment/MarkPaymentAsPaidAction.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Payment;
 
-use App\Enums\PaymentStatusEnum;
+use App\Actions\Cart\MarkCartAsConvertedAction;
+use App\Enums\Payment\PaymentStatusEnum;
 use App\Models\Payment;
 use App\Models\PaymentStatus;
 use DB;
diff --git a/backend/app/Actions/ProcessOrderPaymentAction.php b/backend/app/Actions/Payment/ProcessOrderPaymentAction.php
similarity index 90%
rename from backend/app/Actions/ProcessOrderPaymentAction.php
rename to backend/app/Actions/Payment/ProcessOrderPaymentAction.php
index b710ff0..ff7cf9a 100644
--- a/backend/app/Actions/ProcessOrderPaymentAction.php
+++ b/backend/app/Actions/Payment/ProcessOrderPaymentAction.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Payment;
 
-use App\Data\PaymentResponseDTO;
-use App\Enums\PaymentModes;
-use App\Enums\PaymentStatusEnum;
+use App\Data\Payment\PaymentResponseDTO;
+use App\Enums\Payment\PaymentModes;
+use App\Enums\Payment\PaymentStatusEnum;
 use App\Models\Order;
 use App\Models\PaymentStatus;
 use App\Services\Payment\PaymentGatewayFactory;
diff --git a/backend/app/Actions/CreateProductAction.php b/backend/app/Actions/Product/CreateProductAction.php
similarity index 81%
rename from backend/app/Actions/CreateProductAction.php
rename to backend/app/Actions/Product/CreateProductAction.php
index e9ec199..52ef7ea 100644
--- a/backend/app/Actions/CreateProductAction.php
+++ b/backend/app/Actions/Product/CreateProductAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Product;
 
-use App\Data\UploadImageDTO;
+use App\Data\Upload\UploadImageDTO;
 
 final readonly class CreateProductAction
 {
diff --git a/backend/app/Actions/GetAllProductCategory.php b/backend/app/Actions/Product/GetAllProductCategory.php
similarity index 83%
rename from backend/app/Actions/GetAllProductCategory.php
rename to backend/app/Actions/Product/GetAllProductCategory.php
index 24d12c3..9ffe761 100644
--- a/backend/app/Actions/GetAllProductCategory.php
+++ b/backend/app/Actions/Product/GetAllProductCategory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Product;
 
-use App\Data\ProductCategoryDTO;
+use App\Data\Product\ProductCategoryDTO;
 use App\Models\ProductCategory;
 
 final readonly class GetAllProductCategory
diff --git a/backend/app/Actions/VerifyStripeSessionAction.php b/backend/app/Actions/Stripe/VerifyStripeSessionAction.php
similarity index 96%
rename from backend/app/Actions/VerifyStripeSessionAction.php
rename to backend/app/Actions/Stripe/VerifyStripeSessionAction.php
index b90e579..f67d010 100644
--- a/backend/app/Actions/VerifyStripeSessionAction.php
+++ b/backend/app/Actions/Stripe/VerifyStripeSessionAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Stripe;
 
-use App\Data\VerifiedCheckoutResponseDTO;
+use App\Data\Payment\VerifiedCheckoutResponseDTO;
 use App\Models\User;
 use Exception;
 use Log;
diff --git a/backend/app/Actions/UploadImageAction.php b/backend/app/Actions/Upload/UploadImageAction.php
similarity index 81%
rename from backend/app/Actions/UploadImageAction.php
rename to backend/app/Actions/Upload/UploadImageAction.php
index 1c0e21b..2ad88e7 100644
--- a/backend/app/Actions/UploadImageAction.php
+++ b/backend/app/Actions/Upload/UploadImageAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\Upload;
 
-use App\Data\UploadImageDTO;
+use App\Data\Upload\UploadImageDTO;
 
 final readonly class UploadImageAction
 {
diff --git a/backend/app/Actions/CreateUserAction.php b/backend/app/Actions/User/CreateUserAction.php
similarity index 93%
rename from backend/app/Actions/CreateUserAction.php
rename to backend/app/Actions/User/CreateUserAction.php
index 96ef8ff..827f1d0 100644
--- a/backend/app/Actions/CreateUserAction.php
+++ b/backend/app/Actions/User/CreateUserAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Actions;
+namespace App\Actions\User;
 
-use App\Data\RegisterDTO;
+use App\Data\User\RegisterDTO;
 use App\Models\User;
 
 final readonly class CreateUserAction
diff --git a/backend/app/Contracts/PaymentGateway.php b/backend/app/Contracts/PaymentGateway.php
index 43ce900..3f50c99 100644
--- a/backend/app/Contracts/PaymentGateway.php
+++ b/backend/app/Contracts/PaymentGateway.php
@@ -2,7 +2,7 @@
 
 namespace App\Contracts;
 
-use App\Data\PaymentResponseDTO;
+use App\Data\Payment\PaymentResponseDTO;
 use App\Models\Order;
 
 interface PaymentGateway
diff --git a/backend/app/Data/AddUserAddressRequestDTO.php b/backend/app/Data/Address/AddUserAddressRequestDTO.php
similarity index 97%
rename from backend/app/Data/AddUserAddressRequestDTO.php
rename to backend/app/Data/Address/AddUserAddressRequestDTO.php
index 57a16e5..02d4956 100644
--- a/backend/app/Data/AddUserAddressRequestDTO.php
+++ b/backend/app/Data/Address/AddUserAddressRequestDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Address;
 
 use App\Contracts\InputDataTransferObject;
 use Illuminate\Foundation\Http\FormRequest;
@@ -16,6 +16,18 @@ public function __construct(
         public string $pinCode
     ) {}
 
+    public static function fromRequest(FormRequest $request): InputDataTransferObject
+    {
+        return new self(
+            firstName: $request->firstName,
+            lastName: $request->lastName,
+            street: $request->street,
+            city: $request->city,
+            state: $request->state,
+            pinCode: $request->pinCode
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -30,16 +42,4 @@ public function toArray(): array
             'pin' => $this->pinCode,
         ];
     }
-
-    public static function fromRequest(FormRequest $request): InputDataTransferObject
-    {
-        return new self(
-            firstName: $request->firstName,
-            lastName: $request->lastName,
-            street: $request->street,
-            city: $request->city,
-            state: $request->state,
-            pinCode: $request->pinCode
-        );
-    }
 }
diff --git a/backend/app/Data/UpdateUserAddressRequestDTO.php b/backend/app/Data/Address/UpdateUserAddressRequestDTO.php
similarity index 97%
rename from backend/app/Data/UpdateUserAddressRequestDTO.php
rename to backend/app/Data/Address/UpdateUserAddressRequestDTO.php
index 5817b4f..612bf5b 100644
--- a/backend/app/Data/UpdateUserAddressRequestDTO.php
+++ b/backend/app/Data/Address/UpdateUserAddressRequestDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Address;
 
 use App\Contracts\InputDataTransferObject;
 use Illuminate\Foundation\Http\FormRequest;
@@ -16,6 +16,18 @@ public function __construct(
         public ?string $pinCode = null,
     ) {}
 
+    public static function fromRequest(FormRequest $request): InputDataTransferObject
+    {
+        return new self(
+            firstName: $request->input('firstName'),
+            lastName: $request->input('lastName'),
+            street: $request->input('street'),
+            city: $request->input('city'),
+            state: $request->input('state'),
+            pinCode: $request->input('pinCode'),
+        );
+    }
+
     /**
      * @return array<string = null = null, mixed>
      */
@@ -32,16 +44,4 @@ public function toArray(): array
 
         return array_filter($data, fn ($value) => $value !== null);
     }
-
-    public static function fromRequest(FormRequest $request): InputDataTransferObject
-    {
-        return new self(
-            firstName: $request->input('firstName'),
-            lastName: $request->input('lastName'),
-            street: $request->input('street'),
-            city: $request->input('city'),
-            state: $request->input('state'),
-            pinCode: $request->input('pinCode'),
-        );
-    }
 }
diff --git a/backend/app/Data/UserAddressResponseDTO.php b/backend/app/Data/Address/UserAddressResponseDTO.php
similarity index 97%
rename from backend/app/Data/UserAddressResponseDTO.php
rename to backend/app/Data/Address/UserAddressResponseDTO.php
index cb23fa0..25393e5 100644
--- a/backend/app/Data/UserAddressResponseDTO.php
+++ b/backend/app/Data/Address/UserAddressResponseDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Address;
 
 use App\Contracts\OutputDataTransferObject;
 use App\Models\Address;
@@ -17,6 +17,19 @@ public function __construct(
         public string $pinCode
     ) {}
 
+    public static function fromModel(Address $address): OutputDataTransferObject
+    {
+        return new self(
+            id: $address->id,
+            firstName: $address->first_name,
+            lastName: $address->last_name,
+            street: $address->street,
+            city: $address->city,
+            state: $address->state,
+            pinCode: $address->pin
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -32,17 +45,4 @@ public function toArray(): array
             'pinCode' => $this->pinCode,
         ];
     }
-
-    public static function fromModel(Address $address): OutputDataTransferObject
-    {
-        return new self(
-            id: $address->id,
-            firstName: $address->first_name,
-            lastName: $address->last_name,
-            street: $address->street,
-            city: $address->city,
-            state: $address->state,
-            pinCode: $address->pin
-        );
-    }
 }
diff --git a/backend/app/Data/AddToCartDTO.php b/backend/app/Data/Cart/AddToCartDTO.php
similarity index 96%
rename from backend/app/Data/AddToCartDTO.php
rename to backend/app/Data/Cart/AddToCartDTO.php
index 2035573..4226c5a 100644
--- a/backend/app/Data/AddToCartDTO.php
+++ b/backend/app/Data/Cart/AddToCartDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Cart;
 
 use App\Contracts\InputDataTransferObject;
 use Illuminate\Foundation\Http\FormRequest;
@@ -12,6 +12,14 @@ public function __construct(
         public int $quantity
     ) {}
 
+    public static function fromRequest(FormRequest $request): InputDataTransferObject
+    {
+        return new self(
+            productId: $request->productId,
+            quantity: $request->quantity
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -22,12 +30,4 @@ public function toArray(): array
             'quantity' => $this->quantity,
         ];
     }
-
-    public static function fromRequest(FormRequest $request): InputDataTransferObject
-    {
-        return new self(
-            productId: $request->productId,
-            quantity: $request->quantity
-        );
-    }
 }
diff --git a/backend/app/Data/CartDTO.php b/backend/app/Data/Cart/CartDTO.php
similarity index 98%
rename from backend/app/Data/CartDTO.php
rename to backend/app/Data/Cart/CartDTO.php
index f618ccd..7a47f97 100644
--- a/backend/app/Data/CartDTO.php
+++ b/backend/app/Data/Cart/CartDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Cart;
 
 use App\Contracts\OutputDataTransferObject;
 use App\Models\Cart;
@@ -17,19 +17,6 @@ public function __construct(
         public array $items = []
     ) {}
 
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'itemsCount' => $this->itemsCount,
-            'totalPrice' => $this->totalPrice,
-            'items' => $this->items,
-        ];
-    }
-
     public static function fromModel(Cart $cart)
     {
         return new self(
@@ -46,4 +33,17 @@ public static function fromModel(Cart $cart)
             ))->toArray()
         );
     }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(): array
+    {
+        return [
+            'id' => $this->id,
+            'itemsCount' => $this->itemsCount,
+            'totalPrice' => $this->totalPrice,
+            'items' => $this->items,
+        ];
+    }
 }
diff --git a/backend/app/Data/CartItemDTO.php b/backend/app/Data/Cart/CartItemDTO.php
similarity index 96%
rename from backend/app/Data/CartItemDTO.php
rename to backend/app/Data/Cart/CartItemDTO.php
index 8e024ff..72d0f9c 100644
--- a/backend/app/Data/CartItemDTO.php
+++ b/backend/app/Data/Cart/CartItemDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Cart;
 
 use App\Contracts\OutputDataTransferObject;
 
diff --git a/backend/app/Data/OrderCreatedResponseDTO.php b/backend/app/Data/Order/OrderCreatedResponseDTO.php
similarity index 95%
rename from backend/app/Data/OrderCreatedResponseDTO.php
rename to backend/app/Data/Order/OrderCreatedResponseDTO.php
index b9cb646..76a8098 100644
--- a/backend/app/Data/OrderCreatedResponseDTO.php
+++ b/backend/app/Data/Order/OrderCreatedResponseDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Order;
 
 use App\Contracts\OutputDataTransferObject;
 use Illuminate\Database\Eloquent\Model;
@@ -11,6 +11,12 @@ public function __construct(
         // TODO: Define your properties here
     ) {}
 
+    public static function fromModel(Model $model): OutputDataTransferObject
+    {
+        return new self;
+        // TODO: Map model data to properties
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -20,10 +26,4 @@ public function toArray(): array
             // TODO: Map properties to array
         ];
     }
-
-    public static function fromModel(Model $model): OutputDataTransferObject
-    {
-        return new self;
-        // TODO: Map model data to properties
-    }
 }
diff --git a/backend/app/Data/OrderRequestDTO.php b/backend/app/Data/Order/OrderRequestDTO.php
similarity index 96%
rename from backend/app/Data/OrderRequestDTO.php
rename to backend/app/Data/Order/OrderRequestDTO.php
index 0855509..9dbe7a1 100644
--- a/backend/app/Data/OrderRequestDTO.php
+++ b/backend/app/Data/Order/OrderRequestDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Order;
 
 use App\Contracts\InputDataTransferObject;
 use Illuminate\Foundation\Http\FormRequest;
@@ -12,6 +12,14 @@ public function __construct(
         public string $addressId,
     ) {}
 
+    public static function fromRequest(FormRequest $request): OrderRequestDTO
+    {
+        return new self(
+            cartId: $request->cartId,
+            addressId: $request->addressId,
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -22,12 +30,4 @@ public function toArray(): array
             'address_id' => $this->addressId,
         ];
     }
-
-    public static function fromRequest(FormRequest $request): OrderRequestDTO
-    {
-        return new self(
-            cartId: $request->cartId,
-            addressId: $request->addressId,
-        );
-    }
 }
diff --git a/backend/app/Data/PaymentResponseDTO.php b/backend/app/Data/Payment/PaymentResponseDTO.php
similarity index 96%
rename from backend/app/Data/PaymentResponseDTO.php
rename to backend/app/Data/Payment/PaymentResponseDTO.php
index fe48fea..c1605fa 100644
--- a/backend/app/Data/PaymentResponseDTO.php
+++ b/backend/app/Data/Payment/PaymentResponseDTO.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Payment;
 
 use App\Contracts\OutputDataTransferObject;
-use App\Enums\PaymentModes;
+use App\Enums\Payment\PaymentModes;
 
 final readonly class PaymentResponseDTO implements OutputDataTransferObject
 {
diff --git a/backend/app/Data/VerifiedCheckoutResponseDTO.php b/backend/app/Data/Payment/VerifiedCheckoutResponseDTO.php
similarity index 97%
rename from backend/app/Data/VerifiedCheckoutResponseDTO.php
rename to backend/app/Data/Payment/VerifiedCheckoutResponseDTO.php
index 9c6a4bb..254813a 100644
--- a/backend/app/Data/VerifiedCheckoutResponseDTO.php
+++ b/backend/app/Data/Payment/VerifiedCheckoutResponseDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Payment;
 
 use App\Contracts\OutputDataTransferObject;
 
diff --git a/backend/app/Data/ProductCategoryDTO.php b/backend/app/Data/Product/ProductCategoryDTO.php
similarity index 96%
rename from backend/app/Data/ProductCategoryDTO.php
rename to backend/app/Data/Product/ProductCategoryDTO.php
index 734a535..a05b534 100644
--- a/backend/app/Data/ProductCategoryDTO.php
+++ b/backend/app/Data/Product/ProductCategoryDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Product;
 
 use App\Contracts\OutputDataTransferObject;
 use App\Models\ProductCategory;
@@ -13,6 +13,15 @@ public function __construct(
         public string $slug,
     ) {}
 
+    public static function fromModel(ProductCategory $category): self
+    {
+        return new self(
+            id: $category->id,
+            name: $category->name,
+            slug: $category->slug,
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -24,13 +33,4 @@ public function toArray(): array
             'slug' => $this->slug,
         ];
     }
-
-    public static function fromModel(ProductCategory $category): self
-    {
-        return new self(
-            id: $category->id,
-            name: $category->name,
-            slug: $category->slug,
-        );
-    }
 }
diff --git a/backend/app/Data/ProductDTO.php b/backend/app/Data/Product/ProductDTO.php
similarity index 98%
rename from backend/app/Data/ProductDTO.php
rename to backend/app/Data/Product/ProductDTO.php
index 4190d09..721131c 100644
--- a/backend/app/Data/ProductDTO.php
+++ b/backend/app/Data/Product/ProductDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Product;
 
 use App\Contracts\OutputDataTransferObject;
 use App\Models\Product;
@@ -25,6 +25,24 @@ public function __construct(
         public ?bool $isFavorite = null
     ) {}
 
+    public static function fromModel(Product $product): self
+    {
+        return new self(
+            id: $product->id,
+            title: $product->title,
+            slug: $product->slug,
+            description: $product->description,
+            actualPrice: $product->actual_price,
+            listPrice: $product->list_price,
+            category: ProductCategoryDTO::fromModel($product->category),
+            productImages: $product->images->map(fn (ProductImage $productImage) => ProductImageDTO::fromModel($productImage))->all(),
+            updatedAt: $product->updated_at,
+            createdAt: $product->created_at,
+            // this column is added by where exists query
+            isFavorite: $product->favorited_by_exists,
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -45,22 +63,4 @@ public function toArray(): array
             'isFavorite' => $this->isFavorite,
         ];
     }
-
-    public static function fromModel(Product $product): self
-    {
-        return new self(
-            id: $product->id,
-            title: $product->title,
-            slug: $product->slug,
-            description: $product->description,
-            actualPrice: $product->actual_price,
-            listPrice: $product->list_price,
-            category: ProductCategoryDTO::fromModel($product->category),
-            productImages: $product->images->map(fn (ProductImage $productImage) => ProductImageDTO::fromModel($productImage))->all(),
-            updatedAt: $product->updated_at,
-            createdAt: $product->created_at,
-            // this column is added by where exists query
-            isFavorite: $product->favorited_by_exists,
-        );
-    }
 }
diff --git a/backend/app/Data/ProductImageDTO.php b/backend/app/Data/Product/ProductImageDTO.php
similarity index 96%
rename from backend/app/Data/ProductImageDTO.php
rename to backend/app/Data/Product/ProductImageDTO.php
index 0736274..f218f60 100644
--- a/backend/app/Data/ProductImageDTO.php
+++ b/backend/app/Data/Product/ProductImageDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Product;
 
 use App\Contracts\OutputDataTransferObject;
 use App\Models\ProductImage;
@@ -13,6 +13,15 @@ public function __construct(
         public ?int $productId = null,
     ) {}
 
+    public static function fromModel(ProductImage $productImage): self
+    {
+        return new self(
+            $productImage->id,
+            $productImage->path,
+            $productImage->product_id
+        );
+    }
+
     /**
      * @return array<string, mixed>
      */
@@ -24,13 +33,4 @@ public function toArray(): array
             'productId' => $this->productId,
         ];
     }
-
-    public static function fromModel(ProductImage $productImage): self
-    {
-        return new self(
-            $productImage->id,
-            $productImage->path,
-            $productImage->product_id
-        );
-    }
 }
diff --git a/backend/app/Data/StripeLineItemDTO.php b/backend/app/Data/Stripe/StripeLineItemDTO.php
similarity index 92%
rename from backend/app/Data/StripeLineItemDTO.php
rename to backend/app/Data/Stripe/StripeLineItemDTO.php
index 112dbc9..b2ab270 100644
--- a/backend/app/Data/StripeLineItemDTO.php
+++ b/backend/app/Data/Stripe/StripeLineItemDTO.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Stripe;
 
 use App\Contracts\OutputDataTransferObject;
-use App\Enums\StripeCurrency;
+use App\Enums\Stripe\StripeCurrency;
 
 final readonly class StripeLineItemDTO implements OutputDataTransferObject
 {
diff --git a/backend/app/Data/StripeSessionDataDTO.php b/backend/app/Data/Stripe/StripeSessionDataDTO.php
similarity index 91%
rename from backend/app/Data/StripeSessionDataDTO.php
rename to backend/app/Data/Stripe/StripeSessionDataDTO.php
index 8d21ffd..3440558 100644
--- a/backend/app/Data/StripeSessionDataDTO.php
+++ b/backend/app/Data/Stripe/StripeSessionDataDTO.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Stripe;
 
 use App\Contracts\OutputDataTransferObject;
-use App\Enums\StripePaymentMode;
+use App\Enums\Stripe\StripePaymentMode;
 
 final readonly class StripeSessionDataDTO implements OutputDataTransferObject
 {
diff --git a/backend/app/Data/UploadImageDTO.php b/backend/app/Data/Upload/UploadImageDTO.php
similarity index 93%
rename from backend/app/Data/UploadImageDTO.php
rename to backend/app/Data/Upload/UploadImageDTO.php
index 7a17477..8c014ab 100644
--- a/backend/app/Data/UploadImageDTO.php
+++ b/backend/app/Data/Upload/UploadImageDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\Upload;
 
 use App\Models\Product;
 use Illuminate\Http\UploadedFile;
diff --git a/backend/app/Data/RegisterDTO.php b/backend/app/Data/User/RegisterDTO.php
similarity index 96%
rename from backend/app/Data/RegisterDTO.php
rename to backend/app/Data/User/RegisterDTO.php
index c2e4e5c..55e93a7 100644
--- a/backend/app/Data/RegisterDTO.php
+++ b/backend/app/Data/User/RegisterDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\User;
 
 use App\Contracts\InputDataTransferObject;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/backend/app/Data/UserDTO.php b/backend/app/Data/User/UserDTO.php
similarity index 96%
rename from backend/app/Data/UserDTO.php
rename to backend/app/Data/User/UserDTO.php
index 6a871c5..981a859 100644
--- a/backend/app/Data/UserDTO.php
+++ b/backend/app/Data/User/UserDTO.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Data;
+namespace App\Data\User;
 
 use App\Contracts\OutputDataTransferObject;
 
diff --git a/backend/app/Enums/CartStatus.php b/backend/app/Enums/Cart/CartStatus.php
similarity index 90%
rename from backend/app/Enums/CartStatus.php
rename to backend/app/Enums/Cart/CartStatus.php
index c06b8cc..1fb5a0a 100644
--- a/backend/app/Enums/CartStatus.php
+++ b/backend/app/Enums/Cart/CartStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Cart;
 
 enum CartStatus: string
 {
diff --git a/backend/app/Enums/OrderStatus.php b/backend/app/Enums/Order/OrderStatus.php
similarity index 95%
rename from backend/app/Enums/OrderStatus.php
rename to backend/app/Enums/Order/OrderStatus.php
index a02e72f..1078671 100644
--- a/backend/app/Enums/OrderStatus.php
+++ b/backend/app/Enums/Order/OrderStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Order;
 
 /**
  * Open -> The order was placed or created. There is work to do for the order, which can include processing payment, fulfilling, or processing returns.
diff --git a/backend/app/Enums/PaymentModes.php b/backend/app/Enums/Payment/PaymentModes.php
similarity index 81%
rename from backend/app/Enums/PaymentModes.php
rename to backend/app/Enums/Payment/PaymentModes.php
index 4bd844d..744e520 100644
--- a/backend/app/Enums/PaymentModes.php
+++ b/backend/app/Enums/Payment/PaymentModes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Payment;
 
 enum PaymentModes: string
 {
diff --git a/backend/app/Enums/PaymentStatusEnum.php b/backend/app/Enums/Payment/PaymentStatusEnum.php
similarity index 84%
rename from backend/app/Enums/PaymentStatusEnum.php
rename to backend/app/Enums/Payment/PaymentStatusEnum.php
index 8a82698..1d6af50 100644
--- a/backend/app/Enums/PaymentStatusEnum.php
+++ b/backend/app/Enums/Payment/PaymentStatusEnum.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Payment;
 
 enum PaymentStatusEnum: string
 {
diff --git a/backend/app/Enums/StripeCurrency.php b/backend/app/Enums/Stripe/StripeCurrency.php
similarity index 75%
rename from backend/app/Enums/StripeCurrency.php
rename to backend/app/Enums/Stripe/StripeCurrency.php
index 90a69af..8f17d41 100644
--- a/backend/app/Enums/StripeCurrency.php
+++ b/backend/app/Enums/Stripe/StripeCurrency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Stripe;
 
 enum StripeCurrency: string
 {
diff --git a/backend/app/Enums/StripeEventType.php b/backend/app/Enums/Stripe/StripeEventType.php
similarity index 79%
rename from backend/app/Enums/StripeEventType.php
rename to backend/app/Enums/Stripe/StripeEventType.php
index 0433d93..be19700 100644
--- a/backend/app/Enums/StripeEventType.php
+++ b/backend/app/Enums/Stripe/StripeEventType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Stripe;
 
 enum StripeEventType: string
 {
diff --git a/backend/app/Enums/StripePaymentMode.php b/backend/app/Enums/Stripe/StripePaymentMode.php
similarity index 72%
rename from backend/app/Enums/StripePaymentMode.php
rename to backend/app/Enums/Stripe/StripePaymentMode.php
index e3c8862..ca47a20 100644
--- a/backend/app/Enums/StripePaymentMode.php
+++ b/backend/app/Enums/Stripe/StripePaymentMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\Stripe;
 
 enum StripePaymentMode: string
 {
diff --git a/backend/app/Enums/UserRoles.php b/backend/app/Enums/User/UserRoles.php
similarity index 82%
rename from backend/app/Enums/UserRoles.php
rename to backend/app/Enums/User/UserRoles.php
index 561885e..721edf2 100644
--- a/backend/app/Enums/UserRoles.php
+++ b/backend/app/Enums/User/UserRoles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enums;
+namespace App\Enums\User;
 
 enum UserRoles: string
 {
diff --git a/backend/app/Http/Controllers/AuthenticatedUserController.php b/backend/app/Http/Controllers/AuthenticatedUserController.php
index c01414a..5ea3d33 100644
--- a/backend/app/Http/Controllers/AuthenticatedUserController.php
+++ b/backend/app/Http/Controllers/AuthenticatedUserController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Data\UserDTO;
+use App\Data\User\UserDTO;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/backend/app/Http/Controllers/CartController.php b/backend/app/Http/Controllers/CartController.php
index ffddc15..b1e973d 100644
--- a/backend/app/Http/Controllers/CartController.php
+++ b/backend/app/Http/Controllers/CartController.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\AddProductToCartAction;
-use App\Actions\GetActiveUserCartAction;
-use App\Actions\RemoveProductFromCartAction;
-use App\Actions\UpdateProductInCartAction;
-use App\Data\AddToCartDTO;
+use App\Actions\Cart\AddProductToCartAction;
+use App\Actions\Cart\GetActiveUserCartAction;
+use App\Actions\Cart\RemoveProductFromCartAction;
+use App\Actions\Cart\UpdateProductInCartAction;
+use App\Data\Cart\AddToCartDTO;
 use App\Http\Requests\AddProductToCartRequest;
 use App\Http\Requests\RemoveProductFromCartRequest;
 use App\Http\Requests\UpdateProductInCartRequest;
-use App\Http\Resources\CartResource;
+use App\Http\Resources\Cart\CartResource;
 use Illuminate\Support\Facades\Auth;
 
 class CartController extends Controller
diff --git a/backend/app/Http/Controllers/FavouriteProductController.php b/backend/app/Http/Controllers/FavouriteProductController.php
index c7a99ac..5e8c643 100644
--- a/backend/app/Http/Controllers/FavouriteProductController.php
+++ b/backend/app/Http/Controllers/FavouriteProductController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Resources\FavouriteProductResource;
+use App\Http\Resources\Product\FavouriteProductResource;
 use App\Models\FavouriteProduct;
 use App\Models\Product;
 use App\Models\User;
diff --git a/backend/app/Http/Controllers/OrderController.php b/backend/app/Http/Controllers/OrderController.php
index 9fabad4..ece87ad 100644
--- a/backend/app/Http/Controllers/OrderController.php
+++ b/backend/app/Http/Controllers/OrderController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\CreateOrderAction;
-use App\Data\OrderRequestDTO;
+use App\Actions\Order\CreateOrderAction;
+use App\Data\Order\OrderRequestDTO;
 use App\Exceptions\StaleCartException;
 use App\Http\Requests\StoreOrderRequest;
 use App\Http\Requests\UpdateOrderRequest;
diff --git a/backend/app/Http/Controllers/PaymentController.php b/backend/app/Http/Controllers/PaymentController.php
index dc7ff8a..7916411 100644
--- a/backend/app/Http/Controllers/PaymentController.php
+++ b/backend/app/Http/Controllers/PaymentController.php
@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\ProcessOrderPaymentAction;
-use App\Actions\VerifyStripeSessionAction;
-use App\Enums\PaymentModes;
+use App\Actions\Payment\ProcessOrderPaymentAction;
+use App\Actions\Stripe\VerifyStripeSessionAction;
+use App\Enums\Payment\PaymentModes;
 use App\Http\Requests\PaymentRequest;
 use App\Http\Requests\VerifyPaymentRequest;
-use App\Http\Resources\PaymentResource;
+use App\Http\Resources\Payment\PaymentResource;
 use App\Models\Order;
 use App\Models\Payment;
 
diff --git a/backend/app/Http/Controllers/ProductCategoryController.php b/backend/app/Http/Controllers/ProductCategoryController.php
index f01b3f7..04ca427 100644
--- a/backend/app/Http/Controllers/ProductCategoryController.php
+++ b/backend/app/Http/Controllers/ProductCategoryController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\GetAllProductCategory;
+use App\Actions\Product\GetAllProductCategory;
 
 class ProductCategoryController extends Controller
 {
diff --git a/backend/app/Http/Controllers/ProductController.php b/backend/app/Http/Controllers/ProductController.php
index 635c1cd..fd07a0b 100644
--- a/backend/app/Http/Controllers/ProductController.php
+++ b/backend/app/Http/Controllers/ProductController.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Data\ProductDTO;
+use App\Data\Product\ProductDTO;
 use App\Http\Requests\CreateProductRequest;
-use App\Http\Resources\ProductResource;
+use App\Http\Resources\Product\ProductResource;
 use App\Models\Product;
 use App\Queries\GetProductsQuery;
 use Illuminate\Http\Request;
diff --git a/backend/app/Http/Controllers/ProductImagesController.php b/backend/app/Http/Controllers/ProductImagesController.php
index f906a45..9717941 100644
--- a/backend/app/Http/Controllers/ProductImagesController.php
+++ b/backend/app/Http/Controllers/ProductImagesController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\UploadImageAction;
-use App\Data\UploadImageDTO;
+use App\Actions\Upload\UploadImageAction;
+use App\Data\Upload\UploadImageDTO;
 use App\Http\Requests\UploadImageRequest;
 use App\Models\ProductImages;
 
diff --git a/backend/app/Http/Controllers/RegisteredUserController.php b/backend/app/Http/Controllers/RegisteredUserController.php
index a66fa73..2512361 100644
--- a/backend/app/Http/Controllers/RegisteredUserController.php
+++ b/backend/app/Http/Controllers/RegisteredUserController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\CreateUserAction;
-use App\Data\RegisterDTO;
+use App\Actions\User\CreateUserAction;
+use App\Data\User\RegisterDTO;
 use App\Http\Requests\RegisterUserRequest;
 use Illuminate\Http\JsonResponse;
 
diff --git a/backend/app/Http/Controllers/StripeWebhookController.php b/backend/app/Http/Controllers/StripeWebhookController.php
index fca00ab..5e66895 100644
--- a/backend/app/Http/Controllers/StripeWebhookController.php
+++ b/backend/app/Http/Controllers/StripeWebhookController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\MarkPaymentAsPaidAction;
-use App\Enums\StripeEventType;
+use App\Actions\Payment\MarkPaymentAsPaidAction;
+use App\Enums\Stripe\StripeEventType;
 use App\Models\Payment;
 use Illuminate\Http\Request;
 use Log;
diff --git a/backend/app/Http/Controllers/UserAddressController.php b/backend/app/Http/Controllers/UserAddressController.php
index 1f7f5d5..9a7616b 100644
--- a/backend/app/Http/Controllers/UserAddressController.php
+++ b/backend/app/Http/Controllers/UserAddressController.php
@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\DeleteUserAddressAction;
-use App\Actions\SaveUserAddressAction;
-use App\Actions\UpdateUserAddressAction;
-use App\Data\AddUserAddressRequestDTO;
-use App\Data\UpdateUserAddressRequestDTO;
-use App\Data\UserAddressResponseDTO;
+use App\Actions\Address\DeleteUserAddressAction;
+use App\Actions\Address\SaveUserAddressAction;
+use App\Actions\Address\UpdateUserAddressAction;
+use App\Data\Address\AddUserAddressRequestDTO;
+use App\Data\Address\UpdateUserAddressRequestDTO;
+use App\Data\Address\UserAddressResponseDTO;
 use App\Http\Requests\AddUserAddressRequest;
 use App\Http\Requests\UpdateUserAddressRequest;
-use App\Http\Resources\AddressResource;
+use App\Http\Resources\Address\AddressResource;
 use App\Models\Address;
 use Illuminate\Http\Request;
 
diff --git a/backend/app/Http/Requests/PaymentRequest.php b/backend/app/Http/Requests/PaymentRequest.php
index 9b0990f..f0e8f81 100644
--- a/backend/app/Http/Requests/PaymentRequest.php
+++ b/backend/app/Http/Requests/PaymentRequest.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\PaymentModes;
+use App\Enums\Payment\PaymentModes;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/backend/app/Http/Resources/AddressCollection.php b/backend/app/Http/Resources/Address/AddressCollection.php
similarity index 90%
rename from backend/app/Http/Resources/AddressCollection.php
rename to backend/app/Http/Resources/Address/AddressCollection.php
index d0c11a0..a20d1b0 100644
--- a/backend/app/Http/Resources/AddressCollection.php
+++ b/backend/app/Http/Resources/Address/AddressCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Address;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/backend/app/Http/Resources/AddressResource.php b/backend/app/Http/Resources/Address/AddressResource.php
similarity index 90%
rename from backend/app/Http/Resources/AddressResource.php
rename to backend/app/Http/Resources/Address/AddressResource.php
index 33faea5..0ce1fa7 100644
--- a/backend/app/Http/Resources/AddressResource.php
+++ b/backend/app/Http/Resources/Address/AddressResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Address;
 
-use App\Data\UserAddressResponseDTO;
+use App\Data\Address\UserAddressResponseDTO;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/backend/app/Http/Resources/CartItemCollection.php b/backend/app/Http/Resources/Cart/CartItemCollection.php
similarity index 91%
rename from backend/app/Http/Resources/CartItemCollection.php
rename to backend/app/Http/Resources/Cart/CartItemCollection.php
index 69073c5..8344ac2 100644
--- a/backend/app/Http/Resources/CartItemCollection.php
+++ b/backend/app/Http/Resources/Cart/CartItemCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Cart;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/backend/app/Http/Resources/CartItemResource.php b/backend/app/Http/Resources/Cart/CartItemResource.php
similarity index 91%
rename from backend/app/Http/Resources/CartItemResource.php
rename to backend/app/Http/Resources/Cart/CartItemResource.php
index 2510e20..91d9bfc 100644
--- a/backend/app/Http/Resources/CartItemResource.php
+++ b/backend/app/Http/Resources/Cart/CartItemResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Cart;
 
-use App\Data\CartItemDTO;
+use App\Data\Cart\CartItemDTO;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Storage;
diff --git a/backend/app/Http/Resources/CartResource.php b/backend/app/Http/Resources/Cart/CartResource.php
similarity index 91%
rename from backend/app/Http/Resources/CartResource.php
rename to backend/app/Http/Resources/Cart/CartResource.php
index 99ab883..8062240 100644
--- a/backend/app/Http/Resources/CartResource.php
+++ b/backend/app/Http/Resources/Cart/CartResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Cart;
 
-use App\Data\CartDTO;
+use App\Data\Cart\CartDTO;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/backend/app/Http/Resources/OrderResource.php b/backend/app/Http/Resources/Order/OrderResource.php
similarity index 90%
rename from backend/app/Http/Resources/OrderResource.php
rename to backend/app/Http/Resources/Order/OrderResource.php
index 7f7f379..d03e7e6 100644
--- a/backend/app/Http/Resources/OrderResource.php
+++ b/backend/app/Http/Resources/Order/OrderResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Order;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/backend/app/Http/Resources/PaymentResource.php b/backend/app/Http/Resources/Payment/PaymentResource.php
similarity index 89%
rename from backend/app/Http/Resources/PaymentResource.php
rename to backend/app/Http/Resources/Payment/PaymentResource.php
index 0f18bc1..71ec1a3 100644
--- a/backend/app/Http/Resources/PaymentResource.php
+++ b/backend/app/Http/Resources/Payment/PaymentResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Payment;
 
-use App\Data\PaymentResponseDTO;
+use App\Data\Payment\PaymentResponseDTO;
 use App\Models\Payment;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/backend/app/Http/Resources/FavouriteProductResource.php b/backend/app/Http/Resources/Product/FavouriteProductResource.php
similarity index 93%
rename from backend/app/Http/Resources/FavouriteProductResource.php
rename to backend/app/Http/Resources/Product/FavouriteProductResource.php
index 4ad6a80..6b91bcf 100644
--- a/backend/app/Http/Resources/FavouriteProductResource.php
+++ b/backend/app/Http/Resources/Product/FavouriteProductResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Product;
 
 use App\Models\FavouriteProduct;
 use Illuminate\Http\Request;
diff --git a/backend/app/Http/Resources/ProductCollection.php b/backend/app/Http/Resources/Product/ProductCollection.php
similarity index 88%
rename from backend/app/Http/Resources/ProductCollection.php
rename to backend/app/Http/Resources/Product/ProductCollection.php
index ae72b40..742291d 100644
--- a/backend/app/Http/Resources/ProductCollection.php
+++ b/backend/app/Http/Resources/Product/ProductCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Product;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/backend/app/Http/Resources/ProductResource.php b/backend/app/Http/Resources/Product/ProductResource.php
similarity index 90%
rename from backend/app/Http/Resources/ProductResource.php
rename to backend/app/Http/Resources/Product/ProductResource.php
index 9749042..ee37cd6 100644
--- a/backend/app/Http/Resources/ProductResource.php
+++ b/backend/app/Http/Resources/Product/ProductResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Http\Resources\Product;
 
-use App\Data\ProductDTO;
-use App\Data\ProductImageDTO;
+use App\Data\Product\ProductDTO;
+use App\Data\Product\ProductImageDTO;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Storage;
diff --git a/backend/app/Models/Cart.php b/backend/app/Models/Cart.php
index 5ce007f..555ba91 100644
--- a/backend/app/Models/Cart.php
+++ b/backend/app/Models/Cart.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Enums\CartStatus;
+use App\Enums\Cart\CartStatus;
 use Illuminate\Database\Eloquent\Attributes\Scope;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -16,16 +16,6 @@ class Cart extends Model
 {
     protected $fillable = ['user_id', 'status'];
 
-    /**
-     * @return array<string, string>
-     */
-    protected function casts(): array
-    {
-        return [
-            'status' => CartStatus::class,
-        ];
-    }
-
     public function products(): BelongsToMany
     {
         return $this->belongsToMany(Product::class)
@@ -43,6 +33,16 @@ public function order(): BelongsTo
         return $this->belongsTo(Order::class);
     }
 
+    /**
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'status' => CartStatus::class,
+        ];
+    }
+
     #[Scope]
     protected function active(Builder $query)
     {
diff --git a/backend/app/Models/User.php b/backend/app/Models/User.php
index 4445f3b..1391f8c 100644
--- a/backend/app/Models/User.php
+++ b/backend/app/Models/User.php
@@ -3,7 +3,7 @@
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-use App\Enums\UserRoles;
+use App\Enums\User\UserRoles;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -45,18 +45,9 @@ class User extends Authenticatable
         'remember_token',
     ];
 
-    /**
-     * Get the attributes that should be cast.
-     *
-     * @return array<string, string>
-     */
-    protected function casts(): array
+    public function hasFavorited(Product $product): bool
     {
-        return [
-            'email_verified_at' => 'datetime',
-            'password' => 'hashed',
-            'role' => UserRoles::class,
-        ];
+        return $this->favoriteProducts()->where('product_id', $product->id)->exists();
     }
 
     public function favoriteProducts(): BelongsToMany
@@ -64,11 +55,6 @@ public function favoriteProducts(): BelongsToMany
         return $this->belongsToMany(Product::class, 'favorite_products', 'user_id', 'product_id');
     }
 
-    public function hasFavorited(Product $product): bool
-    {
-        return $this->favoriteProducts()->where('product_id', $product->id)->exists();
-    }
-
     /**
      * @return HasMany<Cart>
      */
@@ -92,4 +78,18 @@ public function orders(): HasMany
     {
         return $this->hasMany(Order::class);
     }
+
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'email_verified_at' => 'datetime',
+            'password' => 'hashed',
+            'role' => UserRoles::class,
+        ];
+    }
 }
diff --git a/backend/app/Services/Payment/PaymentGatewayFactory.php b/backend/app/Services/Payment/PaymentGatewayFactory.php
index b75dba8..4d645db 100644
--- a/backend/app/Services/Payment/PaymentGatewayFactory.php
+++ b/backend/app/Services/Payment/PaymentGatewayFactory.php
@@ -2,7 +2,7 @@
 
 namespace App\Services\Payment;
 
-use App\Enums\PaymentModes;
+use App\Enums\Payment\PaymentModes;
 
 class PaymentGatewayFactory
 {
diff --git a/backend/app/Services/Payment/StripePaymentGateway.php b/backend/app/Services/Payment/StripePaymentGateway.php
index a352a42..11688d6 100644
--- a/backend/app/Services/Payment/StripePaymentGateway.php
+++ b/backend/app/Services/Payment/StripePaymentGateway.php
@@ -3,12 +3,12 @@
 namespace App\Services\Payment;
 
 use App\Contracts\PaymentGateway;
-use App\Data\PaymentResponseDTO;
-use App\Data\StripeLineItemDTO;
-use App\Data\StripeSessionDataDTO;
-use App\Enums\PaymentModes;
-use App\Enums\StripeCurrency;
-use App\Enums\StripePaymentMode;
+use App\Data\Payment\PaymentResponseDTO;
+use App\Data\Stripe\StripeLineItemDTO;
+use App\Data\Stripe\StripeSessionDataDTO;
+use App\Enums\Payment\PaymentModes;
+use App\Enums\Stripe\StripeCurrency;
+use App\Enums\Stripe\StripePaymentMode;
 use App\Models\Order;
 use Exception;
 use Illuminate\Support\Facades\Log;
diff --git a/backend/database/migrations/2026_02_27_044159_add_role_to_users.php b/backend/database/migrations/2026_02_27_044159_add_role_to_users.php
index 7158dc2..3a8567b 100644
--- a/backend/database/migrations/2026_02_27_044159_add_role_to_users.php
+++ b/backend/database/migrations/2026_02_27_044159_add_role_to_users.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Enums\UserRoles;
+use App\Enums\User\UserRoles;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/backend/database/migrations/2026_03_06_054113_create_carts_table.php b/backend/database/migrations/2026_03_06_054113_create_carts_table.php
index 8e68e1a..8333d9d 100644
--- a/backend/database/migrations/2026_03_06_054113_create_carts_table.php
+++ b/backend/database/migrations/2026_03_06_054113_create_carts_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Enums\CartStatus;
+use App\Enums\Cart\CartStatus;
 use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
diff --git a/backend/database/migrations/2026_03_17_120130_create_orders_table.php b/backend/database/migrations/2026_03_17_120130_create_orders_table.php
index 80c3889..a22ad15 100644
--- a/backend/database/migrations/2026_03_17_120130_create_orders_table.php
+++ b/backend/database/migrations/2026_03_17_120130_create_orders_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Enums\OrderStatus;
+use App\Enums\Order\OrderStatus;
 use App\Models\Cart;
 use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
diff --git a/backend/database/seeders/PaymentStatusSeeder.php b/backend/database/seeders/PaymentStatusSeeder.php
index ab68c84..79fc677 100644
--- a/backend/database/seeders/PaymentStatusSeeder.php
+++ b/backend/database/seeders/PaymentStatusSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Enums\PaymentStatusEnum;
+use App\Enums\Payment\PaymentStatusEnum;
 use App\Models\PaymentStatus;
 use Illuminate\Database\Seeder;