diff --git a/app/blog/page.tsx b/app/blog/page.tsx
index 0cc02c4..3062d03 100644
--- a/app/blog/page.tsx
+++ b/app/blog/page.tsx
@@ -1,5 +1,5 @@
 import { getAllBlogPosts } from "../../lib/content";
-import ContentThumbnailTemplate from "../components/ContentThumbnailTemplate";
+import ContentThumbnailTemplate from "../components/content/ContentThumbnailTemplate";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
diff --git a/app/components/ContextMenu.tsx b/app/components/ContextMenu/ContextMenu.tsx
similarity index 100%
rename from app/components/ContextMenu.tsx
rename to app/components/ContextMenu/ContextMenu.tsx
diff --git a/app/components/ContextMenuDivider.tsx b/app/components/ContextMenu/ContextMenuDivider.tsx
similarity index 100%
rename from app/components/ContextMenuDivider.tsx
rename to app/components/ContextMenu/ContextMenuDivider.tsx
diff --git a/app/components/ContextMenuItem/ContextMenuItem.container.tsx b/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx
similarity index 100%
rename from app/components/ContextMenuItem/ContextMenuItem.container.tsx
rename to app/components/ContextMenu/ContextMenuItem/ContextMenuItem.container.tsx
diff --git a/app/components/ContextMenuItem/ContextMenuItem.types.ts b/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.types.ts
similarity index 100%
rename from app/components/ContextMenuItem/ContextMenuItem.types.ts
rename to app/components/ContextMenu/ContextMenuItem/ContextMenuItem.types.ts
diff --git a/app/components/ContextMenuItem/ContextMenuItem.view.tsx b/app/components/ContextMenu/ContextMenuItem/ContextMenuItem.view.tsx
similarity index 100%
rename from app/components/ContextMenuItem/ContextMenuItem.view.tsx
rename to app/components/ContextMenu/ContextMenuItem/ContextMenuItem.view.tsx
diff --git a/app/components/ContextMenuItem/index.tsx b/app/components/ContextMenu/ContextMenuItem/index.tsx
similarity index 100%
rename from app/components/ContextMenuItem/index.tsx
rename to app/components/ContextMenu/ContextMenuItem/index.tsx
diff --git a/app/components/ContextMenuSection.tsx b/app/components/ContextMenu/ContextMenuSection.tsx
similarity index 100%
rename from app/components/ContextMenuSection.tsx
rename to app/components/ContextMenu/ContextMenuSection.tsx
diff --git a/app/components/MiniCard/MiniCard.container.tsx b/app/components/cards/MiniCard/MiniCard.container.tsx
similarity index 100%
rename from app/components/MiniCard/MiniCard.container.tsx
rename to app/components/cards/MiniCard/MiniCard.container.tsx
diff --git a/app/components/MiniCard/MiniCard.types.ts b/app/components/cards/MiniCard/MiniCard.types.ts
similarity index 100%
rename from app/components/MiniCard/MiniCard.types.ts
rename to app/components/cards/MiniCard/MiniCard.types.ts
diff --git a/app/components/MiniCard/MiniCard.view.tsx b/app/components/cards/MiniCard/MiniCard.view.tsx
similarity index 100%
rename from app/components/MiniCard/MiniCard.view.tsx
rename to app/components/cards/MiniCard/MiniCard.view.tsx
diff --git a/app/components/MiniCard/index.tsx b/app/components/cards/MiniCard/index.tsx
similarity index 100%
rename from app/components/MiniCard/index.tsx
rename to app/components/cards/MiniCard/index.tsx
diff --git a/app/components/ContentContainer/ContentContainer.container.tsx b/app/components/content/ContentContainer/ContentContainer.container.tsx
similarity index 96%
rename from app/components/ContentContainer/ContentContainer.container.tsx
rename to app/components/content/ContentContainer/ContentContainer.container.tsx
index 4cacb27..ce82012 100644
--- a/app/components/ContentContainer/ContentContainer.container.tsx
+++ b/app/components/content/ContentContainer/ContentContainer.container.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import { memo } from "react";
-import { getAssetPath, ASSETS } from "../../../lib/assetUtils";
+import { getAssetPath, ASSETS } from "../../../../lib/assetUtils";
 import ContentContainerView from "./ContentContainer.view";
 import type { ContentContainerProps } from "./ContentContainer.types";
