diff --git a/src/app/_components/AlternatingImageCard.tsx b/src/app/_components/AlternatingImageCard.tsx
index 2d88db3c2..f693b01cb 100644
--- a/src/app/_components/AlternatingImageCard.tsx
+++ b/src/app/_components/AlternatingImageCard.tsx
@@ -2,7 +2,7 @@ import Image from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { buildImageSizeProp } from '@/utils/buildImageSizeProp'
 
diff --git a/src/app/_components/ArticleHeader.tsx b/src/app/_components/ArticleHeader.tsx
index 7b44ba566..1c6a43ce1 100644
--- a/src/app/_components/ArticleHeader.tsx
+++ b/src/app/_components/ArticleHeader.tsx
@@ -1,4 +1,4 @@
-import type { ImageProps } from '@/types/sharedProps/imageType'
+import type { ImageProps } from '@/types/imageType'
 
 import { graphicsData } from '@/data/graphicsData'
 
diff --git a/src/app/_components/CTAButtonGroup.tsx b/src/app/_components/CTAButtonGroup.tsx
index 4c6805d9e..7402bb803 100644
--- a/src/app/_components/CTAButtonGroup.tsx
+++ b/src/app/_components/CTAButtonGroup.tsx
@@ -1,6 +1,6 @@
 import { clsx } from 'clsx'
 
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Button } from '@/components/Button'
 
diff --git a/src/app/_components/Card.tsx b/src/app/_components/Card.tsx
index 07f040890..d8eee1b9f 100644
--- a/src/app/_components/Card.tsx
+++ b/src/app/_components/Card.tsx
@@ -2,7 +2,7 @@ import { ArrowUpRight } from '@phosphor-icons/react/dist/ssr'
 import { clsx } from 'clsx'
 import theme from 'tailwindcss/defaultTheme'
 
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import { type CTAProps } from '@/types/ctaType'
 
 import { isExternalLink } from '@/utils/linkUtils'
 
diff --git a/src/app/_components/DesktopNavigation.tsx b/src/app/_components/DesktopNavigation.tsx
index 09b2456b6..1715a314c 100644
--- a/src/app/_components/DesktopNavigation.tsx
+++ b/src/app/_components/DesktopNavigation.tsx
@@ -9,7 +9,7 @@ import type { Route } from 'next'
 
 import { PATHS } from '@/constants/paths'
 
-import { desktopNavigationItems } from '@/data/components/navigationData'
+import { desktopNavigationItems } from '@/data/navigationData'
 
 import { useNavigationItems } from '@/hooks/useNavigationItems'
 
diff --git a/src/app/_components/DynamicImage.tsx b/src/app/_components/DynamicImage.tsx
index ded7815e0..ce5d1b3ae 100644
--- a/src/app/_components/DynamicImage.tsx
+++ b/src/app/_components/DynamicImage.tsx
@@ -2,7 +2,7 @@ import Image, { type ImageProps } from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { ImageObjectFit } from '@/types/sharedProps/imageType'
+import type { ImageObjectFit } from '@/types/imageType'
 
 import { StaticImage, type StaticImageProps } from '@/components/StaticImage'
 
diff --git a/src/app/_components/ErrorMessage.tsx b/src/app/_components/ErrorMessage.tsx
index e67a283b9..696f2d4ca 100644
--- a/src/app/_components/ErrorMessage.tsx
+++ b/src/app/_components/ErrorMessage.tsx
@@ -1,4 +1,4 @@
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import { type CTAProps } from '@/types/ctaType'
 
 import { PATHS } from '@/constants/paths'
 
diff --git a/src/app/_components/FocusAreaCard.tsx b/src/app/_components/FocusAreaCard.tsx
index 502c43454..c0abad294 100644
--- a/src/app/_components/FocusAreaCard.tsx
+++ b/src/app/_components/FocusAreaCard.tsx
@@ -1,6 +1,6 @@
 import Image from 'next/image'
 
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { buildImageSizeProp } from '@/utils/buildImageSizeProp'
 
diff --git a/src/app/_components/HomeExploreSectionCard.tsx b/src/app/_components/HomeExploreSectionCard.tsx
index 6f2fa6798..ff9168c3f 100644
--- a/src/app/_components/HomeExploreSectionCard.tsx
+++ b/src/app/_components/HomeExploreSectionCard.tsx
@@ -1,6 +1,6 @@
 import { clsx } from 'clsx'
 
-import { type CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Card } from '@/components/Card'
 import { type HeadingProps, Heading } from '@/components/Heading'
diff --git a/src/app/_components/NoResultsMessage.tsx b/src/app/_components/NoResultsMessage.tsx
index 7dfcc9188..19bf60eef 100644
--- a/src/app/_components/NoResultsMessage.tsx
+++ b/src/app/_components/NoResultsMessage.tsx
@@ -1,4 +1,4 @@
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Button } from '@/components/Button'
 import { Heading } from '@/components/Heading'
