74 files changed, 29 insertions, 29 deletions

diff --git a/src/collections/en/pastebin b/src/collections/en/pastebin
new file mode 120000
index 0000000..5168ff3
--- /dev/null
+++ b/src/collections/en/pastebin
@@ -0,0 +1 @@
+../../content/en/pastebin
\ No newline at end of file
diff --git a/src/collections/en/pastebins b/src/collections/en/pastebins
deleted file mode 120000
index 162f7a3..0000000
--- a/src/collections/en/pastebins
+++ /dev/null
@@ -1 +0,0 @@
-../../content/en/pastebins
\ No newline at end of file
diff --git a/src/collections/en/podcast b/src/collections/en/podcast
new file mode 120000
index 0000000..2334546
--- /dev/null
+++ b/src/collections/en/podcast
@@ -0,0 +1 @@
+../../content/en/podcast
\ No newline at end of file
diff --git a/src/collections/en/podcasts b/src/collections/en/podcasts
deleted file mode 120000
index 247422f..0000000
--- a/src/collections/en/podcasts
+++ /dev/null
@@ -1 +0,0 @@
-../../content/en/podcasts
\ No newline at end of file
diff --git a/src/collections/en/screencast b/src/collections/en/screencast
new file mode 120000
index 0000000..e04adf4
--- /dev/null
+++ b/src/collections/en/screencast
@@ -0,0 +1 @@
+../../content/en/screencast
\ No newline at end of file
diff --git a/src/collections/en/screencasts b/src/collections/en/screencasts
deleted file mode 120000
index 5c599b6..0000000
--- a/src/collections/en/screencasts
+++ /dev/null
@@ -1 +0,0 @@
-../../content/en/screencasts
\ No newline at end of file
diff --git a/src/collections/en/til b/src/collections/en/til
new file mode 120000
index 0000000..6519d09
--- /dev/null
+++ b/src/collections/en/til
@@ -0,0 +1 @@
+../../content/en/til
\ No newline at end of file
diff --git a/src/collections/en/tils b/src/collections/en/tils
deleted file mode 120000
index 0397edb..0000000
--- a/src/collections/en/tils
+++ /dev/null
@@ -1 +0,0 @@
-../../content/en/tils
\ No newline at end of file
diff --git a/src/content/en/blog/2020/11/07/diy-bugs.adoc b/src/content/en/blog/2020/11/07/diy-bugs.adoc
index 8ab7953..5fbc920 100644
--- a/src/content/en/blog/2020/11/07/diy-bugs.adoc
+++ b/src/content/en/blog/2020/11/07/diy-bugs.adoc
@@ -4,7 +4,7 @@
 :attack-on-ytdl: https://github.com/github/dmca/blob/master/2020/10/2020-10-23-RIAA.md
 :list-discussions: https://sourcehut.org/blog/2020-10-29-how-mailing-lists-prevent-censorship/
 :docs-in-repo: https://podcast.writethedocs.org/2017/01/25/episode-3-trends/
-:ci-in-notes: link:../../../../tils/2020/11/30/git-notes-ci.html
+:ci-in-notes: link:../../../../til/2020/11/30/git-notes-ci.html
 :todos-mui: https://man.sr.ht/todo.sr.ht/#email-access
 :git-bug-bridges: https://github.com/MichaelMure/git-bug#bridges
 