-import { normalizeContentContainerSize } from "../../../lib/propNormalization";
+import { normalizeContentContainerSize } from "../../../../lib/propNormalization";
 
 const ContentContainerContainer = memo<ContentContainerProps>(
   ({ post, width = "200px", size: sizeProp = "responsive" }) => {
diff --git a/app/components/ContentContainer/ContentContainer.types.ts b/app/components/content/ContentContainer/ContentContainer.types.ts
similarity index 92%
rename from app/components/ContentContainer/ContentContainer.types.ts
rename to app/components/content/ContentContainer/ContentContainer.types.ts
index 8bfbff7..18716f8 100644
--- a/app/components/ContentContainer/ContentContainer.types.ts
+++ b/app/components/content/ContentContainer/ContentContainer.types.ts
@@ -1,4 +1,4 @@
-import type { BlogPost } from "../../../lib/content";
+import type { BlogPost } from "../../../../lib/content";
 
 export type ContentContainerSizeValue = "xs" | "responsive" | "Xs" | "Responsive";
 
diff --git a/app/components/ContentContainer/ContentContainer.view.tsx b/app/components/content/ContentContainer/ContentContainer.view.tsx
similarity index 100%
rename from app/components/ContentContainer/ContentContainer.view.tsx
rename to app/components/content/ContentContainer/ContentContainer.view.tsx
diff --git a/app/components/ContentContainer/index.tsx b/app/components/content/ContentContainer/index.tsx
similarity index 100%
rename from app/components/ContentContainer/index.tsx
rename to app/components/content/ContentContainer/index.tsx
diff --git a/app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx b/app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx
similarity index 92%
rename from app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx
rename to app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx
index 31a1353..646b0da 100644
--- a/app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx
+++ b/app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.container.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import { memo } from "react";
-import { getAssetPath, ASSETS } from "../../../lib/assetUtils";
+import { getAssetPath, ASSETS } from "../../../../lib/assetUtils";
 import ContentThumbnailTemplateView from "./ContentThumbnailTemplate.view";
 import type { ContentThumbnailTemplateProps } from "./ContentThumbnailTemplate.types";
-import { normalizeContentThumbnailVariant } from "../../../lib/propNormalization";
+import { normalizeContentThumbnailVariant } from "../../../../lib/propNormalization";
 
 const ContentThumbnailTemplateContainer = memo<ContentThumbnailTemplateProps>(
   ({ post, className = "", variant: variantProp = "vertical" }) => {
diff --git a/app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts b/app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts
similarity index 91%
rename from app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts
rename to app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts
index 245abfb..3c8fe75 100644
--- a/app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts
+++ b/app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.types.ts
@@ -1,4 +1,4 @@
-import type { BlogPost } from "../../../lib/content";
+import type { BlogPost } from "../../../../lib/content";
 
 export type ContentThumbnailTemplateVariantValue = "vertical" | "horizontal" | "Vertical" | "Horizontal";
 
diff --git a/app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.view.tsx b/app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.view.tsx
similarity index 100%
rename from app/components/ContentThumbnailTemplate/ContentThumbnailTemplate.view.tsx
rename to app/components/content/ContentThumbnailTemplate/ContentThumbnailTemplate.view.tsx
diff --git a/app/components/ContentThumbnailTemplate/index.tsx b/app/components/content/ContentThumbnailTemplate/index.tsx
similarity index 100%
rename from app/components/ContentThumbnailTemplate/index.tsx
rename to app/components/content/ContentThumbnailTemplate/index.tsx
diff --git a/app/components/controls/MultiSelect/MultiSelect.view.tsx b/app/components/controls/MultiSelect/MultiSelect.view.tsx
index 5201008..eaea8e5 100644
--- a/app/components/controls/MultiSelect/MultiSelect.view.tsx
+++ b/app/components/controls/MultiSelect/MultiSelect.view.tsx
@@ -2,7 +2,7 @@
 
 import { memo } from "react";
 import Chip from "../Chip";
-import InputLabel from "../../InputLabel";
+import InputLabel from "../../utility/InputLabel";
 import type { MultiSelectViewProps } from "./MultiSelect.types";
 
 function MultiSelectView({
diff --git a/app/components/SelectDropdown.tsx b/app/components/controls/SelectInput/SelectDropdown.tsx
similarity index 100%
rename from app/components/SelectDropdown.tsx
rename to app/components/controls/SelectInput/SelectDropdown.tsx
diff --git a/app/components/controls/SelectInput/SelectInput.view.tsx b/app/components/controls/SelectInput/SelectInput.view.tsx
index 941ede5..caeea8c 100644
--- a/app/components/controls/SelectInput/SelectInput.view.tsx
+++ b/app/components/controls/SelectInput/SelectInput.view.tsx
@@ -1,7 +1,7 @@
 import React, { Children, type ReactNode } from "react";
 import { getAssetPath, ASSETS } from "../../../../lib/assetUtils";
-import SelectDropdown from "../../SelectDropdown";
-import SelectOption from "../../SelectOption";
+import SelectDropdown from "./SelectDropdown";
+import SelectOption from "./SelectOption";
 import type { SelectOptionData } from "./SelectInput.types";
 
 export interface SelectInputViewProps {
diff --git a/app/components/SelectOption/SelectOption.container.tsx b/app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx
similarity index 96%
rename from app/components/SelectOption/SelectOption.container.tsx
rename to app/components/controls/SelectInput/SelectOption/SelectOption.container.tsx
index f387a1a..b909551 100644
--- a/app/components/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/SelectOption/SelectOption.types.ts b/app/components/controls/SelectInput/SelectOption/SelectOption.types.ts
similarity index 100%
rename from app/components/SelectOption/SelectOption.types.ts
rename to app/components/controls/SelectInput/SelectOption/SelectOption.types.ts
diff --git a/app/components/SelectOption/SelectOption.view.tsx b/app/components/controls/SelectInput/SelectOption/SelectOption.view.tsx
similarity index 100%
rename from app/components/SelectOption/SelectOption.view.tsx
rename to app/components/controls/SelectInput/SelectOption/SelectOption.view.tsx
diff --git a/app/components/SelectOption/index.tsx b/app/components/controls/SelectInput/SelectOption/index.tsx
similarity index 100%
rename from app/components/SelectOption/index.tsx
rename to app/components/controls/SelectInput/SelectOption/index.tsx
diff --git a/app/components/LanguageSwitcher/LanguageSwitcher.container.tsx b/app/components/localization/LanguageSwitcher/LanguageSwitcher.container.tsx
similarity index 100%
rename from app/components/LanguageSwitcher/LanguageSwitcher.container.tsx
rename to app/components/localization/LanguageSwitcher/LanguageSwitcher.container.tsx
diff --git a/app/components/LanguageSwitcher/LanguageSwitcher.types.ts b/app/components/localization/LanguageSwitcher/LanguageSwitcher.types.ts
similarity index 100%
rename from app/components/LanguageSwitcher/LanguageSwitcher.types.ts
rename to app/components/localization/LanguageSwitcher/LanguageSwitcher.types.ts
diff --git a/app/components/LanguageSwitcher/LanguageSwitcher.view.tsx b/app/components/localization/LanguageSwitcher/LanguageSwitcher.view.tsx
similarity index 95%
rename from app/components/LanguageSwitcher/LanguageSwitcher.view.tsx
rename to app/components/localization/LanguageSwitcher/LanguageSwitcher.view.tsx
index 3abea26..a5f138b 100644
--- a/app/components/LanguageSwitcher/LanguageSwitcher.view.tsx
+++ b/app/components/localization/LanguageSwitcher/LanguageSwitcher.view.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { memo } from "react";
-import { useTranslation } from "../../contexts/MessagesContext";
+import { useTranslation } from "../../../contexts/MessagesContext";
 import type { LanguageSwitcherProps, Language } from "./LanguageSwitcher.types";
 
 function LanguageSwitcherView({ className = "" }: LanguageSwitcherProps) {
diff --git a/app/components/LanguageSwitcher/index.ts b/app/components/localization/LanguageSwitcher/index.ts
similarity index 100%
rename from app/components/LanguageSwitcher/index.ts
rename to app/components/localization/LanguageSwitcher/index.ts
diff --git a/app/components/ConditionalHeader/ConditionalHeader.container.tsx b/app/components/navigation/ConditionalHeader/ConditionalHeader.container.tsx
similarity index 100%
rename from app/components/ConditionalHeader/ConditionalHeader.container.tsx
rename to app/components/navigation/ConditionalHeader/ConditionalHeader.container.tsx
diff --git a/app/components/ConditionalHeader/ConditionalHeader.types.ts b/app/components/navigation/ConditionalHeader/ConditionalHeader.types.ts
similarity index 100%
rename from app/components/ConditionalHeader/ConditionalHeader.types.ts
rename to app/components/navigation/ConditionalHeader/ConditionalHeader.types.ts
diff --git a/app/components/ConditionalHeader/ConditionalHeader.view.tsx b/app/components/navigation/ConditionalHeader/ConditionalHeader.view.tsx
similarity index 71%
rename from app/components/ConditionalHeader/ConditionalHeader.view.tsx
rename to app/components/navigation/ConditionalHeader/ConditionalHeader.view.tsx
index 7f50389..ff36612 100644
--- a/app/components/ConditionalHeader/ConditionalHeader.view.tsx
+++ b/app/components/navigation/ConditionalHeader/ConditionalHeader.view.tsx
@@ -1,5 +1,5 @@
-import HomeHeader from "../navigation/HomeHeader";
-import Header from "../navigation/Header";
+import HomeHeader from "../HomeHeader";
+import Header from "../Header";
 import type { ConditionalHeaderViewProps } from "./ConditionalHeader.types";
 
 export function ConditionalHeaderView({
diff --git a/app/components/ConditionalHeader/index.tsx b/app/components/navigation/ConditionalHeader/index.tsx
similarity index 100%
rename from app/components/ConditionalHeader/index.tsx
rename to app/components/navigation/ConditionalHeader/index.tsx
diff --git a/app/components/sections/ContentBanner.tsx b/app/components/sections/ContentBanner.tsx
index fee3e06..8bd0c69 100644
--- a/app/components/sections/ContentBanner.tsx
+++ b/app/components/sections/ContentBanner.tsx
@@ -2,7 +2,7 @@
 
 import { memo } from "react";
 import { getAssetPath } from "../../../lib/assetUtils";
-import ContentContainer from "../ContentContainer";
+import ContentContainer from "../content/ContentContainer";
 import type { BlogPost } from "../../../lib/content";
 
 interface ContentBannerProps {
diff --git a/app/components/sections/FeatureGrid/FeatureGrid.view.tsx b/app/components/sections/FeatureGrid/FeatureGrid.view.tsx
index d1ccf13..d24d178 100644
--- a/app/components/sections/FeatureGrid/FeatureGrid.view.tsx
+++ b/app/components/sections/FeatureGrid/FeatureGrid.view.tsx
@@ -2,7 +2,7 @@
 
 import { useTranslation } from "../../../contexts/MessagesContext";
 import ContentLockup from "../../type/ContentLockup";
-import MiniCard from "../../MiniCard";
+import MiniCard from "../../cards/MiniCard";
 import type { FeatureGridViewProps } from "./FeatureGrid.types";
 
 function FeatureGridView({
diff --git a/app/components/sections/HeroBanner.tsx b/app/components/sections/HeroBanner/HeroBanner.tsx
similarity index 92%
rename from app/components/sections/HeroBanner.tsx
rename to app/components/sections/HeroBanner/HeroBanner.tsx
index 741e98b..1cc6e2c 100644
--- a/app/components/sections/HeroBanner.tsx
+++ b/app/components/sections/HeroBanner/HeroBanner.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import { memo } from "react";
-import { useTranslation } from "../../contexts/MessagesContext";
-import ContentLockup from "../type/ContentLockup";
-import HeroDecor from "../HeroDecor";
-import { getAssetPath } from "../../../lib/assetUtils";
+import { useTranslation } from "../../../contexts/MessagesContext";
+import ContentLockup from "../../type/ContentLockup";
+import HeroDecor from "./HeroDecor";
+import { getAssetPath } from "../../../../lib/assetUtils";
 
 interface HeroBannerProps {
   title?: string;
diff --git a/app/components/HeroDecor.tsx b/app/components/sections/HeroBanner/HeroDecor.tsx
similarity index 100%
rename from app/components/HeroDecor.tsx
rename to app/components/sections/HeroBanner/HeroDecor.tsx
diff --git a/app/components/sections/HeroBanner/index.tsx b/app/components/sections/HeroBanner/index.tsx
new file mode 100644
index 0000000..406f808
--- /dev/null
+++ b/app/components/sections/HeroBanner/index.tsx
@@ -0,0 +1 @@
+export { default } from "./HeroBanner";
diff --git a/app/components/sections/QuoteBlock/QuoteBlock.view.tsx b/app/components/sections/QuoteBlock/QuoteBlock.view.tsx
index 27221db..8be7e58 100644
--- a/app/components/sections/QuoteBlock/QuoteBlock.view.tsx
+++ b/app/components/sections/QuoteBlock/QuoteBlock.view.tsx
@@ -3,7 +3,7 @@
 import { memo } from "react";
 import Image from "next/image";
 import { useTranslation } from "../../../contexts/MessagesContext";
-import QuoteDecor from "../../QuoteDecor";
+import QuoteDecor from "./QuoteDecor";
 import type { QuoteBlockViewProps } from "./QuoteBlock.types";
 
 function QuoteBlockView({
diff --git a/app/components/QuoteDecor.tsx b/app/components/sections/QuoteBlock/QuoteDecor.tsx
similarity index 100%
rename from app/components/QuoteDecor.tsx
rename to app/components/sections/QuoteBlock/QuoteDecor.tsx
diff --git a/app/components/sections/RelatedArticles/RelatedArticles.view.tsx b/app/components/sections/RelatedArticles/RelatedArticles.view.tsx
index 0142ff5..3e9d53e 100644
--- a/app/components/sections/RelatedArticles/RelatedArticles.view.tsx
+++ b/app/components/sections/RelatedArticles/RelatedArticles.view.tsx
@@ -1,4 +1,4 @@
-import ContentThumbnailTemplate from "../../ContentThumbnailTemplate";
+import ContentThumbnailTemplate from "../../content/ContentThumbnailTemplate";
 import type { RelatedArticlesViewProps } from "./RelatedArticles.types";
 
 export function RelatedArticlesView({
diff --git a/app/components/InputLabel/InputLabel.container.tsx b/app/components/utility/InputLabel/InputLabel.container.tsx
similarity index 95%
rename from app/components/InputLabel/InputLabel.container.tsx
rename to app/components/utility/InputLabel/InputLabel.container.tsx
index 1060ba7..a5d09e4 100644
--- a/app/components/InputLabel/InputLabel.container.tsx
+++ b/app/components/utility/InputLabel/InputLabel.container.tsx
@@ -6,7 +6,7 @@ import type { InputLabelProps } from "./InputLabel.types";
 import {
   normalizeInputLabelSize,
   normalizeInputLabelPalette,
-} from "../../../lib/propNormalization";
+} from "../../../../lib/propNormalization";
 
 const InputLabelContainer = memo<InputLabelProps>(
   ({
diff --git a/app/components/InputLabel/InputLabel.types.ts b/app/components/utility/InputLabel/InputLabel.types.ts
similarity index 100%
rename from app/components/InputLabel/InputLabel.types.ts
rename to app/components/utility/InputLabel/InputLabel.types.ts
diff --git a/app/components/InputLabel/InputLabel.view.tsx b/app/components/utility/InputLabel/InputLabel.view.tsx
similarity index 98%
rename from app/components/InputLabel/InputLabel.view.tsx
rename to app/components/utility/InputLabel/InputLabel.view.tsx
index 9b5ab56..79fe5c4 100644
--- a/app/components/InputLabel/InputLabel.view.tsx
+++ b/app/components/utility/InputLabel/InputLabel.view.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { memo } from "react";
-import { getAssetPath, ASSETS } from "../../../lib/assetUtils";
+import { getAssetPath, ASSETS } from "../../../../lib/assetUtils";
 import type { InputLabelViewProps } from "./InputLabel.types";
 
 function InputLabelView({
diff --git a/app/components/InputLabel/index.tsx b/app/components/utility/InputLabel/index.tsx
similarity index 100%
rename from app/components/InputLabel/index.tsx
rename to app/components/utility/InputLabel/index.tsx
diff --git a/app/layout.tsx b/app/layout.tsx
index 7ccbea7..9176575 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -5,7 +5,7 @@ import dynamic from "next/dynamic";
 import { MessagesProvider } from "./contexts/MessagesContext";
 import messages from "../messages/en/index";
 import "./globals.css";
-import ConditionalHeader from "./components/ConditionalHeader";
+import ConditionalHeader from "./components/navigation/ConditionalHeader";
 
 // Code split Footer - below the fold, can be lazy loaded
 const Footer = dynamic(() => import("./components/navigation/Footer"), {
diff --git a/app/learn/page.tsx b/app/learn/page.tsx
index f7b7f93..cd9b0cd 100644
--- a/app/learn/page.tsx
+++ b/app/learn/page.tsx
@@ -1,6 +1,6 @@
 import messages from "../../messages/en/index";
 import { getTranslation } from "../../lib/i18n/getTranslation";
-import ContentThumbnailTemplate from "../components/ContentThumbnailTemplate";
+import ContentThumbnailTemplate from "../components/content/ContentThumbnailTemplate";
 import ContentLockup from "../components/type/ContentLockup";
 import AskOrganizer from "../components/sections/AskOrganizer";
 import { getAllBlogPosts } from "../../lib/content";
diff --git a/stories/ConditionalHeader.stories.js b/stories/ConditionalHeader.stories.js
index 73f64af..0e134f8 100644
--- a/stories/ConditionalHeader.stories.js
+++ b/stories/ConditionalHeader.stories.js
@@ -1,4 +1,4 @@
-import ConditionalHeader from "../app/components/ConditionalHeader";
+import ConditionalHeader from "../app/components/navigation/ConditionalHeader";
 
 export default {
   title: "Components/ConditionalHeader",
diff --git a/stories/ContentContainer.stories.js b/stories/ContentContainer.stories.js
index 0b29ce9..aa39e94 100644
--- a/stories/ContentContainer.stories.js
+++ b/stories/ContentContainer.stories.js
@@ -1,4 +1,4 @@
-import ContentContainer from "../app/components/ContentContainer";
+import ContentContainer from "../app/components/content/ContentContainer";
 
 const mockPost = {
   slug: "sample-article",
diff --git a/stories/ContentThumbnailTemplate.stories.js b/stories/ContentThumbnailTemplate.stories.js
index be1b21e..eaa57b7 100644
--- a/stories/ContentThumbnailTemplate.stories.js
+++ b/stories/ContentThumbnailTemplate.stories.js
@@ -1,4 +1,4 @@
-import ContentThumbnailTemplate from "../app/components/ContentThumbnailTemplate";
+import ContentThumbnailTemplate from "../app/components/content/ContentThumbnailTemplate";
 
 const mockPost = {
   slug: "sample-article",
diff --git a/stories/ContextMenu.stories.js b/stories/ContextMenu.stories.js
index 0602f04..9d81a1b 100644
--- a/stories/ContextMenu.stories.js
+++ b/stories/ContextMenu.stories.js
@@ -1,8 +1,8 @@
 import React, { useState } from "react";
-import ContextMenu from "../app/components/ContextMenu";
-import ContextMenuItem from "../app/components/ContextMenuItem";
-import ContextMenuSection from "../app/components/ContextMenuSection";
-import ContextMenuDivider from "../app/components/ContextMenuDivider";
+import ContextMenu from "../app/components/ContextMenu/ContextMenu";
+import ContextMenuItem from "../app/components/ContextMenu/ContextMenuItem";
+import ContextMenuSection from "../app/components/ContextMenu/ContextMenuSection";
+import ContextMenuDivider from "../app/components/ContextMenu/ContextMenuDivider";
 
 export default {
   title: "Forms/ContextMenu",
diff --git a/stories/HeroBannerSystem.stories.js b/stories/HeroBannerSystem.stories.js
index 9c6356a..c8f7c93 100644
--- a/stories/HeroBannerSystem.stories.js
+++ b/stories/HeroBannerSystem.stories.js
@@ -1,6 +1,6 @@
-import HeroBanner from "../app/components/HeroBanner";
-import ContentLockup from "../app/components/ContentLockup";
-import HeroDecor from "../app/components/HeroDecor";
+import HeroBanner from "../app/components/sections/HeroBanner";
+import ContentLockup from "../app/components/type/ContentLockup";
+import HeroDecor from "../app/components/sections/HeroBanner/HeroDecor";
 
 export default {
   title: "Systems/HeroBanner System",
diff --git a/stories/HeroDecor.stories.js b/stories/HeroDecor.stories.js
index 99e3b68..f3cea00 100644
--- a/stories/HeroDecor.stories.js
+++ b/stories/HeroDecor.stories.js
@@ -1,4 +1,4 @@
-import HeroDecor from "../app/components/HeroDecor";
+import HeroDecor from "../app/components/sections/HeroBanner/HeroDecor";
 
 export default {
   title: "Components/HeroDecor",
diff --git a/stories/MiniCard.stories.js b/stories/MiniCard.stories.js
index 77e6997..40064d7 100644
--- a/stories/MiniCard.stories.js
+++ b/stories/MiniCard.stories.js
@@ -1,4 +1,4 @@
-import MiniCard from "../app/components/MiniCard";
+import MiniCard from "../app/components/cards/MiniCard";
 
 export default {
   title: "Components/MiniCard",
diff --git a/tests/components/ContextMenu.test.tsx b/tests/components/ContextMenu.test.tsx
index 2fb2239..b5ac1f5 100644
--- a/tests/components/ContextMenu.test.tsx
+++ b/tests/components/ContextMenu.test.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import ContextMenu from "../../app/components/ContextMenu";
-import ContextMenuItem from "../../app/components/ContextMenuItem";
+import ContextMenu from "../../app/components/ContextMenu/ContextMenu";
+import ContextMenuItem from "../../app/components/ContextMenu/ContextMenuItem";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type ContextMenuProps = React.ComponentProps<typeof ContextMenu>;
diff --git a/tests/components/ContextMenuItem.test.tsx b/tests/components/ContextMenuItem.test.tsx
index 99c01f0..e14aa43 100644
--- a/tests/components/ContextMenuItem.test.tsx
+++ b/tests/components/ContextMenuItem.test.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ContextMenuItem from "../../app/components/ContextMenuItem";
+import ContextMenuItem from "../../app/components/ContextMenu/ContextMenuItem";
 import { componentTestSuite } from "../utils/componentTestSuite";
 
 type ContextMenuItemProps = React.ComponentProps<typeof ContextMenuItem>;
diff --git a/tests/components/InputLabel.test.tsx b/tests/components/InputLabel.test.tsx
index ba6b1e7..f59966d 100644
--- a/tests/components/InputLabel.test.tsx
+++ b/tests/components/InputLabel.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest";
 import { screen } from "@testing-library/react";
 import { renderWithProviders as render } from "../utils/test-utils";
-import InputLabel from "../../app/components/InputLabel";
+import InputLabel from "../../app/components/utility/InputLabel";
 import {
   componentTestSuite,
   type ComponentTestSuiteConfig,
diff --git a/tests/unit/ContentContainer.test.jsx b/tests/unit/ContentContainer.test.jsx
index af10a80..0df31f5 100644
--- a/tests/unit/ContentContainer.test.jsx
+++ b/tests/unit/ContentContainer.test.jsx
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from "vitest";
 import { render, screen } from "@testing-library/react";
-import ContentContainer from "../../app/components/ContentContainer";
+import ContentContainer from "../../app/components/content/ContentContainer";
 
 // Mock asset utils
 vi.mock("../../lib/assetUtils", () => ({
diff --git a/tests/unit/ContentThumbnailTemplate.test.jsx b/tests/unit/ContentThumbnailTemplate.test.jsx
index 7a57815..374684e 100644
--- a/tests/unit/ContentThumbnailTemplate.test.jsx
+++ b/tests/unit/ContentThumbnailTemplate.test.jsx
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from "vitest";
 import { render, screen } from "@testing-library/react";
-import ContentThumbnailTemplate from "../../app/components/ContentThumbnailTemplate";
+import ContentThumbnailTemplate from "../../app/components/content/ContentThumbnailTemplate";
 
 // Mock Next.js components
 vi.mock("next/link", () => {