diff --git a/src/app/_components/StaticImage.tsx b/src/app/_components/StaticImage.tsx
index 21b37c8cc..627c6f3ab 100644
--- a/src/app/_components/StaticImage.tsx
+++ b/src/app/_components/StaticImage.tsx
@@ -2,7 +2,7 @@ import Image, { type StaticImageData, type ImageProps } from 'next/image'
 
 import { clsx } from 'clsx'
 
-import type { ImageObjectFit } from '@/types/sharedProps/imageType'
+import type { ImageObjectFit } from '@/types/imageType'
 
 export type StaticImageProps = {
   data: StaticImageData
diff --git a/src/app/_data/homepage/filecoinEcosystemData.ts b/src/app/_data/filecoinEcosystemData.ts
similarity index 100%
rename from src/app/_data/homepage/filecoinEcosystemData.ts
rename to src/app/_data/filecoinEcosystemData.ts
diff --git a/src/app/_data/components/navigationData.ts b/src/app/_data/navigationData.ts
similarity index 100%
rename from src/app/_data/components/navigationData.ts
rename to src/app/_data/navigationData.ts
diff --git a/src/app/_schemas/blogPostFrontMatterSchema.ts b/src/app/_schemas/BlogPostFrontMatterSchema.ts
similarity index 86%
rename from src/app/_schemas/blogPostFrontMatterSchema.ts
rename to src/app/_schemas/BlogPostFrontMatterSchema.ts
index 38b5a3f35..e965c2ad4 100644
--- a/src/app/_schemas/blogPostFrontMatterSchema.ts
+++ b/src/app/_schemas/BlogPostFrontMatterSchema.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
 
 import {
-  getCategorySettings,
   createCategorySchema,
+  getCategorySettings,
 } from '@/utils/categoryUtils'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
 
 const { validCategoryIds } = getCategorySettings('blog_posts')
 
diff --git a/src/app/_schemas/digestArticleFrontMatterSchema.ts b/src/app/_schemas/DigestArticleFrontMatterSchema.ts
similarity index 75%
rename from src/app/_schemas/digestArticleFrontMatterSchema.ts
rename to src/app/_schemas/DigestArticleFrontMatterSchema.ts
index e473dcc0d..280860249 100644
--- a/src/app/_schemas/digestArticleFrontMatterSchema.ts
+++ b/src/app/_schemas/DigestArticleFrontMatterSchema.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 export const DigestArticleFrontMatterSchema = DynamicBaseDataSchema.extend({
   title: z.string(),
diff --git a/src/app/_schemas/dynamicDataBaseSchema.ts b/src/app/_schemas/DynamicDataBaseSchema.ts
similarity index 84%
rename from src/app/_schemas/dynamicDataBaseSchema.ts
rename to src/app/_schemas/DynamicDataBaseSchema.ts
index ef7328bce..c721bf6a8 100644
--- a/src/app/_schemas/dynamicDataBaseSchema.ts
+++ b/src/app/_schemas/DynamicDataBaseSchema.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
-import { SeoMetadataSchema } from '@/schemas/seoMetadataSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
+import { SeoMetadataSchema } from '@/schemas/SeoMetadataSchema'
 
 export const DynamicBaseDataSchema = z.object({
   createdOn: z.coerce.date(),
diff --git a/src/app/_schemas/imagePropsSchema.ts b/src/app/_schemas/ImagePropsSchema.ts
similarity index 100%
rename from src/app/_schemas/imagePropsSchema.ts
rename to src/app/_schemas/ImagePropsSchema.ts
diff --git a/src/app/_schemas/seoMetadataSchema.ts b/src/app/_schemas/SeoMetadataSchema.ts
similarity index 100%
rename from src/app/_schemas/seoMetadataSchema.ts
rename to src/app/_schemas/SeoMetadataSchema.ts
diff --git a/src/app/_schemas/ecosystemProject/FrontMatterSchema.ts b/src/app/_schemas/ecosystemProject/FrontMatterSchema.ts
index 28e6d0178..c0bcdcf5f 100644
--- a/src/app/_schemas/ecosystemProject/FrontMatterSchema.ts
+++ b/src/app/_schemas/ecosystemProject/FrontMatterSchema.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { BaseDataSchemaKebabCase } from '@/schemas/dynamicDataBaseSchema'
+import { BaseDataSchemaKebabCase } from '@/schemas/DynamicDataBaseSchema'
 
 import { CategorySchema, SubcategorySchema } from './CategorySchemas'
 
diff --git a/src/app/_schemas/event/FrontMatterSchema.ts b/src/app/_schemas/event/FrontMatterSchema.ts
index 65d3e0e7f..ddc0bb8c3 100644
--- a/src/app/_schemas/event/FrontMatterSchema.ts
+++ b/src/app/_schemas/event/FrontMatterSchema.ts
@@ -1,11 +1,11 @@
 import { z } from 'zod'
 
 import {
-  getEventsCategorySettings,
   createCategorySchema,
+  getEventsCategorySettings,
 } from '@/utils/categoryUtils'
 
-import { DynamicBaseDataSchema } from '@/schemas/dynamicDataBaseSchema'
+import { DynamicBaseDataSchema } from '@/schemas/DynamicDataBaseSchema'
 import { SpeakersSchema } from '@/schemas/event/SpeakerSchema'
 import { SponsorsSchema } from '@/schemas/event/SponsorSchema'
 
diff --git a/src/app/_schemas/event/SpeakerSchema.ts b/src/app/_schemas/event/SpeakerSchema.ts
index cbcaa1f74..72025a7f9 100644
--- a/src/app/_schemas/event/SpeakerSchema.ts
+++ b/src/app/_schemas/event/SpeakerSchema.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 const speakerSchema = z.object({
   name: z.string(),
diff --git a/src/app/_schemas/event/SponsorSchema.ts b/src/app/_schemas/event/SponsorSchema.ts
index 26335bd9a..cb9d99be3 100644
--- a/src/app/_schemas/event/SponsorSchema.ts
+++ b/src/app/_schemas/event/SponsorSchema.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { ImagePropsSchema } from '@/schemas/imagePropsSchema'
+import { ImagePropsSchema } from '@/schemas/ImagePropsSchema'
 
 const sponsorSchema = z.object({
   name: z.string(),
diff --git a/src/app/_types/attributesTypes.ts b/src/app/_types/attributesTypes.ts
index d39374caf..6cea440b1 100644
--- a/src/app/_types/attributesTypes.ts
+++ b/src/app/_types/attributesTypes.ts
@@ -1,4 +1,4 @@
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export type PageAttributes = {
   header: {
diff --git a/src/app/_types/sharedProps/ctaType.ts b/src/app/_types/ctaType.ts
similarity index 100%
rename from src/app/_types/sharedProps/ctaType.ts
rename to src/app/_types/ctaType.ts
diff --git a/src/app/_types/sharedProps/imageType.ts b/src/app/_types/imageType.ts
similarity index 100%
rename from src/app/_types/sharedProps/imageType.ts
rename to src/app/_types/imageType.ts
diff --git a/src/app/_types/sortTypes.ts b/src/app/_types/sortTypes.ts
index bbeab465d..aaafeed4b 100644
--- a/src/app/_types/sortTypes.ts
+++ b/src/app/_types/sortTypes.ts
@@ -2,7 +2,7 @@ import type { Event } from '@/types/eventType'
 
 import { DEFAULT_SORT_OPTION, SORT_TYPES } from '@/constants/sortConstants'
 
-import type { DynamicBaseData } from '@/schemas/dynamicDataBaseSchema'
+import type { DynamicBaseData } from '@/schemas/DynamicDataBaseSchema'
 
 type BaseSortType = typeof SORT_TYPES
 
diff --git a/src/app/_utils/convertMarkdownToDigestArticleData.ts b/src/app/_utils/convertMarkdownToDigestArticleData.ts
index 6d93e12b5..7506c81b7 100644
--- a/src/app/_utils/convertMarkdownToDigestArticleData.ts
+++ b/src/app/_utils/convertMarkdownToDigestArticleData.ts
@@ -1,6 +1,6 @@
 import removeMarkdown from 'remove-markdown'
 
-import { DigestArticleFrontMatterSchema } from '@/schemas/digestArticleFrontMatterSchema'
+import { DigestArticleFrontMatterSchema } from '@/schemas/DigestArticleFrontMatterSchema'
 
 const CONTENT_PREVIEW_CHARACTER_LENGTH = 220
 
diff --git a/src/app/_utils/covertMarkdowntoBlogPostData.ts b/src/app/_utils/convertMarkdowntoBlogPostData.ts
similarity index 86%
rename from src/app/_utils/covertMarkdowntoBlogPostData.ts
rename to src/app/_utils/convertMarkdowntoBlogPostData.ts
index f0e75feaa..4520551b1 100644
--- a/src/app/_utils/covertMarkdowntoBlogPostData.ts
+++ b/src/app/_utils/convertMarkdowntoBlogPostData.ts
@@ -1,4 +1,4 @@
-import { BlogPostFrontMatterSchema } from '@/schemas/blogPostFrontMatterSchema'
+import { BlogPostFrontMatterSchema } from '@/schemas/BlogPostFrontMatterSchema'
 
 export function convertMarkdownToBlogPostData(data: Record<string, any>) {
   return BlogPostFrontMatterSchema.parse({
diff --git a/src/app/_utils/createMetadata.ts b/src/app/_utils/createMetadata.ts
index 73ea60181..178423ce2 100644
--- a/src/app/_utils/createMetadata.ts
+++ b/src/app/_utils/createMetadata.ts
@@ -8,7 +8,7 @@ import { graphicsData } from '@/data/graphicsData'
 import {
   type SeoMetadata,
   SeoMetadataSchema,
-} from '@/schemas/seoMetadataSchema'
+} from '@/schemas/SeoMetadataSchema'
 
 type CreateMetadataProps = {
   seo: SeoMetadata
diff --git a/src/app/_utils/generateWebPageStructuredData.ts b/src/app/_utils/generateWebPageStructuredData.ts
index 2aed4a677..a3b370faf 100644
--- a/src/app/_utils/generateWebPageStructuredData.ts
+++ b/src/app/_utils/generateWebPageStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
-import { type PathValues, type DynamicPathValues } from '@/constants/paths'
+import { type DynamicPathValues, type PathValues } from '@/constants/paths'
 import { BASE_URL } from '@/constants/siteMetadata'
 import { SCHEMA_CONTEXT_URL } from '@/constants/structuredDataConstants'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 type GenerateWebPageStructuredDataProps = {
   title: SeoMetadata['title']
diff --git a/src/app/_utils/getBlogPostData.ts b/src/app/_utils/getBlogPostData.ts
index 564310746..abe506359 100644
--- a/src/app/_utils/getBlogPostData.ts
+++ b/src/app/_utils/getBlogPostData.ts
@@ -1,7 +1,7 @@
 import { PATHS } from '@/constants/paths'
 
-import { convertMarkdownToBlogPostData } from '@/utils/covertMarkdowntoBlogPostData'
-import { getData, getAllData } from '@/utils/getData'
+import { convertMarkdownToBlogPostData } from '@/utils/convertMarkdowntoBlogPostData'
+import { getAllData, getData } from '@/utils/getData'
 
 const BLOG_DIRECTORY_PATH = PATHS.BLOG.entriesContentPath as string
 
diff --git a/src/app/about/data/focusAreasData.ts b/src/app/about/data/focusAreasData.ts
index 4bbac384c..3f3cf9e56 100644
--- a/src/app/about/data/focusAreasData.ts
+++ b/src/app/about/data/focusAreasData.ts
@@ -1,4 +1,4 @@
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { graphicsData } from '@/data/graphicsData'
 
diff --git a/src/app/about/utils/generateStructuredData.ts b/src/app/about/utils/generateStructuredData.ts
index c70564695..24461fc3f 100644
--- a/src/app/about/utils/generateStructuredData.ts
+++ b/src/app/about/utils/generateStructuredData.ts
@@ -1,12 +1,11 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   const baseData = generateWebPageStructuredData({
diff --git a/src/app/blog/utils/generateStructuredData.ts b/src/app/blog/utils/generateStructuredData.ts
index 841807ae9..a67897674 100644
--- a/src/app/blog/utils/generateStructuredData.ts
+++ b/src/app/blog/utils/generateStructuredData.ts
@@ -2,14 +2,13 @@ import type { WebPage, WithContext } from 'schema-dts'
 
 import type { BlogPost } from '@/types/blogPostType'
 
-
 import { PATHS } from '@/constants/paths'
 import { BASE_URL, ORGANIZATION_NAME } from '@/constants/siteMetadata'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(
   posts: Array<BlogPost>,
diff --git a/src/app/digest/utils/generateStructuredData.tsx b/src/app/digest/utils/generateStructuredData.tsx
index 7fd903ddc..232614950 100644
--- a/src/app/digest/utils/generateStructuredData.tsx
+++ b/src/app/digest/utils/generateStructuredData.tsx
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/ecosystem-explorer/project-form/components/EcosystemProjectForm.tsx b/src/app/ecosystem-explorer/project-form/components/EcosystemProjectForm.tsx
index d60986b65..1702e951c 100644
--- a/src/app/ecosystem-explorer/project-form/components/EcosystemProjectForm.tsx
+++ b/src/app/ecosystem-explorer/project-form/components/EcosystemProjectForm.tsx
@@ -24,7 +24,7 @@ import {
   NETWORK_USE_CASE_CHARACTER_LIMIT,
 } from '../constants'
 import { useSubmitEcosystemProjectForm } from '../hooks/useSubmitEcosystemProjectForm'
-import { EcosystemProjectFormSchema } from '../schema/form'
+import { EcosystemProjectFormSchema } from '../schema/EcosystemProjectFormSchema'
 import { getOptionsFromObject } from '../utils/getOptionsFromObject'
 import { getYearOptions } from '../utils/getYearOptions'
 
diff --git a/src/app/ecosystem-explorer/project-form/page.tsx b/src/app/ecosystem-explorer/project-form/page.tsx
index 206498d57..dc39c3e76 100644
--- a/src/app/ecosystem-explorer/project-form/page.tsx
+++ b/src/app/ecosystem-explorer/project-form/page.tsx
@@ -19,7 +19,7 @@ import { StructuredDataScript } from '@/components/StructuredDataScript'
 import { EcosystemProjectForm } from './components/EcosystemProjectForm'
 import { ErrorNotification } from './components/ErrorNotification'
 import { SuccessMessage } from './components/SuccessMessage'
-import { SearchParamsSchema } from './schema/searchParams'
+import { SearchParamsSchema } from './schema/SearchParamsSchema'
 import { generateStructuredData } from './utils/generateStructuredData'
 import { getFormInitialValue } from './utils/getFormInitialValue'
 
diff --git a/src/app/ecosystem-explorer/project-form/schema/form.ts b/src/app/ecosystem-explorer/project-form/schema/EcosystemProjectFormSchema.ts
similarity index 100%
rename from src/app/ecosystem-explorer/project-form/schema/form.ts
rename to src/app/ecosystem-explorer/project-form/schema/EcosystemProjectFormSchema.ts
diff --git a/src/app/ecosystem-explorer/project-form/schema/searchParams.ts b/src/app/ecosystem-explorer/project-form/schema/SearchParamsSchema.ts
similarity index 100%
rename from src/app/ecosystem-explorer/project-form/schema/searchParams.ts
rename to src/app/ecosystem-explorer/project-form/schema/SearchParamsSchema.ts
diff --git a/src/app/ecosystem-explorer/project-form/utils/generateStructuredData.tsx b/src/app/ecosystem-explorer/project-form/utils/generateStructuredData.tsx
index 01f76596f..0c063a795 100644
--- a/src/app/ecosystem-explorer/project-form/utils/generateStructuredData.tsx
+++ b/src/app/ecosystem-explorer/project-form/utils/generateStructuredData.tsx
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/ecosystem-explorer/utils/generateStructuredData.ts b/src/app/ecosystem-explorer/utils/generateStructuredData.ts
index 24ceba9d7..cf5b721c1 100644
--- a/src/app/ecosystem-explorer/utils/generateStructuredData.ts
+++ b/src/app/ecosystem-explorer/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/employee-privacy-policy/utils/generateStructuredData.ts b/src/app/employee-privacy-policy/utils/generateStructuredData.ts
index 2be7151ff..84af7816e 100644
--- a/src/app/employee-privacy-policy/utils/generateStructuredData.ts
+++ b/src/app/employee-privacy-policy/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/events/[slug]/utils/buildCtaArray.ts b/src/app/events/[slug]/utils/buildCtaArray.ts
index b1edb3185..6e7351f60 100644
--- a/src/app/events/[slug]/utils/buildCtaArray.ts
+++ b/src/app/events/[slug]/utils/buildCtaArray.ts
@@ -1,5 +1,5 @@
+import type { CTAProps } from '@/types/ctaType'
 import type { Event } from '@/types/eventType'
-import type { CTAProps } from '@/types/sharedProps/ctaType'
 
 type ctaArrayProps = {
   externalLink?: Event['externalLink']
diff --git a/src/app/events/utils/generateStructuredData.ts b/src/app/events/utils/generateStructuredData.ts
index 8d58acc22..4c2e075ae 100644
--- a/src/app/events/utils/generateStructuredData.ts
+++ b/src/app/events/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/filecoin-plus/allocators/components/AllocatorsTable.tsx b/src/app/filecoin-plus/allocators/components/AllocatorsTable.tsx
index cf535261b..99de024e0 100644
--- a/src/app/filecoin-plus/allocators/components/AllocatorsTable.tsx
+++ b/src/app/filecoin-plus/allocators/components/AllocatorsTable.tsx
@@ -9,7 +9,7 @@ import {
 import { TableBody } from '@/components/Table/TableBody'
 import { TableHead } from '@/components/Table/TableHead'
 
-import type { Allocator } from '../schemas/allocatorSchema'
+import { type Allocator } from '../schemas/AllocatorSchema'
 
 import { AllocatorsTableColumns } from './AllocatorsTableColumns'
 
diff --git a/src/app/filecoin-plus/allocators/components/AllocatorsTableColumns.tsx b/src/app/filecoin-plus/allocators/components/AllocatorsTableColumns.tsx
index 17aede90e..0e1cf7838 100644
--- a/src/app/filecoin-plus/allocators/components/AllocatorsTableColumns.tsx
+++ b/src/app/filecoin-plus/allocators/components/AllocatorsTableColumns.tsx
@@ -4,7 +4,7 @@ import { createColumnHelper } from '@tanstack/react-table'
 import { CustomLink } from '@/components/CustomLink'
 import { Icon } from '@/components/Icon'
 
-import type { Allocator } from '../schemas/allocatorSchema'
+import type { Allocator } from '../schemas/AllocatorSchema'
 
 const columnHelper = createColumnHelper<Allocator>()
 
diff --git a/src/app/filecoin-plus/allocators/schemas/allocatorSchema.ts b/src/app/filecoin-plus/allocators/schemas/AllocatorSchema.ts
similarity index 100%
rename from src/app/filecoin-plus/allocators/schemas/allocatorSchema.ts
rename to src/app/filecoin-plus/allocators/schemas/AllocatorSchema.ts
diff --git a/src/app/filecoin-plus/allocators/utils/extractAllocators.ts b/src/app/filecoin-plus/allocators/utils/extractAllocators.ts
index 1bfb87f29..66dbe991f 100644
--- a/src/app/filecoin-plus/allocators/utils/extractAllocators.ts
+++ b/src/app/filecoin-plus/allocators/utils/extractAllocators.ts
@@ -1,7 +1,7 @@
 import {
   type AllocatorFileMetaData,
   AllocatorSchema,
-} from '../schemas/allocatorSchema'
+} from '../schemas/AllocatorSchema'
 
 export function extractAllocators(
   allocatorFileMetaData: Array<AllocatorFileMetaData | null>,
diff --git a/src/app/filecoin-plus/allocators/utils/generateStructuredData.ts b/src/app/filecoin-plus/allocators/utils/generateStructuredData.ts
index bf6a3a7a6..897717833 100644
--- a/src/app/filecoin-plus/allocators/utils/generateStructuredData.ts
+++ b/src/app/filecoin-plus/allocators/utils/generateStructuredData.ts
@@ -4,7 +4,7 @@ import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/filecoin-plus/allocators/utils/getAllocatorUrlList.ts b/src/app/filecoin-plus/allocators/utils/getAllocatorUrlList.ts
index b7e4d8f0d..c14e86d4b 100644
--- a/src/app/filecoin-plus/allocators/utils/getAllocatorUrlList.ts
+++ b/src/app/filecoin-plus/allocators/utils/getAllocatorUrlList.ts
@@ -1,7 +1,7 @@
 import {
   AllocatorFileListMetaDataBaseSchema,
   type AllocatorFileMetaDataBase,
-} from '../schemas/allocatorSchema'
+} from '../schemas/AllocatorSchema'
 
 const GITHUB_ALLOCATORS_REPO =
   'https://api.github.com/repos/filecoin-project/Allocator-Registry/contents/Allocators'
diff --git a/src/app/filecoin-plus/allocators/utils/getAllocators.ts b/src/app/filecoin-plus/allocators/utils/getAllocators.ts
index 80793ee1b..eef39ad1d 100644
--- a/src/app/filecoin-plus/allocators/utils/getAllocators.ts
+++ b/src/app/filecoin-plus/allocators/utils/getAllocators.ts
@@ -2,7 +2,7 @@ import {
   type AllocatorFileMetaData,
   type AllocatorFileMetaDataBase,
   AllocatorFileMetaDataSchema,
-} from '../schemas/allocatorSchema'
+} from '../schemas/AllocatorSchema'
 
 import { extractAllocators } from './extractAllocators'
 import { getAllocatorUrlList } from './getAllocatorUrlList'
diff --git a/src/app/filecoin-plus/data/aboutData.ts b/src/app/filecoin-plus/data/aboutData.ts
index d7c6c6a44..90ce96f9d 100644
--- a/src/app/filecoin-plus/data/aboutData.ts
+++ b/src/app/filecoin-plus/data/aboutData.ts
@@ -1,4 +1,4 @@
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { graphicsData } from '@/data/graphicsData'
 
diff --git a/src/app/filecoin-plus/utils/generateStructuredData.tsx b/src/app/filecoin-plus/utils/generateStructuredData.tsx
index 717b7866d..a46732764 100644
--- a/src/app/filecoin-plus/utils/generateStructuredData.tsx
+++ b/src/app/filecoin-plus/utils/generateStructuredData.tsx
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/governance/data/governanceDocsData.tsx b/src/app/governance/data/governanceDocsData.tsx
index a2c9602bd..ea3a24a57 100644
--- a/src/app/governance/data/governanceDocsData.tsx
+++ b/src/app/governance/data/governanceDocsData.tsx
@@ -1,6 +1,6 @@
 import { ChatCircleDots, GithubLogo } from '@phosphor-icons/react/dist/ssr'
 
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { PATHS } from '@/constants/paths'
 import { FILECOIN_FOUNDATION_URLS } from '@/constants/siteMetadata'
diff --git a/src/app/governance/govhub/components/ToolsCardContent.tsx b/src/app/governance/govhub/components/ToolsCardContent.tsx
index 29a604f7e..fb44325f7 100644
--- a/src/app/governance/govhub/components/ToolsCardContent.tsx
+++ b/src/app/governance/govhub/components/ToolsCardContent.tsx
@@ -1,6 +1,6 @@
 import { clsx } from 'clsx'
 
-import type { CTAProps } from '@/types/sharedProps/ctaType'
+import type { CTAProps } from '@/types/ctaType'
 
 import { Heading } from '@/components/Heading'
 import { TextLink } from '@/components/TextLink'
diff --git a/src/app/governance/govhub/data/toolsData.ts b/src/app/governance/govhub/data/toolsData.ts
index 22af43e4a..a037b2a11 100644
--- a/src/app/governance/govhub/data/toolsData.ts
+++ b/src/app/governance/govhub/data/toolsData.ts
@@ -1,5 +1,5 @@
-import type { CTAProps } from '@/types/sharedProps/ctaType'
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { CTAProps } from '@/types/ctaType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { FILECOIN_FOUNDATION_URLS } from '@/constants/siteMetadata'
 
diff --git a/src/app/governance/govhub/utils/generateStructuredData.tsx b/src/app/governance/govhub/utils/generateStructuredData.tsx
index ee636345a..255e66c82 100644
--- a/src/app/governance/govhub/utils/generateStructuredData.tsx
+++ b/src/app/governance/govhub/utils/generateStructuredData.tsx
@@ -4,7 +4,7 @@ import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/governance/utils/generateStructuredData.ts b/src/app/governance/utils/generateStructuredData.ts
index f259fbb97..348c1cbcf 100644
--- a/src/app/governance/utils/generateStructuredData.ts
+++ b/src/app/governance/utils/generateStructuredData.ts
@@ -1,12 +1,11 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   const baseData = generateWebPageStructuredData({
diff --git a/src/app/grants/utils/generateStructuredData.ts b/src/app/grants/utils/generateStructuredData.ts
index 2a0b93751..8d79d82e1 100644
--- a/src/app/grants/utils/generateStructuredData.ts
+++ b/src/app/grants/utils/generateStructuredData.ts
@@ -1,12 +1,11 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   const baseData = generateWebPageStructuredData({
diff --git a/src/app/orbit/data/ambassadorsData.tsx b/src/app/orbit/data/ambassadorsData.tsx
index f233e9d2c..3cd7630bd 100644
--- a/src/app/orbit/data/ambassadorsData.tsx
+++ b/src/app/orbit/data/ambassadorsData.tsx
@@ -1,4 +1,4 @@
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import { TextLink } from '@/components/TextLink'
 
diff --git a/src/app/orbit/data/programGoalsData.tsx b/src/app/orbit/data/programGoalsData.tsx
index 905a47243..9339d3a29 100644
--- a/src/app/orbit/data/programGoalsData.tsx
+++ b/src/app/orbit/data/programGoalsData.tsx
@@ -1,4 +1,4 @@
-import type { StaticImageProps } from '@/types/sharedProps/imageType'
+import type { StaticImageProps } from '@/types/imageType'
 
 import audienceSeatedLargeAuditoriumImg from '@/assets/orbit/goals/audience-seated-large-auditorium.jpg'
 import speakerPresentationNewsPaperImg from '@/assets/orbit/goals/speaker-presentation-newspaper-tech-event.jpg'
diff --git a/src/app/orbit/utils/generateStructuredData.ts b/src/app/orbit/utils/generateStructuredData.ts
index 7cd27edcf..d9920abf0 100644
--- a/src/app/orbit/utils/generateStructuredData.ts
+++ b/src/app/orbit/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 305603b9e..a72d8d8a4 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -7,8 +7,8 @@ import { ORGANIZATION_SCHEMA_BASE } from '@/constants/structuredDataConstants'
 import { attributes as digestAttributes } from '@/content/pages/digest.md'
 import { attributes } from '@/content/pages/home.md'
 
+import { filecoinEcosystemData } from '@/data/filecoinEcosystemData'
 import { graphicsData } from '@/data/graphicsData'
-import { filecoinEcosystemData } from '@/data/homepage/filecoinEcosystemData'
 
 import { createMetadata } from '@/utils/createMetadata'
 import { getEcosystemProjectsData } from '@/utils/getEcosystemProjectData'
diff --git a/src/app/privacy-policy/utils/generateStructuredData.ts b/src/app/privacy-policy/utils/generateStructuredData.ts
index 494f08d28..d88beb3fb 100644
--- a/src/app/privacy-policy/utils/generateStructuredData.ts
+++ b/src/app/privacy-policy/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/security/bug-bounty/data/leaderboardTable.tsx b/src/app/security/bug-bounty/components/LeaderBoardTableColumns.tsx
similarity index 97%
rename from src/app/security/bug-bounty/data/leaderboardTable.tsx
rename to src/app/security/bug-bounty/components/LeaderBoardTableColumns.tsx
index 5d7a02471..6a3f2ca55 100644
--- a/src/app/security/bug-bounty/data/leaderboardTable.tsx
+++ b/src/app/security/bug-bounty/components/LeaderBoardTableColumns.tsx
@@ -5,7 +5,7 @@ import { createColumnHelper } from '@tanstack/react-table'
 
 import { Icon } from '@/components/Icon'
 
-import { leaderboardData } from './leaderboard'
+import { leaderboardData } from '../data/leaderboard'
 
 type WhiteHat = (typeof leaderboardData)[number]
 
diff --git a/src/app/security/bug-bounty/components/Leaderboard.tsx b/src/app/security/bug-bounty/components/Leaderboard.tsx
index 51f8d27ab..79e908214 100644
--- a/src/app/security/bug-bounty/components/Leaderboard.tsx
+++ b/src/app/security/bug-bounty/components/Leaderboard.tsx
@@ -10,7 +10,8 @@ import { TableBody } from '@/components/Table/TableBody'
 import { TableHead } from '@/components/Table/TableHead'
 
 import { leaderboardData } from '../data/leaderboard'
-import { leaderboardTableData } from '../data/leaderboardTable'
+
+import { leaderboardTableData } from './LeaderBoardTableColumns'
 
 export function Leaderboard() {
   const table = useReactTable({
diff --git a/src/app/security/bug-bounty/utils/generateStructuredData.tsx b/src/app/security/bug-bounty/utils/generateStructuredData.tsx
index 76eeb22f3..63b349d19 100644
--- a/src/app/security/bug-bounty/utils/generateStructuredData.tsx
+++ b/src/app/security/bug-bounty/utils/generateStructuredData.tsx
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/security/coordinated-disclosure-policy/utils/generateStructuredData.ts b/src/app/security/coordinated-disclosure-policy/utils/generateStructuredData.ts
index 4ad4e1259..471dd7a26 100644
--- a/src/app/security/coordinated-disclosure-policy/utils/generateStructuredData.ts
+++ b/src/app/security/coordinated-disclosure-policy/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/security/maturity-model/utils/generateStructuredData.tsx b/src/app/security/maturity-model/utils/generateStructuredData.tsx
index c411eeffe..0acb3d470 100644
--- a/src/app/security/maturity-model/utils/generateStructuredData.tsx
+++ b/src/app/security/maturity-model/utils/generateStructuredData.tsx
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/security/utils/generateStructuredData.ts b/src/app/security/utils/generateStructuredData.ts
index 755b381cf..6cd2dffd3 100644
--- a/src/app/security/utils/generateStructuredData.ts
+++ b/src/app/security/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/src/app/sitemap.ts b/src/app/sitemap.ts
index 00ac0740c..33f6c83f2 100644
--- a/src/app/sitemap.ts
+++ b/src/app/sitemap.ts
@@ -8,7 +8,7 @@ import { getDigestArticlesData } from '@/utils/getDigestArticleData'
 import { getEcosystemProjectsData } from '@/utils/getEcosystemProjectData'
 import { getEventsData } from '@/utils/getEventData'
 
-import type { DynamicBaseData } from '@/schemas/dynamicDataBaseSchema'
+import type { DynamicBaseData } from '@/schemas/DynamicDataBaseSchema'
 
 type GenericEntryData = Pick<DynamicBaseData, 'updatedOn'> & { slug: string }
 
diff --git a/src/app/terms-of-use/utils/generateStructuredData.ts b/src/app/terms-of-use/utils/generateStructuredData.ts
index ec1c0f612..8d2b19c75 100644
--- a/src/app/terms-of-use/utils/generateStructuredData.ts
+++ b/src/app/terms-of-use/utils/generateStructuredData.ts
@@ -1,11 +1,10 @@
 import type { WebPage, WithContext } from 'schema-dts'
 
-
 import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({
diff --git a/templates/page.tsx b/templates/page.tsx
index 461ffcac6..be11d16bf 100644
--- a/templates/page.tsx
+++ b/templates/page.tsx
@@ -1,23 +1,26 @@
-`import { CTASection } from '@/components/CTASection'
-import { PageHeader } from '@/components/PageHeader'
-import { PageLayout } from '@/components/PageLayout'
-import { PageSection } from '@/components/PageSection'
-import { StructuredDataScript } from '@/components/StructuredDataScript'
-
-import { createMetadata } from '@/utils/createMetadata'
+;`import { PATHS } from '@/constants/paths'
 
 import { attributes } from '@/content/pages/__PAGE_NAME__.md'
 
-import { PATHS } from '@/constants/paths'
-import { FILECOIN_FOUNDATION_URLS } from '@/constants/siteMetadata'
 import { graphicsData } from '@/data/graphicsData'
 
+import { createMetadata } from '@/utils/createMetadata'
+
+import { CTASection } from '@/components/CTASection'
+import { PageHeader } from '@/components/PageHeader'
+import { PageLayout } from '@/components/PageLayout'
+import { PageSection } from '@/components/PageSection'
+import { StructuredDataScript } from '@/components/StructuredDataScript'
+
 import { generateStructuredData } from './utils/generateStructuredData'
 
 const { header, seo } = attributes
 
 export const metadata = createMetadata({
-  seo,
+  seo: {
+    ...seo,
+    image: graphicsData.imageFallback.data.src,
+  },
   path: PATHS.__PATH_NAME__.path,
 })
 
diff --git a/templates/utils/generateStructuredData.ts b/templates/utils/generateStructuredData.ts
index 98e865dc4..f6307d12d 100644
--- a/templates/utils/generateStructuredData.ts
+++ b/templates/utils/generateStructuredData.ts
@@ -1,10 +1,11 @@
 ;`import type { WebPage, WithContext } from 'schema-dts'
 
-import type { SeoMetadata } from '@/schemas/seoMetadataSchema'
+import { PATHS } from '@/constants/paths'
 
 import { generateWebPageStructuredData } from '@/utils/generateWebPageStructuredData'
 
-import { PATHS } from '@/constants/paths'
+import type { SeoMetadata } from '@/schemas/SeoMetadataSchema'
+
 
 export function generateStructuredData(seo: SeoMetadata): WithContext<WebPage> {
   return generateWebPageStructuredData({