diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index bad2f07..d23af57 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -44,8 +44,8 @@ export default function Layout() {
         <NavbarInline
       logo="Taste of North"
       ctaButton={{
-        text: "Order Pickup",
-        href: "#contact",
+        text: "Order Delivery",
+        href: "#products",
       }}
      navItems={navItems} />
       </SectionErrorBoundary>
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 0a83c94..da92d2d 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,236 +1,33 @@
-import AboutFeaturesSplit from '@/components/sections/about/AboutFeaturesSplit';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
-import HeroTiltedCards from '@/components/sections/hero/HeroTiltedCards';
-import MetricsIconCards from '@/components/sections/metrics/MetricsIconCards';
-import TestimonialMarqueeCards from '@/components/sections/testimonial/TestimonialMarqueeCards';
-import { Award, Clock, Flame, Star, 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">
-          <HeroTiltedCards
-      tag="Authentic Taste"
-      title="Experience the True Taste of North"
-      description="Located in Rawalpindi, we serve the most authentic Chinese dishes prepared with fresh ingredients and traditional recipes."
-      primaryButton={{
-        text: "View Menu",
-        href: "#products",
-      }}
-      secondaryButton={{
-        text: "Call Us",
-        href: "tel:03111195552",
-      }}
-      items={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/ancient-chinise-room_1417-1692.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-view-reunion-dinner-food-chinese-new-year-celebration_23-2151072406.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/crepe-rolls-russian-blinchik-served-with-tartar-sauce_114579-2431.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/female-chef-kitchen-holding-plate-steak_23-2149720771.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/penne-pasta-tomato-sauce-chess-pawns-around_114579-2447.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutFeaturesSplit
-      tag="Our Story"
-      title="Quality You Can Taste"
-      description="Established with a passion for excellence, Taste of North brings the rich heritage of Chinese culinary arts to your table. We prioritize fresh, high-quality ingredients to ensure every meal is memorable."
-      items={[
-        {
-          icon: Award,
-          title: "Traditional Recipes",
-          description: "Authentic methods passed down through generations.",
-        },
-        {
-          icon: Flame,
-          title: "Fresh Ingredients",
-          description: "Locally sourced produce and high-grade meats.",
-        },
-        {
-          icon: Utensils,
-          title: "Cozy Ambience",
-          description: "Perfect for family dinners and gatherings.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/male-chef-preparing-sushi-order-takeaway_23-2149050360.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="products" data-section="products">
-    <SectionErrorBoundary name="products">
-          <FeaturesImageBento
-      tag="Our Menu"
-      title="Flavorful Creations"
-      description="Explore our wide variety of authentic Chinese favorites, from spicy stir-fries to traditional dim sums."
-      items={[
-        {
-          title: "Kung Pao Chicken",
-          description: "Spicy, savory, and perfectly seasoned.",
-          imageSrc: "http://img.b2bpic.net/free-photo/fried-chicken-with-cashew-nuts-thai-food_1150-26465.jpg",
-        },
-        {
-          title: "Dim Sum Selection",
-          description: "Delicately steamed for maximum flavor.",
-          imageSrc: "http://img.b2bpic.net/free-photo/steamed-dumplings-marble-background_123827-22933.jpg",
-        },
-        {
-          title: "Stir-fry Noodles",
-          description: "Fresh vegetables and savory sauces.",
-          imageSrc: "http://img.b2bpic.net/free-photo/noodles_23-2148142553.jpg",
-        },
-        {
-          title: "Sweet & Sour Pork",
-          description: "Crispy and balanced flavor profile.",
-          imageSrc: "http://img.b2bpic.net/free-photo/korean-food-bulgogi-marinated-beef-barbecue-ready-serve_1150-42883.jpg",
-        },
-        {
-          title: "Spring Rolls",
-          description: "Crispy appetizers with fresh filling.",
-          imageSrc: "http://img.b2bpic.net/free-photo/roll-meal-food-white-seafood_1203-4015.jpg",
-        },
-        {
-          title: "Fried Rice Bowls",
-          description: "Traditional wok-fried comfort food.",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-chopsticks-rice-with-vegetables-plate-with-blank-blackboard_23-2148377499.jpg",
-        },
-        {
-          title: "Traditional Soups",
-          description: "Hearty and warming flavors.",
-          imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-noodle-soup-winter-meals_23-2148717414.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ProductsSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsIconCards
-      tag="Our Success"
-      title="Serving Quality Daily"
-      description="We are proud of our commitment to our community and the feedback we receive from our patrons."
-      metrics={[
-        {
-          icon: Star,
-          title: "Customer Rating",
-          value: "4.2",
-        },
-        {
-          icon: Users,
-          title: "Happy Diners",
-          value: "416+",
-        },
-        {
-          icon: Clock,
-          title: "Service Years",
-          value: "5+",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialMarqueeCards
-      tag="Testimonials"
-      title="What Guests Say"
-      description="Don't just take our word for it—read what our wonderful guests think about their dining experience."
-      testimonials={[
-        {
-          name: "Sarah Khan",
-          role: "Foodie",
-          quote: "The most authentic Chinese I've had in Rawalpindi!",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-african-american-woman-cafe_273609-5044.jpg",
-        },
-        {
-          name: "Ali Raza",
-          role: "Regular",
-          quote: "Consistency in quality and service is unmatched.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-happy-woman-having-fun-while-eating-dinner-communicating-with-friends-dining-table_637285-3342.jpg",
-        },
-        {
-          name: "Mehwish Tariq",
-          role: "Family Diner",
-          quote: "Great atmosphere for our weekly family dinners.",
-          imageSrc: "http://img.b2bpic.net/free-photo/middle-age-woman-having-fun-restaurant_23-2149237471.jpg",
-        },
-        {
-          name: "Zeeshan Ahmed",
-          role: "Regular",
-          quote: "The dim sum is a must-try for everyone.",
-          imageSrc: "http://img.b2bpic.net/free-photo/low-angle-friends-shaking-hands_23-2148395404.jpg",
-        },
-        {
-          name: "Fatima Noor",
-          role: "Food Blogger",
-          quote: "Exquisite flavors and authentic spices throughout.",
-          imageSrc: "http://img.b2bpic.net/free-photo/positive-lifestyle-portrait-happy-exited-pretty-woman-with-pink-hairs-having-dinner-vintage-american-cafe-eating-hot-dog-french-fries-mil-shake-junk-food-cheat-meal-pastel-colors_291049-357.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSplitMedia
-      tag="Common Queries"
-      title="Everything You Need To Know"
-      description="Have questions about our service or menu? We're here to help."
-      items={[
-        {
-          question: "Are you open on weekends?",
-          answer: "Yes, we are open daily to serve our customers.",
-        },
-        {
-          question: "Do you offer delivery?",
-          answer: "We currently focus on pickup to ensure the highest quality.",
-        },
-        {
-          question: "Where are you located?",
-          answer: "We are located at 6th Rd, Satellite Block D town, Rawalpindi.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/atmosphere-kitchen-cafe-process_1321-4212.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Visit Us"
-      text="Ready for an authentic experience? Visit us or place your order for pickup now."
-      primaryButton={{
-        text: "Call Now",
-        href: "tel:03111195552",
-      }}
-      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..838f299
--- /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 { Award, Clock, Flame, Star, 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="Quality You Can Taste"
+          description="Established with a passion for excellence, Taste of North brings the rich heritage of Chinese culinary arts to your table. We prioritize fresh, high-quality ingredients to ensure every meal is memorable."
+          items={[
+            {
+              icon: Award,
+              title: "Traditional Recipes",
+              description: "Authentic methods passed down through generations.",
+            },
+            {
+              icon: Flame,
+              title: "Fresh Ingredients",
+              description: "Locally sourced produce and high-grade meats.",
+            },
+            {
+              icon: Utensils,
+              title: "Cozy Ambience",
+              description: "Perfect for family dinners and gatherings.",
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/male-chef-preparing-sushi-order-takeaway_23-2149050360.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..c32dd2d
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,21 @@
+// 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="Ready for an authentic experience? Visit us or place your order for pickup now."
+        primaryButton={{"text":"Order Pickup","href":"tel:03111195552"}}
+        secondaryButton={{"text":"Order Delivery","href":"#products"}}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..07aeba0
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,35 @@
+// 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 FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqSplitMedia
+          tag="Common Queries"
+          title="Everything You Need To Know"
+          description="Have questions about our service or menu? We're here to help."
+          items={[
+            {
+              question: "Are you open on weekends?",
+              answer: "Yes, we are open daily to serve our customers.",
+            },
+            {
+              question: "Do you offer delivery?",
+              answer: "We currently focus on pickup to ensure the highest quality.",
+            },
+            {
+              question: "Where are you located?",
+              answer: "We are located at 6th Rd, Satellite Block D town, Rawalpindi.",
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/atmosphere-kitchen-cafe-process_1321-4212.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..c292e59
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,39 @@
+// 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 HeroTiltedCards from '@/components/sections/hero/HeroTiltedCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroTiltedCards
+        tag="Authentic Taste"
+        title="Experience the True Taste of North"
+        description="Located in Rawalpindi, we serve the most authentic Chinese dishes prepared with fresh ingredients and traditional recipes."
+        primaryButton={{"text":"Order Delivery","href":"#products"}}
+        secondaryButton={{"text":"Order Pickup","href":"tel:03111195552"}}
+        items={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/ancient-chinise-room_1417-1692.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/3d-view-reunion-dinner-food-chinese-new-year-celebration_23-2151072406.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/crepe-rolls-russian-blinchik-served-with-tartar-sauce_114579-2431.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/female-chef-kitchen-holding-plate-steak_23-2149720771.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/penne-pasta-tomato-sauce-chess-pawns-around_114579-2447.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..b4dd7eb
--- /dev/null
+++ b/src/pages/HomePage/sections/Metrics.tsx
@@ -0,0 +1,38 @@
+// 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 MetricsIconCards from '@/components/sections/metrics/MetricsIconCards';
+import { Award, Clock, Flame, Star, Users, Utensils } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function MetricsSection(): React.JSX.Element {
+  return (
+    <div id="metrics" data-section="metrics">
+        <SectionErrorBoundary name="metrics">
+              <MetricsIconCards
+          tag="Our Success"
+          title="Serving Quality Daily"
+          description="We are proud of our commitment to our community and the feedback we receive from our patrons."
+          metrics={[
+            {
+              icon: Star,
+              title: "Customer Rating",
+              value: "4.2",
+            },
+            {
+              icon: Users,
+              title: "Happy Diners",
+              value: "416+",
+            },
+            {
+              icon: Clock,
+              title: "Service Years",
+              value: "5+",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Products.tsx b/src/pages/HomePage/sections/Products.tsx
new file mode 100644
index 0000000..d0fd6c6
--- /dev/null
+++ b/src/pages/HomePage/sections/Products.tsx
@@ -0,0 +1,57 @@
+// 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 FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ProductsSection(): React.JSX.Element {
+  return (
+    <div id="products" data-section="products">
+        <SectionErrorBoundary name="products">
+              <FeaturesImageBento
+          tag="Our Menu"
+          title="Flavorful Creations"
+          description="Explore our wide variety of authentic Chinese favorites, from spicy stir-fries to traditional dim sums."
+          items={[
+            {
+              title: "Kung Pao Chicken",
+              description: "Spicy, savory, and perfectly seasoned.",
+              imageSrc: "http://img.b2bpic.net/free-photo/fried-chicken-with-cashew-nuts-thai-food_1150-26465.jpg",
+            },
+            {
+              title: "Dim Sum Selection",
+              description: "Delicately steamed for maximum flavor.",
+              imageSrc: "http://img.b2bpic.net/free-photo/steamed-dumplings-marble-background_123827-22933.jpg",
+            },
+            {
+              title: "Stir-fry Noodles",
+              description: "Fresh vegetables and savory sauces.",
+              imageSrc: "http://img.b2bpic.net/free-photo/noodles_23-2148142553.jpg",
+            },
+            {
+              title: "Sweet & Sour Pork",
+              description: "Crispy and balanced flavor profile.",
+              imageSrc: "http://img.b2bpic.net/free-photo/korean-food-bulgogi-marinated-beef-barbecue-ready-serve_1150-42883.jpg",
+            },
+            {
+              title: "Spring Rolls",
+              description: "Crispy appetizers with fresh filling.",
+              imageSrc: "http://img.b2bpic.net/free-photo/roll-meal-food-white-seafood_1203-4015.jpg",
+            },
+            {
+              title: "Fried Rice Bowls",
+              description: "Traditional wok-fried comfort food.",
+              imageSrc: "http://img.b2bpic.net/free-photo/high-angle-chopsticks-rice-with-vegetables-plate-with-blank-blackboard_23-2148377499.jpg",
+            },
+            {
+              title: "Traditional Soups",
+              description: "Hearty and warming flavors.",
+              imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-noodle-soup-winter-meals_23-2148717414.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..b04819b
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,52 @@
+// 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 TestimonialMarqueeCards from '@/components/sections/testimonial/TestimonialMarqueeCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialMarqueeCards
+          tag="Testimonials"
+          title="What Guests Say"
+          description="Don't just take our word for it—read what our wonderful guests think about their dining experience."
+          testimonials={[
+            {
+              name: "Sarah Khan",
+              role: "Foodie",
+              quote: "The most authentic Chinese I've had in Rawalpindi!",
+              imageSrc: "http://img.b2bpic.net/free-photo/beautiful-african-american-woman-cafe_273609-5044.jpg",
+            },
+            {
+              name: "Ali Raza",
+              role: "Regular",
+              quote: "Consistency in quality and service is unmatched.",
+              imageSrc: "http://img.b2bpic.net/free-photo/young-happy-woman-having-fun-while-eating-dinner-communicating-with-friends-dining-table_637285-3342.jpg",
+            },
+            {
+              name: "Mehwish Tariq",
+              role: "Family Diner",
+              quote: "Great atmosphere for our weekly family dinners.",
+              imageSrc: "http://img.b2bpic.net/free-photo/middle-age-woman-having-fun-restaurant_23-2149237471.jpg",
+            },
+            {
+              name: "Zeeshan Ahmed",
+              role: "Regular",
+              quote: "The dim sum is a must-try for everyone.",
+              imageSrc: "http://img.b2bpic.net/free-photo/low-angle-friends-shaking-hands_23-2148395404.jpg",
+            },
+            {
+              name: "Fatima Noor",
+              role: "Food Blogger",
+              quote: "Exquisite flavors and authentic spices throughout.",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-lifestyle-portrait-happy-exited-pretty-woman-with-pink-hairs-having-dinner-vintage-american-cafe-eating-hot-dog-french-fries-mil-shake-junk-food-cheat-meal-pastel-colors_291049-357.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}