diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index da325a2..bc6f770 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,242 +1,37 @@
-import AboutText from '@/components/sections/about/AboutText';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqSimple from '@/components/sections/faq/FaqSimple';
-import FeaturesTaggedCards from '@/components/sections/features/FeaturesTaggedCards';
-import HeroSplitVerticalMarquee from '@/components/sections/hero/HeroSplitVerticalMarquee';
-import MetricsMediaCards from '@/components/sections/metrics/MetricsMediaCards';
-import TeamGlassCards from '@/components/sections/team/TeamGlassCards';
-import TestimonialMarqueeOverlayCards from '@/components/sections/testimonial/TestimonialMarqueeOverlayCards';
-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 MetricsSection from './HomePage/sections/Metrics';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import FaqSection from './HomePage/sections/Faq';
+import ContactSection from './HomePage/sections/Contact';
+
+
+{/* webild-stub @2026-06-17T00:33:29.312Z: <TARGET_ELEMENT> Type: Div Text: "Meet The Crew Professional & Knowledgeable The dedicated hands keeping your lawn green and beautiful. Santos Founder & Lead Landscaping Team Service Crew Maintenance Expert Specialist" Selector: [data-webil */}
+
+export default function HomePage(): React.JSX.Element {
   return (
-    <>
-  <div id="hero" data-section="hero">
-    <SectionErrorBoundary name="hero">
-          <HeroSplitVerticalMarquee
-      tag="Expert Landscaping Services"
-      title="Bringing Beauty to Your Landscape"
-      description="Professional residential landscaping and maintenance services. We take pride in creating and maintaining your perfect outdoor living space."
-      primaryButton={{
-        text: "Get a Quote",
-        href: "#contact",
-      }}
-      secondaryButton={{
-        text: "Learn More",
-        href: "#about",
-      }}
-      leftItems={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-spring-landscape-with-blooming-flowers_23-2151913956.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/view-robot-tending-maintaining-gardens_23-2151803931.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/man-looking-after-plants-greenhouse_23-2147768520.jpg",
-        },
-      ]}
-      rightItems={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/path-way-garden_74190-3730.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-zombie-gardening_23-2150838676.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-mature-bearded-hispanic-florist-smiling-camera-watching-flowers-garden-near-countryside-house-with-happy-relaxed-face-expression_176420-19938.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutText
-      title="About S.A. Landscaping Inc"
-      primaryButton={{
-        text: "See Our Reviews",
-        href: "#testimonials",
-      }}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesTaggedCards
-      tag="Our Services"
-      title="Comprehensive Garden Maintenance"
-      description="We offer complete lawn care and landscaping solutions for your residence."
-      items={[
-        {
-          tag: "Lawn Care",
-          title: "Regular Maintenance",
-          description: "Weekly or bi-weekly mowing, edging, and trimming to keep your lawn looking sharp year-round.",
-          imageSrc: "http://img.b2bpic.net/free-photo/elevated-view-watering-can-hand-shovel-gardening-scissors-greenhouse_23-2147948318.jpg",
-          primaryButton: {
-            text: "Book Now",
-            href: "#contact",
-          },
-        },
-        {
-          tag: "Trimming",
-          title: "Tree & Shrub Care",
-          description: "Professional pruning and trimming to maintain healthy growth and curb appeal for your property.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-gardener-taking-care-plants_23-2148905240.jpg",
-          primaryButton: {
-            text: "Book Now",
-            href: "#contact",
-          },
-        },
-        {
-          tag: "Design",
-          title: "Custom Landscaping",
-          description: "From flower beds to water-friendly designs, we bring your vision to life.",
-          imageSrc: "http://img.b2bpic.net/free-photo/white-stairs_1417-1503.jpg",
-          primaryButton: {
-            text: "Book Now",
-            href: "#contact",
-          },
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FeaturesSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsMediaCards
-      tag="Our Performance"
-      title="Client Satisfaction"
-      description="Consistently providing great service and professional work."
-      metrics={[
-        {
-          value: "5.0",
-          title: "Customer Rating",
-          description: "Based on verified Google reviews.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-woman-enjoying-music_23-2148602720.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="team" data-section="team">
-    <SectionErrorBoundary name="team">
-          <TeamGlassCards
-      tag="Meet The Crew"
-      title="Professional & Knowledgeable"
-      description="The dedicated hands keeping your lawn green and beautiful."
-      members={[
-        {
-          name: "Santos",
-          role: "Founder & Lead",
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-bearded-gardener-standing-carrying-modern-hand-hedge-trimmer-park-low-angle-view_7502-10140.jpg",
-        },
-        {
-          name: "Landscaping Team",
-          role: "Service Crew",
-          imageSrc: "http://img.b2bpic.net/free-photo/thoughtful-middle-aged-gardener-looking-evergreen-plants-gray-haired-man-eyeglasses-wearing-blue-shirt-apron-growing-small-thujas-greenhouse-commercial-gardening-summer-concept_74855-12988.jpg",
-        },
-        {
-          name: "Maintenance Expert",
-          role: "Specialist",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-checking-greenhouse-agenda-needs_23-2148357533.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialMarqueeOverlayCards
-      tag="Testimonials"
-      title="What Our Clients Say"
-      description="We've built a strong reputation for professional and reliable service in La Puente."
-      testimonials={[
-        {
-          name: "Rey Martin",
-          role: "Homeowner",
-          company: "La Puente",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-happy-people-greenhouse_23-2149098325.jpg",
-        },
-        {
-          name: "Cong Su",
-          role: "Resident",
-          company: "La Puente",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/women-taking-care-their-plants-greenhouse_23-2149037249.jpg",
-        },
-        {
-          name: "Joel Gonzalez",
-          role: "Homeowner",
-          company: "La Puente",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/man-speaking-phone-while-walking-with-woman_23-2147779718.jpg",
-        },
-        {
-          name: "Client Four",
-          role: "Resident",
-          company: "La Puente",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/pretty-woman-cute-clothes-reaching-plants-greenhouse_197531-12331.jpg",
-        },
-        {
-          name: "Client Five",
-          role: "Resident",
-          company: "La Puente",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/senior-old-man-eldery-puring-water-taking-care-small-tree-table_554837-87.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqSimple
-      tag="FAQ"
-      title="Frequently Asked Questions"
-      items={[
-        {
-          question: "What areas do you serve?",
-          answer: "We serve La Puente and the surrounding communities.",
-        },
-        {
-          question: "Do you provide custom design services?",
-          answer: "Yes, we handle everything from basic maintenance to full landscape design.",
-        },
-        {
-          question: "How can I request a quote?",
-          answer: "Simply fill out our contact form or give us a call.",
-        },
-      ]}
-      description="Common questions about our landscaping process."
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Let's Get Started"
-      text="Ready to improve your yard? Get in touch today for professional, reliable service."
-      primaryButton={{
-        text: "(626) 923-7086",
-        href: "tel:6269237086",
-      }}
-      secondaryButton={{
-        text: "Email Us",
-        href: "mailto:info@salandscaping.com",
-      }}
-    />
-    </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..629e991
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,22 @@
+// 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 AboutText from '@/components/sections/about/AboutText';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutText
+          title="About S.A. Landscaping Inc"
+          primaryButton={{
+            text: "See Our Reviews",
+            href: "#testimonials",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Contact.tsx b/src/pages/HomePage/sections/Contact.tsx
new file mode 100644
index 0000000..ac6da8d
--- /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="Let's Get Started"
+          text="Ready to improve your yard? Get in touch today for professional, reliable service."
+          primaryButton={{
+            text: "(626) 923-7086",
+            href: "tel:6269237086",
+          }}
+          secondaryButton={{
+            text: "Email Us",
+            href: "mailto:info@salandscaping.com",
+          }}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..9452097
--- /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="FAQ"
+          title="Frequently Asked Questions"
+          items={[
+            {
+              question: "What areas do you serve?",
+              answer: "We serve La Puente and the surrounding communities.",
+            },
+            {
+              question: "Do you provide custom design services?",
+              answer: "Yes, we handle everything from basic maintenance to full landscape design.",
+            },
+            {
+              question: "How can I request a quote?",
+              answer: "Simply fill out our contact form or give us a call.",
+            },
+          ]}
+          description="Common questions about our landscaping process."
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Features.tsx b/src/pages/HomePage/sections/Features.tsx
new file mode 100644
index 0000000..caca4df
--- /dev/null
+++ b/src/pages/HomePage/sections/Features.tsx
@@ -0,0 +1,52 @@
+// 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 FeaturesTaggedCards from '@/components/sections/features/FeaturesTaggedCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FeaturesSection(): React.JSX.Element {
+  return (
+    <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+              <FeaturesTaggedCards
+          tag="Our Services"
+          title="Comprehensive Garden Maintenance"
+          description="We offer complete lawn care and landscaping solutions for your residence."
+          items={[
+            {
+              tag: "Lawn Care",
+              title: "Regular Maintenance",
+              description: "Weekly or bi-weekly mowing, edging, and trimming to keep your lawn looking sharp year-round.",
+              imageSrc: "http://img.b2bpic.net/free-photo/elevated-view-watering-can-hand-shovel-gardening-scissors-greenhouse_23-2147948318.jpg",
+              primaryButton: {
+                text: "Book Now",
+                href: "#contact",
+              },
+            },
+            {
+              tag: "Trimming",
+              title: "Tree & Shrub Care",
+              description: "Professional pruning and trimming to maintain healthy growth and curb appeal for your property.",
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-gardener-taking-care-plants_23-2148905240.jpg",
+              primaryButton: {
+                text: "Book Now",
+                href: "#contact",
+              },
+            },
+            {
+              tag: "Design",
+              title: "Custom Landscaping",
+              description: "From flower beds to water-friendly designs, we bring your vision to life.",
+              imageSrc: "http://img.b2bpic.net/free-photo/white-stairs_1417-1503.jpg",
+              primaryButton: {
+                text: "Book Now",
+                href: "#contact",
+              },
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..3bccf21
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,50 @@
+// 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 HeroSplitVerticalMarquee from '@/components/sections/hero/HeroSplitVerticalMarquee';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroSplitVerticalMarquee
+          tag="Expert Landscaping Services"
+          title="Bringing Beauty to Your Landscape"
+          description="Professional residential landscaping and maintenance services. We take pride in creating and maintaining your perfect outdoor living space."
+          primaryButton={{
+            text: "Get a Quote",
+            href: "#contact",
+          }}
+          secondaryButton={{
+            text: "Learn More",
+            href: "#about",
+          }}
+          leftItems={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/beautiful-spring-landscape-with-blooming-flowers_23-2151913956.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/view-robot-tending-maintaining-gardens_23-2151803931.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/man-looking-after-plants-greenhouse_23-2147768520.jpg",
+            },
+          ]}
+          rightItems={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/path-way-garden_74190-3730.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-zombie-gardening_23-2150838676.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-attractive-mature-bearded-hispanic-florist-smiling-camera-watching-flowers-garden-near-countryside-house-with-happy-relaxed-face-expression_176420-19938.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..ae0628d
--- /dev/null
+++ b/src/pages/HomePage/sections/Metrics.tsx
@@ -0,0 +1,28 @@
+// 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 Performance"
+          title="Client Satisfaction"
+          description="Consistently providing great service and professional work."
+          metrics={[
+            {
+              value: "5.0",
+              title: "Customer Rating",
+              description: "Based on verified Google reviews.",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-woman-enjoying-music_23-2148602720.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..52031c1
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,57 @@
+// 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 TestimonialMarqueeOverlayCards from '@/components/sections/testimonial/TestimonialMarqueeOverlayCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialMarqueeOverlayCards
+          tag="Testimonials"
+          title="What Our Clients Say"
+          description="We've built a strong reputation for professional and reliable service in La Puente."
+          testimonials={[
+            {
+              name: "Rey Martin",
+              role: "Homeowner",
+              company: "La Puente",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-happy-people-greenhouse_23-2149098325.jpg",
+            },
+            {
+              name: "Cong Su",
+              role: "Resident",
+              company: "La Puente",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/women-taking-care-their-plants-greenhouse_23-2149037249.jpg",
+            },
+            {
+              name: "Joel Gonzalez",
+              role: "Homeowner",
+              company: "La Puente",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/man-speaking-phone-while-walking-with-woman_23-2147779718.jpg",
+            },
+            {
+              name: "Client Four",
+              role: "Resident",
+              company: "La Puente",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/pretty-woman-cute-clothes-reaching-plants-greenhouse_197531-12331.jpg",
+            },
+            {
+              name: "Client Five",
+              role: "Resident",
+              company: "La Puente",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/senior-old-man-eldery-puring-water-taking-care-small-tree-table_554837-87.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}