diff --git a/src/content/en/pastebins/2016/04/05/rpn.adoc b/src/content/en/pastebin/2016/04/05/rpn.adoc
index c567d0d..c567d0d 100644
--- a/src/content/en/pastebins/2016/04/05/rpn.adoc
+++ b/src/content/en/pastebin/2016/04/05/rpn.adoc
diff --git a/src/content/en/pastebins/2018/07/11/nix-pinning.adoc b/src/content/en/pastebin/2018/07/11/nix-pinning.adoc
index 63b1ac9..63b1ac9 100644
--- a/src/content/en/pastebins/2018/07/11/nix-pinning.adoc
+++ b/src/content/en/pastebin/2018/07/11/nix-pinning.adoc
diff --git a/src/content/en/pastebins/2018/07/13/guix-nixos-systemd.adoc b/src/content/en/pastebin/2018/07/13/guix-nixos-systemd.adoc
index fa4226a..fa4226a 100644
--- a/src/content/en/pastebins/2018/07/13/guix-nixos-systemd.adoc
+++ b/src/content/en/pastebin/2018/07/13/guix-nixos-systemd.adoc
diff --git a/src/content/en/pastebins/2018/07/13/guixbuilder-nixos.adoc b/src/content/en/pastebin/2018/07/13/guixbuilder-nixos.adoc
index 65dbcc7..65dbcc7 100644
--- a/src/content/en/pastebins/2018/07/13/guixbuilder-nixos.adoc
+++ b/src/content/en/pastebin/2018/07/13/guixbuilder-nixos.adoc
diff --git a/src/content/en/pastebins/2018/07/13/guixbuilder.adoc b/src/content/en/pastebin/2018/07/13/guixbuilder.adoc
index 35057f9..35057f9 100644
--- a/src/content/en/pastebins/2018/07/13/guixbuilder.adoc
+++ b/src/content/en/pastebin/2018/07/13/guixbuilder.adoc
diff --git a/src/content/en/pastebins/2018/07/13/nix-strpad.adoc b/src/content/en/pastebin/2018/07/13/nix-strpad.adoc
index 71e8168..71e8168 100644
--- a/src/content/en/pastebins/2018/07/13/nix-strpad.adoc
+++ b/src/content/en/pastebin/2018/07/13/nix-strpad.adoc
diff --git a/src/content/en/pastebins/2018/07/25/nix-exps.adoc b/src/content/en/pastebin/2018/07/25/nix-exps.adoc
index 04cb7f4..04cb7f4 100644
--- a/src/content/en/pastebins/2018/07/25/nix-exps.adoc
+++ b/src/content/en/pastebin/2018/07/25/nix-exps.adoc
diff --git a/src/content/en/pastebins/2018/07/25/nix-showdrv.adoc b/src/content/en/pastebin/2018/07/25/nix-showdrv.adoc
index b62e526..b62e526 100644
--- a/src/content/en/pastebins/2018/07/25/nix-showdrv.adoc
+++ b/src/content/en/pastebin/2018/07/25/nix-showdrv.adoc
diff --git a/src/content/en/pastebins/2019/06/08/inconsistent-hash.adoc b/src/content/en/pastebin/2019/06/08/inconsistent-hash.adoc
index 8dc5794..8dc5794 100644
--- a/src/content/en/pastebins/2019/06/08/inconsistent-hash.adoc
+++ b/src/content/en/pastebin/2019/06/08/inconsistent-hash.adoc
diff --git a/src/content/en/pastebins/2019/12/29/raku-tuple-type.adoc b/src/content/en/pastebin/2019/12/29/raku-tuple-type.adoc
index 50dd841..50dd841 100644
--- a/src/content/en/pastebins/2019/12/29/raku-tuple-type.adoc
+++ b/src/content/en/pastebin/2019/12/29/raku-tuple-type.adoc
diff --git a/src/content/en/pastebins/2020/01/04/guix-import-failure.adoc b/src/content/en/pastebin/2020/01/04/guix-import-failure.adoc
index 5896645..5896645 100644
--- a/src/content/en/pastebins/2020/01/04/guix-import-failure.adoc
+++ b/src/content/en/pastebin/2020/01/04/guix-import-failure.adoc
diff --git a/src/content/en/pastebins/2020/02/14/guix-shebang.adoc b/src/content/en/pastebin/2020/02/14/guix-shebang.adoc
index d415d36..d415d36 100644
--- a/src/content/en/pastebins/2020/02/14/guix-shebang.adoc
+++ b/src/content/en/pastebin/2020/02/14/guix-shebang.adoc
diff --git a/src/content/en/pastebins/2020/11/27/guix-build-local.adoc b/src/content/en/pastebin/2020/11/27/guix-build-local.adoc
index 1a18d4b..1a18d4b 100644
--- a/src/content/en/pastebins/2020/11/27/guix-build-local.adoc
+++ b/src/content/en/pastebin/2020/11/27/guix-build-local.adoc
diff --git a/src/content/en/pastebins/2020/12/15/guix-pack-fail.adoc b/src/content/en/pastebin/2020/12/15/guix-pack-fail.adoc
index 3631fbc..3631fbc 100644
--- a/src/content/en/pastebins/2020/12/15/guix-pack-fail.adoc
+++ b/src/content/en/pastebin/2020/12/15/guix-pack-fail.adoc
diff --git a/src/content/en/pastebins/2021/04/03/naive-slugify-js.adoc b/src/content/en/pastebin/2021/04/03/naive-slugify-js.adoc
index 184ce97..184ce97 100644
--- a/src/content/en/pastebins/2021/04/03/naive-slugify-js.adoc
+++ b/src/content/en/pastebin/2021/04/03/naive-slugify-js.adoc
diff --git a/src/content/en/pastebins/2021/06/08/reading-session-pt1.adoc b/src/content/en/pastebin/2021/06/08/reading-session-pt1.adoc
index d9f1f91..d9f1f91 100644
--- a/src/content/en/pastebins/2021/06/08/reading-session-pt1.adoc
+++ b/src/content/en/pastebin/2021/06/08/reading-session-pt1.adoc
diff --git a/src/content/en/pastebins/2021/06/22/curl-wget.adoc b/src/content/en/pastebin/2021/06/22/curl-wget.adoc
index 97f55c7..97f55c7 100644
--- a/src/content/en/pastebins/2021/06/22/curl-wget.adoc
+++ b/src/content/en/pastebin/2021/06/22/curl-wget.adoc
diff --git a/src/content/en/pastebins/2021/08/11/h1-spacing.adoc b/src/content/en/pastebin/2021/08/11/h1-spacing.adoc
index 38dbb2e..38dbb2e 100644
--- a/src/content/en/pastebins/2021/08/11/h1-spacing.adoc
+++ b/src/content/en/pastebin/2021/08/11/h1-spacing.adoc
diff --git a/src/content/en/pastebins/2021/09/02/sicp-3-19.adoc b/src/content/en/pastebin/2021/09/02/sicp-3-19.adoc
index 166170f..166170f 100644
--- a/src/content/en/pastebins/2021/09/02/sicp-3-19.adoc
+++ b/src/content/en/pastebin/2021/09/02/sicp-3-19.adoc
diff --git a/src/content/en/pastebins/2021/09/03/sicp-persistent-queue.adoc b/src/content/en/pastebin/2021/09/03/sicp-persistent-queue.adoc
index 2b4a8a2..2b4a8a2 100644
--- a/src/content/en/pastebins/2021/09/03/sicp-persistent-queue.adoc
+++ b/src/content/en/pastebin/2021/09/03/sicp-persistent-queue.adoc
diff --git a/src/content/en/pastebins/2022/07/14/git-cleanup.adoc b/src/content/en/pastebin/2022/07/14/git-cleanup.adoc
index b223f86..b223f86 100644
--- a/src/content/en/pastebins/2022/07/14/git-cleanup.adoc
+++ b/src/content/en/pastebin/2022/07/14/git-cleanup.adoc
diff --git a/src/content/en/pastebins/2023/07/22/funcallable-amop.adoc b/src/content/en/pastebin/2023/07/22/funcallable-amop.adoc
index 47a8089..47a8089 100644
--- a/src/content/en/pastebins/2023/07/22/funcallable-amop.adoc
+++ b/src/content/en/pastebin/2023/07/22/funcallable-amop.adoc
diff --git a/src/content/en/pastebins/categories.adoc b/src/content/en/pastebin/categories.adoc
index f29acda..f29acda 100644
--- a/src/content/en/pastebins/categories.adoc
+++ b/src/content/en/pastebin/categories.adoc
diff --git a/src/content/en/pastebins/index.adoc b/src/content/en/pastebin/index.adoc
index 433a2c1..433a2c1 100644
--- a/src/content/en/pastebins/index.adoc
+++ b/src/content/en/pastebin/index.adoc
diff --git a/src/content/en/podcasts/2020/12/19/test-entry.adoc b/src/content/en/podcast/2020/12/19/test-entry.adoc
index 9e7eb00..9e7eb00 100644
--- a/src/content/en/podcasts/2020/12/19/test-entry.adoc
+++ b/src/content/en/podcast/2020/12/19/test-entry.adoc
diff --git a/src/content/en/podcasts/2020/12/19/test-entry.flac b/src/content/en/podcast/2020/12/19/test-entry.flac
index 786ab59..786ab59 100644
--- a/src/content/en/podcasts/2020/12/19/test-entry.flac
+++ b/src/content/en/podcast/2020/12/19/test-entry.flac
diff --git a/src/content/en/podcasts/2020/12/19/test-entry.flac.torrent b/src/content/en/podcast/2020/12/19/test-entry.flac.torrent
index 519fb2f..519fb2f 100644
--- a/src/content/en/podcasts/2020/12/19/test-entry.flac.torrent
+++ b/src/content/en/podcast/2020/12/19/test-entry.flac.torrent
diff --git a/src/content/en/podcasts/2020/12/19/test-entry.ogg b/src/content/en/podcast/2020/12/19/test-entry.ogg
index 9bf5500..9bf5500 100644
--- a/src/content/en/podcasts/2020/12/19/test-entry.ogg
+++ b/src/content/en/podcast/2020/12/19/test-entry.ogg
diff --git a/src/content/en/podcasts/2020/12/19/test-entry.ogg.torrent b/src/content/en/podcast/2020/12/19/test-entry.ogg.torrent
index 901eac3..901eac3 100644
--- a/src/content/en/podcasts/2020/12/19/test-entry.ogg.torrent
+++ b/src/content/en/podcast/2020/12/19/test-entry.ogg.torrent
diff --git a/src/content/en/podcasts/categories.adoc b/src/content/en/podcast/categories.adoc
index f29acda..f29acda 100644
--- a/src/content/en/podcasts/categories.adoc
+++ b/src/content/en/podcast/categories.adoc
diff --git a/src/content/en/podcasts/index.adoc b/src/content/en/podcast/index.adoc
index 1f17da7..1f17da7 100644
--- a/src/content/en/podcasts/index.adoc
+++ b/src/content/en/podcast/index.adoc
diff --git a/src/content/en/screencasts/2021/02/07/autoqemu.adoc b/src/content/en/screencast/2021/02/07/autoqemu.adoc
index b20b092..b20b092 100644
--- a/src/content/en/screencasts/2021/02/07/autoqemu.adoc
+++ b/src/content/en/screencast/2021/02/07/autoqemu.adoc
diff --git a/src/content/en/screencasts/2021/02/07/autoqemu.tar.gz b/src/content/en/screencast/2021/02/07/autoqemu.tar.gz
index c2fa042..c2fa042 100644
--- a/src/content/en/screencasts/2021/02/07/autoqemu.tar.gz
+++ b/src/content/en/screencast/2021/02/07/autoqemu.tar.gz
diff --git a/src/content/en/screencasts/2021/02/07/autoqemu.webm b/src/content/en/screencast/2021/02/07/autoqemu.webm
index f553efb..f553efb 100644
--- a/src/content/en/screencasts/2021/02/07/autoqemu.webm
+++ b/src/content/en/screencast/2021/02/07/autoqemu.webm
diff --git a/src/content/en/screencasts/2021/02/07/autoqemu.webm.torrent b/src/content/en/screencast/2021/02/07/autoqemu.webm.torrent
index 24bfe73..24bfe73 100644
--- a/src/content/en/screencasts/2021/02/07/autoqemu.webm.torrent
+++ b/src/content/en/screencast/2021/02/07/autoqemu.webm.torrent
diff --git a/src/content/en/screencasts/categories.adoc b/src/content/en/screencast/categories.adoc
index f29acda..f29acda 100644
--- a/src/content/en/screencasts/categories.adoc
+++ b/src/content/en/screencast/categories.adoc
diff --git a/src/content/en/screencasts/index.adoc b/src/content/en/screencast/index.adoc
index 083adac..083adac 100644
--- a/src/content/en/screencasts/index.adoc
+++ b/src/content/en/screencast/index.adoc
diff --git a/src/content/en/slides/2020-10-19-rollout-feature-flag-experiment-operational-toggle.slides b/src/content/en/slide/2020-10-19-rollout-feature-flag-experiment-operational-toggle.slides
index 22770e6..22770e6 100644
--- a/src/content/en/slides/2020-10-19-rollout-feature-flag-experiment-operational-toggle.slides
+++ b/src/content/en/slide/2020-10-19-rollout-feature-flag-experiment-operational-toggle.slides
diff --git a/src/content/en/slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides b/src/content/en/slide/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
index 8f17982..8f17982 100644
--- a/src/content/en/slides/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
+++ b/src/content/en/slide/2020-11-14-on-local-first-beyond-the-crdt-silver-bullet.slides
diff --git a/src/content/en/tils/2020/08/12/filename-timestamp.adoc b/src/content/en/til/2020/08/12/filename-timestamp.adoc
index aa8d63b..aa8d63b 100644
--- a/src/content/en/tils/2020/08/12/filename-timestamp.adoc
+++ b/src/content/en/til/2020/08/12/filename-timestamp.adoc
diff --git a/src/content/en/tils/2020/08/13/code-jekyll.adoc b/src/content/en/til/2020/08/13/code-jekyll.adoc
index 6bd90b0..6bd90b0 100644
--- a/src/content/en/tils/2020/08/13/code-jekyll.adoc
+++ b/src/content/en/til/2020/08/13/code-jekyll.adoc
diff --git a/src/content/en/tils/2020/08/14/browse-git.adoc b/src/content/en/til/2020/08/14/browse-git.adoc
index 6b3ff6d..6b3ff6d 100644
--- a/src/content/en/tils/2020/08/14/browse-git.adoc
+++ b/src/content/en/til/2020/08/14/browse-git.adoc
diff --git a/src/content/en/tils/2020/08/16/git-search.adoc b/src/content/en/til/2020/08/16/git-search.adoc
index 4113f3f..4113f3f 100644
--- a/src/content/en/tils/2020/08/16/git-search.adoc
+++ b/src/content/en/til/2020/08/16/git-search.adoc
diff --git a/src/content/en/tils/2020/08/28/grep-online.adoc b/src/content/en/til/2020/08/28/grep-online.adoc
index 77363ab..77363ab 100644
--- a/src/content/en/tils/2020/08/28/grep-online.adoc
+++ b/src/content/en/til/2020/08/28/grep-online.adoc
diff --git a/src/content/en/tils/2020/09/04/cli-email-fun-profit.adoc b/src/content/en/til/2020/09/04/cli-email-fun-profit.adoc
index 1da1154..1da1154 100644
--- a/src/content/en/tils/2020/09/04/cli-email-fun-profit.adoc
+++ b/src/content/en/til/2020/09/04/cli-email-fun-profit.adoc
diff --git a/src/content/en/tils/2020/09/05/oldschool-pr.adoc b/src/content/en/til/2020/09/05/oldschool-pr.adoc
index 392ec67..392ec67 100644
--- a/src/content/en/tils/2020/09/05/oldschool-pr.adoc
+++ b/src/content/en/til/2020/09/05/oldschool-pr.adoc
diff --git a/src/content/en/tils/2020/10/11/search-git-history.adoc b/src/content/en/til/2020/10/11/search-git-history.adoc
index 696368c..696368c 100644
--- a/src/content/en/tils/2020/10/11/search-git-history.adoc
+++ b/src/content/en/til/2020/10/11/search-git-history.adoc
diff --git a/src/content/en/tils/2020/11/08/find-broken-symlink.adoc b/src/content/en/til/2020/11/08/find-broken-symlink.adoc
index 624d24a..624d24a 100644
--- a/src/content/en/tils/2020/11/08/find-broken-symlink.adoc
+++ b/src/content/en/til/2020/11/08/find-broken-symlink.adoc
diff --git a/src/content/en/tils/2020/11/12/diy-nix-bash-ci.adoc b/src/content/en/til/2020/11/12/diy-nix-bash-ci.adoc
index 97ace30..97ace30 100644
--- a/src/content/en/tils/2020/11/12/diy-nix-bash-ci.adoc
+++ b/src/content/en/til/2020/11/12/diy-nix-bash-ci.adoc
diff --git a/src/content/en/tils/2020/11/12/git-bisect-automation.adoc b/src/content/en/til/2020/11/12/git-bisect-automation.adoc
index dff8737..dff8737 100644
--- a/src/content/en/tils/2020/11/12/git-bisect-automation.adoc
+++ b/src/content/en/til/2020/11/12/git-bisect-automation.adoc
diff --git a/src/content/en/tils/2020/11/12/useful-bashvars.adoc b/src/content/en/til/2020/11/12/useful-bashvars.adoc
index fb148fb..fb148fb 100644
--- a/src/content/en/tils/2020/11/12/useful-bashvars.adoc
+++ b/src/content/en/til/2020/11/12/useful-bashvars.adoc
diff --git a/src/content/en/tils/2020/11/14/gpodder-media.adoc b/src/content/en/til/2020/11/14/gpodder-media.adoc
index f722f35..f722f35 100644
--- a/src/content/en/tils/2020/11/14/gpodder-media.adoc
+++ b/src/content/en/til/2020/11/14/gpodder-media.adoc
diff --git a/src/content/en/tils/2020/11/30/git-notes-ci.adoc b/src/content/en/til/2020/11/30/git-notes-ci.adoc
index 48a996b..48a996b 100644
--- a/src/content/en/tils/2020/11/30/git-notes-ci.adoc
+++ b/src/content/en/til/2020/11/30/git-notes-ci.adoc
diff --git a/src/content/en/tils/2020/12/15/shellcheck-repo.adoc b/src/content/en/til/2020/12/15/shellcheck-repo.adoc
index 387e793..387e793 100644
--- a/src/content/en/tils/2020/12/15/shellcheck-repo.adoc
+++ b/src/content/en/til/2020/12/15/shellcheck-repo.adoc
diff --git a/src/content/en/tils/2020/12/29/svg.adoc b/src/content/en/til/2020/12/29/svg.adoc
index e0e75a5..e0e75a5 100644
--- a/src/content/en/tils/2020/12/29/svg.adoc
+++ b/src/content/en/til/2020/12/29/svg.adoc
diff --git a/src/content/en/tils/2021/01/12/curl-awk-emails.adoc b/src/content/en/til/2021/01/12/curl-awk-emails.adoc
index d432da2..d432da2 100644
--- a/src/content/en/tils/2021/01/12/curl-awk-emails.adoc
+++ b/src/content/en/til/2021/01/12/curl-awk-emails.adoc
diff --git a/src/content/en/tils/2021/01/17/posix-shebang.adoc b/src/content/en/til/2021/01/17/posix-shebang.adoc
index 5cf0695..5cf0695 100644
--- a/src/content/en/tils/2021/01/17/posix-shebang.adoc
+++ b/src/content/en/til/2021/01/17/posix-shebang.adoc
diff --git a/src/content/en/tils/2021/04/24/cl-generic-precedence.adoc b/src/content/en/til/2021/04/24/cl-generic-precedence.adoc
index 541afb0..541afb0 100644
--- a/src/content/en/tils/2021/04/24/cl-generic-precedence.adoc
+++ b/src/content/en/til/2021/04/24/cl-generic-precedence.adoc
diff --git a/src/content/en/tils/2021/04/24/clojure-autocurry.adoc b/src/content/en/til/2021/04/24/clojure-autocurry.adoc
index a2c2835..a2c2835 100644
--- a/src/content/en/tils/2021/04/24/clojure-autocurry.adoc
+++ b/src/content/en/til/2021/04/24/clojure-autocurry.adoc
diff --git a/src/content/en/tils/2021/04/24/scm-nif.adoc b/src/content/en/til/2021/04/24/scm-nif.adoc
index 2ea8a6f..2ea8a6f 100644
--- a/src/content/en/tils/2021/04/24/scm-nif.adoc
+++ b/src/content/en/til/2021/04/24/scm-nif.adoc
diff --git a/src/content/en/tils/2021/07/23/git-tls-gpg.adoc b/src/content/en/til/2021/07/23/git-tls-gpg.adoc
index f198c2b..f198c2b 100644
--- a/src/content/en/tils/2021/07/23/git-tls-gpg.adoc
+++ b/src/content/en/til/2021/07/23/git-tls-gpg.adoc
diff --git a/src/content/en/tils/2021/08/11/js-bigint-reviver.adoc b/src/content/en/til/2021/08/11/js-bigint-reviver.adoc
index 98ee79b..98ee79b 100644
--- a/src/content/en/tils/2021/08/11/js-bigint-reviver.adoc
+++ b/src/content/en/til/2021/08/11/js-bigint-reviver.adoc
diff --git a/src/content/en/tils/categories.adoc b/src/content/en/til/categories.adoc
index f29acda..f29acda 100644
--- a/src/content/en/tils/categories.adoc
+++ b/src/content/en/til/categories.adoc
diff --git a/src/content/en/tils/index.adoc b/src/content/en/til/index.adoc
index 7e85335..7e85335 100644
--- a/src/content/en/tils/index.adoc
+++ b/src/content/en/til/index.adoc
diff --git a/src/symlinks.txt b/src/symlinks.txt
index 28320db..ebd28aa 100644
--- a/src/symlinks.txt
+++ b/src/symlinks.txt
@@ -10,7 +10,7 @@ feed.xml	en/blog/feed.xml
 rss.xml	en/blog/feed.xml
 feed.atom	en/blog/feed.xml
 feed.en.atom	en/blog/feed.xml
