diff --git a/BACKEND/app.js b/BACKEND/app.js
index 574f197..e3f57b1 100644
--- a/BACKEND/app.js
+++ b/BACKEND/app.js
@@ -7,18 +7,13 @@ import cors from "cors";
 import express from "express";
 import path from "path";
 import { connectDB } from "./config/db.js";
-import productRoutes from "./routes/product.route.js";
 import authRoutes from "./routes/auth.routes.js";
 import checkoutRoutes from "./routes/checkout.route.js";
-import wishlistRoutes from "./routes/wishlist.route.js";
-import reviewRoutes from "./routes/review.route.js";
 import ordersRoutes from "./routes/orders.route.js";
 import passport from "./config/passport.js";
-import swaggerUi from 'swagger-ui-express';
-import swaggerSpec from './swagger.js';
+import swaggerUi from "swagger-ui-express";
+import swaggerSpec from "./swagger.js";
 import { stripeWebhook } from "./controllers/checkout.controller.js";
-
-// Import error handlers
 import { notFoundHandler, errorHandler } from "./middleware/errorMiddleware.js";
 import { validateEnv } from "./config/env.js";
 
@@ -103,10 +98,8 @@ app.use(express.json());
 
 // ============= API ROUTES =============
 
-app.use("/api/products", productRoutes);
 app.use("/api/auth", authRoutes);
 app.use("/api/checkout", checkoutRoutes);
-app.use("/api/wishlist", wishlistRoutes);
 app.use("/api/orders", ordersRoutes);
 
 
