diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 1a51690..60a9628 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,243 +1,36 @@
-import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import FeaturesRevealCards from '@/components/sections/features/FeaturesRevealCards';
-import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
-import HeroSplit from '@/components/sections/hero/HeroSplit';
-import MetricsIconCards from '@/components/sections/metrics/MetricsIconCards';
-import TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
-import { Award, Coffee, Users } 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 FeaturesSection from './HomePage/sections/Features';
+import MenuSection from './HomePage/sections/Menu';
+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">
-          <HeroSplit
-      tag="Since 2012"
-      title="Experience the Art of Coffee"
-      description="At Café Rikka, we believe in the perfect pour, cozy atmospheres, and community-sourced ingredients to brighten your day."
-      primaryButton={{
-        text: "View Menu",
-        href: "#menu",
-      }}
-      secondaryButton={{
-        text: "Our Story",
-        href: "#about",
-      }}
-      imageSrc="http://img.b2bpic.net/free-photo/high-angle-dining-table-assortment_23-2150312222.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutMediaOverlay
-      tag="Our Philosophy"
-      title="Crafted with Passion"
-      description="We source the finest beans globally and roast them locally to ensure every cup reflects our love for quality, sustainability, and the craft of coffee making."
-      imageSrc="http://img.b2bpic.net/free-photo/coffee-machine-grinder_1150-10944.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesRevealCards
-      tag="What we offer"
-      title="More Than Just Coffee"
-      description="Discover the unique experiences that make Café Rikka a beloved local gathering spot."
-      items={[
-        {
-          title: "Fresh Pastries",
-          description: "Baked daily in our kitchen using locally sourced flour and organic butter.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-photo-croissant-with-ham-cheese-wooden-board_613910-18345.jpg",
-        },
-        {
-          title: "Artisan Roasts",
-          description: "Single-origin beans roasted to perfection by our expert team.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-male-barista-preparing-coffee-coffee-shop_1303-31776.jpg",
-        },
-        {
-          title: "Cozy Ambience",
-          description: "A perfect environment for reading, working, or meeting friends.",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-cup-coffee-with-milk_23-2148337170.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FeaturesSection />
 
-  <div id="menu" data-section="menu">
-    <SectionErrorBoundary name="menu">
-          <FeaturesRevealCardsBento
-      tag="Menu Highlights"
-      title="Taste the Rikka Difference"
-      description="Explore our curated menu of drinks and treats, crafted for every coffee lover."
-      items={[
-        {
-          title: "House Blend",
-          description: "Smooth, medium roast with chocolate notes.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/three-glasses-jar-with-unprepared-beans-gray-table_114579-62955.jpg",
-        },
-        {
-          title: "Classic Cappuccino",
-          description: "Double shot with velvet milk.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/glass-iced-coffee-terrazzo-table_23-2151984956.jpg",
-        },
-        {
-          title: "Hot Chocolate",
-          description: "Rich cocoa with house-made cream.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/cocoa-chocolate-popcorn-ginger-biscuits-knitted-blanket-cozy-winter-home-background_501050-132.jpg",
-        },
-        {
-          title: "Fresh Croissant",
-          description: "Flaky, golden pastry.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-little-cakes-inside-paper-forms-with-sugar-powder-white-surface_140725-19247.jpg",
-        },
-        {
-          title: "Signature Roast",
-          description: "Premium blend for home brewing.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-woman-shopping-organic-spices_23-2148672829.jpg",
-        },
-        {
-          title: "Iced Vanilla Latte",
-          description: "Refreshing espresso delight.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-creative-coffee-composition_23-2148623218.jpg",
-        },
-        {
-          title: "Bagel Set",
-          description: "Warm bagel with cream cheese.",
-          href: "#contact",
-          imageSrc: "http://img.b2bpic.net/free-photo/elevated-view-tea-with-cookies-donuts_23-2147860357.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MenuSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsIconCards
-      tag="Our Impact"
-      title="Serving Joy Daily"
-      description="Numbers that capture the love we put into every single day at the cafe."
-      metrics={[
-        {
-          icon: Coffee,
-          title: "Cups Served",
-          value: "250k+",
-        },
-        {
-          icon: Users,
-          title: "Happy Customers",
-          value: "15k+",
-        },
-        {
-          icon: Award,
-          title: "Awards Won",
-          value: "12",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialOverlayCards
-      tag="Community Voices"
-      title="Loved by Locals"
-      description="See why neighbors call Café Rikka their home away from home."
-      testimonials={[
-        {
-          name: "Alice T.",
-          role: "Regular",
-          company: "Local Design",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-gentle-tender-relaxed-urban-woman-wearing-glasses-enjoying-moment-sitting-alone-cafe_197531-22826.jpg",
-        },
-        {
-          name: "Mark V.",
-          role: "Remote Worker",
-          company: "Tech",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-young-man-sits-cafe-drinks-coffee-watches-video-laptop-looking-screen-with-happy-smile-relaxing-coworking-space_1258-314636.jpg",
-        },
-        {
-          name: "Sarah P.",
-          role: "Frequent Guest",
-          company: "Teacher",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/cheerful-caucasian-fair-haired-woman-standing-with-arms-folded-near-rack-with-dresses-clothes-shop-looking-camera-smiling-boutique-customer-shop-assistant-concept_74855-11584.jpg",
-        },
-        {
-          name: "John D.",
-          role: "Visitor",
-          company: "Artist",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/business-woman-smiling-with-top-hat-thumbs-up_1187-1549.jpg",
-        },
-        {
-          name: "Emily R.",
-          role: "Local",
-          company: "Writer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/teenage-girl-drinking-coffee-from-cup_23-2147906514.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSplitMedia
-      tag="Got Questions?"
-      title="Everything You Need to Know"
-      description="From brewing tips to local event inquiries, here are some common questions."
-      items={[
-        {
-          question: "Are you pet-friendly?",
-          answer: "Absolutely! We love welcoming furry friends to our outdoor terrace.",
-        },
-        {
-          question: "Do you offer vegan options?",
-          answer: "Yes, we have a variety of plant-based milks and vegan-friendly pastries available daily.",
-        },
-        {
-          question: "Can I work from here?",
-          answer: "Definitely. We offer high-speed Wi-Fi and plenty of cozy spots for working or reading.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/coffee-machine-pours-freshly-coffee-white-cup_23-2148209248.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Visit Us"
-      text="Join us for a cup of coffee and experience the warmth of Rikka today."
-      primaryButton={{
-        text: "Get Directions",
-        href: "#",
-      }}
-      secondaryButton={{
-        text: "Contact Us",
-        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..7e18225
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,21 @@
+// 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 AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutMediaOverlay
+        tag="About Us"
+        title="A Calm & Beautiful Ambiance"
+        description="Located in Vellimadukunnu, Café Rikka is known for its serene ambiance, great food, and fast service. Whether you're here for our famous Al Faham or a refreshing green apple soda, we promise an experience beyond your expectation."
+        imageSrc="http://img.b2bpic.net/free-photo/coffee-machine-grinder_1150-10944.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..0a3efc9
--- /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="Wayanad Road, near Madhyamam, Vellimadukunnu, Kozhikode, Kerala 673012. Open until 2 AM."
+        primaryButton={{"text":"Call Us","href":"tel:08089444100"}}
+        secondaryButton={{"text":"WhatsApp","href":"https://wa.me/918089444100"}}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..0f3ca9c
--- /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="Got Questions?"
+          title="Everything You Need to Know"
+          description="From brewing tips to local event inquiries, here are some common questions."
+          items={[
+            {
+              question: "Are you pet-friendly?",
+              answer: "Absolutely! We love welcoming furry friends to our outdoor terrace.",
+            },
+            {
+              question: "Do you offer vegan options?",
+              answer: "Yes, we have a variety of plant-based milks and vegan-friendly pastries available daily.",
+            },
+            {
+              question: "Can I work from here?",
+              answer: "Definitely. We offer high-speed Wi-Fi and plenty of cozy spots for working or reading.",
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/coffee-machine-pours-freshly-coffee-white-cup_23-2148209248.jpg"
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Features.tsx b/src/pages/HomePage/sections/Features.tsx
new file mode 100644
index 0000000..dc461c2
--- /dev/null
+++ b/src/pages/HomePage/sections/Features.tsx
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "features" section.
+
+import React from 'react';
+import FeaturesRevealCards from '@/components/sections/features/FeaturesRevealCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FeaturesSection(): React.JSX.Element {
+  return (
+    <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+              <FeaturesRevealCards
+        tag="What we offer"
+        title="Signature Tastes"
+        description="Discover the unique flavors and experiences that make Café Rikka a favorite spot in Kozhikode."
+        items={[{"imageSrc":"http://img.b2bpic.net/free-photo/close-up-photo-croissant-with-ham-cheese-wooden-board_613910-18345.jpg","description":"Try our famous Chicken Masala Shawaya and Rikka Special Shawaya.","title":"Arabic Specials"},{"imageSrc":"http://img.b2bpic.net/free-photo/young-male-barista-preparing-coffee-coffee-shop_1303-31776.jpg","description":"Choose from Pepper, Peri Peri, Barbeque, and Nawabi Al Faham.","title":"Al Faham Varieties"},{"imageSrc":"http://img.b2bpic.net/free-photo/front-view-cup-coffee-with-milk_23-2148337170.jpg","description":"Enjoy our refreshing juices and the surprise package: green apple soda!","title":"Fresh Beverages"}]}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..e58d527
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,23 @@
+// 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 HeroSplit from '@/components/sections/hero/HeroSplit';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroSplit
+        tag="Vellimadukunnu, Kozhikode"
+        title="Beyond Your Expectation"
+        description="Experience the true aroma of Arabia at Café Rikka. Enjoy our signature Arabic specials, Shawaya, and Al Faham in a calm and beautiful ambiance."
+        primaryButton={{"href":"#menu","text":"View Menu"}}
+        secondaryButton={{"href":"#contact","text":"Find Us"}}
+        imageSrc="http://img.b2bpic.net/free-photo/high-angle-dining-table-assortment_23-2150312222.jpg"
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Menu.tsx b/src/pages/HomePage/sections/Menu.tsx
new file mode 100644
index 0000000..0b14d97
--- /dev/null
+++ b/src/pages/HomePage/sections/Menu.tsx
@@ -0,0 +1,21 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "menu" section.
+
+import React from 'react';
+import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function MenuSection(): React.JSX.Element {
+  return (
+    <div id="menu" data-section="menu">
+        <SectionErrorBoundary name="menu">
+              <FeaturesRevealCardsBento
+        tag="Menu Highlights"
+        title="Taste the Rikka Difference"
+        description="Explore our curated menu of Arabic specials, fresh juices, and more."
+        items={[{"title":"Chicken Masala Shawaya","description":"Our signature roasted chicken with special spices.","href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/three-glasses-jar-with-unprepared-beans-gray-table_114579-62955.jpg"},{"title":"Rikka Special Shawaya","href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/glass-iced-coffee-terrazzo-table_23-2151984956.jpg","description":"A must-try special roasted chicken."},{"title":"Pepper Al Faham","href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/cocoa-chocolate-popcorn-ginger-biscuits-knitted-blanket-cozy-winter-home-background_501050-132.jpg","description":"Spicy and flavorful Al Faham."},{"href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/front-view-little-cakes-inside-paper-forms-with-sugar-powder-white-surface_140725-19247.jpg","description":"For those who love an extra kick of spice.","title":"Peri Peri Al Faham"},{"title":"Nawabi Al Faham","href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/close-up-woman-shopping-organic-spices_23-2148672829.jpg","description":"A rich and flavorful Al Faham experience."},{"href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/high-angle-creative-coffee-composition_23-2148623218.jpg","description":"A delicious and filling roll.","title":"Mexican Rumali Roll"},{"description":"Looks like a chemistry lab experiment, tastes awesome!","href":"#contact","imageSrc":"http://img.b2bpic.net/free-photo/elevated-view-tea-with-cookies-donuts_23-2147860357.jpg","title":"Green Apple Soda"}]}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Metrics.tsx b/src/pages/HomePage/sections/Metrics.tsx
new file mode 100644
index 0000000..98037fb
--- /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, Coffee, Users } 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 Impact"
+          title="Serving Joy Daily"
+          description="Numbers that capture the love we put into every single day at the cafe."
+          metrics={[
+            {
+              icon: Coffee,
+              title: "Cups Served",
+              value: "250k+",
+            },
+            {
+              icon: Users,
+              title: "Happy Customers",
+              value: "15k+",
+            },
+            {
+              icon: Award,
+              title: "Awards Won",
+              value: "12",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Testimonials.tsx b/src/pages/HomePage/sections/Testimonials.tsx
new file mode 100644
index 0000000..c25a201
--- /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 TestimonialOverlayCards from '@/components/sections/testimonial/TestimonialOverlayCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialOverlayCards
+        tag="Reviews"
+        title="Loved by Locals"
+        description="See what our guests have to say about their experience at Café Rikka."
+        testimonials={[{"name":"Ubaid P.","role":"Reviewer","company":"Local Guide","imageSrc":"http://img.b2bpic.net/free-photo/vertical-shot-gentle-tender-relaxed-urban-woman-wearing-glasses-enjoying-moment-sitting-alone-cafe_197531-22826.jpg","rating":5},{"role":"Reviewer","name":"Krishnan J.","rating":5,"company":"Local Guide","imageSrc":"http://img.b2bpic.net/free-photo/portrait-handsome-young-man-sits-cafe-drinks-coffee-watches-video-laptop-looking-screen-with-happy-smile-relaxing-coworking-space_1258-314636.jpg"},{"role":"Reviewer","name":"Sumi S.","rating":3,"company":"Reviewer","imageSrc":"http://img.b2bpic.net/free-photo/cheerful-caucasian-fair-haired-woman-standing-with-arms-folded-near-rack-with-dresses-clothes-shop-looking-camera-smiling-boutique-customer-shop-assistant-concept_74855-11584.jpg"}]}
+      />
+        </SectionErrorBoundary>
+      </div>
+  );
+}