diff --git a/src/_includes/main/navbar.njk b/src/_includes/main/navbar.njk
index 53182b61..5dfb8e86 100644
--- a/src/_includes/main/navbar.njk
+++ b/src/_includes/main/navbar.njk
@@ -2,7 +2,7 @@
 
 {% block navbarLinks %}
     {% set currentUrl %}{{ page.url }}{% endset %}
-    {% set navPages = collections.pages | eleventyNavigation %}
+    {% set navPages = collections["navbar links"] | eleventyNavigation %}
     {%- for entry in navPages %}
         <li>
             <a {% if entry.url == page.url %}aria-current="page"{% endif %} href="{{ entry.url }}">{{ entry.title }}</a>
diff --git a/src/changelogs/changelogs.njk b/src/slashes/footerlinks/changelogs.njk
similarity index 100%
rename from src/changelogs/changelogs.njk
rename to src/slashes/footerlinks/changelogs.njk
diff --git a/src/slashes/footerlinks/footerlinks.11tydata.json b/src/slashes/footerlinks/footerlinks.11tydata.json
new file mode 100644
index 00000000..1d9c9b05
--- /dev/null
+++ b/src/slashes/footerlinks/footerlinks.11tydata.json
@@ -0,0 +1,3 @@
+{
+    "tags": "footer links"
+}
\ No newline at end of file
diff --git a/src/pages/sitemap.njk b/src/slashes/footerlinks/sitemap.njk
similarity index 100%
rename from src/pages/sitemap.njk
rename to src/slashes/footerlinks/sitemap.njk
diff --git a/src/pages/about.md b/src/slashes/navbarlinks/about.md
similarity index 100%
rename from src/pages/about.md
rename to src/slashes/navbarlinks/about.md
diff --git a/src/pages/adoptables.njk b/src/slashes/navbarlinks/adoptables.njk
similarity index 100%
rename from src/pages/adoptables.njk
rename to src/slashes/navbarlinks/adoptables.njk
diff --git a/src/pages/articles.md b/src/slashes/navbarlinks/articles.md
similarity index 100%
rename from src/pages/articles.md
rename to src/slashes/navbarlinks/articles.md
diff --git a/src/pages/blog.njk b/src/slashes/navbarlinks/blog.njk
similarity index 100%
rename from src/pages/blog.njk
rename to src/slashes/navbarlinks/blog.njk
diff --git a/src/pages/guestbook.njk b/src/slashes/navbarlinks/guestbook.njk
similarity index 100%
rename from src/pages/guestbook.njk
rename to src/slashes/navbarlinks/guestbook.njk
diff --git a/src/pages/links.njk b/src/slashes/navbarlinks/links.njk
similarity index 100%
rename from src/pages/links.njk
rename to src/slashes/navbarlinks/links.njk
diff --git a/src/slashes/navbarlinks/navbarlinks.11tydata.json b/src/slashes/navbarlinks/navbarlinks.11tydata.json
new file mode 100644
index 00000000..6c19b1d6
--- /dev/null
+++ b/src/slashes/navbarlinks/navbarlinks.11tydata.json
@@ -0,0 +1,3 @@
+{
+    "tags": "navbar links"
+}
\ No newline at end of file
diff --git a/src/pages/now.md b/src/slashes/navbarlinks/now.md
similarity index 100%
rename from src/pages/now.md
rename to src/slashes/navbarlinks/now.md
diff --git a/src/pages/projects.md b/src/slashes/navbarlinks/projects.md
similarity index 100%
rename from src/pages/projects.md
rename to src/slashes/navbarlinks/projects.md
diff --git a/src/pages/shrines.njk b/src/slashes/navbarlinks/shrines.njk
similarity index 100%
rename from src/pages/shrines.njk
rename to src/slashes/navbarlinks/shrines.njk
diff --git a/src/pages/pages.11tydata.json b/src/slashes/slashes.json
similarity index 100%
rename from src/pages/pages.11tydata.json
rename to src/slashes/slashes.json
diff --git a/src/statements/accessibility.md b/src/slashes/statements/accessibility.md
similarity index 100%
rename from src/statements/accessibility.md
rename to src/slashes/statements/accessibility.md
diff --git a/src/statements/colophon.md b/src/slashes/statements/colophon.md
similarity index 100%
rename from src/statements/colophon.md
rename to src/slashes/statements/colophon.md
diff --git a/src/statements/statements.11tydata.json b/src/slashes/statements/statements.11tydata.json
similarity index 65%
rename from src/statements/statements.11tydata.json
rename to src/slashes/statements/statements.11tydata.json
index 221dfa0b..e060db8c 100644
--- a/src/statements/statements.11tydata.json
+++ b/src/slashes/statements/statements.11tydata.json
@@ -2,9 +2,8 @@
     "layout": "main/statement",
     "tags": "statements",
     "articleElement": true,
-    "permalink": "/{{ page.fileSlug }}/",
     "eleventyComputed": {
-        "desc": "{{ sitemeta.siteName }}'s {{ keyword }}.",
+        "desc": "{{ sitemeta.siteName | safe }}'s {{ keyword }}.",
         "eleventyNavigation":{
             "key": "{{ title }}"
         }