diff --git a/components/custom-pages/PageContent/PageContent.module.css b/components/core/HTMLContent/HTMLContent.module.css
similarity index 100%
rename from components/custom-pages/PageContent/PageContent.module.css
rename to components/core/HTMLContent/HTMLContent.module.css
diff --git a/components/custom-pages/PageContent/PageContent.tsx b/components/core/HTMLContent/HTMLContent.tsx
similarity index 66%
rename from components/custom-pages/PageContent/PageContent.tsx
rename to components/core/HTMLContent/HTMLContent.tsx
index 7237b9fa8..d041ff369 100644
--- a/components/custom-pages/PageContent/PageContent.tsx
+++ b/components/core/HTMLContent/HTMLContent.tsx
@@ -1,12 +1,12 @@
 import cn from 'classnames'
-import s from './PageContent.module.css'
+import s from './HTMLContent.module.css'
 
 type Props = {
   className?: 'string'
   html: string
 }
 
-export default function PageContent({ className, html }: Props) {
+export default function HTMLContent({ className, html }: Props) {
   return (
     <div
       className={cn(s.root, className)}
diff --git a/components/core/HTMLContent/index.ts b/components/core/HTMLContent/index.ts
new file mode 100644
index 000000000..0a1dcb276
--- /dev/null
+++ b/components/core/HTMLContent/index.ts
@@ -0,0 +1 @@
+export { default } from './HTMLContent'
diff --git a/components/core/index.ts b/components/core/index.ts
index 27b19d5d8..b7f384eaa 100644
--- a/components/core/index.ts
+++ b/components/core/index.ts
@@ -7,3 +7,4 @@ export { default as Searchbar } from './Searchbar'
 export { default as UserNav } from './UserNav'
 export { default as Toggle } from './Toggle'
 export { default as Head } from './Head'
+export { default as HTMLContent } from './HTMLContent'
diff --git a/components/custom-pages/PageContent/index.ts b/components/custom-pages/PageContent/index.ts
deleted file mode 100644
index f3fe82eb1..000000000
--- a/components/custom-pages/PageContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './PageContent'
diff --git a/pages/[...pages].tsx b/pages/[...pages].tsx
index 97dfbda71..850ff2957 100644
--- a/pages/[...pages].tsx
+++ b/pages/[...pages].tsx
@@ -1,9 +1,8 @@
 import { GetStaticPropsContext, InferGetStaticPropsType } from 'next'
-import { Layout } from '@components/core'
-import getAllPages from '@lib/bigcommerce/api/operations/get-all-pages'
-import getPage from '@lib/bigcommerce/api/operations/get-page'
 import getSlug from '@utils/get-slug'
-import PageContent from '@components/custom-pages/PageContent'
+import getPage from '@lib/bigcommerce/api/operations/get-page'
+import getAllPages from '@lib/bigcommerce/api/operations/get-all-pages'
+import { Layout, HTMLContent } from '@components/core'
 
 export async function getStaticProps({
   preview,
@@ -40,7 +39,7 @@ export default function Pages({
 }: InferGetStaticPropsType<typeof getStaticProps>) {
   return (
     <div className="max-w-2xl mx-auto py-20">
-      <PageContent html={page.body} />
+      <HTMLContent html={page.body} />
     </div>
   )
 }