diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index abbf2c1..9c27928 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -72,7 +72,11 @@ export default function Layout() {
           title: "Business Hours",
           items: [
             {
-              label: "Open Daily until 5 PM",
+              label: "Sunday - Saturday",
+              href: "#",
+            },
+            {
+              label: "9 AM - 5 PM",
               href: "#",
             },
           ],
diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 10f1484..2ed13e8 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,166 +1,36 @@
-import AboutTestimonial from '@/components/sections/about/AboutTestimonial';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
-import FeaturesBorderGlow from '@/components/sections/features/FeaturesBorderGlow';
-import HeroOverlayMarquee from '@/components/sections/hero/HeroOverlayMarquee';
-import MetricsIconCards from '@/components/sections/metrics/MetricsIconCards';
-import TeamGlassCards from '@/components/sections/team/TeamGlassCards';
-import TestimonialColumnMarqueeCards from '@/components/sections/testimonial/TestimonialColumnMarqueeCards';
-import { Flame, Scissors, Sparkles } 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 ServicesSection from './HomePage/sections/Services';
+import TeamSection from './HomePage/sections/Team';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+import MetricsSection from './HomePage/sections/Metrics';
+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">
-          <HeroOverlayMarquee
-      tag="Expert Grooming in DC"
-      title="Precision Cuts for the Modern Professional"
-      description="Located in The Dawn Salon, we deliver unmatched consistency and clean, professional results in a relaxing environment."
-      primaryButton={{
-        text: "Book Appointment",        href: "#contact"}}
-      secondaryButton={{
-        text: "View Our Work",        href: "#about"}}
-      items={[
-        {
-          text: "Precision Fades",          icon: Scissors,
-        },
-        {
-          text: "Hot Towel Shave",          icon: Flame,
-        },
-        {
-          text: "Beard Grooming",          icon: Sparkles,
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/barber-shop-retro-vintage-style_1150-17931.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutTestimonial
-      tag="Our Philosophy"
-      quote="The consummate professional who values quality over quantity. Consistency is unmatched... the freshest and sharpest cut every time."
-      author="Uptown Libra"
-      role="Loyal Customer"
-      imageSrc="http://img.b2bpic.net/free-photo/male-hairdresser-combing-hair-senior-client_23-2148181882.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="services" data-section="services">
-    <SectionErrorBoundary name="services">
-          <FeaturesBorderGlow
-      tag="Our Services"
-      title="Craftsmanship in Every Cut"
-      description="We offer a range of professional grooming services tailored to your personal style and needs."
-      features={[
-        {
-          icon: Scissors,
-          title: "Precision Haircuts",          description: "Classic and modern styles tailored to your face shape."},
-        {
-          icon: Flame,
-          title: "Hot Towel Shave",          description: "Relaxing, deep-cleaning shave experience for the perfect finish."},
-        {
-          icon: Sparkles,
-          title: "Beard Grooming",          description: "Expert trimming and conditioning to maintain your beard health."},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ServicesSection />
 
-  <div id="team" data-section="team">
-    <SectionErrorBoundary name="team">
-          <TeamGlassCards
-      tag="Meet Our Barbers"
-      title="The Masters of the Blade"
-      description="Our professional team is dedicated to providing superior service and high-quality results for every client."
-      members={[
-        {
-          name: "Reggie",          role: "Head Barber & Owner",          imageSrc: "http://img.b2bpic.net/free-photo/young-evil-joyful-blonde-male-barber-uniform-holds-barber-tools-winner-cup-isolated-white-space-with-copy-space_141793-60452.jpg"},
-        {
-          name: "Bean",          role: "Master Barber",          imageSrc: "http://img.b2bpic.net/free-photo/strict-slavic-middle-aged-male-barber-uniform-combing-beard-holding-scissors-isolated-purple-wall_141793-86101.jpg"},
-        {
-          name: "Marcus",          role: "Senior Barber",          imageSrc: "http://img.b2bpic.net/free-photo/groomed-bearded-man-with-tattooes-is-posing-dark-photo-studio_613910-15016.jpg"},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TeamSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialColumnMarqueeCards
-      tag="Client Stories"
-      title="Why Our Clients Trust Us"
-      description="Experience excellence in grooming with our highly-rated services in Washington DC."
-      testimonials={[
-        {
-          name: "Sarah J.",          role: "Client",          quote: "Clean, professional, and upbeat environment. Always leaves me comfortable.",          imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-man-black-polo-shirt-swinging-paint-brush-with-aggressive-expression-standing-white-background_141793-20662.jpg"},
-        {
-          name: "David M.",          role: "Client",          quote: "First barber shop where I’ve actually loved my cut. Highly recommend.",          imageSrc: "http://img.b2bpic.net/free-photo/barber-giving-high-five-client_23-2147737095.jpg"},
-        {
-          name: "Chris B.",          role: "Client",          quote: "Consistency is unmatched—the sharpest cut every single time.",          imageSrc: "http://img.b2bpic.net/free-photo/young-attractive-man-posing-tropical-location-background-palm-trees-greenery_1321-1419.jpg"},
-        {
-          name: "Alex W.",          role: "Client",          quote: "The owner is professional and values quality over quantity.",          imageSrc: "http://img.b2bpic.net/free-photo/image-brunette-woman-laughing-smiling-while-eating-apple-kitchen-sitting-home-having_1258-199911.jpg"},
-        {
-          name: "Jordan P.",          role: "Client",          quote: "Great shop with great service, takes great care of every client.",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-hair-salon_23-2150665449.jpg"},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsIconCards
-      tag="Our Impact"
-      title="By The Numbers"
-      description="Committed to maintaining excellence and quality standards for all our clients."
-      metrics={[
-        {
-          icon: "Star",          title: "Client Satisfaction",          value: "4.6/5"},
-        {
-          icon: "Scissors",          title: "Cuts Delivered",          value: "10k+"},
-        {
-          icon: "Clock",          title: "Years Experience",          value: "12+"},
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqTabbedAccordion
-      tag="Common Questions"
-      title="Everything You Need To Know"
-      description="Get answers to common questions about our services and booking."
-      categories={[
-        {
-          name: "General",          items: [
-            {
-              question: "Do I need an appointment?",              answer: "We welcome both appointments and walk-ins, though booking is recommended."},
-            {
-              question: "Where are you located?",              answer: "We are located at 1803 Benning Rd NE, inside The Dawn Salon."},
-          ],
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Book Now"
-      text="Ready for your best cut yet? Reach out today to book your session or find us in Washington, DC."
-      primaryButton={{
-        text: "(202) 853-3766",        href: "tel:2028533766"}}
-      secondaryButton={{
-        text: "Get Directions",        href: "https://maps.google.com/?q=1803+Benning+Rd+NE+Washington+DC"}}
-    />
-    </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..2fc89a9
--- /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 AboutTestimonial from '@/components/sections/about/AboutTestimonial';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+              <AboutTestimonial
+          tag="Our Philosophy"
+          quote="The consummate professional who values quality over quantity. Consistency is unmatched... the freshest and sharpest cut every time."
+          author="Uptown Libra"
+          role="Loyal Customer"
+          imageSrc="http://img.b2bpic.net/free-photo/male-hairdresser-combing-hair-senior-client_23-2148181882.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..7297971
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,23 @@
+// 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="Book Now"
+          text="Ready for your best cut yet? Reach out today to book your session or find us in Washington, DC."
+          primaryButton={{
+            text: "(202) 853-3766",        href: "tel:2028533766"}}
+          secondaryButton={{
+            text: "Get Directions",        href: "https://maps.google.com/?q=1803+Benning+Rd+NE+Washington+DC"}}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Faq.tsx b/src/pages/HomePage/sections/Faq.tsx
new file mode 100644
index 0000000..9056252
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,30 @@
+// 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 FaqTabbedAccordion from '@/components/sections/faq/FaqTabbedAccordion';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqTabbedAccordion
+          tag="Common Questions"
+          title="Everything You Need To Know"
+          description="Get answers to common questions about our services and booking."
+          categories={[
+            {
+              name: "General",          items: [
+                {
+                  question: "Do I need an appointment?",              answer: "We welcome both appointments and walk-ins, though booking is recommended."},
+                {
+                  question: "Where are you located?",              answer: "We are located at 1803 Benning Rd NE, inside The Dawn Salon."},
+              ],
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..e5ada60
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,37 @@
+// 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 HeroOverlayMarquee from '@/components/sections/hero/HeroOverlayMarquee';
+import { Flame, Scissors, Sparkles } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+              <HeroOverlayMarquee
+          tag="Expert Grooming in DC"
+          title="Precision Cuts for the Modern Professional"
+          description="Located in The Dawn Salon, we deliver unmatched consistency and clean, professional results in a relaxing environment."
+          primaryButton={{
+            text: "Book Appointment",        href: "#contact"}}
+          secondaryButton={{
+            text: "View Our Work",        href: "#about"}}
+          items={[
+            {
+              text: "Precision Fades",          icon: Scissors,
+            },
+            {
+              text: "Hot Towel Shave",          icon: Flame,
+            },
+            {
+              text: "Beard Grooming",          icon: Sparkles,
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/barber-shop-retro-vintage-style_1150-17931.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..a260017
--- /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 MetricsIconCards from '@/components/sections/metrics/MetricsIconCards';
+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="By The Numbers"
+          description="Committed to maintaining excellence and quality standards for all our clients."
+          metrics={[
+            {
+              icon: "Star",          title: "Client Satisfaction",          value: "4.6/5"},
+            {
+              icon: "Scissors",          title: "Cuts Delivered",          value: "10k+"},
+            {
+              icon: "Clock",          title: "Years Experience",          value: "12+"},
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Services.tsx b/src/pages/HomePage/sections/Services.tsx
new file mode 100644
index 0000000..b509692
--- /dev/null
+++ b/src/pages/HomePage/sections/Services.tsx
@@ -0,0 +1,32 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "services" section.
+
+import React from 'react';
+import FeaturesBorderGlow from '@/components/sections/features/FeaturesBorderGlow';
+import { Flame, Scissors, Sparkles } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ServicesSection(): React.JSX.Element {
+  return (
+    <div id="services" data-section="services">
+        <SectionErrorBoundary name="services">
+              <FeaturesBorderGlow
+          tag="Our Services"
+          title="Craftsmanship in Every Cut"
+          description="We offer a range of professional grooming services tailored to your personal style and needs."
+          features={[
+            {
+              icon: Scissors,
+              title: "Precision Haircuts",          description: "Classic and modern styles tailored to your face shape."},
+            {
+              icon: Flame,
+              title: "Hot Towel Shave",          description: "Relaxing, deep-cleaning shave experience for the perfect finish."},
+            {
+              icon: Sparkles,
+              title: "Beard Grooming",          description: "Expert trimming and conditioning to maintain your beard health."},
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Team.tsx b/src/pages/HomePage/sections/Team.tsx
new file mode 100644
index 0000000..7cecf55
--- /dev/null
+++ b/src/pages/HomePage/sections/Team.tsx
@@ -0,0 +1,28 @@
+// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
+// file as the canonical source for the "team" section.
+
+import React from 'react';
+import TeamGlassCards from '@/components/sections/team/TeamGlassCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TeamSection(): React.JSX.Element {
+  return (
+    <div id="team" data-section="team">
+        <SectionErrorBoundary name="team">
+              <TeamGlassCards
+          tag="Meet Our Barbers"
+          title="The Masters of the Blade"
+          description="Our professional team is dedicated to providing superior service and high-quality results for every client."
+          members={[
+            {
+              name: "Reggie",          role: "Head Barber & Owner",          imageSrc: "http://img.b2bpic.net/free-photo/young-evil-joyful-blonde-male-barber-uniform-holds-barber-tools-winner-cup-isolated-white-space-with-copy-space_141793-60452.jpg"},
+            {
+              name: "Bean",          role: "Master Barber",          imageSrc: "http://img.b2bpic.net/free-photo/strict-slavic-middle-aged-male-barber-uniform-combing-beard-holding-scissors-isolated-purple-wall_141793-86101.jpg"},
+            {
+              name: "Marcus",          role: "Senior Barber",          imageSrc: "http://img.b2bpic.net/free-photo/groomed-bearded-man-with-tattooes-is-posing-dark-photo-studio_613910-15016.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..970f246
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,32 @@
+// 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 TestimonialColumnMarqueeCards from '@/components/sections/testimonial/TestimonialColumnMarqueeCards';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+              <TestimonialColumnMarqueeCards
+          tag="Client Stories"
+          title="Why Our Clients Trust Us"
+          description="Experience excellence in grooming with our highly-rated services in Washington DC."
+          testimonials={[
+            {
+              name: "Sarah J.",          role: "Client",          quote: "Clean, professional, and upbeat environment. Always leaves me comfortable.",          imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-man-black-polo-shirt-swinging-paint-brush-with-aggressive-expression-standing-white-background_141793-20662.jpg"},
+            {
+              name: "David M.",          role: "Client",          quote: "First barber shop where I’ve actually loved my cut. Highly recommend.",          imageSrc: "http://img.b2bpic.net/free-photo/barber-giving-high-five-client_23-2147737095.jpg"},
+            {
+              name: "Chris B.",          role: "Client",          quote: "Consistency is unmatched—the sharpest cut every single time.",          imageSrc: "http://img.b2bpic.net/free-photo/young-attractive-man-posing-tropical-location-background-palm-trees-greenery_1321-1419.jpg"},
+            {
+              name: "Alex W.",          role: "Client",          quote: "The owner is professional and values quality over quantity.",          imageSrc: "http://img.b2bpic.net/free-photo/image-brunette-woman-laughing-smiling-while-eating-apple-kitchen-sitting-home-having_1258-199911.jpg"},
+            {
+              name: "Jordan P.",          role: "Client",          quote: "Great shop with great service, takes great care of every client.",          imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-hair-salon_23-2150665449.jpg"},
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}