diff --git a/BACKEND/controllers/product.controller.js b/BACKEND/controllers/product.controller.js
deleted file mode 100644
index c6abbea..0000000
--- a/BACKEND/controllers/product.controller.js
+++ /dev/null
@@ -1,422 +0,0 @@
-import Product from "../models/product.model.js";
-import mongoose from "mongoose";
-import { escapeRegex } from '../utils/escapeRegex.js';
-import cloudinary from '../config/cloudinary.js';
-import { AppError } from "../middleware/errorMiddleware.js";
-import { indexProduct, deleteProductFromIndex, searchProductsES } from '../services/elasticsearch.service.js';
-
-const cloudinaryConfigured = () =>
-    process.env.CLOUDINARY_CLOUD_NAME &&
-    process.env.CLOUDINARY_API_KEY &&
-    process.env.CLOUDINARY_API_SECRET;
-
-const uploadToCloudinary = (buffer) => {
-    return new Promise((resolve, reject) => {
-        const stream = cloudinary.uploader.upload_stream(
-            { folder: 'product-store' },
-            (error, result) => {
-                if (error) reject(error);
-                else resolve(result);
-            }
-        );
-        stream.end(buffer);
-    });
-};
-
-const extractCloudinaryPublicId = (url) => {
-    if (!url || !url.includes('res.cloudinary.com')) return null;
-    const parts = url.split('/');
-    const uploadIdx = parts.indexOf('upload');
-    if (uploadIdx === -1) return null;
-    const afterUpload = parts.slice(uploadIdx + 1);
-    if (afterUpload[0] && /^v\d+$/.test(afterUpload[0])) afterUpload.shift();
-    return afterUpload.join('/').replace(/\.[^.]+$/, '');
-};
-
-// @desc    Get all products
-export const getProducts = async (req, res, next) => {
-    try {
-        const page = parseInt(req.query.page, 10) || 1;
-        const limit = parseInt(req.query.limit, 10) || 10;
-        const { sort, category, minPrice, maxPrice, brand, minRating, inStock } = req.query;
-
-        if (page < 1 || limit < 1) {
-            return res.status(400).json({
-                success: false,
-                message: "Invalid pagination parameters. page and limit must be positive integers.",
-            });
-        }
-
-        let sortOption = {};
-        if (sort === "price_asc") {
-            sortOption = { price: 1 };
-        } else if (sort === "price_desc") {
-            sortOption = { price: -1 };
-        } else if (sort === "newest") {
-            sortOption = { createdAt: -1 };
-        }
-
-        const filter = { isDeleted: { $ne: true } };
-        if (category) filter.category = category;
-
-        if (minPrice || maxPrice) {
-            filter.price = {};
-            if (minPrice) filter.price.$gte = Number(minPrice);
-            if (maxPrice) filter.price.$lte = Number(maxPrice);
-        }
-        if (brand) {
-            // Case-insensitive brand search
-            filter.brand = { $regex: new RegExp(brand, 'i') };
-        }
-        if (minRating) {
-            filter.averageRating = { $gte: Number(minRating) };
-        }
-        if (inStock === 'true') {
-            filter.stock = { $gt: 0 };
-        }
-
-        const skip = (page - 1) * limit;
-        const totalProducts = await Product.countDocuments(filter);
-        const products = await Product.find(filter).sort(sortOption).skip(skip).limit(limit);
-        const totalPages = totalProducts > 0 ? Math.ceil(totalProducts / limit) : 0;
-
-        res.status(200).json({
-            success: true,
-            currentPage: page,
-            totalPages,
-            totalProducts,
-            limit,
-            data: products,
-        });
-    } catch (error) {
-        next(error);
-    }
-};
-
-// @desc    Get distinct product categories
-export const getProductCategories = async (req, res, next) => {
-    try {
-        const categories = await Product.distinct('category', { isDeleted: { $ne: true }, category: { $ne: '' } });
-        res.status(200).json({ success: true, data: categories.sort() });
-    } catch (error) {
-        next(error);
-    }
-};
-
-// @desc    Create a new product
-export const createProduct = async (req, res, next) => {
-    const { name, price, image: imageUrl, description, category, brand, stock, originalPrice, discount } = req.body;
-
-    if (!name || price === undefined || price === null || price === '' || isNaN(Number(price))) {
-        return next(new AppError("Please provide all fields", 400));
-    }
-
-    if (Number(price) < 0) {
-        return next(new AppError("Price cannot be negative", 400));
-    }
-
-    let finalImageUrl = imageUrl || '';
-
-    if (req.file) {
-        if (!cloudinaryConfigured()) {
-            return next(new AppError("File uploads are not configured. Please use an image URL instead.", 503));
-        }
-        try {
-            const result = await uploadToCloudinary(req.file.buffer);
-            finalImageUrl = result.secure_url;
-        } catch (error) {
-            return next(new AppError("Image upload failed", 500));
-        }
-    }
-
-    if (!finalImageUrl) {
-        return next(new AppError("Please provide a product image", 400));
-    }
-
-    const newProduct = new Product({
-        name,
-        price: Number(price),
-        image: finalImageUrl,
-        images: Array.isArray(req.body.images) ? req.body.images : [],
-        description,
-        category,
-        brand,
-        ...(stock !== undefined && { stock: Number(stock) }),
-        ...(originalPrice !== undefined && { originalPrice: Number(originalPrice) }),
-        ...(discount !== undefined && { discount: Number(discount) }),
-    });
-
-    try {
-        await newProduct.save();
-        await indexProduct(newProduct);
-        res.status(201).json({ success: true, data: newProduct });
-    } catch (error) {
-        next(error);
-    }
-};
-
-// @desc    Update a product
-export const updateProduct = async (req, res, next) => {
-    const { id } = req.params;
-
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return next(new AppError("Invalid Product Id format", 404));
-    }
-
-    if ((!req.body || Object.keys(req.body).length === 0) && !req.file) {
-        return next(new AppError("No update fields provided", 400));
-    }
-
-    let existing;
-    try {
-        existing = await Product.findById(id);
-    } catch (error) {
-        return next(error);
-    }
-    if (!existing) {
-        return next(new AppError("Product not found", 404));
-    }
-
-    const { name, price, image: imageUrl, description, category, brand, stock, originalPrice, discount } = req.body;
-    const updateData = {};
-    if (name !== undefined) updateData.name = name;
-    if (price !== undefined) {
-        if (price === '' || isNaN(Number(price))) {
-            return next(new AppError("Invalid price value", 400));
-        }
-        updateData.price = Number(price);
-    }
-    if (imageUrl !== undefined) updateData.image = imageUrl;
-    if (req.body.images !== undefined) updateData.images = Array.isArray(req.body.images) ? req.body.images : [];
-    if (description !== undefined) updateData.description = description;
-    if (category !== undefined) updateData.category = category;
-    if (brand !== undefined) updateData.brand = brand;
-    if (stock !== undefined) updateData.stock = Number(stock);
-    if (originalPrice !== undefined) updateData.originalPrice = Number(originalPrice);
-    if (discount !== undefined) updateData.discount = Number(discount);
-
-    if (req.file) {
-        if (!cloudinaryConfigured()) {
-            return next(new AppError("File uploads are not configured. Please use an image URL instead.", 503));
-        }
-        try {
-            const result = await uploadToCloudinary(req.file.buffer);
-            updateData.image = result.secure_url;
-
-        } catch (error) {
-            return next(new AppError("Image upload failed", 500));
-        }
-    }
-
-    try {
-        const updatedProduct = await Product.findByIdAndUpdate(id, updateData, { new: true, runValidators: true });
-        if (!updatedProduct) {
-            return next(new AppError("Product not found", 404));
-        }
-        if (req.file){
-            const oldPublicId = extractCloudinaryPublicId(existing.image);
-                if (oldPublicId) {
-                    cloudinary.uploader.destroy(oldPublicId).catch((err) => {
-                        console.warn("Old image cleanup failed:", err.message);
-                    });
-                }
-        }
-
-        await indexProduct(updatedProduct);
-
-        res.status(200).json({ success: true, data: updatedProduct });
-    } catch (error) {
-        next(error);
-    }
-};
-
-// @desc    Delete a product (soft delete)
-export const deleteProduct = async (req, res, next) => {
-    const { id } = req.params;
-
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return res.status(404).json({ success: false, message: "Invalid Product Id" });
-    }
-
-    try {
-        const product = await Product.findByIdAndUpdate(id, { isDeleted: true }, { new: true });
-        if (!product) {
-            return res.status(404).json({ success: false, message: "Product not found" });
-        }
-        await deleteProductFromIndex(id);
-        res.status(200).json({ success: true, message: "Product deleted successfully" });
-    } catch (error) {
-        console.log("error in deleting product:", error.message);
-        res.status(500).json({ success: false, message: "Server Error" });
-    }
-};
-
-// @desc    Get product by ID
-export const getProductById = async (req, res, next) => {
-    const { id } = req.params;
-
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return next(new AppError("Invalid Product Id format", 404));
-    }
-
-    try {
-        const product = await Product.findOne({ _id: id, isDeleted: { $ne: true } });
-        if (!product) {
-            return next(new AppError("Product not found", 404));
-        }
-        res.status(200).json({ success: true, data: product });
-    } catch (error) {
-        next(error);
-    }
-};
-
-const stopWords = new Set(["the", "a", "an", "and", "or", "but", "in", "on", "at", "to", "for", "with", "of"]);
-
-function tokenize(text) {
-    return text
-        .toLowerCase()
-        .split(/\s+/)
-        .map(w => w.replace(/[^a-z0-9]/g, ""))
-        .filter(w => w.length > 1 && !stopWords.has(w));
-}
-
-export const getRelatedProducts = async (req, res) => {
-    const { id } = req.params;
-
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return res.status(400).json({ success: false, message: "Invalid Product Id format" });
-    }
-
-    try {
-        const product = await Product.findById(id);
-
-        if (!product || product.isDeleted === true) {
-            return res.status(404).json({ success: false, message: "Product not found" });
-        }
-
-        const targetTagsSet = new Set((product.tags || []).map(t => t.toLowerCase()));
-        const targetWords = new Set(tokenize(product.name));
-
-        const orConditions = [];
-        if (product.category) orConditions.push({ category: product.category });
-        if (product.brand) orConditions.push({ brand: product.brand });
-        if (targetTagsSet.size > 0) orConditions.push({ tags: { $in: [ ...targetTagsSet ] } });
-
-        const query = {
-            _id: { $ne: product._id },
-            isDeleted: { $ne: true },
-        };
-        if (orConditions.length > 0) query.$or = orConditions;
-
-        const candidates = await Product.find(query).sort({ updatedAt: -1 }).limit(50);
-
-        const scored = candidates.map(c => {
-            let score = 0;
-
-            if (c.category && product.category &&
-                c.category.toLowerCase() === product.category.toLowerCase()) {
-                score += 3;
-            }
-
-            if (c.brand && product.brand &&
-                c.brand.toLowerCase() === product.brand.toLowerCase()) {
-                score += 1;
-            }
-
-            if (c.tags && c.tags.length > 0) {
-                for (const tag of c.tags) {
-                    if (targetTags.has(tag.toLowerCase())) {
-                        score += 2;
-                    }
-                }
-            }
-
-            const candidateWords = tokenize(c.name);
-            for (const word of candidateWords) {
-                if (targetWords.has(word)) {
-                    score += 0.5;
-                }
-            }
-
-            return { product: c, score };
-        });
-
-        scored.sort((a, b) => b.score - a.score);
-
-        const related = scored.slice(0, 5).map(s => s.product);
-
-        res.status(200).json({ success: true, data: related });
-    } catch (error) {
-        console.error("Error in getRelatedProducts:", error.message);
-        res.status(500).json({ success: false, message: "Server Error" });
-    }
-};
-
-export const getProductBundle = async (req, res) => {
-    const { id } = req.params;
-
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return res.status(400).json({ success: false, message: "Invalid Product Id" });
-    }
-
-    try {
-        const product = await Product.findById(id).populate('complementaryItems.product');
-        if (!product || product.isDeleted === true) {
-            return res.status(404).json({ success: false, message: "Product not found" });
-        }
-
-        const items = product.complementaryItems
-            .filter(ci => ci.product && !ci.product.isDeleted)
-            .slice(0, 3);
-
-        const bundleTotal = [product, ...items.map(i => i.product)]
-            .reduce((sum, p) => sum + p.price, 0);
-
-        const bundleDiscount = 0.1;
-        const bundlePrice = +(bundleTotal * (1 - bundleDiscount)).toFixed(2);
-        const savings = +(bundleTotal * bundleDiscount).toFixed(2);
-
-        res.status(200).json({
-            success: true,
-            data: {
-                mainProduct: product,
-                items: items.map(ci => ({
-                    product: ci.product,
-                    reason: ci.reason
-                })),
-                bundleTotal,
-                bundleDiscount,
-                bundlePrice,
-                savings
-            }
-        });
-    } catch (error) {
-        console.error("Error in fetching bundle:", error.message);
-        res.status(500).json({ success: false, message: "Server Error" });
-    }
-};
-
-// @desc    Search products
-export const searchProducts = async (req, res, next) => {
-    const { q } = req.query;
-
-    if (!q || !q.trim()) {
-        return res.status(400).json({ success: false, message: "Search query is required" });
-    }
-
-    try {
-        // Try Elasticsearch first
-        const esProducts = await searchProductsES(q);
-        if (esProducts) {
-            return res.status(200).json({ success: true, data: esProducts });
-        }
-
-        // Fallback to MongoDB regex search
-        const safeQuery = escapeRegex(q);
-        const regex = new RegExp(safeQuery, 'i');
-        const products = await Product.find({ name: regex, isDeleted: { $ne: true } });
-        res.status(200).json({ success: true, data: products });
-    } catch (error) {
-        next(error);
-    }
-};
diff --git a/BACKEND/routes/product.route.js b/BACKEND/routes/product.route.js
deleted file mode 100644
index 77db7d0..0000000
--- a/BACKEND/routes/product.route.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import express from "express";
-import upload, { handleUploadError } from "../middleware/upload.js";
-import { createProduct, deleteProduct, getProducts, getProductCategories, updateProduct, getProductById, getRelatedProducts, searchProducts, getProductBundle } from "../controllers/product.controller.js";
-import reviewRoutes from './review.route.js';  // ← YEH LINE ADD KARO
-
-const router = express.Router();
-
-router.get("/", getProducts);
-router.get("/categories", getProductCategories);
-router.get("/related/:id", getRelatedProducts);
-router.get("/search", searchProducts);
-router.get("/:id/bundle", getProductBundle);
-router.get("/:id", getProductById);
-router.post("/", upload.single("image"), handleUploadError, createProduct);
-router.put("/:id", upload.single("image"), handleUploadError, updateProduct);
-router.delete("/:id", deleteProduct);
-
-
-router.use('/:productId/reviews', reviewRoutes);
-
-export default router;
\ No newline at end of file
diff --git a/BACKEND/routes/review.route.js b/BACKEND/routes/review.route.js
deleted file mode 100644
index 00fff93..0000000
--- a/BACKEND/routes/review.route.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import express from 'express';
-import { addReview, getReviews, updateReview, deleteReview } from '../controllers/review.controller.js';
-import authMiddleware from '../middleware/authMiddleware.js';
-
-const router = express.Router({ mergeParams: true });
-
-router.get('/', getReviews);
-router.post('/', authMiddleware, addReview);
-router.put('/:reviewId', authMiddleware, updateReview);
-router.delete('/:reviewId', authMiddleware, deleteReview);
-
-export default router;
\ No newline at end of file
diff --git a/BACKEND/controllers/WishlistController.controller.js b/BACKEND/services/product-service/controllers/WishlistController.controller.js
similarity index 100%
rename from BACKEND/controllers/WishlistController.controller.js
rename to BACKEND/services/product-service/controllers/WishlistController.controller.js
diff --git a/BACKEND/services/product-service/controllers/product.controller.js b/BACKEND/services/product-service/controllers/product.controller.js
new file mode 100644
index 0000000..67d02a0
--- /dev/null
+++ b/BACKEND/services/product-service/controllers/product.controller.js
@@ -0,0 +1,43 @@
+import Product from "../models/product.js";
+export const getProducts = async (req, res, next) => {
+    try {
+        const products = await Product.find({});
+        res.status(200).json({ success: true, data: products });
+    } catch (error) {
+        next(error);
+    }
+};
+export const getProductById = async (req, res, next) => {
+    try {
+        const product = await Product.findById(req.params.id);
+        if (!product) return res.status(404).json({ success: false, message: "Product not found" });
+        res.status(200).json({ success: true, data: product });
+    } catch (error) {
+        next(error);
+    }
+};
+export const createProduct = async (req, res, next) => {
+    try {
+        const newProduct = new Product(req.body);
+        await newProduct.save();
+        res.status(201).json({ success: true, data: newProduct });
+    } catch (error) {
+        next(error);
+    }
+};
+export const updateProduct = async (req, res, next) => {
+    try {
+        const updatedProduct = await Product.findByIdAndUpdate(req.params.id, req.body, { new: true });
+        res.status(200).json({ success: true, data: updatedProduct });
+    } catch (error) {
+        next(error);
+    }
+};
+export const deleteProduct = async (req, res, next) => {
+    try {
+        await Product.findByIdAndDelete(req.params.id);
+        res.status(200).json({ success: true, message: "Product deleted successfully" });
+    } catch (error) {
+        next(error);
+    }
+};
diff --git a/BACKEND/controllers/review.controller.js b/BACKEND/services/product-service/controllers/review.controller.js
similarity index 100%
rename from BACKEND/controllers/review.controller.js
rename to BACKEND/services/product-service/controllers/review.controller.js
diff --git a/BACKEND/models/Wishlist.model.js b/BACKEND/services/product-service/models/Wishlist.model.js
similarity index 100%
rename from BACKEND/models/Wishlist.model.js
rename to BACKEND/services/product-service/models/Wishlist.model.js
diff --git a/BACKEND/models/product.model.js b/BACKEND/services/product-service/models/product.model.js
similarity index 100%
rename from BACKEND/models/product.model.js
rename to BACKEND/services/product-service/models/product.model.js
diff --git a/BACKEND/models/review.model.js b/BACKEND/services/product-service/models/review.model.js
similarity index 100%
rename from BACKEND/models/review.model.js
rename to BACKEND/services/product-service/models/review.model.js
diff --git a/BACKEND/services/product-service/routes/product.route.js b/BACKEND/services/product-service/routes/product.route.js
new file mode 100644
index 0000000..0e57322
--- /dev/null
+++ b/BACKEND/services/product-service/routes/product.route.js
@@ -0,0 +1,15 @@
+import express from "express";
+import { 
+    getProducts, 
+    getProductById, 
+    createProduct, 
+    updateProduct, 
+    deleteProduct 
+} from "../controllers/product.controller.js";
+const router = express.Router();
+router.get("/", getProducts);
+router.get("/:id", getProductById);
+router.post("/", createProduct);
+router.put("/:id", updateProduct);
+router.delete("/:id", deleteProduct);
+export default router;
diff --git a/BACKEND/services/product-service/routes/review.route.js b/BACKEND/services/product-service/routes/review.route.js
new file mode 100644
index 0000000..7578998
--- /dev/null
+++ b/BACKEND/services/product-service/routes/review.route.js
@@ -0,0 +1,6 @@
+import express from "express";
+import { createReview, getProductReviews } from "../controllers/review.controller.js";
+const router = express.Router();
+router.post("/", createReview);
+router.get("/:productId", getProductReviews);
+export default router;
diff --git a/BACKEND/routes/wishlist.route.js b/BACKEND/services/product-service/routes/wishlist.route.js
similarity index 100%
rename from BACKEND/routes/wishlist.route.js
rename to BACKEND/services/product-service/routes/wishlist.route.js
diff --git a/BACKEND/services/product-service/server.js b/BACKEND/services/product-service/server.js
new file mode 100644
index 0000000..1b767c3
--- /dev/null
+++ b/BACKEND/services/product-service/server.js
@@ -0,0 +1,24 @@
+import express from "express";
+import cors from "cors";
+import helmet from "helmet";
+import { connectDB } from "../../config/db.js"; 
+import productRoutes from "./routes/product.route.js";
+import wishlistRoutes from "./routes/wishlist.route.js";
+import reviewRoutes from "./routes/review.route.js";
+import { notFoundHandler, errorHandler } from "../../middleware/errorMiddleware.js";
+const app = express();
+app.use(helmet());
+app.use(cors({ origin: process.env.FRONTEND_URL, credentials: true }));
+app.use(express.json());
+// Target Microservice Routes
+app.use("/api/products", productRoutes);
+app.use("/api/wishlist", wishlistRoutes);
+app.use("/api/reviews", reviewRoutes);
+// Error Handling
+app.use(notFoundHandler);
+app.use(errorHandler);
+const PORT = process.env.PRODUCT_SERVICE_PORT || 5001;
+connectDB();
+app.listen(PORT, () => {
+    console.log(`🚀 Product Microservice running cleanly on port ${PORT}`);
+});