diff --git a/src/OnboardingSPA/components/ErrorState/Step/index.js b/src/OnboardingSPA/components/ErrorState/Step/index.js
index d97570176..909eda268 100644
--- a/src/OnboardingSPA/components/ErrorState/Step/index.js
+++ b/src/OnboardingSPA/components/ErrorState/Step/index.js
@@ -1,5 +1,5 @@
 import CommonLayout from '../../Layouts/Common';
-import HeadingWithSubHeading from '../../HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../Heading/HeadingWithSubHeading';
 import NeedHelpTag from '../../NeedHelpTag';
 
 const StepErrorState = ( { title, subtitle, error } ) => {
diff --git a/src/OnboardingSPA/components/AIHeading/index.js b/src/OnboardingSPA/components/Heading/AIHeading/index.js
similarity index 100%
rename from src/OnboardingSPA/components/AIHeading/index.js
rename to src/OnboardingSPA/components/Heading/AIHeading/index.js
diff --git a/src/OnboardingSPA/components/AIHeading/stylesheet.scss b/src/OnboardingSPA/components/Heading/AIHeading/stylesheet.scss
similarity index 100%
rename from src/OnboardingSPA/components/AIHeading/stylesheet.scss
rename to src/OnboardingSPA/components/Heading/AIHeading/stylesheet.scss
diff --git a/src/OnboardingSPA/components/HeadingWithSubHeading/index.js b/src/OnboardingSPA/components/Heading/HeadingWithSubHeading/index.js
similarity index 100%
rename from src/OnboardingSPA/components/HeadingWithSubHeading/index.js
rename to src/OnboardingSPA/components/Heading/HeadingWithSubHeading/index.js
diff --git a/src/OnboardingSPA/components/HeadingWithSubHeading/stylesheet.scss b/src/OnboardingSPA/components/Heading/HeadingWithSubHeading/stylesheet.scss
similarity index 100%
rename from src/OnboardingSPA/components/HeadingWithSubHeading/stylesheet.scss
rename to src/OnboardingSPA/components/Heading/HeadingWithSubHeading/stylesheet.scss
diff --git a/src/OnboardingSPA/components/Loaders/Step/index.js b/src/OnboardingSPA/components/Loaders/Step/index.js
index ea84b1950..09f655d1f 100644
--- a/src/OnboardingSPA/components/Loaders/Step/index.js
+++ b/src/OnboardingSPA/components/Loaders/Step/index.js
@@ -1,5 +1,5 @@
 import CommonLayout from '../../Layouts/Common';
-import HeadingWithSubHeading from '../../HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../Heading/HeadingWithSubHeading';
 import NeedHelpTag from '../../NeedHelpTag';
 
 const StepLoader = ( { title, subtitle } ) => {
diff --git a/src/OnboardingSPA/pages/ErrorPage/index.js b/src/OnboardingSPA/pages/ErrorPage/index.js
index eb14fc4e0..760da6d6a 100644
--- a/src/OnboardingSPA/pages/ErrorPage/index.js
+++ b/src/OnboardingSPA/pages/ErrorPage/index.js
@@ -2,7 +2,7 @@ import { useDispatch } from '@wordpress/data';
 import { useEffect } from '@wordpress/element';
 
 import CommonLayout from '../../components/Layouts/Common';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import { SIDEBAR_LEARN_MORE, VIEW_NAV_PAGE } from '../../../constants';
 import { store as nfdOnboardingStore } from '../../store';
 import { useViewportMatch } from '@wordpress/compose';
diff --git a/src/OnboardingSPA/steps/BasicInfo/index.js b/src/OnboardingSPA/steps/BasicInfo/index.js
index 4c73b3fc6..d9b91ccf1 100644
--- a/src/OnboardingSPA/steps/BasicInfo/index.js
+++ b/src/OnboardingSPA/steps/BasicInfo/index.js
@@ -1,5 +1,5 @@
 import CommonLayout from '../../components/Layouts/Common';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import BasicInfoForm from './basicInfoForm';
 import { SIDEBAR_LEARN_MORE, VIEW_NAV_PRIMARY } from '../../../constants';
 import { store as nfdOnboardingStore } from '../../store';
diff --git a/src/OnboardingSPA/steps/DesignHomepageMenu/index.js b/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
index 91e772c7c..845282dfe 100644
--- a/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
+++ b/src/OnboardingSPA/steps/DesignHomepageMenu/index.js
@@ -11,7 +11,7 @@ import {
 	THEME_STATUS_INIT,
 	SIDEBAR_LEARN_MORE,
 } from '../../../constants';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import { DesignStateHandler } from '../../components/StateHandlers';
 import {
 	LivePreviewSelectableCard,
diff --git a/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js b/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
index 9409a42ce..a1a5e02c5 100644
--- a/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
+++ b/src/OnboardingSPA/steps/DesignThemeStyles/Menu/index.js
@@ -5,7 +5,7 @@ import { useNavigate, useLocation } from 'react-router-dom';
 import getContents from '../contents';
 import { store as nfdOnboardingStore } from '../../../store';
 import CommonLayout from '../../../components/Layouts/Common';
-import HeadingWithSubHeading from '../../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../../components/Heading/HeadingWithSubHeading';
 import { useGlobalStylesOutput } from '../../../utils/global-styles/use-global-styles-output';
 import { getPatterns } from '../../../utils/api/patterns';
 import { getGlobalStyles } from '../../../utils/api/themes';
diff --git a/src/OnboardingSPA/steps/SiteFeatures/index.js b/src/OnboardingSPA/steps/SiteFeatures/index.js
index a8265e459..d7eb37f2a 100644
--- a/src/OnboardingSPA/steps/SiteFeatures/index.js
+++ b/src/OnboardingSPA/steps/SiteFeatures/index.js
@@ -8,7 +8,7 @@ import { store as nfdOnboardingStore } from '../../store';
 import { SIDEBAR_LEARN_MORE, VIEW_NAV_PRIMARY } from '../../../constants';
 import CommonLayout from '../../components/Layouts/Common';
 import { getSiteFeatures } from '../../utils/api/plugins';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import CheckboxList from '../../components/CheckboxTemplate/CheckboxList';
 import { CheckboxListSkeleton } from '../../components/CheckboxTemplate';
 import getContents from './contents';
diff --git a/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js b/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
index b5831a23f..be45c518e 100644
--- a/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
+++ b/src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js
@@ -3,9 +3,9 @@ import { useEffect, useState } from '@wordpress/element';
 
 import getContents from './contents';
 import Animate from '../../../components/Animate';
-import AIHeading from '../../../components/AIHeading';
 import { HEADER_SITEGEN } from '../../../../constants';
 import { store as nfdOnboardingStore } from '../../../store';
+import AIHeading from '../../../components/Heading/AIHeading';
 import CommonLayout from '../../../components/Layouts/Common';
 import TextInputSiteGen from '../../../components/TextInput/TextInputSiteGen';
 import NextButtonSiteGen from '../../../components/Button/NextButtonSiteGen';
diff --git a/src/OnboardingSPA/steps/SitePages/index.js b/src/OnboardingSPA/steps/SitePages/index.js
index bea7a884e..6cd9986fa 100644
--- a/src/OnboardingSPA/steps/SitePages/index.js
+++ b/src/OnboardingSPA/steps/SitePages/index.js
@@ -4,7 +4,7 @@ import { useLocation } from 'react-router-dom';
 
 import { store as nfdOnboardingStore } from '../../store';
 import CommonLayout from '../../components/Layouts/Common';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import { getPatterns } from '../../utils/api/patterns';
 import {
 	THEME_STATUS_ACTIVE,
diff --git a/src/OnboardingSPA/steps/TopPriority/index.js b/src/OnboardingSPA/steps/TopPriority/index.js
index 37a66e526..d42ab1621 100644
--- a/src/OnboardingSPA/steps/TopPriority/index.js
+++ b/src/OnboardingSPA/steps/TopPriority/index.js
@@ -6,7 +6,7 @@ import { useDispatch, useSelect } from '@wordpress/data';
 import SkipButton from '../../components/SkipButton';
 import { store as nfdOnboardingStore } from '../../store';
 import CommonLayout from '../../components/Layouts/Common';
-import HeadingWithSubHeading from '../../components/HeadingWithSubHeading';
+import HeadingWithSubHeading from '../../components/Heading/HeadingWithSubHeading';
 import SelectableCardList from '../../components/SelectableCardList/selectable-card-list';
 import getContents from './contents';
 import {