diff --git a/www/src/components/AboutPage.astro b/www/src/components/pages/AboutPage.astro
similarity index 100%
rename from www/src/components/AboutPage.astro
rename to www/src/components/pages/AboutPage.astro
diff --git a/www/src/components/CareersPage.astro b/www/src/components/pages/CareersPage.astro
similarity index 100%
rename from www/src/components/CareersPage.astro
rename to www/src/components/pages/CareersPage.astro
diff --git a/www/src/components/FaqPage.astro b/www/src/components/pages/FaqPage.astro
similarity index 100%
rename from www/src/components/FaqPage.astro
rename to www/src/components/pages/FaqPage.astro
diff --git a/www/src/components/HomePage.astro b/www/src/components/pages/HomePage.astro
similarity index 74%
rename from www/src/components/HomePage.astro
rename to www/src/components/pages/HomePage.astro
index dc21479..be54c4f 100644
--- a/www/src/components/HomePage.astro
+++ b/www/src/components/pages/HomePage.astro
@@ -1,17 +1,17 @@
 ---
 import { getEntry } from 'astro:content';
-import BaseLayout from '../layouts/BaseLayout.astro';
-import HomeBenefits from './home/HomeBenefits.astro';
-import HomeDirector from './home/HomeDirector.astro';
-import HomeEsa from './home/HomeEsa.astro';
-import HomeFinancialHelp from './home/HomeFinancialHelp.astro';
-import HomeHero from './home/HomeHero.astro';
-import HomeInsurance from './home/HomeInsurance.astro';
-import HomeProcess from './home/HomeProcess.astro';
-import HomeServicesIntro from './home/HomeServicesIntro.astro';
-import HomeSkills from './home/HomeSkills.astro';
-import HomeTestimonials from './home/HomeTestimonials.astro';
-import type { HomePageContent, HomeSection } from '../types/home-sections';
+import BaseLayout from '../../layouts/BaseLayout.astro';
+import HomeBenefits from '../home/HomeBenefits.astro';
+import HomeDirector from '../home/HomeDirector.astro';
+import HomeEsa from '../home/HomeEsa.astro';
+import HomeFinancialHelp from '../home/HomeFinancialHelp.astro';
+import HomeHero from '../home/HomeHero.astro';
+import HomeInsurance from '../home/HomeInsurance.astro';
+import HomeProcess from '../home/HomeProcess.astro';
+import HomeServicesIntro from '../home/HomeServicesIntro.astro';
+import HomeSkills from '../home/HomeSkills.astro';
+import HomeTestimonials from '../home/HomeTestimonials.astro';
+import type { HomePageContent, HomeSection } from '../../types/home-sections';
 
 interface Props { lang?: string }
 const { lang = 'en' } = Astro.props;
diff --git a/www/src/components/ServicesPage.astro b/www/src/components/pages/ServicesPage.astro
similarity index 99%
rename from www/src/components/ServicesPage.astro
rename to www/src/components/pages/ServicesPage.astro
index 4aefac6..496d8aa 100644
--- a/www/src/components/ServicesPage.astro
+++ b/www/src/components/pages/ServicesPage.astro
@@ -1,5 +1,5 @@
 ---
-import Button from './Button.astro';
+import Button from '../Button.astro';
 ---
 
 <style>
diff --git a/www/src/components/TeamPage.astro b/www/src/components/pages/TeamPage.astro
similarity index 100%
rename from www/src/components/TeamPage.astro
rename to www/src/components/pages/TeamPage.astro
diff --git a/www/src/layouts/PageLayout.astro b/www/src/layouts/PageLayout.astro
index 76066b2..b56c8f2 100644
--- a/www/src/layouts/PageLayout.astro
+++ b/www/src/layouts/PageLayout.astro
@@ -1,11 +1,11 @@
 ---
 import BaseLayout from './BaseLayout.astro';
 import FormShell from '../components/FormShell.astro';
-import TeamPage from '../components/TeamPage.astro';
-import AboutPage from '../components/AboutPage.astro';
-import ServicesPage from '../components/ServicesPage.astro';
-import CareersPage from '../components/CareersPage.astro';
-import FaqPage from '../components/FaqPage.astro';
+import TeamPage from '../components/pages/TeamPage.astro';
+import AboutPage from '../components/pages/AboutPage.astro';
+import ServicesPage from '../components/pages/ServicesPage.astro';
+import CareersPage from '../components/pages/CareersPage.astro';
+import FaqPage from '../components/pages/FaqPage.astro';
 import PageHero from '../components/PageHero.astro';
 import { pageHeroImages } from '../data/page-visuals';
 const { entry } = Astro.props;
diff --git a/www/src/pages/es/index.astro b/www/src/pages/es/index.astro
index f8103f8..80d479d 100644
--- a/www/src/pages/es/index.astro
+++ b/www/src/pages/es/index.astro
@@ -1,4 +1,4 @@
 ---
-import HomePage from '../../components/HomePage.astro';
+import HomePage from '../../components/pages/HomePage.astro';
 ---
 <HomePage lang="es" />
diff --git a/www/src/pages/index.astro b/www/src/pages/index.astro
index 27a8641..40ce9a9 100644
--- a/www/src/pages/index.astro
+++ b/www/src/pages/index.astro
@@ -1,4 +1,4 @@
 ---
-import HomePage from '../components/HomePage.astro';
+import HomePage from '../components/pages/HomePage.astro';
 ---
 <HomePage lang="en" />