diff --git a/src/pages/__tests__/__snapshots__/blog.test.tsx.snap b/src/pages/__tests__/__snapshots__/blog.test.tsx.snap
deleted file mode 100644
index 5238cf51bf..0000000000
--- a/src/pages/__tests__/__snapshots__/blog.test.tsx.snap
+++ /dev/null
@@ -1,154 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Blog page renders correctly 1`] = `
-
-
-
-
-
-
-
-
-
- 11/11/2022
-
-
- by
-
-
- Mock author name
-
-
-
-
-
-
-
-`;
-
-exports[`Blog page renders correctly for empty blogs list 1`] = `
-
-
-
-
-`;
diff --git a/src/pages/__tests__/__snapshots__/community.test.tsx.snap b/src/pages/__tests__/__snapshots__/community.test.tsx.snap
index c9cdaf3dfd..49dde3f120 100644
--- a/src/pages/__tests__/__snapshots__/community.test.tsx.snap
+++ b/src/pages/__tests__/__snapshots__/community.test.tsx.snap
@@ -79,8 +79,8 @@ exports[`Community Page renders correctly 1`] = `
Resources
diff --git a/src/pages/__tests__/blog.test.tsx b/src/pages/__tests__/blog.test.tsx
deleted file mode 100644
index 3a909e7d32..0000000000
--- a/src/pages/__tests__/blog.test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import AllBlogPosts from '../blog';
-import { createBlogData } from '../../__fixtures__/page';
-
-const mockData = createBlogData();
-
-describe('Blog page', () => {
- it('renders correctly', () => {
- const { container } = render(
);
- // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
- const pageContent = container.querySelector('main');
-
- expect(pageContent).toMatchSnapshot();
- });
-
- it('renders correctly for empty blogs list', () => {
- const { container } = render(
-
- );
- // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
- const pageContent = container.querySelector('main');
-
- expect(pageContent).toMatchSnapshot();
- });
-});
diff --git a/src/pages/about/__tests__/__snapshots__/governance.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/governance.test.tsx.snap
index c101f70985..4f1ae2f1e4 100644
--- a/src/pages/about/__tests__/__snapshots__/governance.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/governance.test.tsx.snap
@@ -79,8 +79,8 @@ exports[`Governance Page renders correctly 1`] = `
Resources
diff --git a/src/pages/about/__tests__/__snapshots__/index.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/index.test.tsx.snap
index 129ca5435d..9c53668ade 100644
--- a/src/pages/about/__tests__/__snapshots__/index.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/index.test.tsx.snap
@@ -79,8 +79,8 @@ exports[`About page renders correctly 1`] = `
Resources
diff --git a/src/pages/about/__tests__/__snapshots__/privacy.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/privacy.test.tsx.snap
index 6471288afc..e48d58f3ac 100644
--- a/src/pages/about/__tests__/__snapshots__/privacy.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/privacy.test.tsx.snap
@@ -79,8 +79,8 @@ exports[`Privacy Page renders correctly 1`] = `
Resources
diff --git a/src/pages/about/__tests__/__snapshots__/releases.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/releases.test.tsx.snap
index c6eb13f23b..4a1d9594e2 100644
--- a/src/pages/about/__tests__/__snapshots__/releases.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/releases.test.tsx.snap
@@ -79,8 +79,8 @@ exports[`Releases page renders correctly 1`] = `
Resources
diff --git a/src/pages/resources/__tests__/__snapshots__/index.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/resources.test.tsx.snap
similarity index 99%
rename from src/pages/resources/__tests__/__snapshots__/index.test.tsx.snap
rename to src/pages/about/__tests__/__snapshots__/resources.test.tsx.snap
index 379af077ca..0f353b14cb 100644
--- a/src/pages/resources/__tests__/__snapshots__/index.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/resources.test.tsx.snap
@@ -260,8 +260,8 @@ exports[`Resources page renders correctly 1`] = `
Resources
diff --git a/src/pages/about/__tests__/__snapshots__/security.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/security.test.tsx.snap
index cc6d003b61..323422e9eb 100644
--- a/src/pages/about/__tests__/__snapshots__/security.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/security.test.tsx.snap
@@ -78,8 +78,8 @@ exports[`Security page renders correctly 1`] = `
Resources
diff --git a/src/pages/about/__tests__/__snapshots__/working-groups.test.tsx.snap b/src/pages/about/__tests__/__snapshots__/working-groups.test.tsx.snap
index 35c9389f9f..246cb83616 100644
--- a/src/pages/about/__tests__/__snapshots__/working-groups.test.tsx.snap
+++ b/src/pages/about/__tests__/__snapshots__/working-groups.test.tsx.snap
@@ -78,8 +78,8 @@ exports[`Working Groups page renders correctly 1`] = `
Resources
diff --git a/src/pages/resources/__tests__/index.test.tsx b/src/pages/about/__tests__/resources.test.tsx
similarity index 90%
rename from src/pages/resources/__tests__/index.test.tsx
rename to src/pages/about/__tests__/resources.test.tsx
index 02bfac8dda..93efa976c3 100644
--- a/src/pages/resources/__tests__/index.test.tsx
+++ b/src/pages/about/__tests__/resources.test.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { render } from '@testing-library/react';
-import ResourcesPage from '../../about';
+import ResourcesPage from '..';
import { createResourcesData } from '../../../__fixtures__/page';
const mockData = createResourcesData();
diff --git a/src/pages/resources/index.tsx b/src/pages/about/resources.tsx
similarity index 95%
rename from src/pages/resources/index.tsx
rename to src/pages/about/resources.tsx
index dde36b155e..5ddcfe29ee 100644
--- a/src/pages/resources/index.tsx
+++ b/src/pages/about/resources.tsx
@@ -4,7 +4,7 @@ import { SideNavBarKeys } from '../../components/SideNavBar';
import connectGraphQlArticle from '../../components/connectGraphQlArticle';
export default connectGraphQlArticle(ArticleLayout, {
- editPath: 'content/resources/resources.md',
+ editPath: 'content/about/resources.md',
sidenavKey: SideNavBarKeys.resources,
});
diff --git a/src/pages/blog.tsx b/src/pages/blog.tsx
deleted file mode 100644
index a7a87c5171..0000000000
--- a/src/pages/blog.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-import { injectIntl, WrappedComponentProps } from 'react-intl';
-import { graphql } from 'gatsby';
-import Layout from '../components/Layout';
-import { BlogCategories, BlogPosts } from '../types';
-import BlogContainer from '../containers/BlogContainer';
-
-interface Props {
- data: {
- posts: BlogPosts;
- categories: BlogCategories;
- };
-}
-
-const Blog = ({
- data: { posts, categories },
- intl,
-}: Props & WrappedComponentProps): JSX.Element => (
-
-
-
-
-
-);
-
-export default injectIntl(Blog);
-
-export const pageQuery = graphql`
- query {
- posts: allMdx(
- filter: { fileAbsolutePath: { regex: "/blog/" } }
- sort: { fields: [fields___date], order: DESC }
- ) {
- edges {
- node {
- frontmatter {
- title
- blogAuthors {
- id
- name
- }
- category {
- name
- slug
- }
- }
- fields {
- date(formatString: "MMMM DD, YYYY")
- slug
- readingTime {
- text
- }
- }
- }
- }
- }
- categories: allCategoriesYaml {
- edges {
- node {
- name
- slug
- }
- }
- }
- }
-`;
diff --git a/src/pages/download/__tests__/__snapshots__/package-manager.test.tsx.snap b/src/pages/download/__tests__/__snapshots__/package-manager.test.tsx.snap
index 6af1234441..bcc923d108 100644
--- a/src/pages/download/__tests__/__snapshots__/package-manager.test.tsx.snap
+++ b/src/pages/download/__tests__/__snapshots__/package-manager.test.tsx.snap
@@ -260,8 +260,8 @@ exports[`Package Manager Page renders correctly 1`] = `
Resources
diff --git a/src/templates/api.module.scss b/src/styles/templates/api.module.scss
similarity index 90%
rename from src/templates/api.module.scss
rename to src/styles/templates/api.module.scss
index 4b8874d168..b0e6dd3bed 100644
--- a/src/templates/api.module.scss
+++ b/src/styles/templates/api.module.scss
@@ -1,4 +1,4 @@
-@use '../styles/containers.scss';
+@use '../containers.scss';
.api-container {
@extend .grid-container;
diff --git a/src/templates/blog.module.scss b/src/styles/templates/post.module.scss
similarity index 84%
rename from src/templates/blog.module.scss
rename to src/styles/templates/post.module.scss
index 6bdfb0e82c..c7af5353a2 100644
--- a/src/templates/blog.module.scss
+++ b/src/styles/templates/post.module.scss
@@ -1,4 +1,4 @@
-.blog-container {
+.post-container {
grid-gap: var(--space-24);
article {
diff --git a/src/templates/__tests__/__snapshots__/blog.test.tsx.snap b/src/templates/__tests__/__snapshots__/post.test.tsx.snap
similarity index 99%
rename from src/templates/__tests__/__snapshots__/blog.test.tsx.snap
rename to src/templates/__tests__/__snapshots__/post.test.tsx.snap
index a84dafd225..d43745a4e7 100644
--- a/src/templates/__tests__/__snapshots__/blog.test.tsx.snap
+++ b/src/templates/__tests__/__snapshots__/post.test.tsx.snap
@@ -183,7 +183,7 @@ exports[`LearnLayout Template renders correctly 1`] = `