diff --git a/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx b/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx
index 6b524dc..23beff6 100644
--- a/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx
+++ b/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx
@@ -3,7 +3,7 @@
 import { forwardRef, memo, useCallback } from "react";
 import { ContextMenuItemView } from "./ContextMenuItem.view";
 import type { ContextMenuItemProps } from "./ContextMenuItem.types";
-import { normalizeContextMenuItemSize } from "../../../lib/propNormalization";
+import { normalizeContextMenuItemSize } from "../../../../lib/propNormalization";
 
 const ContextMenuItemContainer = forwardRef<
   HTMLDivElement,
diff --git a/app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx b/app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx
index b909551..c92b089 100644
--- a/app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx
+++ b/app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx
@@ -3,7 +3,7 @@
 import { forwardRef, memo, useCallback } from "react";
 import { SelectOptionView } from "./SelectOption.view";
 import type { SelectOptionProps } from "./SelectOption.types";
-import { normalizeContextMenuItemSize } from "../../../../lib/propNormalization";
+import { normalizeContextMenuItemSize } from "../../../../../lib/propNormalization";
 
 const SelectOptionContainer = forwardRef<HTMLDivElement, SelectOptionProps>(
   (
diff --git a/app/components/utility/ModalFooter/ModalFooter.view.tsx b/app/components/utility/ModalFooter/ModalFooter.view.tsx
index da0434f..311cee2 100644
--- a/app/components/utility/ModalFooter/ModalFooter.view.tsx
+++ b/app/components/utility/ModalFooter/ModalFooter.view.tsx
@@ -2,7 +2,7 @@
 
 import { useTranslation } from "../../../contexts/MessagesContext";
 import Button from "../../buttons/Button";
-import Stepper from "../../progress/Stepper";
+import Stepper from "../../progress/Progress/Stepper";
 import type { ModalFooterProps } from "./ModalFooter.types";
 
 export function ModalFooterView({
diff --git a/tests/components/Alert.test.tsx b/tests/components/Alert.test.tsx
index c9f78b3..b0b4826 100644
--- a/tests/components/Alert.test.tsx
+++ b/tests/components/Alert.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Alert from "../../app/components/Alert";
+import Alert from "../../app/components/modals/Alert";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type AlertProps = React.ComponentProps<typeof Alert>;
diff --git a/tests/components/AskOrganizer.test.tsx b/tests/components/AskOrganizer.test.tsx
index 6bfc7be..0bf7c78 100644
--- a/tests/components/AskOrganizer.test.tsx
+++ b/tests/components/AskOrganizer.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { renderWithProviders as render, screen } from "../utils/test-utils";
 import { describe, it, expect } from "vitest";
-import AskOrganizer from "../../app/components/AskOrganizer";
+import AskOrganizer from "../../app/components/sections/AskOrganizer";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/Button.test.tsx b/tests/components/Button.test.tsx
index 3f7f1a5..ae40e3c 100644
--- a/tests/components/Button.test.tsx
+++ b/tests/components/Button.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect, vi } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import "@testing-library/jest-dom/vitest";
-import Button from "../../app/components/Button";
+import Button from "../../app/components/buttons/Button";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/Checkbox.test.tsx b/tests/components/Checkbox.test.tsx
index 1b33731..8fa14ae 100644
--- a/tests/components/Checkbox.test.tsx
+++ b/tests/components/Checkbox.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Checkbox from "../../app/components/Checkbox";
+import Checkbox from "../../app/components/controls/Checkbox";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type CheckboxProps = React.ComponentProps<typeof Checkbox>;
diff --git a/tests/components/ContentBanner.test.tsx b/tests/components/ContentBanner.test.tsx
index 79a4ec9..b3ee80c 100644
--- a/tests/components/ContentBanner.test.tsx
+++ b/tests/components/ContentBanner.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import { describe, it, expect, vi } from "vitest";
-import ContentBanner from "../../app/components/ContentBanner";
+import ContentBanner from "../../app/components/sections/ContentBanner";
 import type { BlogPost } from "../../lib/content";
 
 vi.mock("next/link", () => ({
diff --git a/tests/components/Create.test.tsx b/tests/components/Create.test.tsx
index 6e5be7e..6841a96 100644
--- a/tests/components/Create.test.tsx
+++ b/tests/components/Create.test.tsx
@@ -3,8 +3,8 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { screen, fireEvent, waitFor } from "@testing-library/react";
 import "@testing-library/jest-dom/vitest";
 import { renderWithProviders } from "../utils/test-utils";
-import Create from "../../app/components/Create";
-import TextInput from "../../app/components/TextInput";
+import Create from "../../app/components/modals/Create";
+import TextInput from "../../app/components/controls/TextInput";
 
 type CreateProps = React.ComponentProps<typeof Create>;
 
diff --git a/tests/components/FeatureGrid.test.tsx b/tests/components/FeatureGrid.test.tsx
index 4114a68..e9ef002 100644
--- a/tests/components/FeatureGrid.test.tsx
+++ b/tests/components/FeatureGrid.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { renderWithProviders as render, screen } from "../utils/test-utils";
 import { describe, it, expect } from "vitest";
-import FeatureGrid from "../../app/components/FeatureGrid";
+import FeatureGrid from "../../app/components/sections/FeatureGrid";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/Footer.test.tsx b/tests/components/Footer.test.tsx
index a560672..8ff0524 100644
--- a/tests/components/Footer.test.tsx
+++ b/tests/components/Footer.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { renderWithProviders as render, screen } from "../utils/test-utils";
 import { describe, it, expect } from "vitest";
-import Footer from "../../app/components/Footer";
+import Footer from "../../app/components/navigation/Footer";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/Header.test.tsx b/tests/components/Header.test.tsx
index 5abbe34..de9d8b2 100644
--- a/tests/components/Header.test.tsx
+++ b/tests/components/Header.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Header from "../../app/components/Header";
+import Header from "../../app/components/navigation/Header";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type HeaderProps = React.ComponentProps<typeof Header>;
diff --git a/tests/components/HeroBanner.test.tsx b/tests/components/HeroBanner.test.tsx
index ac25da3..aabcdd8 100644
--- a/tests/components/HeroBanner.test.tsx
+++ b/tests/components/HeroBanner.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { renderWithProviders as render, screen } from "../utils/test-utils";
 import { describe, it, expect } from "vitest";
-import HeroBanner from "../../app/components/HeroBanner";
+import HeroBanner from "../../app/components/sections/HeroBanner";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/IconCard.test.tsx b/tests/components/IconCard.test.tsx
index 5b050a8..d4e9859 100644
--- a/tests/components/IconCard.test.tsx
+++ b/tests/components/IconCard.test.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { describe, it, expect, vi } from "vitest";
 import { render, screen, fireEvent } from "@testing-library/react";
 import "@testing-library/jest-dom/vitest";
-import IconCard from "../../app/components/IconCard";
+import IconCard from "../../app/components/cards/IconCard";
 import {
   componentTestSuite,
   type ComponentTestSuiteConfig,
diff --git a/tests/components/Logo.test.tsx b/tests/components/Logo.test.tsx
index 8698fbe..5ade664 100644
--- a/tests/components/Logo.test.tsx
+++ b/tests/components/Logo.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import { describe, it, expect } from "vitest";
-import Logo from "../../app/components/Logo";
+import Logo from "../../app/components/icons/Logo";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/MultiSelect.test.tsx b/tests/components/MultiSelect.test.tsx
index 06c895f..265479a 100644
--- a/tests/components/MultiSelect.test.tsx
+++ b/tests/components/MultiSelect.test.tsx
@@ -2,7 +2,7 @@ import { describe, it, expect, vi } from "vitest";
 import { screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { renderWithProviders as render } from "../utils/test-utils";
-import MultiSelect from "../../app/components/MultiSelect";
+import MultiSelect from "../../app/components/controls/MultiSelect";
 import {
   componentTestSuite,
   type ComponentTestSuiteConfig,
diff --git a/tests/components/Progress.test.tsx b/tests/components/Progress.test.tsx
index 23edb33..f480741 100644
--- a/tests/components/Progress.test.tsx
+++ b/tests/components/Progress.test.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { describe, it, expect } from "vitest";
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom/vitest";
-import Progress from "../../app/components/Progress";
+import Progress from "../../app/components/progress/Progress";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/RadioButton.test.tsx b/tests/components/RadioButton.test.tsx
index 1139bfa..47c5949 100644
--- a/tests/components/RadioButton.test.tsx
+++ b/tests/components/RadioButton.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import RadioButton from "../../app/components/RadioButton";
+import RadioButton from "../../app/components/controls/RadioButton";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type RadioButtonProps = React.ComponentProps<typeof RadioButton>;
diff --git a/tests/components/RadioGroup.test.tsx b/tests/components/RadioGroup.test.tsx
index 26ad75e..35ad774 100644
--- a/tests/components/RadioGroup.test.tsx
+++ b/tests/components/RadioGroup.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import RadioGroup from "../../app/components/RadioGroup";
+import RadioGroup from "../../app/components/controls/RadioGroup";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type RadioGroupProps = React.ComponentProps<typeof RadioGroup>;
diff --git a/tests/components/RelatedArticles.test.tsx b/tests/components/RelatedArticles.test.tsx
index c3aa2b0..8b8ecb4 100644
--- a/tests/components/RelatedArticles.test.tsx
+++ b/tests/components/RelatedArticles.test.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import { describe, it, expect, vi } from "vitest";
-import RelatedArticles from "../../app/components/RelatedArticles";
+import RelatedArticles from "../../app/components/sections/RelatedArticles";
 import type { BlogPost } from "../../lib/content";
 
 vi.mock("next/link", () => ({
@@ -12,7 +12,7 @@ vi.mock("next/link", () => ({
   ),
 }));
 
-vi.mock("../../app/components/ContentThumbnailTemplate", () => ({
+vi.mock("../../app/components/content/ContentThumbnailTemplate", () => ({
   default: ({ post }: { post: BlogPost }) => (
     <div data-testid={`thumbnail-${post.slug}`}>
       <a href={`/blog/${post.slug}`}>
diff --git a/tests/components/SectionHeader.test.tsx b/tests/components/SectionHeader.test.tsx
index 0987139..dc5fd36 100644
--- a/tests/components/SectionHeader.test.tsx
+++ b/tests/components/SectionHeader.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import SectionHeader from "../../app/components/SectionHeader";
+import SectionHeader from "../../app/components/sections/SectionHeader";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type SectionHeaderProps = React.ComponentProps<typeof SectionHeader>;
diff --git a/tests/components/SelectInput.test.tsx b/tests/components/SelectInput.test.tsx
index d71eb53..2e31060 100644
--- a/tests/components/SelectInput.test.tsx
+++ b/tests/components/SelectInput.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import SelectInput from "../../app/components/SelectInput";
+import SelectInput from "../../app/components/controls/SelectInput";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type SelectInputProps = React.ComponentProps<typeof SelectInput>;
diff --git a/tests/components/Stepper.test.tsx b/tests/components/Stepper.test.tsx
index 98fad2a..0a21daf 100644
--- a/tests/components/Stepper.test.tsx
+++ b/tests/components/Stepper.test.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { describe, it, expect } from "vitest";
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom/vitest";
-import Stepper from "../../app/components/Stepper";
+import Stepper from "../../app/components/progress/Progress/Stepper";
 import {
   componentTestSuite,
   ComponentTestSuiteConfig,
diff --git a/tests/components/Switch.test.tsx b/tests/components/Switch.test.tsx
index 2074dfa..fa5d374 100644
--- a/tests/components/Switch.test.tsx
+++ b/tests/components/Switch.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Switch from "../../app/components/Switch";
+import Switch from "../../app/components/controls/Switch";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type SwitchProps = React.ComponentProps<typeof Switch>;
diff --git a/tests/components/TextArea.test.tsx b/tests/components/TextArea.test.tsx
index ac083f7..67e0fa0 100644
--- a/tests/components/TextArea.test.tsx
+++ b/tests/components/TextArea.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import TextArea from "../../app/components/TextArea";
+import TextArea from "../../app/components/controls/TextArea";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type TextAreaProps = React.ComponentProps<typeof TextArea>;
diff --git a/tests/components/TextInput.test.tsx b/tests/components/TextInput.test.tsx
index c63f8ad..72a27ad 100644
--- a/tests/components/TextInput.test.tsx
+++ b/tests/components/TextInput.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import TextInput from "../../app/components/TextInput";
+import TextInput from "../../app/components/controls/TextInput";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type TextInputProps = React.ComponentProps<typeof TextInput>;
diff --git a/tests/components/Toggle.test.tsx b/tests/components/Toggle.test.tsx
index ad091d0..2f863a5 100644
--- a/tests/components/Toggle.test.tsx
+++ b/tests/components/Toggle.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Toggle from "../../app/components/Toggle";
+import Toggle from "../../app/components/controls/Toggle";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type ToggleProps = React.ComponentProps<typeof Toggle>;
diff --git a/tests/components/ToggleGroup.test.tsx b/tests/components/ToggleGroup.test.tsx
index fe049ac..5ec6f21 100644
--- a/tests/components/ToggleGroup.test.tsx
+++ b/tests/components/ToggleGroup.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ToggleGroup from "../../app/components/ToggleGroup";
+import ToggleGroup from "../../app/components/controls/ToggleGroup";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type ToggleGroupProps = React.ComponentProps<typeof ToggleGroup>;
diff --git a/tests/components/Tooltip.test.tsx b/tests/components/Tooltip.test.tsx
index 76b0c29..1a83aa9 100644
--- a/tests/components/Tooltip.test.tsx
+++ b/tests/components/Tooltip.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import "@testing-library/jest-dom/vitest";
-import Tooltip from "../../app/components/Tooltip";
+import Tooltip from "../../app/components/modals/Tooltip";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type TooltipProps = React.ComponentProps<typeof Tooltip>;
diff --git a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-chromium.png b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-chromium.png
index 195bce9..1224f47 100644
Binary files a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-chromium.png and b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-chromium.png differ
diff --git a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-firefox.png b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-firefox.png
index 163984c..dd7cb05 100644
Binary files a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-firefox.png and b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-firefox.png differ
diff --git a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-mobile.png b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-mobile.png
index debd686..d30f5ab 100644
Binary files a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-mobile.png and b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-mobile.png differ
diff --git a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-webkit.png b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-webkit.png
index ddf608c..0e85ee0 100644
Binary files a/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-webkit.png and b/tests/e2e/visual-regression.spec.ts-snapshots/homepage-full-webkit.png differ
diff --git a/tests/pages/blog.test.jsx b/tests/pages/blog.test.jsx
index fee2646..5c0483d 100644
--- a/tests/pages/blog.test.jsx
+++ b/tests/pages/blog.test.jsx
@@ -1,5 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
+import { renderWithProviders as render } from "../utils/test-utils";
 import React from "react";
 import BlogPostPage from "../../app/blog/[slug]/page";
 
@@ -47,7 +48,7 @@ vi.mock("../../lib/content", () => ({
 }));
 
 // Mock components
-vi.mock("../../app/components/ContentBanner", () => {
+vi.mock("../../app/components/sections/ContentBanner", () => {
   return {
     default: ({ post }) => (
       <div data-testid="content-banner">
@@ -58,7 +59,7 @@ vi.mock("../../app/components/ContentBanner", () => {
   };
 });
 
-vi.mock("../../app/components/RelatedArticles", () => {
+vi.mock("../../app/components/sections/RelatedArticles", () => {
   return {
     default: ({ relatedPosts }) => (
       <div data-testid="related-articles">
@@ -73,7 +74,7 @@ vi.mock("../../app/components/RelatedArticles", () => {
   };
 });
 
-vi.mock("../../app/components/AskOrganizer", () => {
+vi.mock("../../app/components/sections/AskOrganizer", () => {
   return {
     default: ({ title, subtitle, buttonText }) => (
       <div data-testid="ask-organizer">
diff --git a/tests/unit/LogoWall.test.jsx b/tests/unit/LogoWall.test.jsx
index 89ced86..2b83130 100644
--- a/tests/unit/LogoWall.test.jsx
+++ b/tests/unit/LogoWall.test.jsx
@@ -1,6 +1,6 @@
 import { render, screen, cleanup } from "@testing-library/react";
 import { describe, test, expect, afterEach } from "vitest";
-import LogoWall from "../../app/components/LogoWall";
+import LogoWall from "../../app/components/sections/LogoWall";
 
 afterEach(() => {
   cleanup();
diff --git a/tests/unit/NumberCard.test.jsx b/tests/unit/NumberCard.test.jsx
index aefb1cb..d47e604 100644
--- a/tests/unit/NumberCard.test.jsx
+++ b/tests/unit/NumberCard.test.jsx
@@ -1,6 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { describe, it, expect } from "vitest";
-import NumberCard from "../../app/components/NumberCard";
+import NumberCard from "../../app/components/cards/NumberCard";
 
 describe("NumberCard Component", () => {
   const defaultProps = {
diff --git a/tests/unit/NumberedCards.test.jsx b/tests/unit/NumberedCards.test.jsx
index fa36e2c..cdc19fd 100644
--- a/tests/unit/NumberedCards.test.jsx
+++ b/tests/unit/NumberedCards.test.jsx
@@ -4,7 +4,7 @@ import {
   cleanup,
 } from "../utils/test-utils";
 import { describe, test, expect, afterEach } from "vitest";
-import NumberedCards from "../../app/components/NumberedCards";
+import NumberedCards from "../../app/components/sections/NumberedCards";
 
 afterEach(() => {
   cleanup();
diff --git a/tests/unit/QuoteBlock.test.jsx b/tests/unit/QuoteBlock.test.jsx
index 08a7656..2b000f4 100644
--- a/tests/unit/QuoteBlock.test.jsx
+++ b/tests/unit/QuoteBlock.test.jsx
@@ -4,7 +4,7 @@ import {
   cleanup,
 } from "../utils/test-utils";
 import { vi, describe, test, expect, afterEach } from "vitest";
-import QuoteBlock from "../../app/components/QuoteBlock";
+import QuoteBlock from "../../app/components/sections/QuoteBlock";
 
 afterEach(() => {
   cleanup();