diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 3fd6107..eef48b7 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,239 +1,33 @@
-import AboutFeaturesSplit from '@/components/sections/about/AboutFeaturesSplit';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
-import HeroTiltedCards from '@/components/sections/hero/HeroTiltedCards';
-import MetricsMediaCards from '@/components/sections/metrics/MetricsMediaCards';
-import TeamDetailedCards from '@/components/sections/team/TeamDetailedCards';
-import TestimonialTrustCard from '@/components/sections/testimonial/TestimonialTrustCard';
-import { Database, Github, Linkedin, Terminal, Zap } 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 MetricsSection from './HomePage/sections/Metrics';
+import TeamSection from './HomePage/sections/Team';
+import TestimonialsSection from './HomePage/sections/Testimonials';
+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="Software Engineer"
-      title="Hi, I'm Danish."
-      description="Building scalable, high-performance software solutions for the modern digital era."
-      primaryButton={{
-        text: "View Projects",
-        href: "#features",
-      }}
-      secondaryButton={{
-        text: "Contact",
-        href: "#contact",
-      }}
-      items={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/panoramic-views-dubai-city-illuminated-neon-spectrum_23-2151305369.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/optical-fiber-background_23-2149301549.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/cyber-security-concept-digital-art_23-2151637778.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-wheelchair-doing-maintenance-server-room-infrastructure_482257-124817.jpg",
-        },
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-white-stationery-mock-up-against-black-background_23-2148052544.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutFeaturesSplit
-      tag="Expertise"
-      title="Passionate about clean code."
-      description="I focus on architecting robust systems that solve complex real-world problems efficiently."
-      items={[
-        {
-          icon: Terminal,
-          title: "Full Stack",
-          description: "Building end-to-end solutions.",
-        },
-        {
-          icon: Database,
-          title: "Scalable Data",
-          description: "Managing complex database structures.",
-        },
-        {
-          icon: Zap,
-          title: "Performance",
-          description: "Optimizing for speed and reliability.",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/portrait-african-american-person-smiling-working-his-living-room_482257-126267.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="features" data-section="features">
-    <SectionErrorBoundary name="features">
-          <FeaturesRevealCardsBento
-      tag="Portfolio"
-      title="Selected Projects"
-      description="A collection of software projects demonstrating my skills and problem-solving abilities."
-      items={[
-        {
-          title: "E-Commerce API",
-          description: "High performance API for retail.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-working-dark-home-office-with-laptop_53876-138150.jpg",
-        },
-        {
-          title: "Fintech Dashboard",
-          description: "Real-time analytics engine.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/technology-circuit-processor-innovation-network-concept_53876-124253.jpg",
-        },
-        {
-          title: "AI Image Generator",
-          description: "Integrated LLM-based image creation tool.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/cyber-security-concept-digital-art_23-2151637773.jpg",
-        },
-        {
-          title: "Cloud Monitoring Tool",
-          description: "Real-time resource tracking.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/community-cloud-storage-sync-secure_53876-124011.jpg",
-        },
-        {
-          title: "Mobile Banking App",
-          description: "Secure mobile financial platform.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/minimalistic-home-workspace-design_23-2148991453.jpg",
-        },
-        {
-          title: "Smart Logistics System",
-          description: "Automated delivery pathing.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/coffee-sticky-notes-near-digital-devices_23-2147929681.jpg",
-        },
-        {
-          title: "DevOps Toolkit",
-          description: "Automated deployment pipelines.",
-          href: "#",
-          imageSrc: "http://img.b2bpic.net/free-photo/developer-works-data-center-laptop_482257-76561.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FeaturesSection />
 
-  <div id="metrics" data-section="metrics">
-    <SectionErrorBoundary name="metrics">
-          <MetricsMediaCards
-      tag="Impact"
-      title="Measurable Results"
-      description="Delivering software with real impact for users and businesses alike."
-      metrics={[
-        {
-          value: "50+",
-          title: "Projects Completed",
-          description: "Successfully deployed software.",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-enjoying-her-virtual-date_23-2149307272.jpg",
-        },
-        {
-          value: "99.9%",
-          title: "Uptime",
-          description: "Ensuring reliability for critical systems.",
-          imageSrc: "http://img.b2bpic.net/free-photo/focus-laptop-used-by-engineers-coding-modern-data-center_482257-124889.jpg",
-        },
-        {
-          value: "1M+",
-          title: "Active Users",
-          description: "Serving millions globally.",
-          imageSrc: "http://img.b2bpic.net/free-photo/3d-render-modern-network-communications-low-poly-plexus-design_1048-13390.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <MetricsSection />
 
-  <div id="team" data-section="team">
-    <SectionErrorBoundary name="team">
-          <TeamDetailedCards
-      tag="Professional Journey"
-      title="Experience"
-      description="My professional path through software engineering."
-      members={[
-        {
-          name: "Muhammed Danish",
-          role: "Senior Engineer",
-          description: "Expert in modern full-stack development and architectural design.",
-          socialLinks: [
-            {
-              icon: Github,
-              url: "#",
-            },
-            {
-              icon: Linkedin,
-              url: "#",
-            },
-          ],
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-young-bald-call-center-man-holding-pointing-with-hand-laptop-isolated-olive-green-with-copy-space_141793-76626.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TeamSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialTrustCard
-      quote="Danish is a brilliant engineer. His technical depth and ability to solve impossible problems were instrumental to our success."
-      rating={5}
-      author="Sarah Jenkins, CTO at StartupTech"
-      avatars={[
-        {
-          name: "Sarah J",
-          imageSrc: "http://img.b2bpic.net/free-photo/serious-young-multi-ethnic-men-standing-near-office-building_1262-17205.jpg",
-        },
-        {
-          name: "Mike R",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-cto-manager-using-pc-startup-office-implement-algorithms_482257-119009.jpg",
-        },
-        {
-          name: "Anna W",
-          imageSrc: "http://img.b2bpic.net/free-photo/business-finance-employment-female-successful-entrepreneurs-concept-confident-good-looking-female-office-manager-lady-white-jacket-smiling-looking-determined-win-case-court_1258-58834.jpg",
-        },
-        {
-          name: "David K",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-solar-panels-plant-using-laptop-improve-solar-cells-efficiency_482257-119894.jpg",
-        },
-        {
-          name: "Zoe L",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-home-office-desk-typing-laptop-keyboard_482257-101018.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Hire Me"
-      text="Ready to bring your software ideas to life?"
-      primaryButton={{
-        text: "Get in Touch",
-        href: "mailto:danish@example.com",
-      }}
-      secondaryButton={{
-        text: "View Github",
-        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..7551da2
--- /dev/null
+++ b/src/pages/HomePage/sections/About.tsx
@@ -0,0 +1,42 @@
+// 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 { Database, Github, Linkedin, Terminal, Zap } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function AboutSection(): React.JSX.Element {
+  return (
+    <div id="about" data-section="about">
+        <SectionErrorBoundary name="about">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <AboutFeaturesSplit
+          tag="Expertise"
+          title="Passionate about clean code."
+          description="I focus on architecting robust systems that solve complex real-world problems efficiently."
+          items={[
+            {
+              icon: Terminal,
+              title: "Full Stack",
+              description: "Building end-to-end solutions.",
+            },
+            {
+              icon: Database,
+              title: "Scalable Data",
+              description: "Managing complex database structures.",
+            },
+            {
+              icon: Zap,
+              title: "Performance",
+              description: "Optimizing for speed and reliability.",
+            },
+          ]}
+          imageSrc="http://img.b2bpic.net/free-photo/portrait-african-american-person-smiling-working-his-living-room_482257-126267.jpg"
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Contact.tsx b/src/pages/HomePage/sections/Contact.tsx
new file mode 100644
index 0000000..8e330c0
--- /dev/null
+++ b/src/pages/HomePage/sections/Contact.tsx
@@ -0,0 +1,30 @@
+// 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";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function ContactSection(): React.JSX.Element {
+  return (
+    <div id="contact" data-section="contact">
+        <SectionErrorBoundary name="contact">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <ContactCta
+          tag="Hire Me"
+          text="Ready to bring your software ideas to life?"
+          primaryButton={{
+            text: "Get in Touch",
+            href: "mailto:danish@example.com",
+          }}
+          secondaryButton={{
+            text: "View Github",
+            href: "#",
+          }}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Features.tsx b/src/pages/HomePage/sections/Features.tsx
new file mode 100644
index 0000000..8b257bf
--- /dev/null
+++ b/src/pages/HomePage/sections/Features.tsx
@@ -0,0 +1,67 @@
+// 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 FeaturesRevealCardsBento from '@/components/sections/features/FeaturesRevealCardsBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function FeaturesSection(): React.JSX.Element {
+  return (
+    <div id="features" data-section="features">
+        <SectionErrorBoundary name="features">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <FeaturesRevealCardsBento
+          tag="Portfolio"
+          title="Selected Projects"
+          description="A collection of software projects demonstrating my skills and problem-solving abilities."
+          items={[
+            {
+              title: "E-Commerce API",
+              description: "High performance API for retail.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-working-dark-home-office-with-laptop_53876-138150.jpg",
+            },
+            {
+              title: "Fintech Dashboard",
+              description: "Real-time analytics engine.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/technology-circuit-processor-innovation-network-concept_53876-124253.jpg",
+            },
+            {
+              title: "AI Image Generator",
+              description: "Integrated LLM-based image creation tool.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/cyber-security-concept-digital-art_23-2151637773.jpg",
+            },
+            {
+              title: "Cloud Monitoring Tool",
+              description: "Real-time resource tracking.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/community-cloud-storage-sync-secure_53876-124011.jpg",
+            },
+            {
+              title: "Mobile Banking App",
+              description: "Secure mobile financial platform.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/minimalistic-home-workspace-design_23-2148991453.jpg",
+            },
+            {
+              title: "Smart Logistics System",
+              description: "Automated delivery pathing.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/coffee-sticky-notes-near-digital-devices_23-2147929681.jpg",
+            },
+            {
+              title: "DevOps Toolkit",
+              description: "Automated deployment pipelines.",
+              href: "#",
+              imageSrc: "http://img.b2bpic.net/free-photo/developer-works-data-center-laptop_482257-76561.jpg",
+            },
+          ]}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..21d72d6
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,48 @@
+// 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";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div id="hero" data-section="hero">
+        <SectionErrorBoundary name="hero">
+            <ScrollReveal variant="slide-up">
+              <HeroTiltedCards
+          tag="Software Engineer"
+          title="Hi, I'm Danish."
+          description="Building scalable, high-performance software solutions for the modern digital era."
+          primaryButton={{
+            text: "View Projects",
+            href: "#features",
+          }}
+          secondaryButton={{
+            text: "Contact",
+            href: "#contact",
+          }}
+          items={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/panoramic-views-dubai-city-illuminated-neon-spectrum_23-2151305369.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/optical-fiber-background_23-2149301549.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/cyber-security-concept-digital-art_23-2151637778.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-wheelchair-doing-maintenance-server-room-infrastructure_482257-124817.jpg",
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-white-stationery-mock-up-against-black-background_23-2148052544.jpg",
+            },
+          ]}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Metrics.tsx b/src/pages/HomePage/sections/Metrics.tsx
new file mode 100644
index 0000000..b0a3fa6
--- /dev/null
+++ b/src/pages/HomePage/sections/Metrics.tsx
@@ -0,0 +1,43 @@
+// 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";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function MetricsSection(): React.JSX.Element {
+  return (
+    <div id="metrics" data-section="metrics">
+        <SectionErrorBoundary name="metrics">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <MetricsMediaCards
+          tag="Impact"
+          title="Measurable Results"
+          description="Delivering software with real impact for users and businesses alike."
+          metrics={[
+            {
+              value: "50+",
+              title: "Projects Completed",
+              description: "Successfully deployed software.",
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-enjoying-her-virtual-date_23-2149307272.jpg",
+            },
+            {
+              value: "99.9%",
+              title: "Uptime",
+              description: "Ensuring reliability for critical systems.",
+              imageSrc: "http://img.b2bpic.net/free-photo/focus-laptop-used-by-engineers-coding-modern-data-center_482257-124889.jpg",
+            },
+            {
+              value: "1M+",
+              title: "Active Users",
+              description: "Serving millions globally.",
+              imageSrc: "http://img.b2bpic.net/free-photo/3d-render-modern-network-communications-low-poly-plexus-design_1048-13390.jpg",
+            },
+          ]}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Team.tsx b/src/pages/HomePage/sections/Team.tsx
new file mode 100644
index 0000000..dbda520
--- /dev/null
+++ b/src/pages/HomePage/sections/Team.tsx
@@ -0,0 +1,42 @@
+// 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 TeamDetailedCards from '@/components/sections/team/TeamDetailedCards';
+import { Database, Github, Linkedin, Terminal, Zap } from "lucide-react";
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function TeamSection(): React.JSX.Element {
+  return (
+    <div id="team" data-section="team">
+        <SectionErrorBoundary name="team">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <TeamDetailedCards
+          tag="Professional Journey"
+          title="Experience"
+          description="My professional path through software engineering."
+          members={[
+            {
+              name: "Muhammed Danish",
+              role: "Senior Engineer",
+              description: "Expert in modern full-stack development and architectural design.",
+              socialLinks: [
+                {
+                  icon: Github,
+                  url: "#",
+                },
+                {
+                  icon: Linkedin,
+                  url: "#",
+                },
+              ],
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-young-bald-call-center-man-holding-pointing-with-hand-laptop-isolated-olive-green-with-copy-space_141793-76626.jpg",
+            },
+          ]}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Testimonials.tsx b/src/pages/HomePage/sections/Testimonials.tsx
new file mode 100644
index 0000000..57e78f5
--- /dev/null
+++ b/src/pages/HomePage/sections/Testimonials.tsx
@@ -0,0 +1,45 @@
+// 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 TestimonialTrustCard from '@/components/sections/testimonial/TestimonialTrustCard';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import ScrollReveal from "@/components/ui/ScrollReveal";
+
+export default function TestimonialsSection(): React.JSX.Element {
+  return (
+    <div id="testimonials" data-section="testimonials">
+        <SectionErrorBoundary name="testimonials">
+            <ScrollReveal variant="slide-up" delay={0.1}>
+              <TestimonialTrustCard
+          quote="Danish is a brilliant engineer. His technical depth and ability to solve impossible problems were instrumental to our success."
+          rating={5}
+          author="Sarah Jenkins, CTO at StartupTech"
+          avatars={[
+            {
+              name: "Sarah J",
+              imageSrc: "http://img.b2bpic.net/free-photo/serious-young-multi-ethnic-men-standing-near-office-building_1262-17205.jpg",
+            },
+            {
+              name: "Mike R",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-cto-manager-using-pc-startup-office-implement-algorithms_482257-119009.jpg",
+            },
+            {
+              name: "Anna W",
+              imageSrc: "http://img.b2bpic.net/free-photo/business-finance-employment-female-successful-entrepreneurs-concept-confident-good-looking-female-office-manager-lady-white-jacket-smiling-looking-determined-win-case-court_1258-58834.jpg",
+            },
+            {
+              name: "David K",
+              imageSrc: "http://img.b2bpic.net/free-photo/man-solar-panels-plant-using-laptop-improve-solar-cells-efficiency_482257-119894.jpg",
+            },
+            {
+              name: "Zoe L",
+              imageSrc: "http://img.b2bpic.net/free-photo/smiling-man-sitting-home-office-desk-typing-laptop-keyboard_482257-101018.jpg",
+            },
+          ]}
+        />
+            </ScrollReveal>
+        </SectionErrorBoundary>
+      </div>
+  );
+}