diff --git a/gatsby-node.js b/gatsby-node.js
index d7290b9..e699b2e 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -78,9 +78,9 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
         activity.setStatus("Generating blog pages...");
 
         const blogListingTemplate = path.resolve(
-            `src/templates/blogListing.tsx`
+            `src/templates/blog/listing.tsx`
         );
-        const blogTemplate = path.resolve(`src/templates/blogPost.tsx`);
+        const blogTemplate = path.resolve(`src/templates/blog/post.tsx`);
 
         reporter.info("Creating blog listings...");
 
diff --git a/src/templates/blogListing.module.scss b/src/templates/blog/listing.module.scss
similarity index 98%
rename from src/templates/blogListing.module.scss
rename to src/templates/blog/listing.module.scss
index 29c3747..dd2f60b 100644
--- a/src/templates/blogListing.module.scss
+++ b/src/templates/blog/listing.module.scss
@@ -1,4 +1,4 @@
-@import "../globals";
+@import "../../globals";
 
 .sectionBacklink {
     display: block;
diff --git a/src/templates/blogListing.module.scss.d.ts b/src/templates/blog/listing.module.scss.d.ts
similarity index 100%
rename from src/templates/blogListing.module.scss.d.ts
rename to src/templates/blog/listing.module.scss.d.ts
diff --git a/src/templates/blogListing.tsx b/src/templates/blog/listing.tsx
similarity index 98%
rename from src/templates/blogListing.tsx
rename to src/templates/blog/listing.tsx
index 514f49f..6ce05da 100644
--- a/src/templates/blogListing.tsx
+++ b/src/templates/blog/listing.tsx
@@ -5,9 +5,9 @@ import { Link } from "gatsby-plugin-react-i18next";
 import React from "react";
 import { useTranslation } from "react-i18next";
 
-import Layout from "../layouts/default";
+import Layout from "../../layouts/default";
 
-import * as styles from "./blogListing.module.scss";
+import * as styles from "./listing.module.scss";
 
 const BlogListing = ({ data, pageContext }) => {
     const { t } = useTranslation();
diff --git a/src/templates/blogPost.module.scss b/src/templates/blog/post.module.scss
similarity index 98%
rename from src/templates/blogPost.module.scss
rename to src/templates/blog/post.module.scss
index 268b791..24f0935 100644
--- a/src/templates/blogPost.module.scss
+++ b/src/templates/blog/post.module.scss
@@ -1,4 +1,4 @@
-@import "../globals";
+@import "../../globals";
 
 .postSection {
     flex-grow: 1;
diff --git a/src/templates/blogPost.module.scss.d.ts b/src/templates/blog/post.module.scss.d.ts
similarity index 100%
rename from src/templates/blogPost.module.scss.d.ts
rename to src/templates/blog/post.module.scss.d.ts
diff --git a/src/templates/blogPost.tsx b/src/templates/blog/post.tsx
similarity index 98%
rename from src/templates/blogPost.tsx
rename to src/templates/blog/post.tsx
index 9f06dd0..0191a69 100644
--- a/src/templates/blogPost.tsx
+++ b/src/templates/blog/post.tsx
@@ -6,9 +6,9 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import Utterances from "utterances-react";
 
-import Layout from "../layouts/default";
+import Layout from "../../layouts/default";
 
-import * as styles from "./blogPost.module.scss";
+import * as styles from "./post.module.scss";
 import { Link } from "gatsby-plugin-react-i18next";
 
 const BlogPost = ({ data }) => {