-feed.til.en.atom	en/tils/feed.xml
+feed.til.en.atom	en/til/feed.xml
 
 # Some I think existed, and where the logs show a few hundred missing hits
 images/atom.svg	img/atom.svg
@@ -23,7 +23,7 @@ index.html	en/index.html
 security.txt	.well-known/security.txt
 
 # Current published pages
-static/attachments/autoqemu.tar.gz	en/screencasts/2021/02/07/autoqemu.tar.gz
+static/attachments/autoqemu.tar.gz	en/screencast/2021/02/07/autoqemu.tar.gz
 static/attachments/cargo2nix-demo.tar.gz	en/blog/2020/10/05/cargo2nix-demo.tar.gz
 static/attachments/cargo2nix.tar.gz	en/blog/2020/10/05/cargo2nix.tar.gz
 static/attachments/fallible.tar.gz	en/blog/2021/02/17/fallible.tar.gz
@@ -37,38 +37,38 @@ static/lord-favicon.ico	favicon.ico
 static/lord-favicon.png	favicon.png
 static/lord-favicon.svg	img/favicon.svg
 
-resources/podcasts/2020-12-19-a-test-entry.flac	en/podcasts/2020/12/19/test-entry.flac
-resources/podcasts/2020-12-19-a-test-entry.flac.torrent	en/podcasts/2020/12/19/test-entry.flac.torrent
-resources/podcasts/2020-12-19-a-test-entry.ogg	en/podcasts/2020/12/19/test-entry.ogg
-resources/screencasts/2021-02-07-autoqemu-automate-installation-and-ssh-setup-of-iso-os-images.webm	en/screencasts/2021/02/07/autoqemu.webm
-resources/screencasts/2021-02-07-autoqemu-automate-installation-and-ssh-setup-of-iso-os-images.webm.torrent	en/screencasts/2021/02/07/autoqemu.webm.torrent
+resources/podcasts/2020-12-19-a-test-entry.flac	en/podcast/2020/12/19/test-entry.flac
+resources/podcasts/2020-12-19-a-test-entry.flac.torrent	en/podcast/2020/12/19/test-entry.flac.torrent
+resources/podcasts/2020-12-19-a-test-entry.ogg	en/podcast/2020/12/19/test-entry.ogg
+resources/screencasts/2021-02-07-autoqemu-automate-installation-and-ssh-setup-of-iso-os-images.webm	en/screencast/2021/02/07/autoqemu.webm
+resources/screencasts/2021-02-07-autoqemu-automate-installation-and-ssh-setup-of-iso-os-images.webm.torrent	en/screencast/2021/02/07/autoqemu.webm.torrent
 
 
-til.html	en/tils/index.html
-podcast.en.html	en/podcasts/index.html
-screencasts.en.html	en/screencasts/index.html
-pastebins.en.html	en/pastebins/index.html
+til.html	en/til/index.html
+podcast.en.html	en/podcast/index.html
+screencasts.en.html	en/screencast/index.html
+pastebins.en.html	en/pastebin/index.html
 about.html	en/about.html
 articles-by-category.html	en/blog/categories.html
