diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx
index 0284295..003dc85 100644
--- a/src/pages/HomePage.tsx
+++ b/src/pages/HomePage.tsx
@@ -1,198 +1,30 @@
-import AboutMediaOverlay from '@/components/sections/about/AboutMediaOverlay';
-import ContactCta from '@/components/sections/contact/ContactCta';
-import FaqTwoColumn from '@/components/sections/faq/FaqTwoColumn';
-import FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
-import HeroCenteredLogos from '@/components/sections/hero/HeroCenteredLogos';
-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 ServicesSection from './HomePage/sections/Services';
+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">
-          <HeroCenteredLogos
-      avatarsSrc={[
-        "http://img.b2bpic.net/free-photo/man-wearing-red-bow-tie_1298-359.jpg",
-        "http://img.b2bpic.net/free-photo/portrait-modern-woman-home_23-2148115589.jpg",
-        "http://img.b2bpic.net/free-photo/young-confident-blonde-office-worker-man-headphones-sits-desk-with-office-tools-using-laptop-gestures-ok-hand-sign-looking-camera-isolated-white-background-with-copy-space_141793-65652.jpg",
-        "http://img.b2bpic.net/free-photo/portrait-smiling-young-woman-using-mobile-phone-holding-cookie-hand_23-2148137425.jpg",
-      ]}
-      avatarText="22+ sretnih klijenata"
-      title="Stručnjaci za vodoinstalacije i kupaonice"
-      description="HYDRO PRO SERVISI j.d.o.o. – vrhunska adaptacija kupaonica i instalacije vode za Zagreb i okolicu."
-      primaryButton={{
-        text: "Nazovite odmah",
-        href: "tel:0953511975",
-      }}
-      secondaryButton={{
-        text: "Kontaktirajte nas",
-        href: "#contact",
-      }}
-      names={[
-        "Ivan",
-        "Marko",
-        "Ana",
-        "Petra",
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/modern-wooden-drawers-with-marble-facade_169016-72795.jpg?_wi=1"
-    />
-    </SectionErrorBoundary>
-  </div>
+<>
+  <HeroSection />
 
-  <div id="about" data-section="about">
-    <SectionErrorBoundary name="about">
-          <AboutMediaOverlay
-      tag="O nama"
-      title="Vaša vizija kupaonice postaje stvarnost"
-      description="Hydro Pro j.d.o.o. specijaliziran je za izvedbu vodoinstalacija u novim kupaonicama i adaptacijama. Od instalacije vode do finalne montaže sanitarija, pružamo kvalitetu i pouzdanost."
-      imageSrc="http://img.b2bpic.net/free-photo/profile-man-touching-socket-wall-with-screwdriver_259150-58245.jpg"
-    />
-    </SectionErrorBoundary>
-  </div>
+  <AboutSection />
 
-  <div id="services" data-section="services">
-    <SectionErrorBoundary name="services">
-          <FeaturesImageBento
-      tag="Naše usluge"
-      title="Sve što trebate za savršenu kupaonicu"
-      description="Profesionalna izvedba vodovoda, odvodnje i montaže sanitarija."
-      items={[
-        {
-          title: "Vodovodne instalacije",
-          description: "Kompletna priprema i izvedba novih vodovodnih instalacija.",
-          imageSrc: "http://img.b2bpic.net/free-photo/attractive-male-contractor-working-with-wood-sanding-wooden-panel-carpenter-using-electrical-sander_662251-454.jpg",
-        },
-        {
-          title: "Montaža sanitarija",
-          description: "Ugradnja tuševa, umivaonika, WC školjki i opreme.",
-          imageSrc: "http://img.b2bpic.net/free-photo/crop-hand-touching-bath-tap_23-2147787883.jpg",
-        },
-        {
-          title: "Adaptacija kupaonica",
-          description: "Kompletno preuređenje prostora kupaonice od temelja.",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746318.jpg",
-        },
-        {
-          title: "Ugradnja tuš kabina",
-          description: "Precizna montaža tuš paravana i sustava.",
-          imageSrc: "http://img.b2bpic.net/free-photo/wrench-flexible-connector-dark-table_23-2147772298.jpg",
-        },
-        {
-          title: "Odvodni sustavi",
-          description: "Izvedba kvalitetnih i dugotrajnih sustava odvodnje.",
-          imageSrc: "http://img.b2bpic.net/free-photo/female-desk-home_23-2147778840.jpg",
-        },
-        {
-          title: "Hitne intervencije",
-          description: "Brzo rješavanje problema i popravaka u vašem domu.",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746309.jpg",
-        },
-        {
-          title: "Priprema keramike",
-          description: "Stručna priprema podloga i zidova prije keramike.",
-          imageSrc: "http://img.b2bpic.net/free-photo/smeared-technician-hands_23-2147897912.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <ServicesSection />
 
-  <div id="testimonials" data-section="testimonials">
-    <SectionErrorBoundary name="testimonials">
-          <TestimonialMarqueeOverlayCards
-      tag="Recenzije"
-      title="Povjerenje naših klijenata"
-      description="Pogledajte što klijenti kažu o našem radu i profesionalnosti."
-      testimonials={[
-        {
-          name: "Tanya Sting",
-          role: "Klijent",
-          company: "Google",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-happy-people-chatting_23-2149152928.jpg",
-        },
-        {
-          name: "Walentine Kosmat",
-          role: "Klijent",
-          company: "Google",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/couple-love-bathroom_23-2147986324.jpg",
-        },
-        {
-          name: "Ivan Horvat",
-          role: "Klijent",
-          company: "Google",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/confident-african-american-businessman-black-classic-jacket-isolated-dark-background_613910-17869.jpg",
-        },
-        {
-          name: "Ana Kovač",
-          role: "Klijent",
-          company: "Google",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/couple-posing-together-their-new-home-while-holding-paintbrush_23-2149086842.jpg",
-        },
-        {
-          name: "Marko Ivić",
-          role: "Klijent",
-          company: "Google",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-mechanic-making-phone-call-while-relaxing-office-repair-shop_637285-11573.jpg",
-        },
-      ]}
-    />
-    </SectionErrorBoundary>
-  </div>
+  <TestimonialsSection />
 
-  <div id="faq" data-section="faq">
-    <SectionErrorBoundary name="faq">
-          <FaqTwoColumn
-      tag="Pitanja"
-      title="Česta pitanja"
-      items={[
-        {
-          question: "Radite li na području Zagreba?",
-          answer: "Da, pružamo usluge na području Zagreba i okolice.",
-        },
-        {
-          question: "Kako dogovoriti termin?",
-          answer: "Nazovite nas direktno na telefon 095 351 1975.",
-        },
-        {
-          question: "Izvodite li kompletne adaptacije?",
-          answer: "Da, specijalizirani smo za kompletnu adaptaciju kupaonica.",
-        },
-        {
-          question: "Radite li hitne popravke?",
-          answer: "Nastojimo biti što ekspeditivniji u rješavanju hitnih problema.",
-        },
-        {
-          question: "Dajete li garanciju na rad?",
-          answer: "Da, svi naši radovi su pokriveni garancijom na kvalitetu izvedbe.",
-        },
-      ]}
-      description="Odgovori na najčešća pitanja naših klijenata."
-    />
-    </SectionErrorBoundary>
-  </div>
+  <FaqSection />
 
-  <div id="contact" data-section="contact">
-    <SectionErrorBoundary name="contact">
-          <ContactCta
-      tag="Kontakt"
-      text="Trebate vodoinstalatera ili adaptaciju? Nazovite nas već danas i dogovorite procjenu radova."
-      primaryButton={{
-        text: "Nazovi odmah",
-        href: "tel:0953511975",
-      }}
-      secondaryButton={{
-        text: "Pošalji e-mail",
-        href: "mailto:hydropro@example.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..15de5c2
--- /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="O nama"
+          title="Vaša vizija kupaonice postaje stvarnost"
+          description="Hydro Pro j.d.o.o. specijaliziran je za izvedbu vodoinstalacija u novim kupaonicama i adaptacijama. Od instalacije vode do finalne montaže sanitarija, pružamo kvalitetu i pouzdanost."
+          imageSrc="http://img.b2bpic.net/free-photo/profile-man-touching-socket-wall-with-screwdriver_259150-58245.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..db9b481
--- /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="Kontakt"
+          text="Trebate vodoinstalatera ili adaptaciju? Nazovite nas već danas i dogovorite procjenu radova."
+          primaryButton={{
+            text: "Nazovi odmah",
+            href: "tel:0953511975",
+          }}
+          secondaryButton={{
+            text: "Pošalji e-mail",
+            href: "mailto:hydropro@example.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..1ab78da
--- /dev/null
+++ b/src/pages/HomePage/sections/Faq.tsx
@@ -0,0 +1,42 @@
+// 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 FaqTwoColumn from '@/components/sections/faq/FaqTwoColumn';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function FaqSection(): React.JSX.Element {
+  return (
+    <div id="faq" data-section="faq">
+        <SectionErrorBoundary name="faq">
+              <FaqTwoColumn
+          tag="Pitanja"
+          title="Česta pitanja"
+          items={[
+            {
+              question: "Radite li na području Zagreba?",
+              answer: "Da, pružamo usluge na području Zagreba i okolice.",
+            },
+            {
+              question: "Kako dogovoriti termin?",
+              answer: "Nazovite nas direktno na telefon 095 351 1975.",
+            },
+            {
+              question: "Izvodite li kompletne adaptacije?",
+              answer: "Da, specijalizirani smo za kompletnu adaptaciju kupaonica.",
+            },
+            {
+              question: "Radite li hitne popravke?",
+              answer: "Nastojimo biti što ekspeditivniji u rješavanju hitnih problema.",
+            },
+            {
+              question: "Dajete li garanciju na rad?",
+              answer: "Da, svi naši radovi su pokriveni garancijom na kvalitetu izvedbe.",
+            },
+          ]}
+          description="Odgovori na najčešća pitanja naših klijenata."
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Hero.tsx b/src/pages/HomePage/sections/Hero.tsx
new file mode 100644
index 0000000..81ec7de
--- /dev/null
+++ b/src/pages/HomePage/sections/Hero.tsx
@@ -0,0 +1,19 @@
+// Created by add_section_from_catalog (HeroSplit).
+
+import React from 'react';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
+
+export default function HeroSection(): React.JSX.Element {
+  return (
+    <div data-webild-section="hero" id="hero">
+      <HeroSplit
+        title="Stručnjaci za vodoinstalacije i kupaonice"
+        primaryButton={{"text":"Nazovite odmah","href":"tel:0953511975"}}
+        imageSrc="http://img.b2bpic.net/free-photo/modern-wooden-drawers-with-marble-facade_169016-72795.jpg?_wi=1"
+        description="HYDRO PRO SERVISI j.d.o.o. – vrhunska adaptacija kupaonica i instalacije vode za Zagreb i okolicu."
+        tag="300+ sretnih klijenata"
+        secondaryButton={{"href":"#contact","text":"Kontaktirajte nas"}}
+      />
+    </div>
+  );
+}
diff --git a/src/pages/HomePage/sections/Services.tsx b/src/pages/HomePage/sections/Services.tsx
new file mode 100644
index 0000000..6d510c8
--- /dev/null
+++ b/src/pages/HomePage/sections/Services.tsx
@@ -0,0 +1,57 @@
+// 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 FeaturesImageBento from '@/components/sections/features/FeaturesImageBento';
+import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+
+export default function ServicesSection(): React.JSX.Element {
+  return (
+    <div id="services" data-section="services">
+        <SectionErrorBoundary name="services">
+              <FeaturesImageBento
+          tag="Naše usluge"
+          title="Sve što trebate za savršenu kupaonicu"
+          description="Profesionalna izvedba vodovoda, odvodnje i montaže sanitarija."
+          items={[
+            {
+              title: "Vodovodne instalacije",
+              description: "Kompletna priprema i izvedba novih vodovodnih instalacija.",
+              imageSrc: "http://img.b2bpic.net/free-photo/attractive-male-contractor-working-with-wood-sanding-wooden-panel-carpenter-using-electrical-sander_662251-454.jpg",
+            },
+            {
+              title: "Montaža sanitarija",
+              description: "Ugradnja tuševa, umivaonika, WC školjki i opreme.",
+              imageSrc: "http://img.b2bpic.net/free-photo/crop-hand-touching-bath-tap_23-2147787883.jpg",
+            },
+            {
+              title: "Adaptacija kupaonica",
+              description: "Kompletno preuređenje prostora kupaonice od temelja.",
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746318.jpg",
+            },
+            {
+              title: "Ugradnja tuš kabina",
+              description: "Precizna montaža tuš paravana i sustava.",
+              imageSrc: "http://img.b2bpic.net/free-photo/wrench-flexible-connector-dark-table_23-2147772298.jpg",
+            },
+            {
+              title: "Odvodni sustavi",
+              description: "Izvedba kvalitetnih i dugotrajnih sustava odvodnje.",
+              imageSrc: "http://img.b2bpic.net/free-photo/female-desk-home_23-2147778840.jpg",
+            },
+            {
+              title: "Hitne intervencije",
+              description: "Brzo rješavanje problema i popravaka u vašem domu.",
+              imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-working-as-plumber_23-2150746309.jpg",
+            },
+            {
+              title: "Priprema keramike",
+              description: "Stručna priprema podloga i zidova prije keramike.",
+              imageSrc: "http://img.b2bpic.net/free-photo/smeared-technician-hands_23-2147897912.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..3eca4cd
--- /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="Recenzije"
+          title="Povjerenje naših klijenata"
+          description="Pogledajte što klijenti kažu o našem radu i profesionalnosti."
+          testimonials={[
+            {
+              name: "Tanya Sting",
+              role: "Klijent",
+              company: "Google",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-happy-people-chatting_23-2149152928.jpg",
+            },
+            {
+              name: "Walentine Kosmat",
+              role: "Klijent",
+              company: "Google",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/couple-love-bathroom_23-2147986324.jpg",
+            },
+            {
+              name: "Ivan Horvat",
+              role: "Klijent",
+              company: "Google",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-african-american-businessman-black-classic-jacket-isolated-dark-background_613910-17869.jpg",
+            },
+            {
+              name: "Ana Kovač",
+              role: "Klijent",
+              company: "Google",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/couple-posing-together-their-new-home-while-holding-paintbrush_23-2149086842.jpg",
+            },
+            {
+              name: "Marko Ivić",
+              role: "Klijent",
+              company: "Google",
+              rating: 5,
+              imageSrc: "http://img.b2bpic.net/free-photo/happy-mechanic-making-phone-call-while-relaxing-office-repair-shop_637285-11573.jpg",
+            },
+          ]}
+        />
+        </SectionErrorBoundary>
+      </div>
+  );
+}