diff --git a/src/404.html b/src/pages/404.html
similarity index 91%
rename from src/404.html
rename to src/pages/404.html
index 0a1094e..68e7d39 100644
--- a/src/404.html
+++ b/src/pages/404.html
@@ -1,6 +1,6 @@
---
-layout: "layouts/base"
permalink: /404.html
+title: 404 - Can't Find That Frog
youtube: true
---
diff --git a/src/about.md b/src/pages/about.md
similarity index 96%
rename from src/about.md
rename to src/pages/about.md
index f51d129..7710f0d 100644
--- a/src/about.md
+++ b/src/pages/about.md
@@ -1,8 +1,5 @@
---
-layout: "layouts/base"
-permalink: /about/index.html
title: About
-tags: ["page"]
---
# About me
diff --git a/src/blogroll.html b/src/pages/blogroll.html
similarity index 91%
rename from src/blogroll.html
rename to src/pages/blogroll.html
index 4639f0c..a0fa2bf 100644
--- a/src/blogroll.html
+++ b/src/pages/blogroll.html
@@ -1,6 +1,4 @@
---
-layout: "layouts/base"
-permalink: /blogroll/index.html
title: Blogroll
---
diff --git a/src/catalogue-type.html b/src/pages/catalogue-type.html
similarity index 97%
rename from src/catalogue-type.html
rename to src/pages/catalogue-type.html
index 08c6f5f..015b7f6 100644
--- a/src/catalogue-type.html
+++ b/src/pages/catalogue-type.html
@@ -1,5 +1,4 @@
---
-layout: "layouts/base"
pagination:
data: collections.catalogueByType
size: 1
diff --git a/src/catalogue.html b/src/pages/catalogue.html
similarity index 90%
rename from src/catalogue.html
rename to src/pages/catalogue.html
index e121d53..feb50e5 100644
--- a/src/catalogue.html
+++ b/src/pages/catalogue.html
@@ -1,6 +1,4 @@
---
-layout: "layouts/base"
-permalink: /catalogue/index.html
title: Catalogue
---
diff --git a/src/colophon.md b/src/pages/colophon.md
similarity index 98%
rename from src/colophon.md
rename to src/pages/colophon.md
index f2bed8b..fb1f48d 100644
--- a/src/colophon.md
+++ b/src/pages/colophon.md
@@ -1,8 +1,6 @@
---
layout: "layouts/base"
-permalink: /colophon/index.html
title: Colophon
-tags: ["page"]
---
# Colophon
diff --git a/src/links.md b/src/pages/links.md
similarity index 88%
rename from src/links.md
rename to src/pages/links.md
index 016074d..c0854d6 100644
--- a/src/links.md
+++ b/src/pages/links.md
@@ -1,8 +1,5 @@
---
-layout: "layouts/base"
-permalink: /links/index.html
title: Links
-tags: ["page"]
---
# Find me online
diff --git a/src/now.html b/src/pages/now.html
similarity index 96%
rename from src/now.html
rename to src/pages/now.html
index 0427db1..898dfe2 100644
--- a/src/now.html
+++ b/src/pages/now.html
@@ -1,6 +1,4 @@
---
-layout: "layouts/base"
-permalink: /now/index.html
title: /now
---
diff --git a/src/pages/pages.json b/src/pages/pages.json
new file mode 100644
index 0000000..fd3fba2
--- /dev/null
+++ b/src/pages/pages.json
@@ -0,0 +1,5 @@
+{
+ "layout": "layouts/base",
+ "permalink": "{{ page.fileSlug }}/index.html",
+ "tags": ["page"]
+}
diff --git a/src/styleguide.html b/src/pages/styleguide.html
similarity index 97%
rename from src/styleguide.html
rename to src/pages/styleguide.html
index d9c2dbe..a21d89e 100644
--- a/src/styleguide.html
+++ b/src/pages/styleguide.html
@@ -1,6 +1,4 @@
---
-layout: "layouts/base"
-permalink: /styleguide/index.html
title: Styleguide
---
diff --git a/src/tag.html b/src/pages/tag.html
similarity index 96%
rename from src/tag.html
rename to src/pages/tag.html
index cde3325..0321169 100644
--- a/src/tag.html
+++ b/src/pages/tag.html
@@ -1,5 +1,4 @@
---
-layout: "layouts/base"
pagination:
data: collections.postsByTag
size: 1
diff --git a/src/tags.html b/src/pages/tags.html
similarity index 89%
rename from src/tags.html
rename to src/pages/tags.html
index b66ab65..1e6811a 100644
--- a/src/tags.html
+++ b/src/pages/tags.html
@@ -1,6 +1,4 @@
---
-layout: "layouts/base"
-permalink: /tags/index.html
title: All tags
---
diff --git a/src/uses.md b/src/pages/uses.md
similarity index 99%
rename from src/uses.md
rename to src/pages/uses.md
index 0ed2b50..6295b34 100644
--- a/src/uses.md
+++ b/src/pages/uses.md
@@ -1,8 +1,5 @@
---
-layout: "layouts/base"
-permalink: /uses/index.html
title: /uses
-tags: ["page"]
---
# Uses
diff --git a/src/posts.html b/src/posts/posts.html
similarity index 100%
rename from src/posts.html
rename to src/posts/posts.html
diff --git a/src/robots.njk b/src/robots.njk
index c34a308..3243f9a 100644
--- a/src/robots.njk
+++ b/src/robots.njk
@@ -1,5 +1,6 @@
---
permalink: /robots.txt
+layout: null
eleventyExcludeFromCollections: true
excludeFromSitemap: true
---
diff --git a/src/sitemap.njk b/src/sitemap.njk
index 4ffcd4c..90f5726 100644
--- a/src/sitemap.njk
+++ b/src/sitemap.njk
@@ -1,5 +1,6 @@
---
permalink: /sitemap.xml
+layout: null
eleventyExcludeFromCollections: true
---