-til-by-category.html	en/tils/categories.html
-podcast-episodes-by-category.html	en/podcasts/categories.html
-screencasts-by-category.html	en/screencasts/categories.html
-pastebins-by-category.html	en/pastebins/categories.html
+til-by-category.html	en/til/categories.html
+podcast-episodes-by-category.html	en/podcast/categories.html
+screencasts-by-category.html	en/screencast/categories.html
+pastebins-by-category.html	en/pastebin/categories.html
 
 feed.articles.en.atom	en/blog/feed.xml
 feed.blog.en.atom	en/blog/feed.xml
 feed.posts.en.atom	en/blog/feed.xml
-feed.tils.en.atom	en/tils/feed.xml
-feed.podcasts.en.atom	en/podcasts/feed.xml
-feed.screencasts.en.atom	en/screencasts/feed.xml
-feed.pastebins.en.atom	en/pastebins/feed.xml
+feed.tils.en.atom	en/til/feed.xml
+feed.podcasts.en.atom	en/podcast/feed.xml
+feed.screencasts.en.atom	en/screencast/feed.xml
+feed.pastebins.en.atom	en/pastebin/feed.xml
 
 feed.articles-by-category.en.article-review.atom	en/blog/feed.article-review.xml
 feed.articles-by-category.en.mediator.atom	en/blog/feed.mediator.xml
 feed.articles-by-category.en.presentation.atom	en/blog/feed.presentation.xml
 feed.articles-by-category.en.video-review.atom	en/blog/feed.video-review.xml
-feed.pastebins-by-category.en.guix.atom	en/pastebins/feed.guix.xml
-feed.pastebins-by-category.en.nix.atom	en/pastebins/feed.nix.xml
-feed.tils-by-category.en.ci.atom	en/tils/feed.ci.xml
-feed.tils-by-category.en.git.atom	en/tils/feed.git.xml
-feed.tils-by-category.en.shell.atom	en/tils/feed.shell.xml
+feed.pastebins-by-category.en.guix.atom	en/pastebin/feed.guix.xml
+feed.pastebins-by-category.en.nix.atom	en/pastebin/feed.nix.xml
+feed.tils-by-category.en.ci.atom	en/til/feed.ci.xml
+feed.tils-by-category.en.git.atom	en/til/feed.git.xml
+feed.tils-by-category.en.shell.atom	en/til/feed.shell.xml