diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 34369e6..da92d2d 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,227 +1,33 @@
-import AboutFeaturesSplit from '@/components/sections/about/AboutFeaturesSplit';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSimple from '@/components/sections/faq/FaqSimple';
-import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
-import HeroBillboardBrand from '@/components/sections/hero/HeroBillboardBrand';
-import MetricsMediaCards from '@/components/sections/metrics/MetricsMediaCards';
-import TestimonialRatingCards from '@/components/sections/testimonial/TestimonialRatingCards';
-import { Heart, Users, Utensils } from "lucide-react";
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+// AUTO-GENERATED shell by per-section-migrate.
+// Section bodies live in ./<PageBase>/sections/<X>.tsx. Edit the section
+// files directly. Non-block content (wrappers, non-inlinable sections) is
+// preserved inline; extracted section blocks become <XSection/> refs.
 
-export default function HomePage() {
+import React from 'react';
+import HeroSection from './HomePage/sections/Hero';
+import AboutSection from './HomePage/sections/About';
+import ProductsSection from './HomePage/sections/Products';
+import MetricsSection from './HomePage/sections/Metrics';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import FaqSection from './HomePage/sections/Faq';
+import ContactSection from './HomePage/sections/Contact';
+
+export default function HomePage(): React.JSX.Element {
   return (
-    <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroBillboardBrand
-      brand="Cheeze Hub"
-      description="Solo Formaggio. Only cheese, purely Italian. Bringing the true taste of tradition to the heart of Islamabad."
-      primaryButton={{
-        text: "Order Now",
-        href: "tel:03306669211",
-      }}
-      secondaryButton={{
-        text: "View Menu",
-        href: "#products",
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/baking-pizza-wood-fired-oven_23-2150134280.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutFeaturesSplit
-      tag="Our Story"
-      title="A Story of Brotherhood"
-      description="Cheeze Hub was born from a group of friends with one mission: to bring authentic Italian taste to every bite. From pizzas to burgers, every recipe carries our passion for pure, high-quality ingredients."
-      items={[
-        {
-          icon: Utensils,
-          title: "Pure Ingredients",
-          description: "We source only the finest quality cheese and fresh produce.",
-        },
-        {
-          icon: Heart,
-          title: "Italian Passion",
-          description: "Recipes crafted with authenticity and a deep love for tradition.",
-        },
-        {
-          icon: Users,
-          title: "Born of Brotherhood",
-          description: "Founded by friends dedicated to creating meaningful food experiences.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-hands-holding-pizza_23-2149269332.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="products" data-section="products">
-    <SectionErrorBoundary name="products">
-          <FeaturesRevealCardsBento
-      tag="Menu Favorites"
-      title="Our Signature Creations"
-      description="Discover our handcrafted range of Italian-inspired delights."
-      items={[
-        {
-          title: "Four Seasons Pizza",
-          description: "A classic blend of four distinct flavors. Price starts at 850.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/neatly-sliced-pizza-board-marble_114579-45037.jpg",
-        },
-        {
-          title: "Cheeze Hub Burger",
-          description: "Signature beef or chicken patty with our secret sauce. Price: 550.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/grilled-beef-sandwich-ciabatta-with-tomato-generative-ai_188544-8276.jpg",
-        },
-        {
-          title: "Family Broast",
-          description: "15 pieces of crispy, succulent fried chicken. Price: 4100.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-fried-chicken-plate-with-sauce-copy-space_23-2148646664.jpg",
-        },
-        {
-          title: "Chicken Manchurian",
-          description: "Tangy and savory Chinese classic. Price: 400.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/sushi-is-plate-with-chopsticks-dipping-sauce-white-cement-floor_1150-22640.jpg",
-        },
-        {
-          title: "Loaded Fries",
-          description: "Deep-fried goodness topped with cheese. Price: 600.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-gramajo-box_181624-59605.jpg",
-        },
-        {
-          title: "Korean Spicy Wings",
-          description: "Our special Korean-style spicy glaze. Price: 500.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-chicken-wings-plate-with-sesame-seeds-copy-space_23-2148679081.jpg",
-        },
-        {
-          title: "Alfredo Pasta",
-          description: "Creamy, rich, and authentic. Price starts at 430.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/caucasian-traditional-foodl-dushbere-gurze-served-with-yogurt-tomato-sauce-white-plate-decorated-with-turshu-wooden-table_114579-50.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ProductsSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsMediaCards
-      tag="Our Growth"
-      title="Serving Islamabad Daily"
-      description="We are proud of the community we've built one slice at a time."
-      metrics={[
-        {
-          value: "500+",
-          title: "Pizzas Baked",
-          description: "Daily count of our signature Italian pizzas.",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-delicious-italian-pizza-table_23-2148305641.jpg",
-        },
-        {
-          value: "10k+",
-          title: "Happy Customers",
-          description: " Islamabad food lovers have joined our journey.",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-with-food_23-2148899055.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialRatingCards
-      tag="Reviews"
-      title="What Our Fans Say"
-      description="Authentic feedback from our community of food lovers."
-      testimonials={[
-        {
-          name: "Sarah A.",
-          role: "Loyal Customer",
-          quote: "The best Italian pizza in Islamabad. Pure cheese magic!",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/roommates-sharing-meal-together_23-2149112172.jpg",
-        },
-        {
-          name: "Ahmed K.",
-          role: "Foodie",
-          quote: "The Zinger burger is next level. Always fresh and crispy.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg",
-        },
-        {
-          name: "Maria S.",
-          role: "Family Regular",
-          quote: "Family broast is our weekly tradition now. Exceptional quality.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-eating-restaurant_23-2148006700.jpg",
-        },
-        {
-          name: "Bilal Z.",
-          role: "Student",
-          quote: "Great prices, even better taste. Love the Korean wings!",
-          rating: 4,
-          imageSrc: "http://img.b2bpic.net/free-photo/friends-eating-pizza-medium-shot_23-2149872407.jpg",
-        },
-        {
-          name: "Fatima J.",
-          role: "Diner",
-          quote: "Pasta alfredo is perfection. Truly the Cheeze Hub.",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/glad-dark-skinned-woman-with-crisp-hair-reads-news-web-site-connected-wireless-internet-cafeteria-drinks-fresh-smoothie-poses-terrace-restaurant-installs-app-wears-t-shirt-necklace_273609-29075.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSimple
-      tag="Support"
-      title="Common Questions"
-      description="Need information about our restaurant or services?"
-      items={[
-        {
-          question: "Do you offer delivery?",
-          answer: "Yes, contact us at 0330-6669211 to place your order.",
-        },
-        {
-          question: "Where are you located?",
-          answer: "Al Rafay Arcade, E 17/3, Islamabad.",
-        },
-        {
-          question: "Do you have vegetarian options?",
-          answer: "Yes, our menu features various non-meat pizzas and pasta options.",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Visit Us"
-      text="Visit us at Al Rafay Arcade, E 17/3, Islamabad or give us a call to order your favorite meal today."
-      primaryButton={{
-        text: "Call Now",
-        href: "tel:03306669211",
-      }}
-      secondaryButton={{
-        text: "Get Directions",
-        href: "#",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ContactSection />
     </>
   );
 }
diff --git a/src/pages/HomePage/sections/About.tsx b/src/pages/HomePage/sections/About.tsx
new file mode 100644
index 0000000..cd5de3f
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,39 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "about" section.
+
+import React from 'react';
+import AboutFeaturesSplit from '@/components/sections/about/AboutFeaturesSplit';
+import { Heart, Users, Utensils } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutFeaturesSplit
+          tag="Our Story"
+          title="A Story of Brotherhood"
+          description="Cheeze Hub was born from a group of friends with one mission: to bring authentic Italian taste to every bite. From pizzas to burgers, every recipe carries our passion for pure, high-quality ingredients."
+          items={[
+            {
+              icon: Utensils,
+              title: "Pure Ingredients",
+              description: "We source only the finest quality cheese and fresh produce.",
+            },
+            {
+              icon: Heart,
+              title: "Italian Passion",
+              description: "Recipes crafted with authenticity and a deep love for tradition.",
+            },
+            {
+              icon: Users,
+              title: "Born of Brotherhood",
+              description: "Founded by friends dedicated to creating meaningful food experiences.",
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/close-up-hands-holding-pizza_23-2149269332.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Contact.tsx b/src/pages/HomePage/sections/Contact.tsx
new file mode 100644
index 0000000..3f8c4a0
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,27 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "contact" section.
+
+import React from 'react';
+import ContactCta from '@/components/sections/contact/ContactCta';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ContactSection(): React.JSX.Element {
+  return (
+    <div id="contact" data-section="contact">
+        <SectionErrorBoundary name="contact">
+              <ContactCta
+          tag="Visit Us"
+          text="Visit us at Al Rafay Arcade, E 17/3, Islamabad or give us a call to order your favorite meal today."
+          primaryButton={{
+            text: "Call Now",
+            href: "tel:03306669211",
+          }}
+          secondaryButton={{
+            text: "Get Directions",
+            href: "#",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..834e8cd
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,34 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "faq" section.
+
+import React from 'react';
+import FaqSimple from '@/components/sections/faq/FaqSimple';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqSimple
+          tag="Support"
+          title="Common Questions"
+          description="Need information about our restaurant or services?"
+          items={[
+            {
+              question: "Do you offer delivery?",
+              answer: "Yes, contact us at 0330-6669211 to place your order.",
+            },
+            {
+              question: "Where are you located?",
+              answer: "Al Rafay Arcade, E 17/3, Islamabad.",
+            },
+            {
+              question: "Do you have vegetarian options?",
+              answer: "Yes, our menu features various non-meat pizzas and pasta options.",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..004fb62
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,28 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "hero" section.
+
+import React from 'react';
+import HeroBillboardBrand from '@/components/sections/hero/HeroBillboardBrand';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroBillboardBrand
+          brand="Cheeze Hub"
+          description="Solo Formaggio. Only cheese, purely Italian. Bringing the true taste of tradition to the heart of Islamabad."
+          primaryButton={{
+            text: "Order Now",
+            href: "tel:03306669211",
+          }}
+          secondaryButton={{
+            text: "View Menu",
+            href: "#products",
+          }}
+          imageSrc="http://img.b2bpic.net/free-photo/baking-pizza-wood-fired-oven_23-2150134280.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Metrics.tsx b/src/pages/HomePage/sections/Metrics.tsx
new file mode 100644
index 0000000..1a5f7e2
--- /dev/null
+++ b/src/pages/HomePage/sections/Metrics.tsx
@@ -0,0 +1,34 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "metrics" section.
+
+import React from 'react';
+import MetricsMediaCards from '@/components/sections/metrics/MetricsMediaCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function MetricsSection(): React.JSX.Element {
+  return (
+    <div id="metrics" data-section="metrics">
+        <SectionErrorBoundary name="metrics">
+              <MetricsMediaCards
+          tag="Our Growth"
+          title="Serving Islamabad Daily"
+          description="We are proud of the community we've built one slice at a time."
+          metrics={[
+            {
+              value: "500+",
+              title: "Pizzas Baked",
+              description: "Daily count of our signature Italian pizzas.",
+              imageSrc: "http://img.b2bpic.net/free-photo/high-angle-delicious-italian-pizza-table_23-2148305641.jpg",
+            },
+            {
+              value: "10k+",
+              title: "Happy Customers",
+              description: " Islamabad food lovers have joined our journey.",
+              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-man-with-food_23-2148899055.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Products.tsx b/src/pages/HomePage/sections/Products.tsx
new file mode 100644
index 0000000..c011901
--- /dev/null
+++ b/src/pages/HomePage/sections/Products.tsx
@@ -0,0 +1,64 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "products" section.
+
+import React from 'react';
+import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ProductsSection(): React.JSX.Element {
+  return (
+    <div id="products" data-section="products">
+        <SectionErrorBoundary name="products">
+              <FeaturesRevealCardsBento
+          tag="Menu Favorites"
+          title="Our Signature Creations"
+          description="Discover our handcrafted range of Italian-inspired delights."
+          items={[
+            {
+              title: "Four Seasons Pizza",
+              description: "A classic blend of four distinct flavors. Price starts at 850.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/neatly-sliced-pizza-board-marble_114579-45037.jpg",
+            },
+            {
+              title: "Cheeze Hub Burger",
+              description: "Signature beef or chicken patty with our secret sauce. Price: 550.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/grilled-beef-sandwich-ciabatta-with-tomato-generative-ai_188544-8276.jpg",
+            },
+            {
+              title: "Family Broast",
+              description: "15 pieces of crispy, succulent fried chicken. Price: 4100.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/high-angle-fried-chicken-plate-with-sauce-copy-space_23-2148646664.jpg",
+            },
+            {
+              title: "Chicken Manchurian",
+              description: "Tangy and savory Chinese classic. Price: 400.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/sushi-is-plate-with-chopsticks-dipping-sauce-white-cement-floor_1150-22640.jpg",
+            },
+            {
+              title: "Loaded Fries",
+              description: "Deep-fried goodness topped with cheese. Price: 600.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/closeup-shot-gramajo-box_181624-59605.jpg",
+            },
+            {
+              title: "Korean Spicy Wings",
+              description: "Our special Korean-style spicy glaze. Price: 500.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-chicken-wings-plate-with-sesame-seeds-copy-space_23-2148679081.jpg",
+            },
+            {
+              title: "Alfredo Pasta",
+              description: "Creamy, rich, and authentic. Price starts at 430.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/caucasian-traditional-foodl-dushbere-gurze-served-with-yogurt-tomato-sauce-white-plate-decorated-with-turshu-wooden-table_114579-50.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Testimonials.tsx b/src/pages/HomePage/sections/Testimonials.tsx
new file mode 100644
index 0000000..4a28e98
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "testimonials" section.
+
+import React from 'react';
+import TestimonialRatingCards from '@/components/sections/testimonial/TestimonialRatingCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialRatingCards
+        tag="Reviews"
+        title="What Our Fans Say"
+        description="Authentic feedback from our community of food lovers. Rated 4.4/5 stars overall!"
+        testimonials={[{"role":"Local Guide","rating":5,"imageSrc":"http://img.b2bpic.net/free-photo/roommates-sharing-meal-together_23-2149112172.jpg","name":"Arshad Mehmood Malik","quote":"Loved the cheesy pizza and the loaded fries were awesome! Such a calm and cozy place to hang out with family and friends at night. Totally worth a visit — highly recommend!"},{"quote":"Cheeze Hub is an awesome spot for pizza, burgers, and fries! Everything tasted amazing and was served hot and fresh. The flavors were really good and the portion sizes were satisfying.","name":"Mohammad Taha","imageSrc":"http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg","rating":5,"role":"Customer"},{"imageSrc":"http://img.b2bpic.net/free-photo/woman-eating-restaurant_23-2148006700.jpg","rating":5,"role":"Customer","quote":"If you're a fan of cheese, then Cheese Hub is definitely worth checking out! Cheese Hub has a casual, laid-back vibe, perfect for grabbing a quick bite with friends or enjoying a solo meal.","name":"Farhad Ali"},{"quote":"Their taste is amazing, their pizza is the best in the game rn in all of E16/17. The staff was so humble, apologetic and accommodating. It was really nice.","name":"K Raza","rating":5,"role":"Local Guide","imageSrc":"http://img.b2bpic.net/free-photo/friends-eating-pizza-medium-shot_23-2149872407.jpg"},{"imageSrc":"http://img.b2bpic.net/free-photo/glad-dark-skinned-woman-with-crisp-hair-reads-news-web-site-connected-wireless-internet-cafeteria-drinks-fresh-smoothie-poses-terrace-restaurant-installs-app-wears-t-shirt-necklace_273609-29075.jpg","role":"Customer","rating":5,"quote":"I tried Cheese Hub recently and really enjoyed it! The burger was juicy with just the right amount of cheese, and the fries were amazing. The service was quick and the portions were filling.","name":"Faizan Satti"},{"imageSrc":"http://img.b2bpic.net/free-photo/roommates-sharing-meal-together_23-2149112172.jpg","role":"Customer","rating":5,"quote":"This wasn’t just pizza — this was an experience. From the very first bite, I knew I was tasting something special. The crust had the perfect crunch followed by a soft, pillowy chew.","name":"Not Al1Again"},{"name":"Hunain Bangash","quote":"Amazing experience at The Cheese Hub! The setup is fantastic, staff is super friendly, and the food is delicious! I loved it, and my family enjoyed it too. Highly recommended!","imageSrc":"http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg","role":"Customer","rating":5}]}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}