« get me outta code hell

use new directory suffix fields most places - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
path: root/album
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2024-11-03 13:15:41 -0400
committer(quasar) nebula <qznebula@protonmail.com>2024-11-19 17:19:09 -0400
commit45b1e0234ab70d2a30dd56b926caa0fabce63a1c (patch)
tree13cb72b81f072d272d0442489742778da04784e3 /album
parentb9b621d47cf5eb3527a132380bc83a988b1a3933 (diff)
use new directory suffix fields most places
Reviewed basically the entire wiki, except CaNMT.
Diffstat (limited to 'album')
-rw-r--r--album/10-percent-of-my-strength.yaml3
-rw-r--r--album/a-memory-finds-its-name.yaml12
-rw-r--r--album/a-nameless-inheritance.yaml32
-rw-r--r--album/a-shade-of-blue.yaml2
-rw-r--r--album/a-viral-medium-vol-1.yaml4
-rw-r--r--album/act-8-volume-1.yaml7
-rw-r--r--album/ad-astra.yaml5
-rw-r--r--album/album-of-stories-and-imagination.yaml2
-rw-r--r--album/alternate-hues-and-melodies.yaml1
-rw-r--r--album/alternian-misadventures-volume-1.yaml14
-rw-r--r--album/ancestral.yaml25
-rw-r--r--album/anew-again.yaml3
-rw-r--r--album/anthology-i.yaml20
-rw-r--r--album/archive.yaml7
-rw-r--r--album/are-you-lost.yaml2
-rw-r--r--album/aspect-clock.yaml10
-rw-r--r--album/autumn-every-day.yaml3
-rw-r--r--album/ava-original-soundtrack.yaml1
-rw-r--r--album/basement-tale.yaml4
-rw-r--r--album/beforus.yaml16
-rw-r--r--album/beforusbound.yaml6
-rw-r--r--album/between-sky-and-sea.yaml8
-rw-r--r--album/bittersweet.yaml9
-rw-r--r--album/brostuck.yaml1
-rw-r--r--album/catch-322.yaml4
-rw-r--r--album/class-act-b-side.yaml15
-rw-r--r--album/class-act.yaml2
-rw-r--r--album/coastal-dreaming.yaml6
-rw-r--r--album/coffee-with-zebruh-codakk.yaml2
-rw-r--r--album/coloUrs-and-mayhem-universe-a.yaml7
-rw-r--r--album/coloUrs-and-mayhem-universe-b.yaml7
-rw-r--r--album/compass-original-soundtrack.yaml13
-rw-r--r--album/compass.yaml6
-rw-r--r--album/cookiefonsters-2016-famitracker-covers.yaml37
-rw-r--r--album/corporate-holiday-hits.yaml5
-rw-r--r--album/cosmic-caretakers.yaml17
-rw-r--r--album/crossmound-vol-1.yaml6
-rw-r--r--album/cyber-city-sound-pak.yaml3
-rw-r--r--album/dare.yaml8
-rw-r--r--album/dead-maams-chest.yaml2
-rw-r--r--album/dead-shufflers-anything-goes.yaml10
-rw-r--r--album/deltarune-ch1-ost.yaml19
-rw-r--r--album/deltarune-ch2-ost.yaml5
-rw-r--r--album/descent-into-madness.yaml5
-rw-r--r--album/desynced-vol-1.yaml15
-rw-r--r--album/desynced-vol-2.yaml11
-rw-r--r--album/diverging-delicacies.yaml4
-rw-r--r--album/dont-read-a-webcomic-called-homestuck.yaml6
-rw-r--r--album/dreamers-diarchy.yaml4
-rw-r--r--album/dwellers-empty-path-ost.yaml5
-rw-r--r--album/early-access.yaml9
-rw-r--r--album/earthbound-halloween-hack.yaml14
-rw-r--r--album/election-season.yaml10
-rw-r--r--album/electric-daydreams.yaml2
-rw-r--r--album/empyreal-rhapsody.yaml4
-rw-r--r--album/entertaining-sound.yaml8
-rw-r--r--album/escaped-chasm.yaml6
-rw-r--r--album/exceptis-excipiendis.yaml3
-rw-r--r--album/exile.yaml10
-rw-r--r--album/face-of-oglogoth-cover-lp.yaml11
-rw-r--r--album/faces-of-oglogoth.yaml3
-rw-r--r--album/farewell-to-all-the-fish.yaml22
-rw-r--r--album/faux-dramatica.yaml6
-rw-r--r--album/fnf-colors-and-mayhem-vol-1.yaml19
-rw-r--r--album/freeroam-volume-1.yaml7
-rw-r--r--album/freeroam-volume-2.yaml3
-rw-r--r--album/friendsim-2-volume-1.yaml17
-rw-r--r--album/friendsymphony.yaml8
-rw-r--r--album/from-beta-to-alpha.yaml3
-rw-r--r--album/gba-pokemon-unbound-super-music-collection.yaml62
-rw-r--r--album/genesis-genocide.yaml2
-rw-r--r--album/glitchstuck-volume-1.yaml9
-rw-r--r--album/gotta-hatch-em-all.yaml4
-rw-r--r--album/gravity-makes-the-flame-rise.yaml6
-rw-r--r--album/grim-chain-of-feast.yaml4
-rw-r--r--album/guidestuck-volume-one.yaml10
-rw-r--r--album/heaven-sent.yaml2
-rw-r--r--album/heinoustuck-vol-1.yaml17
-rw-r--r--album/homestuck-anniversary-act-6.yaml1
-rw-r--r--album/homestuck-anniversary-excl-act-6.yaml2
-rw-r--r--album/homestuck-swagazaki.yaml2
-rw-r--r--album/homestuck-vol-1-4.yaml44
-rw-r--r--album/homestuck-vol-4.yaml3
-rw-r--r--album/homestuck-vol-5.yaml5
-rw-r--r--album/homestuck-vol-6.yaml3
-rw-r--r--album/homestuck-vol-8.yaml5
-rw-r--r--album/hush.yaml10
-rw-r--r--album/hypertonic-dreams.yaml8
-rw-r--r--album/i-am-writing-myself-a-dream-in-a-letter.yaml3
-rw-r--r--album/i-miss-you-earthbound-2012.yaml3
-rw-r--r--album/induction.yaml19
-rw-r--r--album/inhospitable-delisted.yaml5
-rw-r--r--album/intense-symphonic-metal-covers-vol-16.yaml49
-rw-r--r--album/ithaca.yaml4
-rw-r--r--album/jade-tower.yaml2
-rw-r--r--album/jailbreak-vol-1.yaml15
-rw-r--r--album/james-roach-collection.yaml23
-rw-r--r--album/jugglanoids-from-outer-space.yaml3
-rw-r--r--album/labyrinths-heart.yaml12
-rw-r--r--album/land-of-hue-and-duels-trollside.yaml15
-rw-r--r--album/little-town-hero-original-soundtrack.yaml7
-rw-r--r--album/lofam.yaml12
-rw-r--r--album/lofam2.yaml26
-rw-r--r--album/lofam3.yaml25
-rw-r--r--album/lofam4.yaml76
-rw-r--r--album/lofam5.yaml53
-rw-r--r--album/lofam5a2.yaml48
-rw-r--r--album/loftlocked-vol-1.yaml11
-rw-r--r--album/look-on-my-works-ye-mighty-and-despair.yaml6
-rw-r--r--album/made-up-yume-nikkis.yaml6
-rw-r--r--album/magnum-opus.yaml8
-rw-r--r--album/medium.yaml4
-rw-r--r--album/midnight-crew-drawing-dead.yaml4
-rw-r--r--album/moons-of-theseus.yaml4
-rw-r--r--album/music-team-archive-16-21.yaml35
-rw-r--r--album/namco-high-official-soundtrack.yaml3
-rw-r--r--album/nibiru.yaml9
-rw-r--r--album/nice-wizards-electronic-extravaganza.yaml7
-rw-r--r--album/noirscape.yaml4
-rw-r--r--album/nuclears-explosion-1.yaml13
-rw-r--r--album/oceanfables-ray-of-light.yaml11
-rw-r--r--album/oceanfalls-vol-1.yaml15
-rw-r--r--album/oceanfalls-vol-2.yaml7
-rw-r--r--album/oceanfalls-vol-3.yaml5
-rw-r--r--album/oceanfalls-vol-five.yaml3
-rw-r--r--album/on-the-rox.yaml8
-rw-r--r--album/p-s.yaml8
-rw-r--r--album/pale-rain.yaml1
-rw-r--r--album/pantheon.yaml15
-rw-r--r--album/paths.yaml17
-rw-r--r--album/perfectly-generic-album.yaml5
-rw-r--r--album/perils-of-probability.yaml5
-rw-r--r--album/pesterquest-soundtrack.yaml25
-rw-r--r--album/play-the-rain.yaml2
-rw-r--r--album/pokemon-scarlet-violet-super-music-collection.yaml52
-rw-r--r--album/pokemon-sword-shield-super-music-collection.yaml45
-rw-r--r--album/portalstuck-vol-1.yaml7
-rw-r--r--album/project-s-ost-vol-1.yaml3
-rw-r--r--album/psycholonials-ep-2.yaml3
-rw-r--r--album/psycholonials-ep-4.yaml5
-rw-r--r--album/psycholonials-ep-9.yaml2
-rw-r--r--album/psycholonials.yaml39
-rw-r--r--album/qualia.yaml16
-rw-r--r--album/rappets-davekat-collection.yaml3
-rw-r--r--album/redditstuck-vol-1.yaml17
-rw-r--r--album/redditstuck-vol-2.yaml11
-rw-r--r--album/redditstuck-vol-3.yaml9
-rw-r--r--album/repiton.yaml17
-rw-r--r--album/reprise.yaml2
-rw-r--r--album/retcon-2018.yaml12
-rw-r--r--album/riddle-of-dixy-path-of-mind-ost.yaml14
-rw-r--r--album/rose-of-winter.yaml16
-rw-r--r--album/rowing.yaml10
-rw-r--r--album/s-collide.yaml3
-rw-r--r--album/s-press-play.yaml3
-rw-r--r--album/sbahj-the-album.yaml2
-rw-r--r--album/sburb-funkin-edition-ost.yaml5
-rw-r--r--album/sburb-ost.yaml8
-rw-r--r--album/sburban-neighborhood.yaml2
-rw-r--r--album/sburbmon-ost.yaml7
-rw-r--r--album/seven-seas.yaml2
-rw-r--r--album/shortcuts.yaml3
-rw-r--r--album/skaian-synthesis.yaml16
-rw-r--r--album/skaias-the-limit.yaml13
-rw-r--r--album/slender-the-arrival-soundtrack.yaml25
-rw-r--r--album/solar-sessions.yaml3
-rw-r--r--album/some-other-horizon.yaml6
-rw-r--r--album/somnium-remastered.yaml14
-rw-r--r--album/songs-for-doomed-timelines.yaml8
-rw-r--r--album/songs-for-sad-trolls.yaml6
-rw-r--r--album/songs-from-the-planet-earth.yaml11
-rw-r--r--album/songs-of-rivervale.yaml3
-rw-r--r--album/songs-unsung.yaml1
-rw-r--r--album/soul-of-sovereignty-prelude-ost.yaml11
-rw-r--r--album/spelunky-classic.yaml11
-rw-r--r--album/spiritwake.yaml4
-rw-r--r--album/stlap.yaml21
-rw-r--r--album/stlap2.yaml25
-rw-r--r--album/stlap3.yaml24
-rw-r--r--album/strife-2.yaml2
-rw-r--r--album/stuckhome-syndrome-part-one-v1.yaml71
-rw-r--r--album/sunday-night-strifin-act-1-plus-2-ost.yaml21
-rw-r--r--album/super-smash-bros-ultimate.yaml227
-rw-r--r--album/svert-ost-volume-one.yaml5
-rw-r--r--album/symphony-impossible-to-play.yaml7
-rw-r--r--album/synthetica.yaml5
-rw-r--r--album/team-paradox.yaml6
-rw-r--r--album/the-changing-light.yaml2
-rw-r--r--album/the-consuming-shadow-ost.yaml23
-rw-r--r--album/the-funk-mclovin-homestuck-experience.yaml2
-rw-r--r--album/the-green-box-set-1.yaml4
-rw-r--r--album/the-nobles.yaml10
-rw-r--r--album/the-planets.yaml22
-rw-r--r--album/the-rebornening.yaml2
-rw-r--r--album/the-sky-beyond-our-bay.yaml4
-rw-r--r--album/the-sky-is-ours.yaml10
-rw-r--r--album/the-strider-mixtape.yaml6
-rw-r--r--album/the-vriska-mixt8pe.yaml7
-rw-r--r--album/theres-no-place-like-home.yaml6
-rw-r--r--album/time-and-tide.yaml17
-rw-r--r--album/triassic-slump.yaml2
-rw-r--r--album/troleplanet.yaml2
-rw-r--r--album/tumblrstuck-bent-ost-volume-0.yaml1
-rw-r--r--album/tumblrstuck-bent-ost-volume-1.yaml1
-rw-r--r--album/tumblrstuck-bent-ost-volume-2.yaml4
-rw-r--r--album/ulterior-motives.yaml14
-rw-r--r--album/unbeatable-demo-tapes.yaml4
-rw-r--r--album/unbound-battle-selection-original-soundtrack.yaml52
-rw-r--r--album/unbound-day-selection-original-soundtrack.yaml53
-rw-r--r--album/undertale-soundtrack.yaml31
-rw-r--r--album/unknown-diva.yaml3
-rw-r--r--album/us.yaml2
-rw-r--r--album/vast-error-vol-1-3.yaml55
213 files changed, 1171 insertions, 1458 deletions
diff --git a/album/10-percent-of-my-strength.yaml b/album/10-percent-of-my-strength.yaml
index 753ac3cc..601f3ba4 100644
--- a/album/10-percent-of-my-strength.yaml
+++ b/album/10-percent-of-my-strength.yaml
@@ -1,5 +1,4 @@
 Album: 10% of my Strength
-Directory: 10-percent-of-my-strength
 Date: March 29, 2013
 Date Added: April 13, 2024
 URLs:
@@ -47,7 +46,7 @@ Commentary: |-
     I don't think I need to say what I'm sampling at the end
 ---
 Track: Diamonds
-Directory: diamonds-10-percent-of-my-strength
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:09'
 Art Tags:
diff --git a/album/a-memory-finds-its-name.yaml b/album/a-memory-finds-its-name.yaml
index 6c85ee67..5f1b57c3 100644
--- a/album/a-memory-finds-its-name.yaml
+++ b/album/a-memory-finds-its-name.yaml
@@ -425,7 +425,7 @@ Commentary: |-
     The lyrics are based on an old short story I wrote at around the same time, about a windchime left behind in a house that has long been abandoned. Even back then, I adored that tone of hopeful melancholy that you see in a lot of my work.
 ---
 Track: Oceanic Flight
-Directory: oceanic-flight-a-memory-finds-its-name
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:56'
 Referenced Tracks:
@@ -488,7 +488,7 @@ Commentary: |-
     This was, hands down, one of the hardest songs I’ve ever produced, taking almost a year of fiddling, and then more ahead of this release. Little wonder: it’s the biggest track on this album too, in terms of instruments and length.
 ---
 Track: You Are You
-Directory: you-are-you-a-memory-finds-its-name
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:04'
 Referenced Tracks:
@@ -577,7 +577,7 @@ Commentary: |-
     In some strange way, my position is reversed now. I feel more like the person speaking the words of the song than the person it is addressed to, and I adjusted the lyrics to match (and also to match my new lyrical style).
 ---
 Track: The Banner I Unfurl
-Directory: the-banner-i-unfurl-a-memory-finds-its-name
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:22'
 Referenced Tracks:
@@ -643,7 +643,7 @@ Commentary: |-
     I tried to emulate that sense of building in this version of the track, but you can [play the game](https://circlejourney.net/in-between/) to get the full experience.
 ---
 Track: Memorialisation
-Directory: memorialisation-a-memory-finds-its-name
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:41'
 Referenced Tracks:
@@ -821,7 +821,7 @@ Referenced Tracks:
 - From a Windchime
 ---
 Track: Oceanic Flight (Instrumental)
-Directory: oceanic-flight-instrumental-a-memory-finds-its-name
+Suffix Directory: true
 Duration: '4:58'
 Referenced Tracks:
 - track:oceanic-flight-a-memory-finds-its-name
@@ -832,7 +832,7 @@ Referenced Tracks:
 - track:you-are-you-a-memory-finds-its-name
 ---
 Track: The Banner I Unfurl (Instrumental)
-Directory: the-banner-i-unfurl-instrumental-a-memory-finds-its-name
+Suffix Directory: true
 Duration: '1:24'
 Referenced Tracks:
 - track:the-banner-i-unfurl-a-memory-finds-its-name
diff --git a/album/a-nameless-inheritance.yaml b/album/a-nameless-inheritance.yaml
index 11120855..476343ac 100644
--- a/album/a-nameless-inheritance.yaml
+++ b/album/a-nameless-inheritance.yaml
@@ -21,7 +21,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Legacy
-Directory: legacy-a-nameless-inheritance
+Suffix Directory: true
 Duration: '1:44'
 URLs:
 - https://parsecproductions.bandcamp.com/track/legacy
@@ -32,42 +32,42 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/eerie-wind
 ---
 Track: Exploratory
-Directory: exploratory-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:30'
 URLs:
 - https://parsecproductions.bandcamp.com/track/exploratory
 ---
 Track: Execute
-Directory: execute-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:14'
 URLs:
 - https://parsecproductions.bandcamp.com/track/execute
 ---
 Track: Abandoned
-Directory: abandoned-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:00'
 URLs:
 - https://parsecproductions.bandcamp.com/track/abandoned
 ---
 Track: Enclosure
-Directory: enclosure-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:24'
 URLs:
 - https://parsecproductions.bandcamp.com/track/enclosure
 ---
 Track: Heart Attack
-Directory: heart-attack-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:12'
 URLs:
 - https://parsecproductions.bandcamp.com/track/heart-attack
 ---
 Track: Horrify
-Directory: horrify-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:20'
 URLs:
@@ -79,21 +79,21 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/exauguration
 ---
 Track: Exterminate
-Directory: exterminate-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:12'
 URLs:
 - https://parsecproductions.bandcamp.com/track/exterminate
 ---
 Track: Outbreak
-Directory: outbreak-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://parsecproductions.bandcamp.com/track/outbreak
 ---
 Track: Lurk
-Directory: lurk-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:32'
 URLs:
@@ -105,28 +105,28 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/delurk
 ---
 Track: Terrify
-Directory: terrify-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:20'
 URLs:
 - https://parsecproductions.bandcamp.com/track/terrify
 ---
 Track: Undisturbed
-Directory: undisturbed-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:30'
 URLs:
 - https://parsecproductions.bandcamp.com/track/undisturbed
 ---
 Track: Ritual
-Directory: ritual-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:31'
 URLs:
 - https://parsecproductions.bandcamp.com/track/ritual
 ---
 Track: Doomed
-Directory: doomed-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:49'
 URLs:
@@ -147,7 +147,7 @@ Referenced Tracks:
 - track:legacy-a-nameless-inheritance
 ---
 Track: Heritage
-Directory: heritage-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:27'
 URLs:
@@ -158,6 +158,6 @@ Referenced Tracks:
 Section: Bonus tracks
 ---
 Track: Bequest
-Directory: bequest-a-nameless-inheritance
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:28'
diff --git a/album/a-shade-of-blue.yaml b/album/a-shade-of-blue.yaml
index 53005884..cf2e2eb8 100644
--- a/album/a-shade-of-blue.yaml
+++ b/album/a-shade-of-blue.yaml
@@ -71,7 +71,7 @@ Art Tags:
 - Earth
 ---
 Track: Ignite
-Directory: ignite-a-shade-of-blue
+Suffix Directory: true
 Cover Art File Extension: jpg
 Duration: '2:07'
 URLs:
diff --git a/album/a-viral-medium-vol-1.yaml b/album/a-viral-medium-vol-1.yaml
index 782e1963..fc22d416 100644
--- a/album/a-viral-medium-vol-1.yaml
+++ b/album/a-viral-medium-vol-1.yaml
@@ -1,5 +1,5 @@
 Album: A Viral Medium Vol.1
-Directory: a-viral-medium-vol-1
+Directory Suffix: a-viral-medium
 Artists:
 - Maggot
 Date: July 27, 2019
@@ -53,7 +53,7 @@ URLs:
 - https://soundcloud.com/aviralmedium/4-saturday-morning
 ---
 Track: News
-Directory: news-a-viral-medium
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:52'
 URLs:
diff --git a/album/act-8-volume-1.yaml b/album/act-8-volume-1.yaml
index 29708f63..fc17588d 100644
--- a/album/act-8-volume-1.yaml
+++ b/album/act-8-volume-1.yaml
@@ -1,4 +1,5 @@
 Album: Act 8 Volume 1
+Directory Suffix: act-8
 Date: September 9, 2016
 Date Added: April 13, 2023
 URLs:
@@ -68,7 +69,7 @@ Art Tags:
 - Dream Bubbles
 ---
 Track: Penumbra Phantasm
-Directory: penumbra-phantasm-act-8
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - dbnet18
@@ -86,7 +87,7 @@ Referenced Tracks:
 - Penumbra Phantasm
 ---
 Track: Earthbound
-Directory: earthbound-act-8
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - DoomedCloud
@@ -162,7 +163,7 @@ Art Tags:
 Section: Bonus tracks
 ---
 Track: Medic
-Directory: medic-act-8
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - dbnet18
diff --git a/album/ad-astra.yaml b/album/ad-astra.yaml
index c2a13eab..15d4a6c1 100644
--- a/album/ad-astra.yaml
+++ b/album/ad-astra.yaml
@@ -1,5 +1,4 @@
 Album: Ad Astra
-Directory: ad-astra
 Artists:
 - Ducky Senpai
 Date: April 9, 2016
@@ -41,7 +40,7 @@ Commentary: |-
     If you liked The Planets, I'm sure you'll <i>really</i> like Ad Astra.
 ---
 Track: Stargazer
-Directory: stargazer-ad-astra
+Suffix Directory: true
 Additional Names:
 - StarGazer (name in artwork)
 Duration: 1:24
@@ -50,7 +49,7 @@ URLs:
 - https://soundcloud.com/sloof/stargazer
 ---
 Track: Tempest
-Directory: tempest-ad-astra
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 5:12
 Color: '#666fe9'
diff --git a/album/album-of-stories-and-imagination.yaml b/album/album-of-stories-and-imagination.yaml
index 381e950d..ac624891 100644
--- a/album/album-of-stories-and-imagination.yaml
+++ b/album/album-of-stories-and-imagination.yaml
@@ -156,7 +156,7 @@ Commentary: |-
     creepy dangerous song!
 ---
 Track: Trapped
-Directory: trapped-album-of-stories-and-imagination
+Suffix Directory: true
 Always Reference By Directory: true
 Date First Released: October 18, 2023
 Duration: '02:20'
diff --git a/album/alternate-hues-and-melodies.yaml b/album/alternate-hues-and-melodies.yaml
index a052109a..38c8ae86 100644
--- a/album/alternate-hues-and-melodies.yaml
+++ b/album/alternate-hues-and-melodies.yaml
@@ -1,5 +1,4 @@
 Album: Alternate Hues and Melodies
-Directory: alternate-hues-and-melodies
 Date: June 12, 2018
 Date Added: April 13, 2024
 URLs:
diff --git a/album/alternian-misadventures-volume-1.yaml b/album/alternian-misadventures-volume-1.yaml
index fcc17ce9..48ec8b15 100644
--- a/album/alternian-misadventures-volume-1.yaml
+++ b/album/alternian-misadventures-volume-1.yaml
@@ -1,5 +1,5 @@
 Album: Alternian Misadventures! Volume.1
-Directory: alternian-misadventures-volume-1
+Directory Suffix: alternian-misadventures
 Date: August 4, 2020
 Date Added: June 12, 2024
 Artists:
@@ -30,7 +30,7 @@ Commentary: |-
     [[artist:nektannn|Nektannn]] to AM team
 ---
 Track: Apathy
-Directory: apathy-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:49'
 URLs:
@@ -50,7 +50,7 @@ Commentary: |-
     Carline Sullen Theme
 ---
 Track: Timekeeper
-Directory: timekeeper-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:17'
 Referenced Tracks:
@@ -72,7 +72,7 @@ Commentary: |-
     Alex Shatter Theme
 ---
 Track: idk...
-Directory: idk-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:47'
 URLs:
@@ -83,7 +83,7 @@ Commentary: |-
     Tim Leere Theme
 ---
 Track: Omen
-Directory: omen-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:20'
 URLs:
@@ -112,7 +112,7 @@ Commentary: |-
     Andrew Cervisto Theme
 ---
 Track: Deliverance
-Directory: deliverance-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:23'
 URLs:
@@ -123,7 +123,7 @@ Commentary: |-
     Jack Vacker Theme
 ---
 Track: En Garde!
-Directory: en-garde-alternian-misadventures
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:35'
 URLs:
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index ff64a0a6..c439e0f2 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -1,5 +1,4 @@
 Album: Ancestral
-Directory: ancestral
 Date: August 27, 2017
 Date Added: June 12, 2020
 URLs:
@@ -59,7 +58,8 @@ Additional Files:
 Section: Disc 1
 ---
 Track: Disc One
-Directory: disc1-ancestral
+Directory: disc1
+Suffix Directory: true
 Artists:
 - Corona Sanctus
 Duration: 0:29
@@ -345,7 +345,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: Disc Two
-Directory: disc2-ancestral
+Directory: disc2
+Suffix Directory: true
 Artists:
 - Corona Sanctus
 Duration: 0:32
@@ -466,7 +467,7 @@ Commentary: |-
     Capturing such a profound moment proved to be somewhat challenging, balancing struggle, triumph, and condescension all in one piece. The process of creating such a proud and arrogant face of victory washed over by the shadows of an unforeseeable future was very fun, eagerly claiming the crown for her own, for better of or for worse.
 ---
 Track: Rampage
-Directory: rampage-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Mathias Ramalho
@@ -542,7 +543,7 @@ Commentary: |-
     The Dolorosa makes the fateful decision to abandon the mother grub and care for the mutant anomaly, the Signless, setting into motion events far beyond her understanding, ones that will have far reaching consequences, even beyond her own timeline. The music begins as the ramifications of her decision quickly begin to unfold, following not just her efforst to keep the Signless safe on the surface, but the broader implications that her choice set in motion. The gears begin to turn...
 ---
 Track: Protector
-Directory: protector-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Sean William Calhoun
@@ -751,7 +752,8 @@ Commentary: |-
     This song marks the end of the Signless' life, encapsulating what would have been his last thoughts and words. I wanted to portray the sort of emptiness that happens after he has gotten his wish, and show the mark he leaves even in death.
 ---
 Track: E%ile
-Directory: exile-ancestral
+Directory: exile
+Suffix Directory: true
 Additional Names:
 - Exile (quirk-free)
 Artists:
@@ -775,7 +777,7 @@ Commentary: |-
     This made me think of Darkleer's life in general so here he is, standing proud and doing his job, and then his slouched form bemoaning his existence after being banished.
 ---
 Track: Legacy
-Directory: legacy-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - aeolianChemist
@@ -1127,7 +1129,7 @@ Commentary: |-
     The track made me feel like she was doing her time travel thing and wreckin crud, so here she is in some important part of history screwing everything up, getting ready to cull you if necessary 8]
 ---
 Track: Mutiny
-Directory: mutiny-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Zan Beaver
@@ -1366,7 +1368,8 @@ Commentary: |-
 Section: Disc 3
 ---
 Track: Disc Three
-Directory: disc3-ancestral
+Directory: disc3
+Suffix Directory: true
 Artists:
 - Corona Sanctus
 Duration: 0:30
@@ -1566,7 +1569,7 @@ Commentary: |-
     I decided to focus on Darkleer struggling to reconcile his weakness towards two known criminals and how their influence forces him to question his loyalty to the Empress, as well as his role in enforcing her hemocaste system.
 ---
 Track: Leftovers
-Directory: leftovers-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - psithurist
@@ -1613,7 +1616,7 @@ Commentary: |-
     The only time Pyralspite and Redglare are shown together in-comic they're busy raining hellfire on Mindfang's fleet, so I wanted to create a more intimate moment to showcase their relationship. A monstrous and powerful, but loving, dragon mother surrounds and protects her cocky, talented daughter with a dangerous passion for justice. I wanted it to look a bit like an aged photograph, like an old, warm memory, which is something the harpsichord made me think of. As we know, Pyralspite outlived Redglare by quite a lot.
 ---
 Track: Preach
-Directory: preach-ancestral
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Seijen
diff --git a/album/anew-again.yaml b/album/anew-again.yaml
index fcd6cd2c..13725884 100644
--- a/album/anew-again.yaml
+++ b/album/anew-again.yaml
@@ -26,7 +26,8 @@ Commentary: |-
     "Beginning"
 ---
 Track: Decree
-Directory: decree-anew-again
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '2:58'
 URLs:
 - https://jamiepaige.bandcamp.com/track/decree
diff --git a/album/anthology-i.yaml b/album/anthology-i.yaml
index 486a1154..31aeb553 100644
--- a/album/anthology-i.yaml
+++ b/album/anthology-i.yaml
@@ -60,7 +60,8 @@ URLs:
 - https://desynced.bandcamp.com/track/forevers-plaything
 ---
 Track: Surrural
-Directory: surrural-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 3:44
 Artists:
 - SpilledCereals
@@ -78,7 +79,8 @@ URLs:
 - https://desynced.bandcamp.com/track/surrural
 ---
 Track: Serendipity
-Directory: serendipity-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 2:47
 Artists:
 - Spad3s
@@ -170,7 +172,8 @@ URLs:
 - https://desynced.bandcamp.com/track/disc-2-gods-country
 ---
 Track: Battalion
-Directory: battalion-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 2:16
 Artists:
 - Rainy
@@ -196,7 +199,8 @@ URLs:
 - https://desynced.bandcamp.com/track/out-of-reach
 ---
 Track: Haven
-Directory: haven-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 3:42
 Artists:
 - Levc
@@ -238,7 +242,8 @@ URLs:
 Section: Disc 3
 ---
 Track: Gravitas
-Directory: gravitas-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Additional Names:
 - Name: >-
     [Disc 3] ~ Gravitas
@@ -308,7 +313,8 @@ URLs:
 Section: Disc 4
 ---
 Track: Haymaker
-Directory: haymaker-anthology-i
+Suffix Directory: true
+Always Reference By Directory: true
 Additional Names:
 - Name: >-
     [Disc 4] ~ Haymaker
@@ -355,7 +361,7 @@ URLs:
 - https://desynced.bandcamp.com/track/angelic-beauty
 ---
 Track: Emergency Broadcast
-Directory: emergency-broadcast-anthology-i
+Suffix Directory: true
 Duration: 3:54
 Artists:
 - Rainy
diff --git a/album/archive.yaml b/album/archive.yaml
index b6ea6c17..cbff5e6f 100644
--- a/album/archive.yaml
+++ b/album/archive.yaml
@@ -1,5 +1,4 @@
 Album: Archive
-Directory: archive
 Artists:
 - Michael Guy Bowman
 Date: July 19, 2016
@@ -431,7 +430,7 @@ Commentary: |-
     Commission for Cari Garafalo, 2013
 ---
 Track: Aba Daba Honeymoon
-Directory: aba-daba-honeymoon-archive
+Suffix Directory: true
 Duration: 1:27
 URLs:
 - https://bowman.bandcamp.com/track/aba-daba-honeymoon
@@ -899,7 +898,7 @@ Commentary: |-
     Request is as follows: "Something kinda romantic or nostalgic, about stargazing with a sweetheart?"
 ---
 Track: Far Away
-Directory: far-away-archive
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:53
 URLs:
@@ -966,7 +965,7 @@ Commentary: |-
     Request: "I have no preference as far as topic, but something in 6/8 time would be awesome."
 ---
 Track: Bandages
-Directory: bandages-archive
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:46
 URLs:
diff --git a/album/are-you-lost.yaml b/album/are-you-lost.yaml
index f353e014..334252bc 100644
--- a/album/are-you-lost.yaml
+++ b/album/are-you-lost.yaml
@@ -78,7 +78,7 @@ Referenced Tracks:
 - Quiet Autumn
 ---
 Track: MEDIUM
-Directory: medium-are-you-lost
+Suffix Directory: true
 Duration: '6:22'
 Artists:
 - hywell
diff --git a/album/aspect-clock.yaml b/album/aspect-clock.yaml
index fe2908c1..79cf6edf 100644
--- a/album/aspect-clock.yaml
+++ b/album/aspect-clock.yaml
@@ -58,7 +58,7 @@ Referenced Tracks:
 - Penumbra Phantasm
 ---
 Track: Caretakers
-Directory: caretakers-aspect-clock
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:15'
 URLs:
@@ -94,7 +94,8 @@ Referenced Tracks:
 - Austin, Atlantis
 ---
 Track: Ringleader
-Directory: ringleader-aspect-clock
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '02:16'
 URLs:
 - https://actomega.bandcamp.com/track/ringleader
@@ -103,7 +104,8 @@ Referenced Tracks:
 - The Carnival
 ---
 Track: Intermission
-Directory: intermission-aspect-clock
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '02:03'
 URLs:
 - https://actomega.bandcamp.com/track/intermission
@@ -170,7 +172,7 @@ Referenced Tracks:
 - A Taste for Adventure
 ---
 Track: Penumbra Phantasm
-Directory: penumbra-phantasm-aspect-clock
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:13'
 URLs:
diff --git a/album/autumn-every-day.yaml b/album/autumn-every-day.yaml
index 0dab0dc2..583c7460 100644
--- a/album/autumn-every-day.yaml
+++ b/album/autumn-every-day.yaml
@@ -397,7 +397,6 @@ Commentary: |-
     Special thanks to [[artist:marcy-nabors|Marcy Nabors]] ily
 ---
 Track: Amélie
-Directory: amelie
 Duration: '1:35'
 URLs:
 - https://jamiepaige.bandcamp.com/track/am-lie
@@ -543,7 +542,7 @@ Lyrics: |-
     You say the words that I can't say
 ---
 Track: Pass
-Directory: pass-autumn-every-day
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Jamie Paige
diff --git a/album/ava-original-soundtrack.yaml b/album/ava-original-soundtrack.yaml
index 84810607..097779c9 100644
--- a/album/ava-original-soundtrack.yaml
+++ b/album/ava-original-soundtrack.yaml
@@ -1,5 +1,4 @@
 Album: Ava - Original Soundtrack
-Directory: ava-original-soundtrack
 Artists:
 - tempest2k
 Date: December 31, 2017
diff --git a/album/basement-tale.yaml b/album/basement-tale.yaml
index afbf0cbb..92d0887c 100644
--- a/album/basement-tale.yaml
+++ b/album/basement-tale.yaml
@@ -24,7 +24,7 @@ Commentary: |-
     ([Community listening stream w/ chat](https://www.youtube.com/watch?v=UbUTs-9XMC4&t=385))
 ---
 Track: In the Beginning
-Directory: in-the-beginning-basement-tale
+Suffix Directory: true
 Additional Names:
 - Proto-CONTACT (alternative name)
 Cover Artists:
@@ -88,7 +88,7 @@ Commentary: |-
     Very loosely based on Undertale's [[track:anticipation]]
 ---
 Track: Fragments
-Directory: fragments-basement-tale
+Suffix Directory: true
 Always Reference By Directory: true
 Cover Artists:
 - artist:avocado-canmt
diff --git a/album/beforus.yaml b/album/beforus.yaml
index d1a097d5..6f29bbb3 100644
--- a/album/beforus.yaml
+++ b/album/beforus.yaml
@@ -1,5 +1,4 @@
 Album: Beforus
-Directory: beforus
 Date: April 12, 2016
 Date Added: May 25, 2020
 URLs:
@@ -52,7 +51,8 @@ Additional Files:
 Section: Disc 1
 ---
 Track: ♪ Disc 1 ♪
-Directory: disc1-beforus
+Directory: disc1
+Suffix Directory: true
 Artists:
 - Blackhole
 Duration: 0:30
@@ -424,7 +424,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: ♫ Disc 2 ♫
-Directory: disc2-beforus
+Directory: disc2
+Suffix Directory: true
 Artists:
 - Blackhole
 Duration: 0:30
@@ -1135,7 +1136,7 @@ Commentary: |-
     I wanted to really capture Damara's pre-snap personality here. She's got orange cloth over her eyes, representing how she feels she's been blind regarding what Rufioh has been up to. Meenah's hand is holding onto her throat, yet Damara remains oddly tranquil. SHe's fighting to work through all of this no matter how much it hurts. But in the end, she can only hold on so much for so long. And that's when the expression is less peaceful, more internally dead.
 ---
 Track: Timeout
-Directory: timeout-beforus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - psithurist
@@ -1238,7 +1239,7 @@ Commentary: |-
     I was really happy wit hthis song from when I first put on this song and heard the slow, ominous opening. I think it really captures the sense of dread and mystery that surrounds the Scratch. Though the song has a three-part structure, visually I wanted to focus on the event itself. We only briefly see this in the comic, and it's a very striking scene. It was a lot of fun to draw the gigantic music box at the center of everything, and the various lighting effects were an interesting challenge.
 ---
 Track: Voided
-Directory: voided-beforus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Cyclostome
@@ -1636,7 +1637,8 @@ Commentary: |-
 Section: Disc 3
 ---
 Track: ♬ Disc 3 ♬
-Directory: disc3-beforus
+Directory: disc3
+Suffix Directory: true
 Artists:
 - Blackhole
 Duration: 0:30
@@ -1742,7 +1744,7 @@ Commentary: |-
     As MariEater wrote in their track commentary, the song "Tree Dwellers" was meant to be fun, simple, and silly. So for the track art I wanted to show an everyday scene in the village of the Lost Weeaboos; tree houses, trolls dressed up in cosplay, and of course fisticuffs.
 ---
 Track: Puppeteer
-Directory: puppeteer-beforus
+Suffix Directory: true
 Artists:
 - thesketchqueen
 Duration: '3:55'
diff --git a/album/beforusbound.yaml b/album/beforusbound.yaml
index 7ec530c0..19cb860e 100644
--- a/album/beforusbound.yaml
+++ b/album/beforusbound.yaml
@@ -570,7 +570,8 @@ Commentary: |-
     I'm really into the complexity of this song, the theremin like sound is extremely atmospheric and with the seemingly perfect amount of reverb (which i thought wasn't humanly possible) on each instrument and the funky ass chords while maintaining relatively simple drums. Overall i love this cat sound less cat song and i will be listening to it many times.
 ---
 Track: Reboot
-Directory: reboot-beforusbound
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 2:54
 Artists:
 - Pascal van den Bos
@@ -809,7 +810,8 @@ Commentary: |-
     *(Continued in [[track:victory-beforusbound]])*
 ---
 Track: Victory!
-Directory: victory-beforusbound
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 0:09
 Artists:
 - Pascal van den Bos
diff --git a/album/between-sky-and-sea.yaml b/album/between-sky-and-sea.yaml
index b5207fb5..c4466212 100644
--- a/album/between-sky-and-sea.yaml
+++ b/album/between-sky-and-sea.yaml
@@ -36,7 +36,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/like-flying
 ---
 Track: Fuchsia Moonrise
-Directory: fuchsia-moonrise-between-sky-and-sea
+Suffix Directory: true
 Always Reference By Directory: true
 Originally Released As: Fuchsia Moonrise
 Duration: '03:56'
@@ -66,7 +66,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/the-journey
 ---
 Track: Nostalgia
-Directory: nostalgia-between-sky-and-sea
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:34'
 URLs:
@@ -97,7 +97,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/marin
 ---
 Track: Solitaire
-Directory: solitaire-between-sky-and-sea
+Suffix Directory: true
 Always Reference By Directory: true
 Referenced Tracks:
 - The Horizon
@@ -118,7 +118,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/nocturna
 ---
 Track: Goodbye
-Directory: goodbye-between-sky-and-sea
+Suffix Directory: true
 Always Reference By Directory: true
 Referenced Tracks:
 - Like Flying
diff --git a/album/bittersweet.yaml b/album/bittersweet.yaml
index 23abf92a..7083b2a9 100644
--- a/album/bittersweet.yaml
+++ b/album/bittersweet.yaml
@@ -492,7 +492,7 @@ Lyrics: |-
     So I dance in-between with the pyre to forge my blade
 ---
 Track: Ally
-Directory: ally-bittersweet
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - GUMI English
@@ -564,7 +564,7 @@ Lyrics: |-
     You're my ally-alli, I'm so free to take you with me
 ---
 Track: Ballroom
-Directory: ballroom-bittersweet
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Marcy Nabors
@@ -727,7 +727,7 @@ Lyrics: |-
     (And all I want is to stay with you)
 ---
 Track: Close
-Directory: close-bittersweet
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Bluffy
@@ -822,7 +822,8 @@ Lyrics: |-
 Section: Bonus tracks
 ---
 Track: Fiction
-Directory: fiction-bittersweet
+Suffix Directory: true
+Always Reference By Directory: true
 Contributors:
 - GUMI English
 Duration: '1:39'
diff --git a/album/brostuck.yaml b/album/brostuck.yaml
index 7d9edab5..38467333 100644
--- a/album/brostuck.yaml
+++ b/album/brostuck.yaml
@@ -1,5 +1,4 @@
 Album: Brostuck
-Directory: brostuck
 Date: November 9, 2012
 Date Added: April 13, 2024
 URLs:
diff --git a/album/catch-322.yaml b/album/catch-322.yaml
index b9fae473..95965aa3 100644
--- a/album/catch-322.yaml
+++ b/album/catch-322.yaml
@@ -241,7 +241,7 @@ URLs:
 ---
 Track: Courage
 Duration: '4:42'
-Directory: courage-catch-322
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Grace Medley
@@ -289,7 +289,7 @@ URLs:
 Section: Download-only tracks
 ---
 Track: 'Dí̵sţ̵o҉r̡t͠i҉͟ò͞ǹ͠'
-Directory: distortion-catch-322
+Suffix Directory: true
 Originally Released As: track:distortion-vast-error
 Duration: '0:02'
 URLs:
diff --git a/album/class-act-b-side.yaml b/album/class-act-b-side.yaml
index b2cb4197..6eaabeb8 100644
--- a/album/class-act-b-side.yaml
+++ b/album/class-act-b-side.yaml
@@ -1,4 +1,5 @@
 Album: CLASS ACT (B Side)
+Directory Suffix: funk-mclovin
 Always Reference Tracks By Directory: true
 Artists:
 - Funk McLovin
@@ -26,7 +27,7 @@ Commentary: |-
     An album full of covers! Enjoy this one for free. Original artists and video links are included per track!
 ---
 Track: Accept My Shaft
-Directory: accept-my-shaft-funk-mclovin
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Accept My Shaft [Song A Day 2020 Day 32]
@@ -50,7 +51,7 @@ Commentary: |-
     Original song by NINJA SEX PARTY: [youtube.com/watch?v=nxvz325stqw](https://www.youtube.com/watch?v=nxvz325stqw)
 ---
 Track: Get It On
-Directory: get-it-on-funk-mclovin
+Suffix Directory: true
 Additional Names:
 - Name: >-
     GET IT ON [Song a Day 2020 Day 36]
@@ -72,7 +73,7 @@ Commentary: |-
     This one's an old favorite. Enjoy.
 ---
 Track: LAWNMOWER
-Directory: lawnmower-funk-mclovin
+Suffix Directory: true
 Duration: '2:06'
 URLs:
 - https://funkmclovin.bandcamp.com/track/lawnmower
@@ -114,7 +115,7 @@ Commentary: |-
     Song-a-day 234
 ---
 Track: Hey Baby
-Directory: hey-baby-funk-mclovin
+Suffix Directory: true
 Additional Names:
 - Name: >-
     "Hey Baby" AKA That Stand Cheer From Pep Band [Song A Day 2020 Day 46]
@@ -132,7 +133,7 @@ Commentary: |-
     Originally by Bruce Chanel
 ---
 Track: Fever
-Directory: fever-funk-mclovin
+Suffix Directory: true
 Additional Names:
 - Name: >-
     FEVER 🎶🌡 [Song a Day 2020 Day 66]
@@ -168,7 +169,7 @@ Commentary: |-
     Song a Day Day 55
 ---
 Track: Teenagers
-Directory: teenagers-funk-mclovin
+Suffix Directory: true
 Additional Names:
 - Name: >-
     TEENAGERS - Jazz Cover
@@ -192,7 +193,7 @@ Commentary: |-
     Song-a-day 189
 ---
 Track: Rainbow Connection
-Directory: rainbow-connection-funk-mclovin
+Suffix Directory: true
 Duration: '2:51'
 URLs:
 - https://funkmclovin.bandcamp.com/track/rainbow-connection
diff --git a/album/class-act.yaml b/album/class-act.yaml
index 872ee81c..c81e8079 100644
--- a/album/class-act.yaml
+++ b/album/class-act.yaml
@@ -87,7 +87,7 @@ Commentary: |-
     The linked Wordpress blog has gone offline, but Davi [reposted](https://medium.com/@davidecandia/the-devil-was-beautiful-a-poem-edb1bc961fb9) this poem to Medium, too.
 ---
 Track: Away
-Directory: away-class-act
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/coastal-dreaming.yaml b/album/coastal-dreaming.yaml
index dc07fef9..a9404497 100644
--- a/album/coastal-dreaming.yaml
+++ b/album/coastal-dreaming.yaml
@@ -39,7 +39,7 @@ Commentary: |-
     Originally planned to have lyrics, but scrapped the idea. A self-empowerment type deal.
 ---
 Track: Adventure
-Directory: adventure-coastal-dreaming
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:53'
 URLs:
@@ -57,7 +57,7 @@ Commentary: |-
     Sailing a small boat along the coast.
 ---
 Track: Voyage
-Directory: voyage-coastal-dreaming
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:10'
 URLs:
@@ -114,7 +114,7 @@ Commentary: |-
     Misty ruins in a pastoral landscape
 ---
 Track: Glory
-Directory: glory-coastal-dreaming
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:08'
 URLs:
diff --git a/album/coffee-with-zebruh-codakk.yaml b/album/coffee-with-zebruh-codakk.yaml
index 55821837..967e23fe 100644
--- a/album/coffee-with-zebruh-codakk.yaml
+++ b/album/coffee-with-zebruh-codakk.yaml
@@ -36,7 +36,7 @@ Lyrics: |-
     Zebruh: You know? And- and, you know, I'm not really in for myself, you know, I'm in it for  <i>t h e   l a d i e s</i>
 ---
 Track: Friendzone
-Directory: friendzone-cofee-with-zebruh-codakk
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:02'
 URLs:
diff --git a/album/coloUrs-and-mayhem-universe-a.yaml b/album/coloUrs-and-mayhem-universe-a.yaml
index 4726e863..e20613e4 100644
--- a/album/coloUrs-and-mayhem-universe-a.yaml
+++ b/album/coloUrs-and-mayhem-universe-a.yaml
@@ -1,5 +1,6 @@
 Album: 'coloUrs and mayhem: Universe A'
 Directory: coloUrs-and-mayhem-universe-a
+Directory Suffix: universe-a
 Date: April 2, 2012
 Date Added: November 15, 2019
 URLs:
@@ -136,7 +137,7 @@ Commentary: |-
 Section: Side 1
 ---
 Track: ~~SIDE 1~~
-Directory: side-1-universe-a
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:09
@@ -549,7 +550,7 @@ Commentary: |-
 Section: Side 2
 ---
 Track: ~~SIDE 2~~
-Directory: side-2-universe-a
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:10
@@ -850,7 +851,7 @@ Art Tags:
 Section: Additional Mayhem
 ---
 Track: ~~ADDITIONAL MAYHEM~~
-Directory: additional-mayhem-universe-a
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:17
diff --git a/album/coloUrs-and-mayhem-universe-b.yaml b/album/coloUrs-and-mayhem-universe-b.yaml
index 6d5cec71..7b4f50cc 100644
--- a/album/coloUrs-and-mayhem-universe-b.yaml
+++ b/album/coloUrs-and-mayhem-universe-b.yaml
@@ -1,5 +1,6 @@
 Album: 'coloUrs and mayhem: Universe B'
 Directory: coloUrs-and-mayhem-universe-b
+Directory Suffix: universe-b
 Date: April 13, 2012
 Date Added: November 15, 2019
 URLs:
@@ -93,7 +94,7 @@ Commentary: |-
 Section: Side 1
 ---
 Track: ~~SIDE 1~~
-Directory: side-1-universe-b
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:08
@@ -254,7 +255,7 @@ Commentary: |-
 Section: Side 2
 ---
 Track: ~~SIDE 2~~
-Directory: side-2-universe-b
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:13
@@ -420,7 +421,7 @@ Commentary: |-
 Section: Additional Mayhem
 ---
 Track: ~~ADDITIONAL MAYHEM~~
-Directory: additional-mayhem-universe-b
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:18
diff --git a/album/compass-original-soundtrack.yaml b/album/compass-original-soundtrack.yaml
index 49c08ba4..930be86f 100644
--- a/album/compass-original-soundtrack.yaml
+++ b/album/compass-original-soundtrack.yaml
@@ -1,4 +1,5 @@
 Album: 'Compass: Original Soundtrack'
+Directory Suffix: compass-ost
 Artists:
 - Circlejourney
 Date: June 17, 2020
@@ -21,7 +22,7 @@ Commentary: |-
     Original soundtrack for Compass, an interactive comic about two travellers sailing to the edge of the world. Finally complete after 4 years, read Compass at:  [compass.circlejourney.net](https://compass.circlejourney.net)  !
 ---
 Track: Compass
-Directory: compass-compass-ost
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:15'
 Referenced Tracks:
@@ -38,7 +39,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/memory-of-the-sea
 ---
 Track: Solitaire
-Directory: solitaire-compass-ost
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:33'
 Referenced Tracks:
@@ -57,7 +58,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/setting-off
 ---
 Track: Harbours
-Directory: harbours-compass
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:52'
 Referenced Tracks:
@@ -81,7 +82,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/fontana
 ---
 Track: Marin
-Directory: marin-compass-ost
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:56'
 Referenced Tracks:
@@ -90,7 +91,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/marin-2
 ---
 Track: Stargazing
-Directory: stargazing-compass
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:46'
 Referenced Tracks:
@@ -113,7 +114,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/circumnavigation
 ---
 Track: The Horizon
-Directory: the-horizon-compass-ost
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:39'
 Referenced Tracks:
diff --git a/album/compass.yaml b/album/compass.yaml
index 770efd4e..c5a8b215 100644
--- a/album/compass.yaml
+++ b/album/compass.yaml
@@ -18,7 +18,7 @@ Commentary: |-
     This is the compilation of my MIDI compositions, featuring everything from when I began using soundfonts (2008) to last December (2012).
 ---
 Track: Dreamt
-Directory: dreamt-compass
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:13'
 Cover Artists:
@@ -102,7 +102,7 @@ Commentary: |-
     Written for the NEA Songwriting Challenge 2011.
 ---
 Track: Sky
-Directory: sky-compass
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:02'
 URLs:
@@ -134,7 +134,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/from-a-windchime-to-its-long-lost-owner
 ---
 Track: LT
-Directory: lt-compass
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:39'
 URLs:
diff --git a/album/cookiefonsters-2016-famitracker-covers.yaml b/album/cookiefonsters-2016-famitracker-covers.yaml
index 6e892e26..51b0229e 100644
--- a/album/cookiefonsters-2016-famitracker-covers.yaml
+++ b/album/cookiefonsters-2016-famitracker-covers.yaml
@@ -1,5 +1,6 @@
 Album: Cookiefonster's 2016 Famitracker Covers (mostly Homestuck)
 Directory: cookiefonsters-2016-famitracker-covers
+Directory Suffix: famitracker
 Date: January 1, 2017
 Date Added: April 13, 2024
 URLs:
@@ -35,7 +36,7 @@ Commentary: |-
     All of the track art for this album has been taken from the YouTube uploads of the tracks.
 ---
 Track: Let's All Rock the Heist
-Directory: lets-all-rock-the-heist-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:13'
 URLs:
@@ -53,7 +54,7 @@ Commentary: |-
     Here's an 8-bit remix of [[track:lets-all-rock-the-heist|a Homestuck song]]. Unlike my previous 8-bit covers, this one was made using Famitracker, which many consider to be a more legitimate way to make 8-bit music than stuff like GXSCC.
 ---
 Track: Another Jungle
-Directory: another-jungle-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:35'
 URLs:
@@ -75,7 +76,7 @@ Commentary: |-
     I've remade this cover five years after the initial upload. Link to the new version: [(YouTube link)](https://youtu.be/1Ym2UGBJ02Q)
 ---
 Track: Sburban Countdown
-Directory: sburban-countdown-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '0:38'
@@ -85,7 +86,7 @@ Referenced Tracks:
 - Sburban Countdown
 ---
 Track: Oppa Toby Style
-Directory: oppa-toby-style-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Roxy
@@ -109,7 +110,7 @@ Commentary: |-
     An 8-bit cover of [[Oppa Toby Style]], one of the four songs used in the Homestuck animation [[flash:8087|[S] Collide]], made using Famitracker. I'm very proud of this one, even looking back a year and a half later, and I'm happy it got as popular as it did.
 ---
 Track: Mutiny
-Directory: mutiny-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Becquerel
@@ -129,7 +130,7 @@ Commentary: |-
     If you didn't know, [[Mutiny]] is a removed Homestuck song made by Bill Bolin, who quit the music team after songs of his were used without permission. Even though it was removed it's still easy to find online and it's a nice song regardless.
 ---
 Track: BL1ND JUST1C3
-Directory: bl1nd-just1c3-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Terexi
@@ -153,7 +154,7 @@ Commentary: |-
     In retrospect, over a year after uploading this video (and almost two years after making the cover), it's still one of my favorite covers I've made. I can't believe I didn't upload it here right after I made it.
 ---
 Track: Umbral Ultimatum
-Directory: umbral-ultimatum-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Jade
@@ -179,7 +180,7 @@ Commentary: |-
     2019 REMASTERED VERSION OF THIS COVER: [(YouTube link)](https://www.youtube.com/watch?v=NX2GKdiDh2M)
 ---
 Track: Futurama - Full Theme Song
-Directory: futurama-full-theme-song-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '4:52'
@@ -200,7 +201,7 @@ Commentary: |-
     I'm also really happy that the show itself has an 8-bit rendition of itself so I don't have to make more shitty MS Paint art.
 ---
 Track: Ascend
-Directory: ascend-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '6:08'
@@ -210,7 +211,7 @@ Referenced Tracks:
 - Ascend (Famitracker 8-Bit Cover)
 ---
 Track: 25x SHOWDOWN COMBO
-Directory: 25x-showdown-combo-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:08'
 URLs:
@@ -228,7 +229,7 @@ Commentary: |-
     An 8-bit cover of [[track:25x-showdown-combo|a song]] from Cool and New Webcomic Volume 1, a satirical music album by fans of Homestuck with some legitimately good songs; this song is one of them. I am contributing to the [[album:cool-and-new-volume-ii|second]] [[album:cool-and-new-volume-2|album]], which as of the publication of this video will be released in five days.
 ---
 Track: Walk-Stab-Walk
-Directory: walk-stab-walk-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Jack Noir
@@ -248,7 +249,7 @@ Commentary: |-
     To be honest [[track:walk-stab-walk-r-and-e|this song]] is already largely 8-bit but I don't care, it's a good song and I wanted to cover it regardless.
 ---
 Track: 'Jungle #3'
-Directory: jungle-3-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '4:00'
@@ -258,7 +259,7 @@ Referenced Tracks:
 - track:jungle-3
 ---
 Track: Psychedelic Psychodelic
-Directory: psychedelic-psychodelic-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Art Tags:
 - Jack Noir
@@ -281,7 +282,7 @@ Commentary: |-
     Also happy 11/11.
 ---
 Track: Patient
-Directory: patient-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '0:56'
@@ -291,7 +292,7 @@ Referenced Tracks:
 - Patient
 ---
 Track: At the Price of Oblivion
-Directory: at-the-price-of-oblivion-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:13'
 URLs:
@@ -309,7 +310,7 @@ Commentary: |-
     I accidentally made the thumbnail for this video look like a death metal album, ah well. This is still one of the best covers I've done in my opinion. It even has slightly less audio artifacts than usual!
 ---
 Track: Snow Halation
-Directory: snow-halation-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:07'
 URLs:
@@ -339,7 +340,7 @@ Commentary: |-
     Seven years later, I remade this cover: [(YouTube link)](https://youtu.be/GqMf49wvYaU)
 ---
 Track: Ruins
-Directory: ruins-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '1:24'
@@ -350,7 +351,7 @@ Referenced Tracks:
 - track:ruins-undertale
 ---
 Track: Alphys
-Directory: alphys-famitracker
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '1:24'
diff --git a/album/corporate-holiday-hits.yaml b/album/corporate-holiday-hits.yaml
index 7860dede..1b0cb3f7 100644
--- a/album/corporate-holiday-hits.yaml
+++ b/album/corporate-holiday-hits.yaml
@@ -1,4 +1,5 @@
 Album: Corporate Holiday Hits
+Directory Suffix: vast-error
 Date: December 25, 2020
 Date Added: October 25, 2023
 URLs:
@@ -14,7 +15,7 @@ Groups:
 - Fandom
 ---
 Track: Eve
-Directory: eve-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kohauro
@@ -170,7 +171,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/corporate-holiday-hits?track=recall-a-winter-long-past
 ---
 Track: Dawn
-Directory: dawn-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kohauro
diff --git a/album/cosmic-caretakers.yaml b/album/cosmic-caretakers.yaml
index 79cc218c..bbe72337 100644
--- a/album/cosmic-caretakers.yaml
+++ b/album/cosmic-caretakers.yaml
@@ -70,7 +70,8 @@ Additional Files:
 Section: Disc 1
 ---
 Track: Disc 1
-Directory: disc1-cosmic-caretakers
+Directory: disc1
+Suffix Directory: true
 Artists:
 - psithurist
 Duration: '1:06'
@@ -86,7 +87,7 @@ Commentary: |-
     this was done pretty quick, its a simple concept that didnt take much doing. the thing i like most is probably the scratch lightning, ive been drawing a lot of lightning recently.
 ---
 Track: Egbert's Kitchen
-Directory: egberts-kitchen-cosmic-caretakers
+Suffix Directory: true
 Originally Released As: track:egberts-kitchen
 Duration: '3:01'
 URLs:
@@ -406,7 +407,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: Disc 2
-Directory: disc2-cosmic-caretakers
+Directory: disc2
+Suffix Directory: true
 Artists:
 - psithurist
 Duration: 0:53
@@ -497,7 +499,7 @@ Commentary: |-
     Polypolyphemus is an intense track, so it's fitting for its art to capture the same intensity. Sollux's Biclops is captured right before its imminent demise as the troll's Mind Honey-induced flip out rips through the ceiling of his hive and surrounds the lusus in a multi-colored beam of energy. The meteors illuminating the night sky further illustrate the carnage present in the scene in a fashion that pops up time and time again in Homestuck proper. If only one of those meteors could break the chain around the Biclops' leg and set it free! Wait, the resulting impact would probably just kill the Biclops anyway. Never mind, that was a stupid idea.
 ---
 Track: Rangoon
-Directory: rangoon-cosmic-caretakers
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
@@ -732,7 +734,7 @@ Commentary: |-
     \*The sound of a camera flash can be audibly heard over the music.\* Yep. That one's going in my Pietà compilation. But really, is there a more appropriate parallel to make? Probably not. The parable of the Sufferer is full of religious iconography by design, which I guess means that Earth based the Bible off of it, and not the other way around? I don't know. I'll leave that commentary for Hussie, when he (doesn't) get around to it. As a side note, I love the "halos" surrounding the Dolorosa and the Sufferer here. Good stuff.
 ---
 Track: The Puppet Master
-Directory: the-puppet-master-cosmic-caretakers
+Suffix Directory: true
 Artists:
 - SplitSuns
 Duration: '4:10'
@@ -761,7 +763,8 @@ Commentary: |-
 Section: Disc 3
 ---
 Track: Disc 3
-Directory: disc3-cosmic-caretakers
+Directory: disc3
+Suffix Directory: true
 Artists:
 - psithurist
 Duration: 0:27
@@ -802,7 +805,7 @@ Commentary: |-
     It's hard being a single mom when you are a teenage boy. At least Caliborn is sitting still for once.
 ---
 Track: Singularity
-Directory: singularity-cosmic-caretakers
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - keyboard cait
diff --git a/album/crossmound-vol-1.yaml b/album/crossmound-vol-1.yaml
index 626bb3fe..420ee143 100644
--- a/album/crossmound-vol-1.yaml
+++ b/album/crossmound-vol-1.yaml
@@ -41,7 +41,7 @@ Art Tags:
 - Tahbbi (Crossmound)
 ---
 Track: Try
-Directory: try-crossmound-vol-1
+Suffix Directory: true
 Duration: '2:29'
 Artists:
 - Levc
@@ -104,7 +104,7 @@ Commentary: |-
     as some final comment, i really wish i could have made some more tracks apart from this one! but even so, it was reeaaaaally fun to do! (i hope i get to make tahbbi's theme on the vol.2) ((let's hope this doesn't age like milk))
 ---
 Track: Roots
-Directory: roots-crossmound-vol-1
+Suffix Directory: true
 Duration: '1:42'
 Artists:
 - METIANULL
@@ -234,7 +234,7 @@ Art Tags:
 - Egoize (Crossmound)
 ---
 Track: Wired
-Directory: wired-crossmound-vol-1
+Suffix Directory: true
 Duration: '2:24'
 Artists:
 - DudeBro231
diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
index e54b832c..c85720b5 100644
--- a/album/cyber-city-sound-pak.yaml
+++ b/album/cyber-city-sound-pak.yaml
@@ -208,7 +208,8 @@ Sampled Tracks:
 - Weird Birds
 ---
 Track: BEFORE THE STORY
-Directory: before-the-story-cyber-city-sound-pak
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '7:48'
 URLs:
 - https://cristata.bandcamp.com/track/before-the-story
diff --git a/album/dare.yaml b/album/dare.yaml
index 9574ad9b..a9e6b33b 100644
--- a/album/dare.yaml
+++ b/album/dare.yaml
@@ -29,6 +29,7 @@ Commentary: |-
 ---
 Track: Wraith (Ludum Dare 28)
 Directory: wraith
+Suffix Directory: true
 Duration: '2:49'
 URLs:
 - https://parsecproductions.bandcamp.com/track/wraith-ludum-dare-28
@@ -38,6 +39,7 @@ Commentary: |-
 ---
 Track: Seed (Ludum Dare 29)
 Directory: seed
+Suffix Directory: true
 Duration: '2:43'
 URLs:
 - https://parsecproductions.bandcamp.com/track/seed-ludum-dare-29
@@ -65,6 +67,7 @@ Commentary: |-
 ---
 Track: Downbeat (Ludum Dare 32)
 Directory: downbeat
+Suffix Directory: true
 Duration: '1:28'
 URLs:
 - https://parsecproductions.bandcamp.com/track/downbeat-ludum-dare-32
@@ -85,6 +88,7 @@ Commentary: |-
 ---
 Track: Nightlight (Ludum Dare 34)
 Directory: nightlight
+Suffix Directory: true
 Duration: '1:52'
 URLs:
 - https://parsecproductions.bandcamp.com/track/nightlight-ludum-dare-34
@@ -143,7 +147,8 @@ Commentary: |-
     For a game about trying to find a charger before your phone battery ran out, I decided to go with a simple chiptune melody for the first part of the search. As your battery gets lower and lower, it eventually starts fading in electric guitar to drive home the seriousness of it. Finally, as the battery is nearly out, strings and percussion are added to drive the tension up to an epically disproportionate level (I mean, it's just a phone running out of battery after all).
 ---
 Track: Final Stand (Ludum Dare 40)
-Directory: final-stand-dare
+Directory: final-stand
+Suffix Directory: true
 Date First Released: June 2, 2018
 Duration: '3:32'
 URLs:
@@ -249,6 +254,7 @@ Commentary: |-
 ---
 Track: Periphery (Ludum Dare 47)
 Directory: periphery
+Suffix Directory: true
 Date First Released: May 14, 2021
 Duration: '2:41'
 URLs:
diff --git a/album/dead-maams-chest.yaml b/album/dead-maams-chest.yaml
index dfc6b6b0..b1da0d7f 100644
--- a/album/dead-maams-chest.yaml
+++ b/album/dead-maams-chest.yaml
@@ -1,5 +1,4 @@
 Album: Dead Ma’am’s Chest
-Directory: dead-maams-chest
 Artists:
 - Houshou Marine
 Date: July 31, 2024
@@ -155,7 +154,6 @@ Lyrics: |-
     他にはもういらないから
 ---
 Track: Dead Ma’am’s Chest(Instrumental)
-Directory: dead-maams-chest-instrumental
 Contributors:
 - Camellia (arrangement)
 - Toby Fox (composition)
diff --git a/album/dead-shufflers-anything-goes.yaml b/album/dead-shufflers-anything-goes.yaml
index 27effe05..b17cc3a3 100644
--- a/album/dead-shufflers-anything-goes.yaml
+++ b/album/dead-shufflers-anything-goes.yaml
@@ -1,4 +1,5 @@
 Album: 'Dead Shufflers: Anything Goes'
+Directory Suffix: vast-error
 Date: May 23, 2020
 Date Added: October 25, 2023
 URLs:
@@ -16,7 +17,7 @@ Groups:
 Section: Main album
 ---
 Track: Overlook
-Directory: overlook-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Cerulean
@@ -28,7 +29,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/dead-shufflers-anything-goes?track=overlook
 ---
 Track: Hound Dog
-Directory: hound-dog-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - sympolite
@@ -172,7 +173,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/dead-shufflers-anything-goes?track=intermission-mimesiswing
 ---
 Track: Dismantled
-Directory: dismantled-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - pragmaticNihilist
@@ -189,7 +190,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/dead-shufflers-anything-goes?track=dismantled
 ---
 Track: Lovecraft
-Directory: lovecraft-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - sympolite
@@ -332,7 +333,6 @@ URLs:
 Section: Bonus tracks
 ---
 Track: DEAR PESKY SHUFFLERS
-Directory: dear-pesky-shufflers
 Additional Names:
 - Name: >-
     BONUS: DEAR PESKY SHUFFLERS
diff --git a/album/deltarune-ch1-ost.yaml b/album/deltarune-ch1-ost.yaml
index f80297ef..30cf6dc1 100644
--- a/album/deltarune-ch1-ost.yaml
+++ b/album/deltarune-ch1-ost.yaml
@@ -1,5 +1,6 @@
 Album: DELTARUNE Chapter 1 OST
 Directory: deltarune-ch1-ost
+Directory Suffix: deltarune
 Artists:
 - Toby Fox
 Date: November 1, 2018
@@ -34,7 +35,7 @@ Referenced Tracks:
 - track:gasters-theme
 ---
 Track: Beginning
-Directory: beginning-deltarune
+Suffix Directory: true
 Duration: 0:57
 URLs:
 - https://tobyfox.bandcamp.com/track/beginning
@@ -45,7 +46,7 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: School
-Directory: school-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:20'
 URLs:
@@ -73,7 +74,7 @@ Referenced Tracks:
 - Nightmare Knight
 ---
 Track: Cliffs
-Directory: cliffs-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:35
 URLs:
@@ -98,7 +99,7 @@ URLs:
 - https://open.spotify.com/track/1ZA8wuVp91YbS1uif1hyYR
 ---
 Track: Lancer
-Directory: lancer-deltarune
+Suffix Directory: true
 Duration: 0:48
 URLs:
 - https://tobyfox.bandcamp.com/track/lancer
@@ -142,7 +143,7 @@ Referenced Tracks:
 - Game Main Theme (Piano Sketch)
 ---
 Track: Fanfare
-Directory: fanfare-deltarune
+Suffix Directory: true
 Duration: 0:15
 URLs:
 - https://tobyfox.bandcamp.com/track/fanfare-from-rose-of-winter
@@ -152,7 +153,7 @@ Sampled Tracks:
 - track:theme-rose-of-winter
 ---
 Track: Lantern
-Directory: lantern-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:08'
 URLs:
@@ -218,7 +219,7 @@ Referenced Tracks:
 - The Chase
 ---
 Track: Basement
-Directory: basement-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:27
 URLs:
@@ -279,7 +280,7 @@ URLs:
 - https://open.spotify.com/track/2ASkgao4Nv7FtY9AjASDNQ
 ---
 Track: Gallery
-Directory: gallery-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:12
 URLs:
@@ -327,7 +328,7 @@ Referenced Tracks:
 - Game Main Theme (Piano Sketch)
 ---
 Track: Friendship
-Directory: friendship-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:40'
 URLs:
diff --git a/album/deltarune-ch2-ost.yaml b/album/deltarune-ch2-ost.yaml
index 8a12a0b0..fc24134d 100644
--- a/album/deltarune-ch2-ost.yaml
+++ b/album/deltarune-ch2-ost.yaml
@@ -1,5 +1,6 @@
 Album: DELTARUNE Chapter 2 OST
 Directory: deltarune-ch2-ost
+Directory Suffix: deltarune
 Artists:
 - Toby Fox
 Date: September 17, 2021
@@ -61,7 +62,7 @@ URLs:
 - https://open.spotify.com/track/2rZU9qk1HWqWrKA7BKOWyy
 ---
 Track: Queen
-Directory: queen-deltarune
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:56
 URLs:
@@ -427,7 +428,7 @@ Referenced Tracks:
 - The Circus
 ---
 Track: sans.
-Directory: sans-deltarune-ch2
+Directory: sans-ch2
 Originally Released As: track:sans
 Duration: 0:50
 URLs:
diff --git a/album/descent-into-madness.yaml b/album/descent-into-madness.yaml
index 9118b952..aac2b026 100644
--- a/album/descent-into-madness.yaml
+++ b/album/descent-into-madness.yaml
@@ -21,8 +21,8 @@ Commentary: |-
     you stop beig dabe ultramegamix just in time 2 be a young gril's albun in the bed room; but you canot be her albun until she has the name. lets's see if it is indeed the ROZE ALBUN by cerulean
 ---
 Track: Intro
+Suffix Directory: true
 Always Reference By Directory: true
-Directory: intro-descent-into-madness
 Cover Artists:
 - Cool and New Web Comic
 Art Tags:
@@ -131,7 +131,8 @@ Referenced Tracks:
 - Terezi's Theme
 ---
 Track: Chill
-Directory: chill-descent-into-madness
+Suffix Directory: true
+Always Reference By Directory: true
 Cover Artists:
 - Cerulean
 Duration: '01:32'
diff --git a/album/desynced-vol-1.yaml b/album/desynced-vol-1.yaml
index 7e6c389a..ff1a09aa 100644
--- a/album/desynced-vol-1.yaml
+++ b/album/desynced-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Desynced Vol. 1
+Directory Suffix: desynced
 Date: February 7, 2020
 Date Added: February 12, 2021
 URLs:
@@ -26,7 +27,7 @@ Groups:
 Section: Main album
 ---
 Track: Sunrise
-Directory: sunrise-desynced
+Suffix Directory: true
 Artists:
 - Pascal van den Bos
 Duration: '3:05'
@@ -178,7 +179,7 @@ Commentary: |-
     <big>Levc: <span style="font-family: Comic Sans MS, cursive">Have a good day!</span></big>
 ---
 Track: Cooldown
-Directory: cooldown-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Rainy
@@ -253,7 +254,7 @@ Commentary: |-
     <center>to end the song,<br>it was necessary to<br>open the door...</center>
 ---
 Track: Eclipse
-Directory: eclipse-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Net
@@ -356,7 +357,7 @@ Referenced Tracks:
 - Liquid Negrocity
 ---
 Track: Daughter
-Directory: daughter-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
@@ -385,7 +386,7 @@ Referenced Tracks:
 - Lunar Dance
 ---
 Track: Lady
-Directory: lady-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Levc
@@ -445,7 +446,7 @@ Commentary: |-
     [[artist:dizzims|Dizzy]] wanted a theme for Kate's Denizen, Gaea, that was a variation of The song [[track:daughter-desynced|"Daughter"]] by PotatoBoss. So I took the opening chords and arranged them into the repeating motif you hear throughout the song. I got the idea from listening to the track [[track:penumbra-phantasm|"Penumbra phantasm"]] and hearing how that track arranged the chords for [[Doctor]].
 ---
 Track: Noir
-Directory: noir-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
@@ -509,7 +510,7 @@ Referenced Tracks:
 - track:alpha-admission
 ---
 Track: Escapade
-Directory: escapade-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
diff --git a/album/desynced-vol-2.yaml b/album/desynced-vol-2.yaml
index 0f1658b3..0f8d1a6e 100644
--- a/album/desynced-vol-2.yaml
+++ b/album/desynced-vol-2.yaml
@@ -1,4 +1,5 @@
 Album: Desynced Vol. 2
+Directory Suffix: desynced
 Date: June 19, 2020
 Date Added: February 12, 2021
 URLs:
@@ -205,7 +206,7 @@ Commentary: |-
     While I'm not the happiest in terms how the instrumentation came together, I'm glad it came together.
 ---
 Track: Egress
-Directory: egress-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Rainy
@@ -234,7 +235,7 @@ Commentary: |-
     I have a lot of mixed feeling towards the track, which is weird since it's the track I'm probably most known for. [[artist:dizzims|Dizzy]] asked me to make the song for the a flash that would become [[flash:evan-exit|[S]Evan: Exit]] very early on into Vol.2 Development. So I tried to make a track that was a multi faceted as something like [[Umbral Ultimatum]]. However, I felt like the track was a bit of a mess in terms of actual composition. it felt like it didn't really come together like I wanted and I was pretty bummed about it. However, when it got used in the flash, I turned my opinion around on it slightly. While it might not be my favorite song I did for vol.2, I do appreciate the experience it gave me.
 ---
 Track: Chat
-Directory: chat-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Levc
@@ -396,7 +397,7 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: PSYCHO
-Directory: psycho-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Levc
@@ -471,7 +472,7 @@ Art Tags:
 - 'cw: blood (abstract)'
 ---
 Track: Puppet Master
-Directory: puppet-master-desynced
+Suffix Directory: true
 Artists:
 - Levc
 Duration: '2:07'
@@ -628,7 +629,7 @@ Referenced Tracks:
 - track:daughter-desynced
 ---
 Track: Arrival
-Directory: arrival-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index afe82863..df8b295d 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -212,7 +212,7 @@ Referenced Tracks:
 - Homestuck Anthem
 ---
 Track: Betrayed
-Directory: betrayed-diverging-delicacies
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Joe Ouellet
@@ -268,7 +268,7 @@ Referenced Tracks:
 - Chorale for Jaspers
 ---
 Track: Come
-Directory: come-diverging-delicacies
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Grace Medley
diff --git a/album/dont-read-a-webcomic-called-homestuck.yaml b/album/dont-read-a-webcomic-called-homestuck.yaml
index 08b9c725..cf3387b1 100644
--- a/album/dont-read-a-webcomic-called-homestuck.yaml
+++ b/album/dont-read-a-webcomic-called-homestuck.yaml
@@ -28,7 +28,7 @@ Referenced Tracks:
 - Ohgodwhat
 ---
 Track: Heir of Grief
-Directory: heir-of-grief-dont-read-a-webcomic-called-homestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:44'
 URLs:
@@ -47,7 +47,7 @@ Referenced Tracks:
 - track:moonsetter
 ---
 Track: CARNE VALE
-Directory: carne-vale-dont-read-a-webcomic-called-homestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:25'
 URLs:
@@ -76,7 +76,7 @@ Referenced Tracks:
 - Oppa Toby Style
 ---
 Track: Umbral Ultimatum
-Directory: umbral-ultimatum-dont-read-a-webcomic-called-homestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:22'
 URLs:
diff --git a/album/dreamers-diarchy.yaml b/album/dreamers-diarchy.yaml
index dca448c4..d1446588 100644
--- a/album/dreamers-diarchy.yaml
+++ b/album/dreamers-diarchy.yaml
@@ -35,7 +35,7 @@ Commentary: |-
     I have had these track drafts sitting on my hard drive as MIDIs since 2017, and I'm pleased that they are finally seeing the light of day. They were originally made for a concept album about celestial bodies in Homestuck, but all the other tracks got released elsewhere, so I'll be releasing the last few in parts.
 ---
 Track: Promenade
-Directory: promenade-dreamers-diarchy
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:52'
 Color: '#ffcc00'
@@ -50,7 +50,7 @@ URLs:
 - https://music.apple.com/album/promenade/1723638785?i=1723638786
 ---
 Track: Dirge
-Directory: dirge-dreamers-diarchy
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:52'
 Cover Artists:
diff --git a/album/dwellers-empty-path-ost.yaml b/album/dwellers-empty-path-ost.yaml
index c3c5c552..bf968046 100644
--- a/album/dwellers-empty-path-ost.yaml
+++ b/album/dwellers-empty-path-ost.yaml
@@ -1,4 +1,5 @@
 Album: Dweller's Empty Path OST
+Directory Suffix: dwellers-empty-path
 Date: July 10, 2020
 Date Added: April 13, 2024
 URLs:
@@ -178,7 +179,7 @@ URLs:
 - https://open.spotify.com/track/6jT977770CDDwwyoxM4wls
 ---
 Track: Underground Path
-Directory: underground-path-dwellers-empty-path
+Suffix Directory: true
 Duration: '02:24'
 Referenced Tracks:
 - Leaves Fill The Path
@@ -266,7 +267,7 @@ URLs:
 - https://open.spotify.com/track/38sxnZHif13WONhbFunvfh
 ---
 Track: Nightmare
-Directory: nightmare-dwellers-empty-path
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:39'
 Artists:
diff --git a/album/early-access.yaml b/album/early-access.yaml
index 73466ae0..1073a062 100644
--- a/album/early-access.yaml
+++ b/album/early-access.yaml
@@ -50,7 +50,7 @@ Commentary: |-
     Originally titled "OMEGA Anniversary Edition"
 ---
 Track: Cog
-Directory: cog-early-access
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Husr
@@ -69,7 +69,7 @@ Commentary: |-
     Concerning Time.
 ---
 Track: Blastoff
-Directory: blastoff-early-access
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - dbnet18
@@ -89,7 +89,7 @@ Commentary: |-
     A track that me and Husr made for Act Omega, but the full version! Special thanks to Husr for composing most of this!
 ---
 Track: Extermination
-Directory: extermination-early-access
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Husr
@@ -126,7 +126,8 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: Torrent (Bonus)
-Directory: torrent-early-access
+Directory: torrent
+Suffix Directory: true
 Artists:
 - Husr
 Duration: '2:13'
diff --git a/album/earthbound-halloween-hack.yaml b/album/earthbound-halloween-hack.yaml
index 6bf541f6..e1367013 100644
--- a/album/earthbound-halloween-hack.yaml
+++ b/album/earthbound-halloween-hack.yaml
@@ -1,5 +1,5 @@
-Album: 'Earthbound Halloween Hack'
-Directory: earthbound-halloween-hack
+Album: Earthbound Halloween Hack
+Directory Suffix: ebhh
 Date: October 31, 2009
 Date Added: October 25, 2023
 URLs:
@@ -69,7 +69,7 @@ Commentary: |-
     I wanted to do this because it would make Twoson fun to walk around in again. It's a little boring to walk around in a place whose music you're already sick of even if you love it. I think even changing the notes a little revitalized the whole spirit of adventure. Along with the new color of Twoson it really reminds me of a very happy, brisk fall day. Even if I only changed a little, I love this song a lottttt. Totally and utterly symbolizes the happy originality of the beginning of the game.
 ---
 Track: Synchronicity
-Directory: synchronicity-ebhh
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:18'
 URLs:
@@ -91,7 +91,7 @@ Commentary: |-
     Originally I had a cool intro going. If you go into Onett at the beginning of the game in Twoson, you can hear it. It's really out of place considering the rest of the game, so I never had the chance to use it, but I think it's a cool little ditty, if a tad repetitive after the repeat. Hey, I never meant for you to hear it that long... actually it's kinda fitting with all the super-death-enemies in there, I think.
 ---
 Track: Game Over
-Directory: game-over-ebhh
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:13'
 URLs:
@@ -115,7 +115,7 @@ Commentary: |-
     This track has no official title.
 ---
 Track: Sewers
-Directory: sewers-ebhh
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:11'
 URLs:
@@ -128,7 +128,7 @@ Commentary: |-
     This track has no official title.
 ---
 Track: Winters
-Directory: winters-ebhh
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '0:45'
 URLs:
@@ -216,7 +216,7 @@ Commentary: |-
     This song is [[track:holding-back-tears|from Final Fantasy Legend III]], right before when you fight the final boss when you're fighting this guy that doesn't want to fight you and you have to kill him. I only copied the first two parts, actually, but there's only like four measures so that's pretty much all of it. I put Buzz-Buzz in the background and it turned out really loud but I don't care. It's supposed to sort of be like... this is sad, and my heart is quaking. Maybe you get it.
 ---
 Track: Megalovania
-Directory: megalovania-ebhh
+Suffix Directory: true
 Duration: '1:51'
 URLs:
 - https://youtu.be/iIowwZThIXM
diff --git a/album/election-season.yaml b/album/election-season.yaml
index df92966d..83c960f8 100644
--- a/album/election-season.yaml
+++ b/album/election-season.yaml
@@ -1,4 +1,5 @@
 Album: Election Season
+Directory Suffix: desynced
 Date: January 10, 2021
 Date Added: February 12, 2021
 URLs:
@@ -134,7 +135,7 @@ Commentary: |-
     So I wrote this song as a sort a more general theme for the Scholars of Skaia. I've personally found the gods in desynced to be the distinguishing factor between it and homestuck. In the desynced, the Scholars are far more realized as a concept than the Denizens, so they've had my attention for a while. For the song, I want to compose a piece that you would hear you were being told the lore about Skaia and her Scholars. [The latest update](https://mspfa.com/?s=28296&p=769) at time of writing (1/10/2021) would be a good example of a place you would here it. It took pretty major influence from the song [[track:lotus|"Lotus"]] by [[artist:seth-peelle|Beatfox]] both in terms of composition and instrumentation. The song also serves as a preview of something to come but I'll talk more about that when the time comes.
 ---
 Track: Absolution
-Directory: absolution-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Spad3s
@@ -187,7 +188,7 @@ Referenced Tracks:
 - track:vexation-paradox-music-team
 ---
 Track: Embryonic
-Directory: embryonic-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - salex_r3kt
@@ -303,7 +304,6 @@ Art Tags:
 - Kate (Desynced)
 ---
 Track: Désaffectée
-Directory: desaffectee
 Artists:
 - SpilledCereals
 Duration: '3:39'
@@ -318,7 +318,7 @@ Art Tags:
 - Derse
 ---
 Track: Pokerface
-Directory: pokerface-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Levc
@@ -370,7 +370,7 @@ Commentary: |-
     So back when I wrote [[track:do-you-dream-of-electric-sheep|"Do You Dream of Electric Sheep?"]] I had this idea for a track that was a combined all of the motifs for the Derse Dreamers in Desynced (I.E Evan, Josh, [Redacted]). Seeing as this was essentially our Prospit and Derse album, I figured it might fit nicely on Election Season. If it wasn't already obvious, this track is meant to be the Desynced equivalent of Solatrus's track [[track:derse-dreamers|"Derse Dreamers."]] The song follows as fairly similar compositional style, where I have an original melody serving as a base and then throwing in leitmotifs like nuts. Something that is unique to this track is how the song changes feels. The song goes between a more typical swing feel to some thing that more akin to a break beat. This was inspired by a song that we played for Jazz ensemble that went between latin and swing feels. Honestly this might be my second favorite track compositionally after [[Antigone]] and I'm happy with how this turned out.
 ---
 Track: Gestalt
-Directory: gestalt-desynced
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Rainy
diff --git a/album/electric-daydreams.yaml b/album/electric-daydreams.yaml
index 24ec111f..d87090cd 100644
--- a/album/electric-daydreams.yaml
+++ b/album/electric-daydreams.yaml
@@ -473,7 +473,7 @@ Commentary: |-
     ([Music video!](https://www.youtube.com/watch?v=pnVW71lwybY))
 ---
 Track: Purgatory
-Directory: purgatory-electric-daydreams
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:20'
 URLs:
diff --git a/album/empyreal-rhapsody.yaml b/album/empyreal-rhapsody.yaml
index 44a280b3..e0aada77 100644
--- a/album/empyreal-rhapsody.yaml
+++ b/album/empyreal-rhapsody.yaml
@@ -41,7 +41,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/empyreal-rhapsody?track=anesidora
 ---
 Track: Inertia
-Directory: inertia-empyreal-rhapsody
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:47'
 URLs:
@@ -110,7 +110,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/empyreal-rhapsody?track=archon
 ---
 Track: Tributary
-Directory: tributary-empyreal-rhapsody
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:13'
 Sampled Tracks:
diff --git a/album/entertaining-sound.yaml b/album/entertaining-sound.yaml
index 8b7dbbb8..1d3755fa 100644
--- a/album/entertaining-sound.yaml
+++ b/album/entertaining-sound.yaml
@@ -49,7 +49,7 @@ Commentary: |-
     toby fox (the undertale guy) wrote a rock opera about mpreg once
 ---
 Track: Super Dry Dance
-Directory: super-dry-dance-entertaining-sound
+Suffix Directory: true
 Duration: '2:33'
 URLs:
 - https://conlangcritic.bandcamp.com/track/super-dry-dance-2
@@ -68,7 +68,7 @@ Commentary: |-
     böpgil by sapaa is better than any song on this album, including this one
 ---
 Track: Griffin Space Jam
-Directory: griffin-space-jam-entertaining-sound
+Suffix Directory: true
 Duration: '1:05'
 URLs:
 - https://conlangcritic.bandcamp.com/track/griffin-space-jam
@@ -133,7 +133,7 @@ Commentary: |-
     based on a true story
 ---
 Track: body
-Directory: body-entertaining-sound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:10'
 URLs:
@@ -286,7 +286,7 @@ Commentary: |-
     left hand remix plays in the left ear and right hand remix plays in the right ear
 ---
 Track: A Song About a Circle Constant
-Directory: a-song-about-a-circle-constant-entertaining-sound
+Suffix Directory: true
 Duration: '2:40'
 URLs:
 - https://conlangcritic.bandcamp.com/track/a-song-about-a-circle-constant
diff --git a/album/escaped-chasm.yaml b/album/escaped-chasm.yaml
index 90250acb..d8cbb64b 100644
--- a/album/escaped-chasm.yaml
+++ b/album/escaped-chasm.yaml
@@ -24,7 +24,7 @@ Groups:
 - Beyond
 ---
 Track: Title
-Directory: title-escaped-chasm
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Toby Fox
@@ -36,7 +36,7 @@ Commentary: |-
      The title for this track is an improvised version based on the file name, the original file name is "title_Toby"
 ---
 Track: House
-Directory: house-escaped-chasm
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:48'
 URLs:
@@ -94,7 +94,7 @@ Commentary: |-
      The title for this track is an improvised version based on the file name, the original file name is "temmie_demonman_last2"
 ---
 Track: Secret
-Directory: secret-escaped-chasm
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:05'
 URLs:
diff --git a/album/exceptis-excipiendis.yaml b/album/exceptis-excipiendis.yaml
index bdead333..24209e1c 100644
--- a/album/exceptis-excipiendis.yaml
+++ b/album/exceptis-excipiendis.yaml
@@ -1,4 +1,5 @@
 Album: Exceptis Excipiendis
+Directory Suffix: kal-la-kal-la
 Artists:
 - Kal-la-kal-la
 Date: August 5, 2020
@@ -129,7 +130,7 @@ Lyrics: >-
     (with knowing eyes): What first words will be heard at that last wondrous time?
 ---
 Track: Prana Ferox
-Directory: prana-ferox-kal-la-kal-la
+Suffix Directory: true
 Duration: '3:52'
 URLs:
 - https://nasqueron.bandcamp.com/track/prana-ferox
diff --git a/album/exile.yaml b/album/exile.yaml
index 97d3d0b6..48ff4bfc 100644
--- a/album/exile.yaml
+++ b/album/exile.yaml
@@ -10,14 +10,14 @@ URLs:
 - https://archive.org/details/exile-pinkushion
 ---
 Track: Calamity
-Directory: calamity-exile
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:29
 URLs:
 - https://archive.org/details/exile-pinkushion/01%20Calamity.mp3
 ---
 Track: Contention
-Directory: contention-exile
+Suffix Directory: true
 Originally Released As: track:contention-vol4
 Always Reference By Directory: true
 Duration: '2:28'
@@ -25,7 +25,7 @@ URLs:
 - https://archive.org/details/exile-pinkushion/02%20Contention.mp3
 ---
 Track: Mutiny
-Directory: mutiny-exile
+Suffix Directory: true
 Originally Released As: Mutiny
 Duration: '2:59'
 URLs:
@@ -39,7 +39,7 @@ URLs:
 - https://archive.org/details/exile-pinkushion/04%20Nightlife.mp3
 ---
 Track: Guardian
-Directory: guardian-exile
+Suffix Directory: true
 Originally Released As: track:guardian
 Always Reference By Directory: true
 Duration: '2:04'
@@ -124,4 +124,4 @@ Duration: '3:37'
 URLs:
 - https://archive.org/details/exile-pinkushion/18%20Stress%20%28Speed%20Mix%29.mp3
 Referenced Tracks:
-- Five-Four Stress
\ No newline at end of file
+- Five-Four Stress
diff --git a/album/face-of-oglogoth-cover-lp.yaml b/album/face-of-oglogoth-cover-lp.yaml
index a1bbd12e..3efe3f69 100644
--- a/album/face-of-oglogoth-cover-lp.yaml
+++ b/album/face-of-oglogoth-cover-lp.yaml
@@ -17,7 +17,7 @@ Groups:
 - Fandom
 ---
 Track: Black
-Directory: black-faces-of-oglogoth-cover-lp
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -31,7 +31,7 @@ URLs:
 - https://dvojka.bandcamp.com/track/homestuck-black
 ---
 Track: 'BL1ND JUST1C3: 1NV3ST1G4T1ON'
-Directory: bl1nd-just1c3-1nv3st1g4t1on-faces-of-oglogoth-cover-lp
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -45,7 +45,7 @@ URLs:
 - https://dvojka.bandcamp.com/track/homestuck-bl1nd-just1c3-1nv3st1g4t1on
 ---
 Track: Dance of Thorns
-Directory: dance-of-thorns-faces-of-oglogoth-cover-lp
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -89,7 +89,8 @@ URLs:
 - https://dvojka.bandcamp.com/track/homestuck-megalovania-collector-ver
 ---
 Track: Karkat`s Theme
-Directory: karkats-theme-faces-of-oglogoth-cover-lp
+Directory: karkats-theme
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -103,7 +104,7 @@ URLs:
 - https://dvojka.bandcamp.com/track/homestuck-karkats-theme
 ---
 Track: Purple Tyrant
-Directory: purple-tyrant-faces-of-oglogoth-cover-lp
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/faces-of-oglogoth.yaml b/album/faces-of-oglogoth.yaml
index 97620eaa..e41145ac 100644
--- a/album/faces-of-oglogoth.yaml
+++ b/album/faces-of-oglogoth.yaml
@@ -130,7 +130,8 @@ Lyrics: |-
     Spinal Cervice Extraction
 ---
 Track: Dilemma
-Directory: dilemma-faces-of-oglogoth
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '3:15'
 #Seems to have lyrics, incomprehensible
 URLs:
diff --git a/album/farewell-to-all-the-fish.yaml b/album/farewell-to-all-the-fish.yaml
index e9bfb97e..fb3b81b3 100644
--- a/album/farewell-to-all-the-fish.yaml
+++ b/album/farewell-to-all-the-fish.yaml
@@ -1,4 +1,6 @@
 Album: FAREWELL TO ALL THE FISH
+Directory Suffix: fish
+Always Reference Tracks By Directory: true
 Artists:
 - artist:kobacat
 Date: October 18, 2023
@@ -36,7 +38,7 @@ Commentary: |-
     <img src="media/misc/farewelltoallthefishconcepts.jpg" width="500">
 ---
 Track: Post-Production
-Directory: post-production-fish
+Suffix Directory: true
 Originally Released As: track:post-production
 Duration: '03:30'
 URLs:
@@ -44,14 +46,14 @@ URLs:
 - https://open.spotify.com/track/3MrR6W8njOKbyJjrnRVI2f
 ---
 Track: EMERGENCY BROADCAST
-Directory: emergency-broadcast-fish
+Suffix Directory: true
 Duration: '01:42'
 URLs:
 - https://kobacat.bandcamp.com/track/emergency-broadcast-2
 - https://open.spotify.com/track/5WOwxe0tXexAHBWEc4bAbP
 ---
 Track: The Fifth Window
-Directory: the-fifth-window-fish
+Suffix Directory: true
 Originally Released As: track:the-fifth-window
 Duration: '03:16'
 URLs:
@@ -59,7 +61,7 @@ URLs:
 - https://open.spotify.com/track/22i5B7XT6fmzLXTgR9FRB0
 ---
 Track: Devolver
-Directory: devolver-fish
+Suffix Directory: true
 Originally Released As: track:devolver-vast-error
 Duration: '05:41'
 URLs:
@@ -67,7 +69,7 @@ URLs:
 - https://open.spotify.com/track/7exJgYhMnp6N2H6ghigntQ
 ---
 Track: Catacombs
-Directory: catacombs-fish
+Suffix Directory: true
 Originally Released As: track:catacombs-magnum-opus
 Duration: '04:04'
 URLs:
@@ -75,7 +77,7 @@ URLs:
 - https://open.spotify.com/track/1upzNitteLU6ycie7HI9e2
 ---
 Track: Sea of Tranquility
-Directory: sea-of-tranquility-fish
+Suffix Directory: true
 Originally Released As: track:sea-of-tranquility
 Duration: '04:54'
 URLs:
@@ -83,14 +85,14 @@ URLs:
 - https://open.spotify.com/track/2FgIaaomL2GdCKkI0lLBaB
 ---
 Track: CATALYZE
-Directory: catalyze-fish
+Suffix Directory: true
 Duration: '04:22'
 URLs:
 - https://kobacat.bandcamp.com/track/catalyze-2
 - https://open.spotify.com/track/38ZcQRIDH6v6nu7RY1bkn3
 ---
 Track: Insecurity
-Directory: insecurity-fish
+Suffix Directory: true
 Originally Released As: track:insecurity-magnum-opus
 Duration: '06:21'
 URLs:
@@ -98,7 +100,7 @@ URLs:
 - https://open.spotify.com/track/5OAb1AfgLpgzlt6kkL2xYH
 ---
 Track: Requiem for a Daybreaker
-Directory: requiem-for-a-daybreaker-fish
+Suffix Directory: true
 Originally Released As: track:requiem-for-a-daybreaker
 Duration: '04:36'
 URLs:
@@ -106,7 +108,7 @@ URLs:
 - https://open.spotify.com/track/7Ib1N3KMrCcfQOW8fnpdpr
 ---
 Track: Twilight Rhythm
-Directory: twilight-rhythm-fish
+Suffix Directory: true
 Originally Released As: track:twilight-rhythm
 Duration: '03:12'
 URLs:
diff --git a/album/faux-dramatica.yaml b/album/faux-dramatica.yaml
index 744fdfc9..94a07e0d 100644
--- a/album/faux-dramatica.yaml
+++ b/album/faux-dramatica.yaml
@@ -119,7 +119,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/faux-dramatica?track=bite-the-hand-that-feeds-you
 ---
 Track: Turncoat
-Directory: turncoat-faux-dramatica
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 6:00
 Cover Artists:
@@ -159,7 +159,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/faux-dramatica?track=requiem-for-a-dying-planet-ft-the-emek-hefer-choir
 ---
 Track: Naught
-Directory: naught-faux-dramatica
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 6:04
 Cover Artists:
@@ -176,7 +176,7 @@ URLs:
 ---
 Section: Bonus track
 ---
-Track: 'COGNITO HAZARD (Ft. Eddie Deezen)'
+Track: COGNITO HAZARD (Ft. Eddie Deezen)
 Directory: cognito-hazard
 Additional Names:
 - Name: >-
diff --git a/album/fnf-colors-and-mayhem-vol-1.yaml b/album/fnf-colors-and-mayhem-vol-1.yaml
index e4de00d2..8773bc36 100644
--- a/album/fnf-colors-and-mayhem-vol-1.yaml
+++ b/album/fnf-colors-and-mayhem-vol-1.yaml
@@ -1,5 +1,6 @@
 Album: 'FNF: COLORS & MAYHEM Vol. 1'
 Directory: fnf-colors-and-mayhem-vol-1
+Directory Suffix: colors-mayhem-vol-1
 Date: October 25, 2023
 Date Added: April 13, 2024
 Additional Names:
@@ -248,6 +249,8 @@ Commentary: |-
     This is actually my 4th attempt at making a Vriska song for FNFCM. [[media:misc/archive/Amen 8r8k (first iteration).flac|The first iteration]] was called Amen 8r8k so you can imagine how that sounded like. I think a lot of times i just repurposed old unreleased songs and try to shove vriska in it. [[media:misc/archive/Luck8r8ker (second iteration).flac|The second iteration]] was called Luck8r8ker but again it was just vriska voice slapped on an instrumental of a remix of [Abjure](https://youtu.be/eK0hKrURCIc) from Sburban Showtime
 ---
 Track: '%mound'
+Directory: crossmound
+Suffix Directory: true
 Additional Names:
 - Name: >-
     %mound (Crossmound)
@@ -258,7 +261,6 @@ Additional Names:
   Annotation: >-
     [Spotify](https://open.spotify.com/track/7Jn2PZ59EdTb0N0M16r6kG),
     [Apple Music](https://music.apple.com/album/strong-bound/1713842340?i=1713842351)
-Directory: crossmound-colors-mayhem-vol-1
 Color: '#487aef'
 Duration: '2:09'
 Referenced Tracks:
@@ -275,7 +277,7 @@ Commentary: |-
     There IS a reason this song's name is so inconsistant between releases and thats cause of Equius's typing quirk. i couldn't put % on spotify so i had to change it to STRONG bound instead of %(Cross)mound. The song was def based on sigmachad shit i heard on tiktok. so all that phonk shit and whatever genre Deku The -Ilante videos were. this song actually shares the same chord progression as [[track:meowrail|meowrail]]
 ---
 Track: mIrAcLeS
-Directory: miracles-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -328,7 +330,8 @@ Commentary: |-
     if im being honest this is my least favorite only cause it was a pain to sample crappy 2013 mobile phone quality voice clips to a pitchable format. so eridan's voice sounds kinda gnaggly. But i dig the inst. if i had the chance i would definately make it feel for rounded out. I was originally gonna call this song 'Troll Fascist' because Eridan being hemophobic and all and to constrant the song [[track:troll-fashion|'Troll Fashion']] but i prioritzed the quirk and plus ehhhhh yea yk yea
 ---
 Track: --Ec)(obo
-Directory: echobo-colors-mayhem-vol-1
+Directory: echobo
+Suffix Directory: true
 Additional Names:
 - Name: >-
     -- Ec)(obo (Echobo)
@@ -411,7 +414,7 @@ Commentary: |-
     this song imo doesn't hold up as well as i think it could. the bass is fire tho and it was my first ever use of MODO Bass VST after the Ample Bass plugin kept doing the weird sound glitch (iykyk). and no the [Bad Romance](https://youtu.be/qrO4YZeyl0I) motif was not intentional. First song i had to push my voice acting skills for cause i couldn't afford to get voice actors to say my super specififc lines with many retakes so i learned how to enhance my range.
 ---
 Track: Beckoning
-Directory: beckoning-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:23'
 Contributors:
@@ -467,7 +470,7 @@ Commentary: |-
     I was reading the epilogues and was shocked at how heated Jade was to karkat and found it funny that he bit her in the en. bam adaptation. short ass song tho
 ---
 Track: Grimdark
-Directory: grimdark-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:36'
 Referenced Tracks:
@@ -483,7 +486,7 @@ Commentary: |-
     One day i was listening to [Impatience](https://youtu.be/LFPjMRvZsU0) from Funkscop and i was like 'i wanna song like this in C&M' and i thought about a fight song between grimdark rose and jack noir. I know if this show us, it should have the husnasty artstyle.
 ---
 Track: Grimbark
-Directory: grimbark-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:49'
 Referenced Tracks:
@@ -520,7 +523,7 @@ Commentary: |-
     The [[track:megalovania-ebhh|Megalovania]] reference listed is actually the Megalovania melody played in reverse.
 ---
 Track: Omnicient
-Directory: omnicient-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:21'
 Referenced Tracks:
@@ -536,7 +539,7 @@ Commentary: |-
     One day me and some friends were on a discord call and he had his voicemod vocoder on and it started vocoding his air conditioner. we joked about sampling it to a song and i did. and then i ended up making a Doc Scratch song ft. Damara. Damara's voice is just sampled from Jolyne since thats my headcanon and all :333. the song was gonna have Andrew Hussie in it but i think i just had to put something out so i did. if i were to make something with this again i'd add in the hussie voices
 ---
 Track: Collide
-Directory: collide-colors-mayhem-vol-1
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/freeroam-volume-1.yaml b/album/freeroam-volume-1.yaml
index 0cd8f3b2..a3edf0e9 100644
--- a/album/freeroam-volume-1.yaml
+++ b/album/freeroam-volume-1.yaml
@@ -1,5 +1,6 @@
 Album: '[FREEROAM] - Volume One'
 Directory: freeroam-volume-1
+Directory Suffix: freeroam
 Date: July 21, 2017
 URLs:
 - https://freeroamfanventure.bandcamp.com/album/freeroam-volume-one
@@ -41,7 +42,7 @@ Commentary: |-
     This album is comprised of [9] full tracks!
 ---
 Track: Waiting for Adventure
-Directory: waiting-for-adventure-freeroam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - artist:avocadosan
@@ -105,7 +106,7 @@ URLs:
 - https://freeroamfanventure.bandcamp.com/track/quiet-whispers
 ---
 Track: Polaris
-Directory: polaris-freeroam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kurenai
@@ -118,7 +119,7 @@ Commentary: |-
     For later use!
 ---
 Track: Friendly Fire
-Directory: friendly-fire-freeroam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - amtrax
diff --git a/album/freeroam-volume-2.yaml b/album/freeroam-volume-2.yaml
index f4dee149..ece725c8 100644
--- a/album/freeroam-volume-2.yaml
+++ b/album/freeroam-volume-2.yaml
@@ -1,5 +1,6 @@
 Album: '[FREEROAM] - Volume Two'
 Directory: freeroam-volume-2
+Directory Suffix: freeroam
 Date: July 21, 2020
 URLs:
 - https://freeroamfanventure.bandcamp.com/album/freeroam-volume-two
@@ -87,7 +88,7 @@ URLs:
 - https://freeroamfanventure.bandcamp.com/track/dismay-on-display
 ---
 Track: Divinity
-Directory: divinity-freeroam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Robert J! Lake
diff --git a/album/friendsim-2-volume-1.yaml b/album/friendsim-2-volume-1.yaml
index b0cb2536..2c7bc93c 100644
--- a/album/friendsim-2-volume-1.yaml
+++ b/album/friendsim-2-volume-1.yaml
@@ -1,4 +1,5 @@
 Album: Friendsim 2 - Volume 1
+Directory Suffix: friendsim-2
 Date: September 11, 2022
 Date Added: January 1, 2023
 Additional Names:
@@ -30,7 +31,7 @@ URLs:
 - https://www.youtube.com/watch?v=NLB2Vc7FrY0
 ---
 Track: Title Theme
-Directory: title-theme-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - James Roach
@@ -42,7 +43,7 @@ Commentary: |-
     i did it in the style of the originals, and played around with the [[track:homestuck|homestuck melody]] but made it different enough that it is its own thing
 ---
 Track: Credits Theme
-Directory: credits-theme-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Funk McLovin
@@ -96,7 +97,7 @@ Referenced Tracks:
 - Friendsim 2 Prologue End Fanfare
 ---
 Track: Prologue
-Directory: prologue-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Frost Carter
@@ -118,7 +119,7 @@ Referenced Tracks:
 - track:investigation-friendsim-2
 ---
 Track: Investigation
-Directory: investigation-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Frost Carter
@@ -145,7 +146,7 @@ Referenced Tracks:
 - track:investigation-friendsim-2
 ---
 Track: Trial Theme
-Directory: trial-theme-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Frost Carter
@@ -265,7 +266,7 @@ URLs:
 - https://studiojune.bandcamp.com/track/wanshis-rp-extravaganza
 ---
 Track: Tavern
-Directory: tavern-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Funk McLovin
@@ -274,7 +275,7 @@ URLs:
 - https://studiojune.bandcamp.com/track/tavern
 ---
 Track: Dungeon
-Directory: dungeon-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Funk McLovin
@@ -292,7 +293,7 @@ URLs:
 - https://studiojune.bandcamp.com/track/join-the-skeleton-war
 ---
 Track: Baggage
-Directory: baggage-friendsim-2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - articulatelyComposed
diff --git a/album/friendsymphony.yaml b/album/friendsymphony.yaml
index 82018639..217ade09 100644
--- a/album/friendsymphony.yaml
+++ b/album/friendsymphony.yaml
@@ -207,7 +207,7 @@ Referenced Tracks:
 - Gold Pilot
 ---
 Track: leech
-Directory: leech-friendsymphony
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Gryotharian
@@ -598,7 +598,7 @@ Referenced Tracks:
 - Spider8ite!!!!!!!!
 ---
 Track: growing up
-Directory: growing-up-friendsymphony
+Suffix Directory: true
 Artists:
 - GhostElevator
 Duration: '1:13'
@@ -694,7 +694,7 @@ Referenced Tracks:
 - Chucklevoodoo Waltz
 ---
 Track: The Show Must Go On
-Directory: the-show-must-go-on-friendsymphony
+Suffix Directory: true
 Artists:
 - Scorpyus
 Duration: '4:02'
@@ -722,7 +722,7 @@ Referenced Tracks:
 - CLOWNFUCKER
 ---
 Track: The Puppetmaster
-Directory: the-puppetmaster-friendsymphony
+Suffix Directory: true
 Artists:
 - Gryotharian
 Duration: '4:22'
diff --git a/album/from-beta-to-alpha.yaml b/album/from-beta-to-alpha.yaml
index e5e7eddf..88d02e98 100644
--- a/album/from-beta-to-alpha.yaml
+++ b/album/from-beta-to-alpha.yaml
@@ -1,5 +1,4 @@
 Album: From Beta to Alpha

-Directory: from-beta-to-alpha

 Date: April 4, 2013

 Date Added: April 13, 2024

 Artists:

@@ -58,7 +57,7 @@ Commentary: |-
     Dirk Strider's theme and a depiction of his fighting style. Before, and then after, he gets serious

 ---

 Track: The Scratch

-Directory: the-scratch-from-beta-to-alpha

+Suffix Directory: true

 Always Reference By Directory: true

 Duration: '2:12'

 URLs:

diff --git a/album/gba-pokemon-unbound-super-music-collection.yaml b/album/gba-pokemon-unbound-super-music-collection.yaml
index 338a7ce0..7ecd5d37 100644
--- a/album/gba-pokemon-unbound-super-music-collection.yaml
+++ b/album/gba-pokemon-unbound-super-music-collection.yaml
@@ -1,5 +1,5 @@
 Album: 'GBA Pokémon Unbound: Super Music Collection'
-Directory: gba-pokemon-unbound-super-music-collection
+Directory Suffix: pokemon-unbound
 Date: March 7, 2022
 #Date Added: April 13, 2024
 URLs:
@@ -111,7 +111,7 @@ URLs:
 - https://www.youtube.com/watch?v=NMGEBU8Q_q4
 ---
 Track: Title Screen
-Directory: title-screen-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:19'
 Artists:
@@ -227,7 +227,7 @@ Referenced Tracks:
 - track:battle-rival-pokemon-unbound
 ---
 Track: Battle! Rival
-Directory: battle-rival-pokemon-unbound
+Suffix Directory: true
 Duration: '2:14'
 Artists:
 - Blanders (composition)
@@ -247,7 +247,7 @@ Referenced Tracks:
 - Professor Log
 ---
 Track: Route 1
-Directory: route-1-pokemon-unbound
+Suffix Directory: true
 Duration: '1:03'
 Artists:
 - Blanders
@@ -256,7 +256,7 @@ URLs:
 - https://www.youtube.com/watch?v=ydOBQ4_NZnY
 ---
 Track: Battle! Wild Pokémon
-Directory: battle-wild-pokemon-pokemon-unbound
+Suffix Directory: true
 Duration: '2:27'
 Artists:
 - Pascal van den Bos
@@ -305,7 +305,7 @@ Referenced Tracks:
 - Poké Mart (Pokémon Ruby / Pokémon Sapphire)
 ---
 Track: Hurry Along
-Directory: hurry-along-pokemon-unbound
+Suffix Directory: true
 Duration: '0:33'
 Artists:
 - Humanly
@@ -324,7 +324,7 @@ URLs:
 - https://www.youtube.com/watch?v=yKYVaGYgEbk
 ---
 Track: Battle! Strong Wild Pokémon
-Directory: battle-strong-wild-pokemon-pokemon-unbound
+Suffix Directory: true
 Duration: '2:23'
 Artists:
 - NewoRGBY
@@ -352,7 +352,7 @@ URLs:
 - https://www.youtube.com/watch?v=iCLZwozvhYY
 ---
 Track: Battle! Trainer
-Directory: battle-trainer-pokemon-unbound
+Suffix Directory: true
 Duration: '3:21'
 Artists:
 - Jose "Phazonruler" Villanueva (composition)
@@ -380,7 +380,7 @@ URLs:
 - https://www.youtube.com/watch?v=XnOM-A6lX0s
 ---
 Track: Route 2
-Directory: route-2-pokemon-unbound
+Suffix Directory: true
 Duration: '0:54'
 Artists:
 - Blanders (composition & arrangement)
@@ -426,7 +426,7 @@ Referenced Tracks:
 - Pokémon Gym (Pokémon Red / Pokémon Blue)
 ---
 Track: Battle! Gym Leader
-Directory: battle-gym-leader-pokemon-unbound
+Suffix Directory: true
 Duration: '2:26'
 Artists:
 - Pascal van den Bos
@@ -445,7 +445,7 @@ Referenced Tracks:
 - Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue)
 ---
 Track: Evolution
-Directory: evolution-pokemon-unbonud
+Suffix Directory: true
 Duration: '0:46'
 Artists:
 - NewoRGBY
@@ -466,7 +466,7 @@ Referenced Tracks:
 - Battle! Black Ferrothorn Goon
 ---
 Track: Route 3
-Directory: route-3-pokemon-unbound
+Suffix Directory: true
 Duration: '0:59'
 Artists:
 - Rowyn Berlan
@@ -602,7 +602,7 @@ URLs:
 - https://www.youtube.com/watch?v=iyGrQfz0TLY
 ---
 Track: Motorcycle
-Directory: motorcycle-pokemon-unbonud
+Suffix Directory: true
 Duration: '2:07'
 Artists:
 - Pascal van den Bos
@@ -654,7 +654,7 @@ URLs:
 - https://www.youtube.com/watch?v=C9wQ3fb7h5I
 ---
 Track: Gate
-Directory: gate-pokemon-unbonud
+Suffix Directory: true
 Duration: '1:00'
 Artists:
 - Rowyn Berlan
@@ -684,7 +684,7 @@ URLs:
 - https://www.youtube.com/watch?v=wFzBXHRkBaE
 ---
 Track: Route 8
-Directory: route-8-pokemon-unbound
+Suffix Directory: true
 Duration: '1:06'
 Artists:
 - Rowyn Berlan
@@ -774,7 +774,7 @@ Referenced Tracks:
 - Tehl Town (Solo Piano)
 ---
 Track: Underground Path
-Directory: underground-path-pokemon-unbound
+Suffix Directory: true
 Duration: '1:02'
 Artists:
 - Humanly
@@ -794,7 +794,7 @@ Referenced Tracks:
 - Beta Gym Theme
 ---
 Track: Route 11
-Directory: route-11-pokemon-unbound
+Suffix Directory: true
 Duration: '1:10'
 Artists:
 - Humanly
@@ -971,7 +971,7 @@ Referenced Tracks:
 - Pokémon Gym (Pokémon Red / Pokémon Blue)
 ---
 Track: Surf
-Directory: surf-pokemon-unbonud
+Suffix Directory: true
 Duration: '0:56'
 Artists:
 - Humanly
@@ -1178,7 +1178,7 @@ URLs:
 - https://www.youtube.com/watch?v=nHuFSXEom7k
 ---
 Track: Pokémon League
-Directory: pokemon-league-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:30'
 Artists:
@@ -1231,7 +1231,7 @@ Referenced Tracks:
 - Bellin Town (Day)
 ---
 Track: Pokémon Center (Night)
-Directory: pokemon-center-night-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:42'
 Artists:
@@ -1276,7 +1276,7 @@ Referenced Tracks:
 - Crater Town (Day)
 ---
 Track: Battle! Deoxys
-Directory: battle-deoxys-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:45'
 Artists:
@@ -1327,7 +1327,7 @@ Referenced Tracks:
 - Underground Ruins
 ---
 Track: Battle! Regirock/Regice/Registeel
-Directory: battle-regirock-regice-registeel-pokemon-unbound
+Suffix Directory: true
 Duration: '1:41'
 Artists:
 - Humanly
@@ -1395,7 +1395,7 @@ Referenced Tracks:
 - Mt. Layuda
 ---
 Track: Battle! Ultra Necrozma
-Directory: battle-ultra-necrozma-pokemon-unbound
+Suffix Directory: true
 Duration: '3:07'
 Artists:
 - Pascal van den Bos
@@ -1441,7 +1441,7 @@ URLs:
 - https://www.youtube.com/watch?v=MGYzIbdaXDI
 ---
 Track: Battle! Xerneas/Yveltal
-Directory: battle-xerneas-yveltal-pokemon-unbound
+Suffix Directory: true
 Duration: '2:50'
 Artists:
 - NewoRGBY
@@ -1536,7 +1536,7 @@ Referenced Tracks:
 - The Borrius Motif
 ---
 Track: Battleground
-Directory: battleground-pokemon-unbonud
+Suffix Directory: true
 Duration: '0:54'
 Artists:
 - Caelan Kier
@@ -1548,7 +1548,7 @@ Referenced Tracks:
 - Phosphor Bronze
 ---
 Track: Dive
-Directory: dive-pokemon-unbonud
+Suffix Directory: true
 Duration: '1:29'
 Artists:
 - Caelan Kier
@@ -1705,7 +1705,7 @@ URLs:
 - https://www.youtube.com/watch?v=Xx8UAb2O0GU
 ---
 Track: Battle Frontier
-Directory: battle-frontier-pokemon-unbound
+Suffix Directory: true
 Duration: '0:51'
 Artists:
 - Pascal van den Bos
@@ -1717,7 +1717,7 @@ Referenced Tracks:
 - The Borrius Motif
 ---
 Track: Battle Tower
-Directory: battle-tower-pokemon-unbound
+Suffix Directory: true
 Duration: '1:03'
 Artists:
 - Pascal van den Bos
@@ -1840,7 +1840,7 @@ Referenced Tracks:
 - Hall of Fame (Pokémon Red / Pokémon Blue)
 ---
 Track: Staff Credits
-Directory: staff-credits-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:29'
 Artists:
@@ -1859,7 +1859,7 @@ Referenced Tracks:
 - Frozen Heights (Day)
 ---
 Track: The End
-Directory: the-end-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:49'
 Artists:
@@ -1918,7 +1918,7 @@ Referenced Tracks:
 - The Borrius Motif
 ---
 Track: Calm Before the Storm
-Directory: calm-before-the-storm-pokemon-unbound
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:24'
 Artists:
diff --git a/album/genesis-genocide.yaml b/album/genesis-genocide.yaml
index 2d7663f8..2a66b9ae 100644
--- a/album/genesis-genocide.yaml
+++ b/album/genesis-genocide.yaml
@@ -31,8 +31,8 @@ Lyrics: |-
     Is Homestuck bad? Homestuck is SO bad! It's so extremely, very incredibly bad. Does Homestuck get better? Well... I mean, if- if it hasn't gotten better, maybe it nev- it won't at this point. BUT there's always a chance that it could get <i>worse</i>. So, umm... That's- maybe that's something to look forward to.
 ---
 Track: His Honorable Tyranny
+Suffix Directory: true
 Duration: '3:41'
-Directory: his-honorable-tyranny-2
 Referenced Tracks:
 - track:his-honorable-tyranny
 URLs:
diff --git a/album/glitchstuck-volume-1.yaml b/album/glitchstuck-volume-1.yaml
index e2879bb8..f6d8c256 100644
--- a/album/glitchstuck-volume-1.yaml
+++ b/album/glitchstuck-volume-1.yaml
@@ -1,4 +1,5 @@
 Album: Glitchstuck Volume 1
+Directory Suffix: glitchstuck
 Artists:
 - Glitchstuck
 Date: January 1, 2012
@@ -32,7 +33,7 @@ Referenced Tracks:
 - track:altercate-glitchstuck
 ---
 Track: Altercate
-Directory: altercate-glitchstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:59'
 URLs: 
@@ -52,7 +53,7 @@ Referenced Tracks:
 - track:discord-glitchstuck
 ---
 Track: Discord
-Directory: discord-glitchstuck
+Suffix Directory: true
 Duration: '01:21'
 URLs: 
 - https://glitchstuck.bandcamp.com/track/discord
@@ -73,7 +74,7 @@ Art Tags:
 - Squiddles
 ---
 Track: Redemption
-Directory: redemption-glitchstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:55'
 URLs: 
@@ -84,7 +85,7 @@ Art Tags:
 - Squiddles
 ---
 Track: Sburban Meltdown
-Directory: sburban-meltdown-glitchstuck
+Suffix Directory: true
 Duration: '00:44'
 URLs: 
 - https://glitchstuck.bandcamp.com/track/sburban-meltdown
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index ab41f46d..a5ecdf0c 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -25,7 +25,7 @@ Commentary: |-
     <img src="media/misc/gotta-hatch-em-all-artwork.jpg" width="350">
 ---
 Track: Title Theme
-Directory: title-theme-gotta-hatch-em-all
+Suffix Directory: true
 Duration: 0:35
 Artists:
 - Funk McLovin
@@ -155,7 +155,7 @@ Referenced Tracks:
 - Spider's Claw
 ---
 Track: Fairies
-Directory: fairies-gotta-hatch-em-all
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:00'
 Artists:
diff --git a/album/gravity-makes-the-flame-rise.yaml b/album/gravity-makes-the-flame-rise.yaml
index 46cabc90..e698356c 100644
--- a/album/gravity-makes-the-flame-rise.yaml
+++ b/album/gravity-makes-the-flame-rise.yaml
@@ -214,7 +214,7 @@ Lyrics: |-
     And ever and ever and ever and ever
 ---
 Track: Burnout
-Directory: burnout-gravity-makes-the-flame-rise
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Bijan Eghtesady (drums)
@@ -392,7 +392,7 @@ Lyrics: |-
     Oh oh oh
 ---
 Track: Manufacturers
-Directory: manufacturers-gravity-makes-the-flame-rise
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Bijan Eghtesady (drums)
@@ -505,7 +505,7 @@ Lyrics: |-
     They want to burn the government down
 ---
 Track: Anarchy
-Directory: anarchy-gravity-makes-the-flame-rise
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Bijan Eghtesady (drums)
diff --git a/album/grim-chain-of-feast.yaml b/album/grim-chain-of-feast.yaml
index adbc1ba3..7dc09f57 100644
--- a/album/grim-chain-of-feast.yaml
+++ b/album/grim-chain-of-feast.yaml
@@ -27,7 +27,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Army of the Wicked God
-Directory: army-of-the-wicked-god-grim-chain-of-feast
+Suffix Directory: true
 Originally Released As: track:army-of-the-wicked-god
 Duration: '3:10'
 URLs:
@@ -173,7 +173,7 @@ URLs:
 - https://thehighblood.bandcamp.com/track/cleanse-the-land-hymnal-psalm-i
 ---
 Track: Remains of formed pain
-Directory: remains-of-formed-pain-grim-chain-of-feast
+Suffix Directory: true
 Originally Released As: track:remains-of-formed-pain
 Duration: '2:49'
 URLs:
diff --git a/album/guidestuck-volume-one.yaml b/album/guidestuck-volume-one.yaml
index 25257930..d2de3d09 100644
--- a/album/guidestuck-volume-one.yaml
+++ b/album/guidestuck-volume-one.yaml
@@ -1,4 +1,5 @@
 Album: Guidestuck - Volume One
+Directory Suffix: guidestuck
 Date: December 15, 2012
 Date Added: September 16, 2023  
 URLs:
@@ -64,7 +65,7 @@ Cover Artists:
 - Mouse
 ---
 Track: Decay
-Directory: decay-guidestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Alfy
@@ -76,7 +77,7 @@ Cover Artists:
 - Adrienne Garcia
 ---
 Track: Naturae
-Directory: naturae-guidestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - HexVertigo
@@ -157,7 +158,7 @@ Cover Artists:
 Cover Art File Extension: jpg
 ---
 Track: Assail!
-Directory: assail-guidestuck
+Suffix Directory: true
 Artists:
 - Doctor Onion
 Duration: '01:35'
@@ -211,7 +212,6 @@ Cover Artists:
 - Bullfrog-Piano
 ---
 Track: Oliver/Olivia
-Directory: oliver-olivia
 Artists:
 - HexVertigo
 Duration: '02:35'
@@ -253,7 +253,7 @@ Cover Artists:
 - apocryphalsovereign
 ---
 Track: Animosity
-Directory: animosity-guidestuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Lea Cason
diff --git a/album/heaven-sent.yaml b/album/heaven-sent.yaml
index 95e4708d..9be26fbb 100644
--- a/album/heaven-sent.yaml
+++ b/album/heaven-sent.yaml
@@ -50,7 +50,7 @@ URLs:
 - https://swagazaki.bandcamp.com/track/nightosphere-bass-unfinished
 ---
 Track: Chroma
-Directory: chroma-heaven-sent
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Swagazaki
diff --git a/album/heinoustuck-vol-1.yaml b/album/heinoustuck-vol-1.yaml
index ef0631e3..935505fe 100644
--- a/album/heinoustuck-vol-1.yaml
+++ b/album/heinoustuck-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Heinoustuck Vol. 1
+Directory Suffix: heinoustuck
 Date: October 15, 2012
 Date Added: January 1, 2023
 URLs:
@@ -35,7 +36,7 @@ Commentary: |-
     I then spent a few months coming up with a bare basic plot, characters and their backstories, what they would need to overcome, what type of mood I wanted the story to have, and constructed a universe for them all to live in. After I had done all that, I began the fan adventure.
 ---
 Track: Theme
-Directory: theme-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - HexVertigo
@@ -59,7 +60,7 @@ Art Tags:
 - 'cw: eye horror'
 ---
 Track: Asylum
-Directory: asylum-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Nicole Feltz
@@ -122,7 +123,7 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Rooftop
-Directory: rooftop-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - HexVertigo
@@ -169,7 +170,7 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Striving
-Directory: striving-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - HexVertigo
@@ -183,7 +184,7 @@ Art Tags:
 - 'cw: body horror'
 ---
 Track: Nightmare
-Directory: nightmare-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - karelianArmy
@@ -198,7 +199,7 @@ Referenced Tracks:
 - Clockwork Melody
 ---
 Track: Rainforest
-Directory: rainforest-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Sarcastic Fringehead
@@ -216,7 +217,7 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: Ignition
-Directory: ignition-heinoustuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - eridamnit
@@ -233,7 +234,7 @@ Art Tags:
 - 'cw: eye horror'
 ---
 Track: Noir
-Directory: noir-heinoustuck
+Suffix Directory: true
 Artists:
 - sticler
 Duration: '02:11'
diff --git a/album/homestuck-anniversary-act-6.yaml b/album/homestuck-anniversary-act-6.yaml
index 23c0a551..0ce00ef3 100644
--- a/album/homestuck-anniversary-act-6.yaml
+++ b/album/homestuck-anniversary-act-6.yaml
@@ -19,7 +19,6 @@ Commentary: |-
     An album celebrating Homestuck Act 6 anniversary. This ones an individual release because I simply didn't want to wait this long to release the other one. Also includes a cover of [[track:moonsetter|Moonsetter]] by [[artist:toby-fox|Toby "Radiation" Fox]]
 ---
 Track: "[11/11/11] What do you suppose the name on the envelopes will be?"
-Directory: 11-11-11-what-do-you-suppose-the-name-on-the-envelopes-will-be
 Duration: '3:46'
 URLs:
 - https://maukustus.bandcamp.com/track/11-11-11-what-do-you-suppose-the-name-on-the-envelopes-will-be
diff --git a/album/homestuck-anniversary-excl-act-6.yaml b/album/homestuck-anniversary-excl-act-6.yaml
index 584f7062..921d4fe0 100644
--- a/album/homestuck-anniversary-excl-act-6.yaml
+++ b/album/homestuck-anniversary-excl-act-6.yaml
@@ -23,7 +23,6 @@ Commentary: |-
     <img src="media/misc/homestuck-anniversary-excl-act-6.jpg" width="250">
 ---
 Track: "[04/13/09] Today is this young man's birthday."
-Directory: 04-13-09-today-is-this-young-mans-birthday
 Duration: '3:37'
 URLs:
 - https://maukustus.bandcamp.com/track/04-13-09-today-is-this-young-mans-birthday
@@ -47,7 +46,6 @@ Sampled Tracks:
 - Amen, Brother
 ---
 Track: "[06/12/10] 12th bilunar perigee of the 6th dark season's equinox."
-Directory: 06-12-10-12th-bilunar-perigee-of-the-6th-dark-seasons-equinox
 Duration: '5:41'
 Cover Artists:
 - Maukustus
diff --git a/album/homestuck-swagazaki.yaml b/album/homestuck-swagazaki.yaml
index 70e95d88..d171ee5c 100644
--- a/album/homestuck-swagazaki.yaml
+++ b/album/homestuck-swagazaki.yaml
@@ -66,7 +66,7 @@ Referenced Tracks:
 - English
 ---
 Track: Sacrifice
-Directory: sacrifice-homestuck-swagazaki
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:17'
 URLs: 
diff --git a/album/homestuck-vol-1-4.yaml b/album/homestuck-vol-1-4.yaml
index 57b2fce0..a1188918 100644
--- a/album/homestuck-vol-1-4.yaml
+++ b/album/homestuck-vol-1-4.yaml
@@ -1,4 +1,6 @@
 Album: Homestuck Vol. 1-4
+Directory Suffix: vol-1-4
+Suffix Track Directories: true
 Date: October 24, 2011
 Date Added: November 15, 2019
 URLs:
@@ -66,7 +68,6 @@ Color: '#38f43d'
 Section: From Homestuck Vol. 1
 ---
 Track: Showtime (Piano Refrain)
-Directory: showtime-piano-refrain-vol-1-4
 Originally Released As: Showtime (Piano Refrain)
 Art Tags:
 - John
@@ -76,7 +77,6 @@ URLs:
 - https://youtu.be/DkVQaxrXM_s
 ---
 Track: Harlequin
-Directory: harlequin-vol-1-4
 Originally Released As: Harlequin
 Duration: '1:43'
 URLs:
@@ -84,7 +84,6 @@ URLs:
 - https://youtu.be/UDJo0gWPTms
 ---
 Track: Showtime (Original Mix)
-Directory: showtime-original-mix-vol-1-4
 Originally Released As: Showtime (Original Mix)
 Art Tags:
 - John's dad
@@ -94,7 +93,6 @@ URLs:
 - https://youtu.be/lc4mLtbGVDA
 ---
 Track: Aggrieve (Violin Refrain)
-Directory: aggrieve-violin-refrain-vol-1-4
 Originally Released As: Aggrieve (Violin Refrain)
 Art Tags:
 - Rose
@@ -104,7 +102,6 @@ URLs:
 - https://youtu.be/lzXuvymrzZg
 ---
 Track: Sburban Countdown
-Directory: sburban-countdown-vol-1-4
 Originally Released As: Sburban Countdown
 Art Tags:
 - Earth
@@ -115,7 +112,6 @@ URLs:
 - https://youtu.be/1402jlRYFuw
 ---
 Track: Aggrieve
-Directory: aggrieve-vol-1-4
 Originally Released As: Aggrieve
 Art Tags:
 - Rose
@@ -126,7 +122,6 @@ URLs:
 - https://youtu.be/0Up18n-IzVA
 ---
 Track: Showtime (Imp Strife Mix)
-Directory: showtime-imp-strife-mix-vol-1-4
 Originally Released As: Showtime (Imp Strife Mix)
 Art Tags:
 - Underlings
@@ -137,7 +132,6 @@ URLs:
 - https://youtu.be/KBQQj_4t1Uo
 ---
 Track: Nannaquin
-Directory: nannaquin-vol-1-4
 Originally Released As: Nannaquin
 Art Tags:
 - John's nanna
@@ -148,7 +142,6 @@ URLs:
 - https://youtu.be/0hDCamkN5HM
 ---
 Track: Skies of Skaia
-Directory: skies-of-skaia-vol-1-4
 Originally Released As: Skies of Skaia
 Art Tags:
 - Skaia
@@ -162,7 +155,6 @@ Color: '#cb87f6'
 Section: From Homestuck Vol. 2
 ---
 Track: Harlequin (Rock Version)
-Directory: harlequin-rock-version-vol-1-4
 Originally Released As: Harlequin (Rock Version)
 Art Tags:
 - Underlings
@@ -173,6 +165,7 @@ URLs:
 - https://youtu.be/Yi7Wf-BTpMs
 ---
 Track: John Sleeps / Skaian Magicant
+Suffix Directory: false
 Additional Names:
 - Can't Sleep, Harlequins Will Eat Me (earlier MSPA credit)
 - Skaian Magicant (earlier MSPA credit)
@@ -189,7 +182,6 @@ Referenced Tracks:
 - Skies of Skaia
 ---
 Track: Upward Movement (Dave Owns)
-Directory: upward-movement-dave-owns-vol-1-4
 Originally Released As: Upward Movement (Dave Owns)
 Art Tags:
 - Dave
@@ -201,7 +193,6 @@ URLs:
 - https://youtu.be/i47-v-eVymk
 ---
 Track: Vagabounce
-Directory: vagabounce-vol-1-4
 Originally Released As: Vagabounce
 Art Tags:
 - WV
@@ -212,7 +203,6 @@ URLs:
 - https://youtu.be/wanZ6XJKChc
 ---
 Track: Explore
-Directory: explore-vol-1-4
 Originally Released As: Explore
 Art Tags:
 - Ruined Earth
@@ -223,6 +213,7 @@ URLs:
 - https://youtu.be/DedSi6YXk1w
 ---
 Track: Gardener
+Suffix Directory: false
 Artists:
 - Steve Everson
 Art Tags:
@@ -247,7 +238,6 @@ Commentary: |-
     We were on a strict timetable at the time, so I didn't get the chance to find a really good bass voice or find a good rhythm. That was much improved for the actual release in Volumes 1-4.
 ---
 Track: Showtime Remix
-Directory: showtime-remix-vol-1-4
 Originally Released As: Showtime Remix
 Duration: '2:02'
 URLs:
@@ -255,7 +245,6 @@ URLs:
 - https://youtu.be/ENWA9aNEkXk
 ---
 Track: Aggrieve Remix
-Directory: aggrieve-remix-vol-1-4
 Originally Released As: Aggrieve Remix
 Duration: '2:11'
 URLs:
@@ -263,7 +252,6 @@ URLs:
 - https://youtu.be/KilKZfggMOU
 ---
 Track: Verdancy (Bassline)
-Directory: verdancy-bassline-vol-1-4
 Originally Released As: Verdancy (Bassline)
 Duration: 0:52
 URLs:
@@ -271,6 +259,7 @@ URLs:
 - https://youtu.be/Hhwop2K7zt0
 ---
 Track: Potential Verdancy
+Suffix Directory: false
 Artists:
 - Robert J! Lake
 Duration: '3:25'
@@ -286,7 +275,6 @@ Color: '#ef001d'
 Section: From Homestuck Vol. 3
 ---
 Track: Beatdown (Strider Style)
-Directory: beatdown-strider-style-vol-1-4
 Originally Released As: Beatdown (Strider Style)
 Art Tags:
 - Dave
@@ -299,7 +287,6 @@ URLs:
 - https://youtu.be/9fXnKNoF81g
 ---
 Track: Harleboss
-Directory: harleboss-vol-1-4
 Originally Released As: Harleboss
 Art Tags:
 - John
@@ -310,7 +297,6 @@ URLs:
 - https://youtu.be/nYaiMTPWh78
 ---
 Track: Beatdown Round 2
-Directory: beatdown-round-2-vol-1-4
 Originally Released As: Beatdown Round 2
 Art Tags:
 - Dave
@@ -322,7 +308,6 @@ URLs:
 - https://youtu.be/knNKryd8jEU
 ---
 Track: Dissension (Original)
-Directory: dissension-original-vol-1-4
 Originally Released As: Dissension (Original)
 Art Tags:
 - Jade
@@ -334,7 +319,6 @@ URLs:
 - https://youtu.be/VwMew8akQx4
 ---
 Track: Dissension (Remix)
-Directory: dissension-remix-vol-1-4
 Originally Released As: Dissension (Remix)
 Art Tags:
 - Jade
@@ -346,7 +330,6 @@ URLs:
 - https://youtu.be/y36JjcfvM0c
 ---
 Track: Ohgodwhat
-Directory: ohgodwhat-vol-1-4
 Originally Released As: Ohgodwhat
 Art Tags:
 - Jade
@@ -356,7 +339,6 @@ URLs:
 - https://youtu.be/P-X8EB6KbZ0
 ---
 Track: Ohgodwhat Remix
-Directory: ohgodwhat-remix-vol-1-4
 Originally Released As: Ohgodwhat Remix
 Art Tags:
 - Jade
@@ -366,7 +348,6 @@ URLs:
 - https://youtu.be/KlVkDe0iVUc
 ---
 Track: Rediscover Fusion
-Directory: rediscover-fusion-vol-1-4
 Originally Released As: Rediscover Fusion
 Duration: '1:36'
 URLs:
@@ -374,7 +355,6 @@ URLs:
 - https://youtu.be/_wv2Q9fTmLk
 ---
 Track: Explore Remix
-Directory: explore-remix-vol-1-4
 Originally Released As: Explore Remix
 Duration: '2:00'
 URLs:
@@ -382,7 +362,6 @@ URLs:
 - https://youtu.be/Zzf5NwkM8Ys
 ---
 Track: Chorale for Jaspers
-Directory: chorale-for-jaspers-vol-1-4
 Originally Released As: Chorale for Jaspers
 Art Tags:
 - Rose
@@ -394,7 +373,6 @@ URLs:
 - https://youtu.be/uvfkPq248Qo
 ---
 Track: Pony Chorale
-Directory: pony-chorale-vol-1-4
 Originally Released As: Pony Chorale
 Art Tags:
 - John
@@ -408,7 +386,6 @@ Color: '#51a2fd'
 Section: From Homestuck Vol. 4
 ---
 Track: Revelawesome
-Directory: revelawesome-vol-1-4
 Originally Released As: Revelawesome
 Art Tags:
 - John
@@ -419,7 +396,6 @@ URLs:
 - https://youtu.be/JEnmIrIDMNs
 ---
 Track: Hardlyquin
-Directory: hardlyquin-vol-1-4
 Originally Released As: Hardlyquin
 Art Tags:
 - John
@@ -430,7 +406,6 @@ URLs:
 - https://youtu.be/c7fzYfxNQLg
 ---
 Track: Carefree Victory
-Directory: carefree-victory-vol-1-4
 Originally Released As: Carefree Victory
 Art Tags:
 - Jade
@@ -444,7 +419,6 @@ URLs:
 - https://youtu.be/ocYQytoPE8M
 ---
 Track: Ballad of Awakening
-Directory: ballad-of-awakening-vol-1-4
 Originally Released As: Ballad of Awakening
 Art Tags:
 - Skaia
@@ -457,7 +431,6 @@ URLs:
 - https://youtu.be/fwqjHs4z0fE
 ---
 Track: Sburban Jungle
-Directory: sburban-jungle-vol-1-4
 Originally Released As: Sburban Jungle
 Cover Artists:
 - Alice Hu
@@ -473,8 +446,8 @@ URLs:
 - https://open.spotify.com/track/1SW1ybpwtkCeP9d4X3oDnG
 ---
 Track: Three in the Morning (RJ's I Can Barely Sleep In This Casino Remix)
-Directory: three-in-the-morning-rj-vol-1-4
 Originally Released As: track:three-in-the-morning-rj
+Directory: three-in-the-morning-rj # suffixed
 Cover Art File Extension: jpg
 Duration: '6:29'
 URLs:
@@ -482,7 +455,6 @@ URLs:
 - https://youtu.be/NutIhwWDqpc
 ---
 Track: Doctor
-Directory: doctor-vol-1-4
 Originally Released As: Doctor
 Art Tags:
 - LoWaS
@@ -493,7 +465,6 @@ URLs:
 - https://youtu.be/EQqnA8Brfcg
 ---
 Track: Endless Climb
-Directory: endless-climb-vol-1-4
 Originally Released As: Endless Climb
 Art Tags:
 - Rose
@@ -505,7 +476,6 @@ URLs:
 - https://youtu.be/Tm5w-82-ZII
 ---
 Track: Atomyk Ebonpyre
-Directory: atomyk-ebonpyre-vol-1-4
 Originally Released As: Atomyk Ebonpyre
 Art Tags:
 - Dave
@@ -517,7 +487,6 @@ URLs:
 - https://youtu.be/Z8HnkcZXBsc
 ---
 Track: Black
-Directory: black-vol-1-4
 Originally Released As: Black
 Art Tags:
 - Jack Noir
@@ -531,6 +500,7 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Doctor (Original Loop)
+Suffix Directory: false
 Artists:
 - Buzinkai
 Cover Art File Extension: jpg
diff --git a/album/homestuck-vol-4.yaml b/album/homestuck-vol-4.yaml
index 0d9aff5e..60cda214 100644
--- a/album/homestuck-vol-4.yaml
+++ b/album/homestuck-vol-4.yaml
@@ -1,4 +1,5 @@
 Album: Homestuck Vol. 4
+Directory Suffix: vol4
 Date: April 13, 2010
 Date Added: December 12, 2020
 Bandcamp Album ID: 3084079678
@@ -185,7 +186,7 @@ Referenced Tracks:
 - track:guardian
 ---
 Track: Contention
-Directory: contention-vol4
+Suffix Directory: true
 Bandcamp Track ID: 3443123575
 # No longer available, can't be embedded
 Artists:
diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index c8937160..e9acbd65 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -1,4 +1,5 @@
 Album: Homestuck Vol. 5
+Directory Suffix: vol5
 Date: June 13, 2010
 Date Added: November 15, 2019
 URLs:
@@ -697,7 +698,7 @@ Commentary: |-
     Until next time!
 ---
 Track: Sarabande
-Directory: sarabande-vol5
+Suffix Directory: true
 Additional Names:
 - Rooftop Waltz (original name)
 Artists:
@@ -1757,7 +1758,7 @@ Art Tags:
 - LoWaS
 ---
 Track: Light
-Directory: light-vol5
+Suffix Directory: true
 Artists:
 - Erik Scheele
 Duration: '4:27'
diff --git a/album/homestuck-vol-6.yaml b/album/homestuck-vol-6.yaml
index e29b390d..dd27849c 100644
--- a/album/homestuck-vol-6.yaml
+++ b/album/homestuck-vol-6.yaml
@@ -1,5 +1,6 @@
 Album: 'Homestuck Vol. 6: Heir Transparent'
 Directory: homestuck-vol-6
+Directory Suffix: vol6
 Date: January 5 2011
 Date Added: November 15, 2019
 URLs:
@@ -74,7 +75,7 @@ Commentary: |-
     [[artist:erik-scheele|Erik "Jit" Scheele]]
 ---
 Track: Frost
-Directory: frost-vol6
+Suffix Directory: true
 Artists:
 - Solatrus
 Art Tags:
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index 84ae13b9..f5138c83 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -1,4 +1,5 @@
 Album: Homestuck Vol. 8
+Directory Suffix: vol8
 Date: October 25, 2011
 Date Added: November 15, 2019
 URLs:
@@ -289,7 +290,7 @@ Commentary: |-
     First off we have Galactic Cancer.  What started off as me meandering about with slightly odd chord progressions became a rather meandering piece in general.  Originally labeled Nether, at least as the piece began to formulate, the first part quickly developed in what I hoped would be a style reminiscent of Russell Brower’s music for Outland in World of Warcraft, primarily the [Outland Suite](https://www.youtube.com/watch?v=o8rcQrqOjaM) and [Netherstorm](https://www.youtube.com/watch?v=yzCLPD9iouE) (what the first name referenced).  I completed most of the piece without drums or effects at first, but felt something was missing.  After messing around with some different bits of drum samples, I found beats that were suitable for what I was going for, and those helped give more definition to the meter of the piece as much of it was long chords that made it hard to distinguish at times, then added some occasional filter effects to increase the overall spacey feel.  After everything was in place, I listened through it multiple times and just began to imagine [Karkat’s monologue](https://www.homestuck.com/story/4003) about how everything was his fault and the phrase “Galactic Cancer” stuck.
 ---
 Track: Serenade
-Directory: serenade-vol8
+Suffix Directory: true
 Artists:
 - Clark Powell
 Duration: '5:05'
@@ -1343,7 +1344,7 @@ Commentary: |-
     <s>I have a hi-res image, but this is all I can post for now.</s>
 ---
 Track: 'null'
-Directory: null-vol8
+Suffix Directory: true
 Artists:
 - Toby Fox
 Duration: 0:09
diff --git a/album/hush.yaml b/album/hush.yaml
index 63fbfd6c..c680dcd7 100644
--- a/album/hush.yaml
+++ b/album/hush.yaml
@@ -135,7 +135,7 @@ Lyrics: |-
     The ones who know
 ---
 Track: Synchronize
-Directory: synchronize-hush
+Suffix Directory: true
 Duration: '3:54'
 URLs:
 - https://bowman.bandcamp.com/track/synchronize
@@ -221,7 +221,7 @@ Lyrics: |-
     All I wanna do
 ---
 Track: Tribes
-Directory: tribes-hush
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:51'
 URLs:
@@ -269,7 +269,7 @@ Commentary: |-
     I'm glad you guys see the value in the message stuff. I feel like outside of hip hop you don't see a lot of music with a message these days. A lot of very personal work, a lot of good grooves, but not a lot of musicians who feel like putting their worldview out there.
 ---
 Track: Redshifts
-Directory: redshifts-hush
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:36'
 URLs:
@@ -315,7 +315,7 @@ Lyrics: |-
     You'll know you're not the only one
 ---
 Track: Rage
-Directory: rage-hush
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:16'
 URLs:
@@ -518,7 +518,7 @@ Commentary: |-
     The visual piece Bowman was studying is an untitled work by Ed Moses, most likely from 1975-1977 (cross-referencing the description in his photo with [this print sale page](https://web.archive.org/web/20240427213204/https://www.printed-editions.com/artist/ed-moses/untitled-leslie-sacks-gallery-ifpda-1-27/) for a similar work).
 ---
 Track: Chameleon
-Directory: chameleon-hush
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:08'
 URLs:
diff --git a/album/hypertonic-dreams.yaml b/album/hypertonic-dreams.yaml
index 7d4461e4..8fd0960f 100644
--- a/album/hypertonic-dreams.yaml
+++ b/album/hypertonic-dreams.yaml
@@ -85,7 +85,8 @@ Art Tags:
 - Sly (Redditstuck)
 ---
 Track: Paperthin
-Directory: paperthin-hypertonic-dreams
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '3:36'
 URLs:
 - https://redditstuckmusic.bandcamp.com/track/paperthin
@@ -95,7 +96,8 @@ Art Tags:
 - Sunil (Redditstuck)
 ---
 Track: Reprieve
-Directory: reprieve-hypertonic-dreams
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '2:25'
 URLs:
 - https://redditstuckmusic.bandcamp.com/track/reprieve
@@ -191,7 +193,7 @@ Cover Artists:
 - Adventureflame
 ---
 Track: Ex Nihilo
-Directory: ex-nihilo-hypertonic-dreams
+Suffix Directory: true
 Duration: '2:35'
 URLs:
 - https://redditstuckmusic.bandcamp.com/track/ex-nihilo
diff --git a/album/i-am-writing-myself-a-dream-in-a-letter.yaml b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
index 5fd9fa56..c505c3f1 100644
--- a/album/i-am-writing-myself-a-dream-in-a-letter.yaml
+++ b/album/i-am-writing-myself-a-dream-in-a-letter.yaml
@@ -1,4 +1,5 @@
 Album: I Am Writing Myself A Dream In A Letter
+Directory Suffix: kal-la-kal-la
 Artists:
 - Kal-la-kal-la
 Date: August 5, 2019
@@ -41,7 +42,7 @@ Lyrics: |-
     What sphinx of cement and aluminum bashed open their skulls and ate up their brains and imagination?<br>Moloch! Solitude! Filth! Ugliness! Ashcans and unobtainable dollars! Children screaming under the stairways! Boys sobbing in armies! Old men weeping in the parks!<br>Moloch! Moloch! Nightmare of Moloch! Moloch the loveless! Mental Moloch! Moloch the heavy judger of men!<br>Moloch the incomprehensible prison! Moloch the crossbone soulless jailhouse and Congress of sorrows! Moloch whose buildings are judgment! Moloch the vast stone of war! Moloch the stunned governments!<br>Moloch whose mind is pure machinery! Moloch whose blood is running money! Moloch whose fingers are ten armies! Moloch whose breast is a cannibal dynamo! Moloch whose ear is a smoking tomb!<br>Moloch whose eyes are a thousand blind windows! Moloch whose skyscrapers stand in the long streets like endless Jehovahs! Moloch whose factories dream and croak in the fog! Moloch whose smoke-stacks and antennae crown the cities!<br>Moloch whose love is endless oil and stone! Moloch whose soul is electricity and banks! Moloch whose poverty is the specter of genius! Moloch whose fate is a cloud of sexless hydrogen! Moloch whose name is the Mind!<br>Moloch in whom I sit lonely! Moloch in whom I dream Angels! Crazy in Moloch! Cocksucker in Moloch! Lacklove and manless in Moloch!<br>Moloch who entered my soul early! Moloch in whom I am a consciousness without a body! Moloch who frightened me out of my natural ecstasy! Moloch whom I abandon! Wake up in Moloch! Light streaming out of the sky!<br>Moloch! Moloch! Robot apartments! invisible suburbs! skeleton treasuries! blind capitals! demonic industries! spectral nations! invincible madhouses! granite cocks! monstrous bombs!<br>They broke their backs lifting Moloch to Heaven! Pavements, trees, radios, tons! lifting the city to Heaven which exists and is everywhere about us!<br>Visions! omens! hallucinations! miracles! ecstasies! gone down the American river!<br>Dreams! adorations! illuminations! religions! the whole boatload of sensitive bullshit!<br>Breakthroughs! over the river! flips and crucifixions! gone down the flood! Highs! Epiphanies! Despairs! Ten years' animal screams and suicides! Minds! New loves! Mad generation! down on the rocks of Time!<br>Real holy laughter in the river! They saw it all! the wild eyes! the holy yells! They bade farewell! They jumped off the roof! to solitude! waving! carrying flowers! Down to the river! into the street!
 ---
 Track: Jet Black
-Directory: jet-black-kal-la-kal-la
+Suffix Directory: true
 Duration: '6:42'
 URLs:
 - https://nasqueron.bandcamp.com/track/jet-black
diff --git a/album/i-miss-you-earthbound-2012.yaml b/album/i-miss-you-earthbound-2012.yaml
index b468f7bb..6f041c20 100644
--- a/album/i-miss-you-earthbound-2012.yaml
+++ b/album/i-miss-you-earthbound-2012.yaml
@@ -1,6 +1,7 @@
 Album: I Miss You - EarthBound 2012
 Date: January 1, 2012
 Date Added: April 13, 2024
+Directory Suffix: i-miss-you
 URLs:
 - https://sleepytimejesse.bandcamp.com/album/i-miss-you-earthbound-2012
 - https://youtube.com/playlist?list=PLI7cAsCDsB3Frjq5OxscvQ8aVp6XFJIG6
@@ -213,7 +214,7 @@ Commentary: |-
     There are a lot of chill songs in EarthBound with rolly-snare drum loops, chill chords, and poppy, droopy bass. [Hospital](https://youtu.be/8SH2tEgUo2s) definitely comes to mind, as does the [[track:choose-a-file|Select Your File]] theme. This song is essentially a fusion of those two tracks to create something chill and faux-nostalgic. It’s always nice to make something that isn’t punching you in the face.
 ---
 Track: Goodbye
-Directory: goodbye-i-miss-you
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - sleepytimejesse
diff --git a/album/induction.yaml b/album/induction.yaml
index fd88101d..a330daed 100644
--- a/album/induction.yaml
+++ b/album/induction.yaml
@@ -35,7 +35,6 @@ Commentary: |-
 Section: Main album
 ---
 Track: Induction
-Directory: induction
 Originally Released As: Havoc
 Duration: '2:30'
 URLs:
@@ -46,7 +45,6 @@ Commentary:
     Originally appeared as [[track:havoc|'Havoc']] on [[album:homestuck-vol-8|Homestuck Volume 8]]
 ---
 Track: My Hibernation
-Directory: my-hibernation
 Duration: '3:32'
 URLs:
 - https://svix.bandcamp.com/track/my-hibernation-2
@@ -71,7 +69,7 @@ Lyrics: |-
     You're gaining momentum
 ---
 Track: Verisimilitude
-Directory: verisimilitude-induction
+Suffix Directory: true
 Duration: '5:18'
 URLs:
 - https://svix.bandcamp.com/track/verisimilitude-2
@@ -112,7 +110,6 @@ Lyrics: |-
     Heed my entrance
 ---
 Track: It Really Doesn't Matter
-Directory: it-really-doesnt-matter
 Duration: '5:39'
 URLs:
 - https://svix.bandcamp.com/track/it-really-doesnt-matter-2
@@ -142,7 +139,8 @@ Lyrics: |-
     Look at you you're falling
 ---
 Track: Goodbye
-Directory: goodbye-induction
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '4:02'
 URLs:
 - https://svix.bandcamp.com/track/goodbye-2
@@ -233,13 +231,13 @@ Lyrics: |-
     until your hand just slipped right through mine
 ---
 Track: Wistful
-Directory: wistful-induction
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '3:42'
 URLs:
 - https://svix.bandcamp.com/track/wistful-2
 ---
 Track: You Fade Away
-Directory: you-fade-away
 Duration: '3:39'
 URLs:
 - https://svix.bandcamp.com/track/you-fade-away-2
@@ -281,7 +279,6 @@ Lyrics: |-
     I'd think it so but the marks you left upon me
 ---
 Track: Shake Your Tail
-Directory: shake-your-tail
 Duration: '3:50'
 URLs:
 - https://svix.bandcamp.com/track/shake-your-tail-2
@@ -298,7 +295,6 @@ URLs:
 - https://svix.bandcamp.com/track/fire-forget-2
 ---
 Track: The Fox Cub
-Directory: the-fox-cub
 Duration: '2:56'
 URLs:
 - https://svix.bandcamp.com/track/the-fox-cub-2
@@ -306,7 +302,7 @@ URLs:
 Section: Download-only track
 ---
 Track: Fin
-Directory: fin-induction
+Suffix Directory: true
 Duration: '4:33'
 URLs:
 - https://www.youtube.com/watch?v=8UFXoZfWagQ
@@ -329,7 +325,6 @@ Commentary: |-
 Section: Remixes
 ---
 Track: Verisimilitude (Glaze Remix)
-Directory: verisimilitude-glaze-remix
 Artists:
 - Glaze
 - WoodenToaster
@@ -341,7 +336,6 @@ Referenced Tracks:
 - track:verisimilitude-induction
 ---
 Track: You Fade Away (Sanxion7 Remix)
-Directory: you-fade-away-sanxion7-remix
 Artists:
 - Sanxion7
 Duration: '2:58'
@@ -351,7 +345,6 @@ Referenced Tracks:
 - track:you-fade-away
 ---
 Track: Goodbye (Metawulf Remix)
-Directory: goodbye-metawulf-remix
 Artists:
 - Metawulf
 Duration: '4:17'
diff --git a/album/inhospitable-delisted.yaml b/album/inhospitable-delisted.yaml
index f6dbdb0b..cba817a9 100644
--- a/album/inhospitable-delisted.yaml
+++ b/album/inhospitable-delisted.yaml
@@ -1,4 +1,5 @@
 Album: '[INHOSPITABLE DELISTED]'
+Directory Suffix: inhospitable
 Artists:
 - tempest2k
 Date: January 4, 2021
@@ -31,7 +32,7 @@ URLs:
 Has Cover Art: false
 ---
 Track: Misconduct
-Directory: misconduct-inhospitable
+Suffix Directory: true
 Always Reference By Directory: true
 Date First Released: November 28, 2017
 Duration: '3:06'
@@ -45,7 +46,7 @@ URLs:
 - https://nuclear333.bandcamp.com/track/faultline-flatfoots
 ---
 Track: Regrets
-Directory: regrets-inhospitable
+Suffix Directory: true
 Always Reference By Directory: true
 Date First Released: November 28, 2017
 Duration: '2:03'
diff --git a/album/intense-symphonic-metal-covers-vol-16.yaml b/album/intense-symphonic-metal-covers-vol-16.yaml
index 907dcff0..3e46650e 100644
--- a/album/intense-symphonic-metal-covers-vol-16.yaml
+++ b/album/intense-symphonic-metal-covers-vol-16.yaml
@@ -1,5 +1,6 @@
 Album: Intense Symphonic Metal Covers, Vol. 16
 Directory: intense-symphonic-metal-covers-vol-16
+Directory Suffix: falkkone
 Artists:
 - FalKKonE
 Date: February 28, 2019
@@ -18,7 +19,8 @@ Groups:
 Cover Art File Extension: jpg
 ---
 Track: 'Rex Duodecim Angelus (From "Homestuck: AlterniaBound")'
-Directory: rex-duodecim-angelus-falkkone
+Directory: rex-duodecim-angelus
+Suffix Directory: true
 Duration: '6:49'
 URLs:
 - https://youtu.be/AWwBuzf1yAo
@@ -29,7 +31,8 @@ Referenced Tracks:
 - Rex Duodecim Angelus
 ---
 Track: 'BL1ND JUST1C3: 1NV3ST1G4T1ON !! (From "Homestuck: AlterniaBound")'
-Directory: bl1nd-just1c3-1nv3st1g4t1on-falkkone
+Directory: bl1nd-just1c3-1nv3st1g4t1on
+Suffix Directory: true
 Additional Names:
 - Name: 'Blind Justice: Investigation !! (From "Homestuck: AlterniaBound")'
   Annotation: quirk-free
@@ -43,7 +46,8 @@ Referenced Tracks:
 - track:bl1nd-just1c3-1nv3st1g4t1on
 ---
 Track: 'Destroyed Skyworld (From "Kid Icarus: Uprising")'
-Directory: destroyed-skyworld-falkkone
+Directory: destroyed-skyworld
+Suffix Directory: true
 Duration: '5:51'
 URLs:
 - https://youtu.be/mdgp2YYXv90
@@ -54,7 +58,8 @@ Referenced Tracks:
 - 'Chapter 20: Destroyed Skyworld'
 ---
 Track: Unfounded Revenge (From "Mother 3")
-Directory: unfounded-revenge-falkkone
+Directory: unfounded-revenge
+Suffix Directory: true
 Duration: '3:43'
 URLs:
 - https://youtu.be/UL3CUZhoZjU
@@ -65,7 +70,8 @@ Referenced Tracks:
 - Unfounded Revenge
 ---
 Track: 'Nothing to Lose (From "Castlevania: Harmony of Despair")'
-Directory: nothing-to-lose-falkkone
+Directory: nothing-to-lose
+Suffix Directory: true
 Duration: '3:37'
 URLs:
 - https://youtu.be/_BC4V1xObWQ
@@ -76,7 +82,8 @@ Referenced Tracks:
 - Nothing to Lose
 ---
 Track: 'Temple (From "Zelda II : The Adventure of Link")'
-Directory: temple-falkkone
+Directory: temple
+Suffix Directory: true
 Duration: '4:06'
 URLs:
 - https://youtu.be/6CgnOIIODc4
@@ -87,7 +94,8 @@ Referenced Tracks:
 - Temple BGM
 ---
 Track: accelerated world (From "Accel World")
-Directory: accelerated-world-falkkone
+Directory: accelerated-world
+Suffix Directory: true
 Duration: '6:58'
 URLs:
 - https://youtu.be/-EG9fn-IAOo
@@ -98,7 +106,8 @@ Referenced Tracks:
 - accelerated world (OST edit)
 ---
 Track: bugz (From "Accel World")
-Directory: bugz-falkkone
+Directory: bugz
+Suffix Directory: true
 Duration: '6:35'
 URLs:
 - https://youtu.be/14pHeSJNE-s
@@ -109,7 +118,8 @@ Referenced Tracks:
 - bugz
 ---
 Track: No, Thank You (From "K-ON!!")
-Directory: no-thank-you-falkkone
+Directory: no-thank-you
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - Sainte Séïa (vocals)
@@ -211,7 +221,8 @@ Lyrics: |-
     But not yet…I want to hold back from it</i>)
 ---
 Track: Legend of the Eagle Bearer (Main Theme) [From "Assassin's Creed Odyssey"]
-Directory: legend-of-the-eagle-bearer-main-theme-falkkone
+Directory: legend-of-the-eagle-bearer-main-theme
+Suffix Directory: true
 Duration: '3:49'
 URLs:
 - https://youtu.be/m6W5LJrN9FM
@@ -222,7 +233,8 @@ Referenced Tracks:
 - Legend of the Eagle Bearer (Main Theme)
 ---
 Track: Battle! Trainer (From "Pokémon Red / Green / Blue")
-Directory: battle-trainer-battle-pokemon-red-blue-falkkone
+Directory: battle-trainer-battle-pokemon-red-blue
+Suffix Directory: true
 Duration: '4:46'
 URLs:
 - https://youtu.be/TJUf9k-w5FY
@@ -233,7 +245,8 @@ Referenced Tracks:
 - track:battle-trainer-battle-pokemon-red-blue
 ---
 Track: Battle! Regirock / Regice / Registeel (From "Pokémon Ruby and Sapphire")
-Directory: battle-regirock-regice-registeel-pokemon-ruby-sapphire-falkkone
+Directory: battle-regirock-regice-registeel-pokemon-ruby-sapphire
+Suffix Directory: true
 Duration: '4:59'
 URLs:
 - https://youtu.be/WcDE_T8yUr0
@@ -244,7 +257,8 @@ Referenced Tracks:
 - track:battle-regirock-regice-registeel-pokemon-ruby-sapphire
 ---
 Track: Battle! Gym Leader (From " Pokémon Red / Green / Blue")
-Directory: battle-gym-leader-from-pokemon-red-green-blue-falkkone
+Directory: battle-gym-leader-from-pokemon-red-green-blue
+Suffix Directory: true
 Duration: '2:44'
 URLs:
 - https://youtu.be/nR95iZDbdAQ
@@ -255,7 +269,8 @@ Referenced Tracks:
 - Battle (VS Gym Leader)
 ---
 Track: Kinjirareta Asobi (From "Rozen Maiden")
-Directory: kinjirareta-asobi-falkkone
+Directory: kinjirareta-asobi
+Suffix Directory: true
 Duration: '4:22'
 Contributors:
 - MamieMegu (vocals)
@@ -350,7 +365,8 @@ Lyrics: |-
     (<i>Say that you truly love me with a pure kiss!</i>)
 ---
 Track: Isaac's Battle Theme (From "Golden Sun")
-Directory: isaacs-battle-theme-falkkone
+Directory: isaacs-battle-theme
+Suffix Directory: true
 Duration: '3:39'
 URLs:
 - https://youtu.be/S_ff94nus2M
@@ -361,7 +377,8 @@ Referenced Tracks:
 - Isaac's Battle Theme
 ---
 Track: Alice's Tango (You Will Be Mine)
-Directory: alices-tango-you-will-be-mine-falkkone
+Directory: alices-tango-you-will-be-mine
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:22'
 Contributors:
diff --git a/album/ithaca.yaml b/album/ithaca.yaml
index f42d2918..8eeae5c1 100644
--- a/album/ithaca.yaml
+++ b/album/ithaca.yaml
@@ -68,7 +68,7 @@ Commentary: |-
     melody and words i remember, and the idea that it was like a big synthpop song. i think maybe i'd just seen "a goofy movie" so powerline is swimming around in my psyche at that age. in this dream i'm watching this guy sing this song, and then i'm literally being lifted in the air by the singer (being a small kid) and the song is being delivered to me. in the morning he's exhausted from singing his heart out and sleeping in the garage. before we get a chance to talk to him he sneaks away in a golf cart. i interpret this as being a meeting between myself as a child and myself as an adult. like a self-fulfilling thing
 ---
 Track: Ascension
-Directory: ascension-ithaca
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Michael Guy Bowman
@@ -287,7 +287,7 @@ Lyrics: |-
     And I'd never once tried to fight for myself
 ---
 Track: Noun
-Directory: noun-ithaca
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:14'
 URLs:
diff --git a/album/jade-tower.yaml b/album/jade-tower.yaml
index f6b99551..b705864c 100644
--- a/album/jade-tower.yaml
+++ b/album/jade-tower.yaml
@@ -42,7 +42,7 @@ Lyrics: |-
     (Y'all ready to get funky!)
 ---
 Track: Run-Stab-Run
-Directory: run-stab-run-jade-tower
+Suffix Directory: true
 Date First Released: April 13, 2024
 Duration: '3:44'
 Artists:
diff --git a/album/jailbreak-vol-1.yaml b/album/jailbreak-vol-1.yaml
index 2574aff9..ddeb9e8c 100644
--- a/album/jailbreak-vol-1.yaml
+++ b/album/jailbreak-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Jailbreak Vol. 1
+Directory Suffix: jailbreak
 Date: October 16, 2011
 Date Added: October 10, 2020
 Additional Names:
@@ -126,7 +127,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Fanfare
-Directory: fanfare-jailbreak
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Robert J! Lake
@@ -194,7 +195,7 @@ Commentary: |-
     *(Continued in [[track:title-screen-jailbreak]])*
 ---
 Track: Title Screen
-Directory: title-screen-jailbreak
+Suffix Directory: true
 Artists:
 - Robert J! Lake
 Duration: '1:12'
@@ -388,7 +389,7 @@ Commentary: |-
     RJ!: No more talking. Jit: Okay.
 ---
 Track: Assail
-Directory: assail-jailbreak
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Erik Scheele
@@ -438,7 +439,7 @@ Commentary: |-
     Nick: Woah, what the hell was that?
 ---
 Track: Confrontation
-Directory: confrontation-jailbreak
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Andrew Huo
@@ -547,7 +548,7 @@ Commentary: |-
     RJ!: No, he does not have any tra—
 ---
 Track: Bars
-Directory: bars-jailbreak
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Robert J! Lake
@@ -1011,7 +1012,7 @@ Commentary: |-
     *(Continued in [[track:game-over-jailbreak]])*
 ---
 Track: Game Over
-Directory: game-over-jailbreak
+Suffix Directory: true
 Artists:
 - Robert J! Lake
 Duration: 0:31
@@ -1237,7 +1238,7 @@ Referenced Tracks:
 - Squiddles!
 ---
 Track: Distanced
-Directory: distanced-jailbreak
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Robert J! Lake
diff --git a/album/james-roach-collection.yaml b/album/james-roach-collection.yaml
index 153bccb4..25a8a250 100644
--- a/album/james-roach-collection.yaml
+++ b/album/james-roach-collection.yaml
@@ -1,4 +1,6 @@
 Album: James Roach Collection
+Directory Suffix: collection
+Suffix Track Directories: true
 Always Reference Tracks By Directory: true
 Artists:
 - James Roach
@@ -26,7 +28,6 @@ Commentary: |-
 Section: Main album
 ---
 Track: Artchop
-Directory: artchop-collection
 Originally Released As: ARTCHOP (APPARENTLY)
 Duration: 1:36
 URLs:
@@ -35,7 +36,7 @@ URLs:
 - https://music.apple.com/album/artchop/1507304960?i=1507304963
 ---
 Track: M_o_i_s_t
-Directory: moist-collection
+Directory: moist # suffixed
 Originally Released As: track:moist
 Duration: 2:29
 URLs:
@@ -44,7 +45,6 @@ URLs:
 - https://music.apple.com/album/m-o-i-s-t/1507304960?i=1507304965
 ---
 Track: Call Me Gor-Gor
-Directory: call-me-gor-gor-collection
 Originally Released As: Call me Gor-Gor
 Duration: 3:05
 URLs:
@@ -53,7 +53,6 @@ URLs:
 - https://music.apple.com/album/call-me-gor-gor/1507304960?i=1507304966
 ---
 Track: TFW Another James Roach Track
-Directory: tfw-another-james-roach-track-collection
 Originally Released As: '>tfw another james roach track'
 Duration: 2:55
 URLs:
@@ -62,7 +61,6 @@ URLs:
 - https://music.apple.com/album/tfw-another-james-roach-track/1507304960?i=1507304967
 ---
 Track: Piwates
-Directory: piwates-collection
 Originally Released As: Piwates ',:^]
 Duration: 3:46
 URLs:
@@ -71,7 +69,6 @@ URLs:
 - https://music.apple.com/album/piwates/1507304960?i=1507304968
 ---
 Track: It Be Like That Sometimes
-Directory: it-be-like-that-sometimes-collection
 Originally Released As: it be like that sometimes
 Duration: 3:08
 URLs:
@@ -80,7 +77,6 @@ URLs:
 - https://music.apple.com/album/it-be-like-that-sometimes/1507304960?i=1507304969
 ---
 Track: Take Me to Clown Church
-Directory: take-me-to-clown-church-collection
 Originally Released As: take me to clown church
 Duration: 3:07
 URLs:
@@ -89,7 +85,6 @@ URLs:
 - https://music.apple.com/album/take-me-to-clown-church/1507304960?i=1507304970
 ---
 Track: Fortnite Funny Moments Episode 413
-Directory: fortnite-funny-moments-episode-413-collection
 Originally Released As: fortnite funny moments epic fails episode 413
 Always Reference By Directory: true
 Duration: 3:36
@@ -99,7 +94,6 @@ URLs:
 - https://music.apple.com/album/fortnite-funny-moments-episode-413/1507304960?i=1507304971
 ---
 Track: Old Secret
-Directory: old-secret-collection
 Originally Released As: Old Secret
 Duration: 4:26
 URLs:
@@ -108,7 +102,6 @@ URLs:
 - https://music.apple.com/album/old-secret/1507304960?i=1507304972
 ---
 Track: Service Car
-Directory: service-car-collection
 Originally Released As: SERVICE CAR
 Duration: 4:13
 URLs:
@@ -117,7 +110,6 @@ URLs:
 - https://music.apple.com/album/service-car/1507304960?i=1507304973
 ---
 Track: An Ascii Image of Bowsette
-Directory: an-ascii-image-of-bowsette-collection
 Originally Released As: (an ascii image of bowsette)
 Duration: 5:09
 URLs:
@@ -126,7 +118,6 @@ URLs:
 - https://music.apple.com/album/an-ascii-image-of-bowsette/1507304960?i=1507304974
 ---
 Track: Graveyard Shift
-Directory: graveyard-shift-collection
 Originally Released As: GRAVEYARD SHIFT
 Duration: 5:24
 URLs:
@@ -135,7 +126,6 @@ URLs:
 - https://music.apple.com/album/graveyard-shift/1507304960?i=1507304975
 ---
 Track: Clownfucker
-Directory: clownfucker-collection
 Originally Released As: CLOWNFUCKER
 Duration: 2:52
 URLs:
@@ -144,7 +134,6 @@ URLs:
 - https://music.apple.com/album/clownfucker-feat-toby-fox/1507304960?i=1507305156
 ---
 Track: This Title Was Too Long
-Directory: this-title-was-too-long-collection
 Originally Released As: (this title was too long)
 Duration: 2:10
 URLs:
@@ -153,7 +142,6 @@ URLs:
 - https://music.apple.com/album/this-title-was-too-long/1507304960?i=1507305157
 ---
 Track: Turns Out Its Like the Shoe
-Directory: turns-out-its-like-the-shoe-collection
 Originally Released As: turns out its like the shoe
 Duration: 2:15
 URLs:
@@ -162,6 +150,7 @@ URLs:
 - https://music.apple.com/album/turns-out-its-like-the-shoe/1507304960?i=1507305158
 ---
 Track: I Guess I Do Other Stuff Now Too
+Suffix Directory: false
 Originally Released As: yall know i just do the music right
 Duration: 2:40
 URLs:
@@ -200,7 +189,6 @@ Commentary: |-
     ...this track changed names from "Yall Know I Just Do the Music Right", to "I Guess I Do Other Stuff Now Too".
 ---
 Track: The Final Clowntdown
-Directory: the-final-clowntdown-collection
 Originally Released As: the final clowntdown
 Duration: 3:11
 URLs:
@@ -209,7 +197,6 @@ URLs:
 - https://music.apple.com/album/the-final-clowntdown/1507304960?i=1507305160
 ---
 Track: END of Friendvangelion
-Directory: end-of-friendvangelion-collection
 Originally Released As: END OF FRIENDVANGELION
 Duration: 3:01
 URLs:
@@ -218,7 +205,6 @@ URLs:
 - https://music.apple.com/album/end-of-friendvangelion/1507304960?i=1507305161
 ---
 Track: Worst End
-Directory: worst-end-collection
 Originally Released As: WORST END
 Duration: 2:30
 URLs:
@@ -229,7 +215,6 @@ URLs:
 Section: Bonus track
 ---
 Track: Yeah It Is
-Directory: yeah-it-is-collection
 Always Reference By Directory: false
 Additional Names:
 - Name: >-
diff --git a/album/jugglanoids-from-outer-space.yaml b/album/jugglanoids-from-outer-space.yaml
index c4c5214c..cd72b2a4 100644
--- a/album/jugglanoids-from-outer-space.yaml
+++ b/album/jugglanoids-from-outer-space.yaml
@@ -1,5 +1,6 @@
 Album: 'Jugglanoids From Outer Space/First Interdimensional Clown Chronicles Volume One [UNRELEASED COMPILATION]'
 Directory: jugglanoids-from-outer-space
+Directory Suffix: jugglanoids
 Date: June 7, 2023
 Date Added: April 13, 2024
 URLs:
@@ -55,7 +56,7 @@ Lyrics: |-
     They coming towards, not for grace
 ---
 Track: Hornography
-Directory: hornography-jugglanoids
+Suffix Directory: true
 Duration: '2:30'
 URLs:
 - https://thehighblood.bandcamp.com/track/hornography
diff --git a/album/labyrinths-heart.yaml b/album/labyrinths-heart.yaml
index 2b47aef8..8d74cee2 100644
--- a/album/labyrinths-heart.yaml
+++ b/album/labyrinths-heart.yaml
@@ -34,7 +34,7 @@ URLs:
 - https://youtu.be/MCQjTIw6VY8
 ---
 Track: Minotaur
-Directory: minotaur-labyrinths-heart
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:36'
 URLs:
@@ -42,7 +42,7 @@ URLs:
 - https://youtu.be/NOIaL69tDHI
 ---
 Track: Pleas
-Directory: pleas-labyrinths-heart
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:06'
 URLs:
@@ -50,7 +50,7 @@ URLs:
 - https://youtu.be/F13Mw50d3Zk
 ---
 Track: Forgotten
-Directory: forgotten-labyrinths-heart
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:22'
 URLs:
@@ -87,7 +87,7 @@ URLs:
 - https://youtu.be/VvREunKFvkQ
 ---
 Track: Shoreline
-Directory: shoreline-labyrinths-heart
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:48'
 URLs:
@@ -113,7 +113,7 @@ URLs:
 - https://youtu.be/_uI2KZD9IYc
 ---
 Track: Fission
-Directory: fission-labyrinths-heart
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:30'
 URLs:
@@ -121,7 +121,7 @@ URLs:
 - https://youtu.be/l_ODZbxdzFg
 ---
 Track: Requiem
-Directory: requiem-labyrinths-heart
+Suffix Directory: true
 Duration: '4:38'
 URLs:
 - https://clarkpowell.bandcamp.com/track/requiem
diff --git a/album/land-of-hue-and-duels-trollside.yaml b/album/land-of-hue-and-duels-trollside.yaml
index 206176f3..cbd2d2e2 100644
--- a/album/land-of-hue-and-duels-trollside.yaml
+++ b/album/land-of-hue-and-duels-trollside.yaml
@@ -1,5 +1,7 @@
 Album: Land of Hue and Duels (Trollside)
 Directory: land-of-hue-and-duels-trollside
+Directory Suffix: lohad
+Suffix Track Directories: true
 Date: April 13, 2023
 Date Added: April 13, 2023
 Color: '#8fceef'
@@ -19,7 +21,6 @@ Commentary: |-
     Full Homestuck Fan Album I began in August of last year, comprised of 12 troll themes composed in Jummbox on my Chromebook, happy 4/13 !
 ---
 Track: ap0calypseArisen
-Directory: ap0calypsearisen-lohad
 Additional Names:
 - apocalypseArisen (quirk-free)
 Duration: '2:34'
@@ -27,7 +28,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=0
 ---
 Track: aDIOStOREADOR
-Directory: adiostoreador-lohad
 Additional Names:
 - adiosToreador (quirk-free)
 Duration: '2:02'
@@ -35,7 +35,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=154
 ---
 Track: twiinArmageddon2
-Directory: twiinarmageddon2-lohad
 Additional Names:
 - twinArmageddons (quirk-free)
 Duration: '2:05'
@@ -43,7 +42,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=276
 ---
 Track: CARCINOGENETICIST
-Directory: carcinogeneticist-lohad
 Additional Names:
 - carcinoGeneticist (quirk-free)
 Duration: '2:04'
@@ -51,7 +49,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=401
 ---
 Track: ':arsenicCatnip'
-Directory: arseniccatnip-lohad
 Additional Names:
 - arsenicCatnip (quirk-free)
 Duration: '2:46'
@@ -59,7 +56,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=525
 ---
 Track: GrimAuxiliatrix
-Directory: grimauxiliatrix-lohad
 Additional Names:
 - grimAuxiliatrix (quirk-free)
 Duration: '2:04'
@@ -67,7 +63,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=691
 ---
 Track: G4LLOWSC4L1BR4TOR
-Directory: g4llowsc4l1br4tor-lohad
 Additional Names:
 - gallowsCalibrator (quirk-free)
 Duration: '1:29'
@@ -75,7 +70,6 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=815
 ---
 Track: ar8chnidsGrip
-Directory: ar8chnidsgrip-lohad
 Additional Names:
 - arachnidsGrip (quirk-free)
 Duration: '1:51'
@@ -83,13 +77,11 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=904
 ---
 Track: centaursTesticle
-Directory: centaurstesticle-lohad
 Duration: '2:11'
 URLs:
 - https://youtu.be/D4RF2M9Z86w?t=1015
 ---
 Track: terminallyCaPrIcIoUs
-Directory: terminallycapricious-lohad
 Additional Names:
 - terminallyCapricious (quirk-free)
 Duration: '1:47'
@@ -97,13 +89,12 @@ URLs:
 - https://youtu.be/D4RF2M9Z86w?t=1146
 ---
 Track: caligulasAquarium
-Directory: caligulasaquarium-lohad
 Duration: '1:46'
 URLs:
 - https://youtu.be/D4RF2M9Z86w?t=1253
 ---
 Track: cuttlefis)(Culler
-Directory: cuttlefishculler-lohad
+Directory: cuttlefishculler
 Additional Names:
 - cuttlefishCuller (quirk-free)
 Duration: '2:21'
diff --git a/album/little-town-hero-original-soundtrack.yaml b/album/little-town-hero-original-soundtrack.yaml
index fce6009b..72c80d5c 100644
--- a/album/little-town-hero-original-soundtrack.yaml
+++ b/album/little-town-hero-original-soundtrack.yaml
@@ -1,5 +1,6 @@
 Album: Little Town Hero Original Soundtrack
 Directory: little-town-hero-original-soundtrack
+Directory Suffix: little-town-hero
 Artists:
 - Toby Fox
 - Hitomi Sato
@@ -102,7 +103,7 @@ Referenced Tracks:
 - Three Bad Boys
 ---
 Track: Roar
-Directory: roar-little-town-hero
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:23'
 Artists:
@@ -122,7 +123,7 @@ URLs:
 - https://www.youtube.com/watch?v=OCwxYGEJGgk
 ---
 Track: You Won!
-Directory: you-won-little-town-hero
+Suffix Directory: true
 Duration: '0:12'
 Artists:
 - Hitomi Sato
@@ -307,7 +308,7 @@ URLs:
 - https://www.youtube.com/watch?v=uCocKi9JK6Q
 ---
 Track: Game Over
-Directory: game-over-little-town-hero
+Suffix Directory: true
 Duration: '0:10'
 Artists:
 - Hitomi Sato
diff --git a/album/lofam.yaml b/album/lofam.yaml
index 04c9a29c..523164c8 100644
--- a/album/lofam.yaml
+++ b/album/lofam.yaml
@@ -286,7 +286,7 @@ Commentary: |-
     This song was basically a nostalgia bomb for me; I just had to think back to the days of playing SNES-era RPGs, and what I thought a title screen tune should sound like. Chrono Trigger's [title screen tune](https://www.youtube.com/watch?v=JU1rM8UYpus), in particular, was a big influence, as was the simple ["Dearly Beloved"](https://www.youtube.com/watch?v=g25QXnhVijQ) from Kingdom Hearts. The chiptune aesthetic certainly helped!
 ---
 Track: Downtime
-Directory: downtime-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
@@ -338,7 +338,7 @@ Commentary: |-
     Credit to AndrewNeo of Skaia.net for the track's name.
 ---
 Track: Meltwater
-Directory: meltwater-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Elaine Wang
@@ -590,7 +590,7 @@ Commentary: |-
     A nice, simple piece. Fashion in Homestuck is associated with Kanaya in my mind so I came up with the idea of Kanaya seeking to escape something, and then halfway through the song the klaxon alarm kicks in. Thus we get this piece of art.
 ---
 Track: Clockbreaker
-Directory: clockbreaker-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Mal McGannon
@@ -1085,7 +1085,7 @@ Commentary: |-
     I'd always hoped that I'd eventually come out with some Homestuck thing that would be well remembered by the fans. Here I was wasting my time whipping together silly mario paints, when I should have been recording catchy songs about amoral abusive relationships. Live and learn.
 ---
 Track: Under the Hat
-Directory: under-the-hat-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Erik Scheele
@@ -1413,7 +1413,7 @@ Commentary: |-
     This happened through my RP twitter account and I was totally drunk when I made the gif at 3 am. Now Shadolith is one of my fav musicians.
 ---
 Track: Vigilante
-Directory: vigilante-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Brenna Curran
@@ -1823,7 +1823,7 @@ Commentary: |-
     <i>Pose as a team, because shit just got real.</i>
 ---
 Track: Farewell
-Directory: farewell-lofam
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Fuzz
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index fca032d1..9a9836d0 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -94,7 +94,8 @@ Track Art File Extension: png
 Section: Disk 1
 ---
 Track: •~DISK 1~•
-Directory: disk1-lofam2
+Directory: disk1
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:31
@@ -246,7 +247,7 @@ Commentary: |-
     *"EUUUUUUUUNGH," GROANS THE ABDUCTEE MOOSE AS IT RISES.*
 ---
 Track: Rectify
-Directory: rectify-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
@@ -800,7 +801,7 @@ Commentary: |-
     I have been listening to Horizon's renditions of Homestuck music with her lyrics for a while now, and Flare has always been my favorite one she did. I hoped I could make a picture that represents the feeling of closeness beween the four kids in getting through the game that I feel in the words she wrote.
 ---
 Track: Sports
-Directory: sports-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Jamie Paige
@@ -1033,7 +1034,7 @@ Commentary: |-
     [[Doctor]], [[track:showtime-original-mix|Showtime]], [[track:beatdown-strider-style|Beatdown]], [[Pumpkin Cravings]], [[Chorale for Jaspers]], [[track:bl1nd-just1c3-1nv3st1g4t1on|BL1ND JUST1C3]], [[Atomyk Ebonpyre]], [[Horschestra]], [[track:MeGaLoVania]], [[Spider's Claw]], [[track:walk-stab-walk-r-and-e|Walk-Stab-Walk]], [[Liquid Negrocity]].
 ---
 Track: Irradiated
-Directory: irradiated-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ibarra
@@ -1163,7 +1164,7 @@ Commentary: |-
     <small>#lune draws things once every blue moon #lune is still terrible at commentary but that's okay?</small>
 ---
 Track: Sburban Genesis
-Directory: sburban-genesis-lofam2
+Suffix Directory: true
 Originally Released As: track:sburban-genesis
 Duration: '4:00'
 URLs:
@@ -1236,7 +1237,7 @@ Commentary: |-
     <center><i><big>BNORKEL</big></i></center>
 ---
 Track: Four
-Directory: four-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Trent West
@@ -1285,7 +1286,8 @@ Commentary: |-
 Section: Disk 2
 ---
 Track: •~Disk 2~•
-Directory: disk2-lofam2
+Directory: disk2
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:20
@@ -1561,7 +1563,7 @@ Commentary: |-
     - 10:53 - [[track:at-the-price-of-oblivion|At the Price of Oblivion]] - [[artist:malcolm-brown]]
 ---
 Track: Trapped
-Directory: trapped-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Yan Rodriguez
@@ -1873,7 +1875,7 @@ Commentary: |-
     Initially a [[track:frost-vol6]] remix but it became something else. The square-wave arpeggio that you hear is probably the only thing that is now reminiscent of that remix. It was because of the harp that this grew into something different. I actually composed this while the composition was playing. I would listen to the notes I had composed, and I would just place new notes where I think they would work while listening. Somehow, everything just seemed to fit together - the violins, the synths, the percussion - everything just worked. The structure of this composition just flowed. I'm pretty sure this is one of my best pieces so far.
 ---
 Track: Red Miles
-Directory: red-miles-lofam2
+Suffix Directory: true
 Artists:
 - David Dycus
 Duration: '2:25'
@@ -2044,7 +2046,7 @@ Commentary: |-
     I initially had no idea what I was going to do for this song. I skimmed through the tracks and noticed this one by Willow Ascenzo (who did some of my favorites on [[album:coloUrs-and-mayhem-universe-a]] like [[Teal Hunter]] and [[Violet Mariner]]), and I was instantly sold probably because of my love for pipe organs. Anyway, for a lack of better inspiration, I used the description left on soundcloud - "Final battle with Lord English." Tie that to Aranea's mentioning that Jake was destined to beat Lord English, and I had my inspiration. The lineart took much longer than it should have since my tablet had been freaking out and I haven't gotten the new one yet, but the coloring went quite smoothly.
 ---
 Track: Gangsta
-Directory: gangsta-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - The Basco Brothers
@@ -2138,7 +2140,7 @@ Commentary: |-
     Also, towards the end, please imagine Jake doing that thing where he jumps in the air shooting both pistols at once.
 ---
 Track: Showtime (Svix Mix)
-Directory: showtime-svix-mix-lofam2
+Suffix Directory: true
 Artists:
 - Svix
 Duration: '2:51'
@@ -2372,7 +2374,7 @@ Commentary: |-
     TG: and i would always watch myself try to do something different to dodge the trap but i always ended up dead</code>
 ---
 Track: Prophecy
-Directory: prophecy-lofam2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - David Dycus
diff --git a/album/lofam3.yaml b/album/lofam3.yaml
index ccb3ec21..584cacaa 100644
--- a/album/lofam3.yaml
+++ b/album/lofam3.yaml
@@ -103,7 +103,8 @@ Additional Files:
 Section: Disk 1
 ---
 Track: ˚ Disk 1 ˚
-Directory: disk1-lofam3
+Directory: disk1
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:24
@@ -211,7 +212,7 @@ Commentary: |-
     John is the hero. (See [[track:youre-the-hero-its-you|track 19]])
 ---
 Track: confinis
-Directory: confinis-lofam3
+Suffix Directory: true
 Originally Released As: track:confinis
 Additional Names:
 - '"beside", or "adjacent to" (English)'
@@ -420,7 +421,7 @@ Commentary: |-
     no, but really, SOO GOOOOD
 ---
 Track: '720413'
-Directory: 720413-lofam3
+Suffix Directory: true
 Originally Released As: track:720413
 Duration: '3:18'
 URLs:
@@ -588,7 +589,7 @@ Commentary: |-
     Karkat furiously playing the marimba ostinato.
 ---
 Track: Medium
-Directory: medium-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Arzenic
@@ -787,7 +788,7 @@ Commentary: |-
     This track was actually slated to be on [[album:lofam2|LOFAM 2]] originally, but got pushed back for some reason or other. This art's been around since then. Very dramatic.
 ---
 Track: Waveform
-Directory: waveform-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - keyboard cait
@@ -1095,7 +1096,8 @@ Commentary: |-
 Section: Disk 2
 ---
 Track: ˚ Disk 2 ˚
-Directory: disk2-lofam3
+Directory: disk2
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:11
@@ -1335,7 +1337,7 @@ Commentary: |-
     I also learnt that I can't draw psionic blasts for my life.
 ---
 Track: Dominion
-Directory: dominion-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
@@ -1385,7 +1387,6 @@ Commentary: |-
     Slick strut!
 ---
 Track: Tombs & Krypton
-Directory: tombs-and-krypton
 Artists:
 - Rob Little
 Duration: '2:46'
@@ -1410,7 +1411,7 @@ Commentary: |-
     I was beyond excited to get to be part of another fan album, especially to be drawing for a song connected to Dirk's planet, since he's one of my absolute favorite characters. Every kid/troll's planet reflects them and also challenges them at the same time. LOTAK is one of the more dangerous planets, with its constant raging lightning storms and the most powerful denizen at it's center, fitting for Dirk who is a determined, skilled fighter. The planet is also a contrast, a planet full of tall buildings for someone who grew up in an ocean surrounded by nothing. I really wanted to show LOTAK as an extension, or part of, Dirk himself. The song itself gives a sense of floating, or as the music artist said themselves, a very spacey feeling, so I tried to capture this as well, with the overview shot of the planet that Dirk appears to be floating over. I hope that others who look at my piece will feel I managed to picture the song well in my drawing for it.
 ---
 Track: Contention
-Directory: contention-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Marcy Nabors
@@ -1552,7 +1553,7 @@ Commentary: |-
     I wanted to go with a simple but striking design that worked on two levels: the large diamond with the grey layers, which looks good as a thumbnail on a small ipod screen or similar, and the silhouetted shadowy type DDs that are more apparent when you view the art at full size. I'm really happy with how well it worked out!
 ---
 Track: Invertebrate
-Directory: invertebrate-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Riki Tsuji
@@ -1594,7 +1595,7 @@ Commentary: |-
     Originally this track was intended for Parcel Mistress, but after learning more about Dirk's character I thought it fit him better. Thank you to LOFAM and all the talented musicians and artists who made this album possible!
 ---
 Track: Scabbard
-Directory: scabbard-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Yan Rodriguez
@@ -1816,7 +1817,7 @@ Commentary: |-
     I had been wanting to make a full set of functional, repearing titles anyway for use in maybe making a simple platformer, so I decided to make use of them and create a sort of "If mspa was a game in the 16 bit era" thing. The spirtes were also an excellent opportunity to test out the sprite base I've been working on making from scratch.
 ---
 Track: Insomniac
-Directory: insomniac-lofam3
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Princey The Kid
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 1158c678..39920b9d 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -258,7 +258,8 @@ Additional Files:
 Section: Disc 1
 ---
 Track: ~~DISC 1~~
-Directory: disc1-lofam4
+Directory: disc1
+Suffix Directory: true
 Artists:
 - Lambda Elise Merryberry
 - keyboard cait
@@ -282,7 +283,7 @@ Commentary: |-
     This piece was a very unique experience for me because it involved drawing something I was rather unfamiliar with. Before I started this piece I knew from the beginning I wanted something rather dynamic and fun and I feel the result stayed true to the image I had in mind. This piece was certainly difficult, but after some trial and error things eventually started coming together nicely. I ended up having a lot of fun trying out new brushes and mixing my favourite colors together to get a final result I was very pleased with.
 ---
 Track: Merge
-Directory: merge-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kouta
@@ -312,7 +313,7 @@ Commentary: |-
     I drew this immediately following [[flash:8087|[S] Collide]]. Kouta later asked to use it as the track cover for Merge on SoundCloud, and I was happy to oblige. I'm honoured that they saw it as a fitting image to accompany their (very impressive) track.
 ---
 Track: 'Jungle #3'
-Directory: jungle-3-lofam4
+Suffix Directory: true
 Originally Released As: track:jungle-3
 Duration: '4:05'
 URLs:
@@ -344,7 +345,7 @@ Commentary: |-
     This art is a lovely rendition by Fitzwibble of that bit in [[flash:5252|[S] Dirk: Unite]] where Dirk takes Roxy and Jane along for a ride. Unfortunately, due to her foolish boorishness, Jane does not appreciate the joy of flying through the air as a bird would in spring. It is a shame, that such an enlightening experience must go ignored.
 ---
 Track: Frost and Clockwork
-Directory: frost-and-clockwork-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Circlejourney
@@ -375,7 +376,7 @@ Commentary: |-
     This was such a fun song and it reminded me of one of my favorite parts of Homestuck - the fun and adventure. It feels so welcoming and warm and triumphant, and I really tried to capture that here!
 ---
 Track: Reunited
-Directory: reunited-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Shandy
@@ -425,7 +426,7 @@ Commentary: |-
     The song that Mmetafour made was an electronic 8-bit style mix, so, logically, I took the role of drawing (or rather, "spriting") the art for this track. As you may know, the song symbolizes Prospit from A6A6A1 after it gets destroyed, so I did two scenes in one: Jane and Jake after their godtier transformations, and our heroes encountering Jack English for the first time. Come to think of it, that act was really messed up, wasn't it? Anyway, the song is amazing, and I really liked how the art came out. I hope you enjoy it too!
 ---
 Track: Altitude
-Directory: altitude-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Whimsy
@@ -452,7 +453,7 @@ Commentary: |-
     i went through like fucking 5 variations of this art before i just decided to fuck it and do vaguely johnroxy retcon sequence that was at the bottom of the subreddit for some time. all of the others involved davesprite but fuck blorange. also please dont notice how lazy i was and i used the color blending tool on the tree when everything else was with the pencil tool.
 ---
 Track: Midnight
-Directory: midnight-lofam4
+Suffix Directory: true
 Originally Released As: track:midnight-canmt
 Duration: '2:47'
 URLs:
@@ -475,7 +476,7 @@ Commentary: |-
     I chose Midnight as my track art, mostly just because of my love for Intermission. The song is absolutely fantastic, but since I'm not the most creative person around it took me a while to come up with any concrete designs at first. I was originally going to start off with a 50/50 bust drawing of Slick and Jack, but I soon discovered that might be a little too bland. I ended up listening to the song a dozen more times until I sketched out the base idea for the finalized idea. The main challenge had just been lining everything and getting the perspective to look pretty alright, although I'm not really an expert on perspective or composition. Either way, I'm really happy with how the piece turned out, especailly with the lighting on Slick himself.
 ---
 Track: Dersite
-Directory: dersite-lofam4
+Suffix Directory: true
 Originally Released As: track:dersite
 Duration: '1:51'
 URLs:
@@ -662,7 +663,7 @@ Commentary: |-
     A little known power held by the clearly very fictional and not at all real troll folklore creatures known as "Rainbow Drinkers" is to create flashing green silhouettes of themselves whenever they dance. This of course, holds no practical purpose whatsoever, except for the theoretical seduction of aliens who happen to resemble flighty broads.
 ---
 Track: Intermission
-Directory: intermission-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Joe Ouellet
@@ -716,7 +717,7 @@ Commentary: |-
     I've always loved the 'John's retocn adventures' section of Homestuck, and I think it has to do with how it leads both the characters and myself along a brisk rollercoaster of twists and turns, through unknown paths - this sense of adventure is what I tried to convey in this art.
 ---
 Track: Formation
-Directory: formation-lofam4
+Suffix Directory: true
 Originally Released As: track:formation
 Duration: '3:43'
 URLs:
@@ -737,7 +738,7 @@ Commentary: |-
     Formation has a very 80's vibe to it, so I decided to aim towards more of a Hotline Miami feel for the accompanying artwork. I'm not sure how well I achieved that, but I figure a combination of bright colours and guns is at least veering in the right direction.
 ---
 Track: Scales
-Directory: scales-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Helena Ruth
@@ -802,7 +803,7 @@ Commentary: |-
     the track is really pretty in a melancholic and reminiscing way so I wanted to encorporate things from earlier in the comic (the tree, the hanging scalemates, and the pink flowers) into a sadder scene that's near the end? The tree's also a clever metaphor for branching paths and al that lol and also it looks cool
 ---
 Track: Glide
-Directory: glide-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Veritas Unae
@@ -827,7 +828,7 @@ Commentary: |-
     We've only ever seen Alt!Calliope looking extremely grim in the comic so I thought it might be a nice change if I were to depict her in a more clement mood. Imagine her soaring through space, creating and destroying galaxies. I gave her wings just so that the illustration would remain relevant to the title of the piece.
 ---
 Track: Limelight
-Directory: limelight-lofam4
+Suffix Directory: true
 Originally Released As: track:limelight
 Additional Names:
 - Miss America (working name)
@@ -873,7 +874,7 @@ Commentary: |-
     The futility of a sacrifice, the chaos of a final battle, the wrath of an arbiter, the finding of love after death, the absolute ownage of a sharply written missive. All these and more contributed to making the epic ending of Problem Sleuth what it came to be known as: a confusing clusterfuck of hilarious and completely insane shenanigans.
 ---
 Track: Stubborn Throes
-Directory: stubborn-throes-lofam4
+Suffix Directory: true
 Originally Released As: track:stubborn-throes
 Duration: '3:08'
 URLs:
@@ -945,7 +946,7 @@ Commentary: |-
     At one point I described this as something along the lines of "electric Scottish war music", and that still stands. The melody in this song is absolutely iconic, if you ask me, and it gets INCREDIBLY amped. Maybe enough to see what lies under that voltaic fault. (Spoiler: It's just a lot of xenon.) Also, the lyrics to this song are "DANGER HIGH VOLTAGE". That is all.
 ---
 Track: Ghosts
-Directory: ghosts-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - David Dycus
@@ -998,7 +999,7 @@ Commentary: |-
     This took a really long time.
 ---
 Track: Aura of Colour
-Directory: aura-of-colour-lofam4
+Suffix Directory: true
 Originally Released As: track:aura-of-colour
 Duration: '3:43'
 URLs:
@@ -1252,7 +1253,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: ~~DISC 2~~
-Directory: disc2-lofam4
+Directory: disc2
+Suffix Directory: true
 Artists:
 - Lambda Elise Merryberry
 - keyboard cait
@@ -1278,7 +1280,7 @@ Commentary: |-
     In my opinion, this track art perfectly fits the "calm before the storm" vibe of a middle before an end, like Disc 2 is before the endgame-themed Disc 3. I'll also note it looks incredibly fitting for the cover of a vinyl record, and with those bright colors and jazzy writing I'd check that hypothetical cover out the moment I saw it.
 ---
 Track: Hiatus
-Directory: hiatus-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kevin Grant
@@ -1565,7 +1567,6 @@ Commentary: |-
     If you liked Bowman's Homestuck stuff, love comedy videos, or were just too damn intrigued by this song to stay out of the loop, I recommend giving [the Stutzbows](https://youtube.com/playlist?list=PLoOnh0MiKsmJb0CsYOTzkihMcNSl6-ruw) (as I like to call their videos) a watch. Whether it's Scott singing you the jingle for his favorite breakfast cereal, Bowman informing you about his credit score (spoiler alert: it's 720), or both of them having some good, old-fashioned backyard fun, I'm certain there's something to enjoy for everyone.
 ---
 Track: Schrödinger's Harbinger
-Directory: schrodingers-harbinger
 Artists:
 - Noisemaker
 Duration: '2:21'
@@ -1682,7 +1683,7 @@ Commentary: |-
     In this piece by sonotcanon, Jade looks down on the city of Prospit from one of the... Prospit Towers. I'd say that sitting like that on a window pane is unsafe, but then I remembered that dreamselves can, you know, fly, so whatever.
 ---
 Track: Red
-Directory: red-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Tamara Fritz
@@ -1732,7 +1733,7 @@ Commentary: |-
     I needed to draw something equally cute for this cute track. I made this almost exclusively with MS Paint save for the final effects on the art, which were done with SAI.
 ---
 Track: Daydreamer
-Directory: daydreamer-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - electric lantern
@@ -1879,8 +1880,8 @@ Commentary: |-
     A calmer, somewhat less dramatic remix of [[Gold Pilot]]. I'd imagine it gets pretty lonely exploring the EXPANSES OF INTERSTELLAR SPACE.
 ---
 Track: Horizontal Headshot
+Suffix Directory: true
 Originally Released As: track:horizontal-headshot
-Directory: horizontal-headshot-lofam4
 Duration: '2:51'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/horizontal-headshot
@@ -1991,7 +1992,7 @@ Commentary: |-
     Look, I should never be allowed to draw Bionicles.
 ---
 Track: Ringleader
-Directory: ringleader-lofam4
+Suffix Directory: true
 Originally Released As: track:ringleader-canmt
 Duration: '3:07'
 URLs:
@@ -2301,7 +2302,7 @@ Commentary: |-
     (SFX: Toki yo Tomare.)
 ---
 Track: Climbing to Infinity
-Directory: climbing-to-infinity-lofam4
+Suffix Directory: true
 Originally Released As: track:climbing-to-infinity
 Duration: '4:28'
 URLs:
@@ -2462,7 +2463,7 @@ Lyrics: |-
     [collective laughter]—)
 ---
 Track: hors
-Directory: hors-lofam4
+Suffix Directory: true
 Originally Released As: track:hors
 Duration: '3:17'
 URLs:
@@ -2486,7 +2487,7 @@ Commentary: |-
     Jojo and Homestuck sure do have a lot of things in common, don't they? Themes of predestination, weird time shit, luck being used as a weapon, a guy without the use of his legs, horses everywhere in a certain part...it's all kind of weird and interesting. So that's why I did an EPIC JOJOKE for this trackart. If you don't understand what's going on here, read some more Jojo, I guess. Or don't. Look, Hors is a great, funny track, and this is the dank artistry it deserves as accompaniment. You're welcome.
 ---
 Track: The Gemoni Mustard Blood
-Directory: the-gemoni-mustard-blood-lofam4
+Suffix Directory: true
 Originally Released As: track:the-gemoni-mustard-blood
 Duration: '2:04'
 URLs:
@@ -2512,7 +2513,7 @@ Commentary: |-
     Sollux is about to get down. Gotta give out some FRESH BEATS. Gotta JAM YOUR EYEBALLS AND EARHOLES WITH SOME SWEET ASS TUNES. CHECK IT OUT YO.
 ---
 Track: Reconciled
-Directory: reconciled-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Shandy
@@ -2642,7 +2643,7 @@ Commentary: |-
     I'm really glad I had the chance to draw track art for a cherub song since Caliborn is probably one of my favorite characters in Homestuck. I tried to fill this up with as many pieces of imagery of the cherub's journeys to god tier, all framed within a beautiful clock ready to be smashed with a crowbar. Side Note: Caliborn's gun was superbly hard to draw and now I can see why Hussie used a jpg image for it as often as he could.
 ---
 Track: Resend
-Directory: resend-lofam4
+Suffix Directory: true
 Originally Released As: track:resend
 Duration: '4:48'
 URLs:
@@ -2666,7 +2667,8 @@ Commentary: |-
 Section: Disc 3
 ---
 Track: ~~DISC 3~~
-Directory: disc3-lofam4
+Directory: disc3
+Suffix Directory: true
 Artists:
 - Lambda Elise Merryberry
 - keyboard cait
@@ -2778,7 +2780,7 @@ Commentary: |-
     (Note: Don't do drugs, kids. Note 2: Don't even THINK of doing meth, trust on this one, please. Note 3: This isn't actually all-new, it's been around since 2013, but BOY is it still a doozy. Note 4: This is a remix of a remix of a remix. Are you a bad enough dude (or any casual moniker of your choice) to continue the chain? Note 5: I've run out of ntoes, so I guess... enjoy the song?!?!?)
 ---
 Track: Thyme on My Fries
-Directory: thyme-on-my-fries-lofam4
+Suffix Directory: true
 Originally Released As: track:thyme-on-my-fries
 Duration: '3:24'
 URLs:
@@ -2867,7 +2869,7 @@ Commentary: |-
     Radness is a rad song so it needed a rad track art and what is more rad than alpha dave soaring through space on unreal air? but there's also a bit of playfulness to the song which is why I added those shitty statues of liberty. Imagine dave with pockets full of shitty statues of liberty just tossing them down on the planet as he flies by.
 ---
 Track: Conflict!
-Directory: conflict-lofam4
+Suffix Directory: true
 Originally Released As: track:conflict
 Duration: '1:07'
 URLs:
@@ -3048,7 +3050,7 @@ Commentary: |-
     [[track:airtime-assault|Also johndave is a bad ship suck it viko]]
 ---
 Track: Shatter
-Directory: shatter-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kanishka
@@ -3088,7 +3090,7 @@ Commentary: |-
     Together in my room" - [Vengaboys](https://www.youtube.com/watch?v=llyiQ4I-mcQ)
 ---
 Track: Denizen
-Directory: denizen-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kouta
@@ -3250,7 +3252,7 @@ Commentary: |-
     I love dealing with dark foreground figures against bright backgrounds, so this was fun to add the final touches to. I got a sense of what Quietserval was going for with this drawing from talking to them, and tried to realise that in its fullest.
 ---
 Track: Everlasting
-Directory: everlasting-lofam4
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Joe Ouellet
@@ -3351,8 +3353,8 @@ Commentary: |-
     The final boss is beaten. The game is won. The lights fade and the world begins to disappear. A gaping maw drags all into it, even the very fabric of reality. In the distance, a door opens.
 ---
 Track: Strife Mayhem
+Suffix Directory: true
 Originally Released As: track:strife-mayhem
-Directory: strife-mayhem-lofam4
 Additional Names:
 - Metallic Mayhem (original name)
 Duration: '5:39'
@@ -3617,8 +3619,8 @@ Commentary: |-
     It's been long enough since I made this image that I don't have much that I can remember to say about this, beyond feeling like I really nailed Boxcars' face.
 ---
 Track: Collision Course (Davepeta's Movement)
+Suffix Directory: true
 Originally Released As: track:collision-course-davepetas-movement
-Directory: collision-course-davepetas-movement-lofam4
 Duration: '4:05'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/collision-course-davepetas-movement
@@ -3639,8 +3641,8 @@ Commentary: |-
     this used to be [[track:collision-course-davepetas-movement|a normal edit]] of [[track:upward-movement-dave-owns|the Upward Movement cover]] but [[album:greatest-hits-2|greatest hits 2]] happened on the cool and new music team so i decided [[track:collision-course-davepetas-movement-greatest-hits-2|to redo it]]. i experimented a lot with the shading but in the end, i kept something simple
 ---
 Track: Revisit/Rewind
+Suffix Directory: true
 Originally Released As: track:revisit-rewind
-Directory: revisit-rewind-lofam4
 Duration: '6:13'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/revisit-rewind
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index d7eb5a42..d698aaeb 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -44,8 +44,8 @@ Additional Files:
   - bg.jpg
 ---
 Track: Skaian Spirograph
+Suffix Directory: true
 Originally Released As: track:skaian-spirograph
-Directory: skaian-spirograph-lofam5
 Duration: '2:56'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/skaian-spirograph
@@ -63,7 +63,7 @@ Commentary: |-
     Skaia has such pretty colours, I wanted to capture that.
 ---
 Track: Spacetime Starstriker
-Directory: spacetime-starstriker-lofam5
+Suffix Directory: true
 Originally Released As: track:spacetime-starstriker
 Duration: '2:19'
 URLs:
@@ -172,7 +172,7 @@ Commentary: |-
     This one I actually wrote a while ago. At this point I was just challenging myself to make as many homestuck covers in as many different styles as I could and I think this one is particularly special. Squiddles were already one of my favorite little lore spirals from homestuck so to be able to put a little bit more AU weirdness is something Im honored to be able to do.
 ---
 Track: On an Island Far Away
-Directory: on-an-island-far-away-lofam5
+Suffix Directory: true
 Artists:
 - Circlejourney
 Contributors:
@@ -218,7 +218,7 @@ Commentary: |-
     Yeah I don't think I had another option I had to draw this.
 ---
 Track: Alpha Admission
-Directory: alpha-admission-lofam5
+Suffix Directory: true
 Originally Released As: track:alpha-admission
 Duration: '3:47'
 URLs:
@@ -301,10 +301,10 @@ Commentary: |-
     This song was made up on the spot note-by-note, but I think it turned out well.
 ---
 Track: Spritely Gardener
+Suffix Directory: true
 Additional Names:
 - Name: Spritely Gardener (Redux)
   Annotation: '[YouTube](https://www.youtube.com/watch?v=yux7hM9TrhQ)'
-Directory: spritely-gardener-lofam5
 Artists:
 - Rainy
 Duration: '3:19'
@@ -365,8 +365,8 @@ Commentary: |-
     The crimson glow of the rising sun falls across the Strider apartment complex, and it looks like Dave's pulled an all-nighter working on his jams. His neighbors must love him. I made this art pretty quickly but I'm proud of it all the same, managed to capture some vibes.
 ---
 Track: Aggrieve (Knightcore Mix)
+Suffix Directory: true
 Originally Released As: track:aggrieve-knightcore-mix
-Directory: aggrieve-knightcore-mix-lofam5
 Duration: '1:53'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/aggrieve-knightcore-mix
@@ -384,7 +384,7 @@ Commentary: |-
     Upon Makin's suggestion, someone needed to make the art for this Rose pondering her orb. And that someone was me. I like to think she does this regularly. Has a special room in her house just for Orb Pondering. And Kanaya just has to deal with it.
 ---
 Track: Dreamers
-Directory: dreamers-lofam5
+Suffix Directory: true
 Originally Released As: track:dreamers
 Duration: '5:29'
 URLs:
@@ -402,8 +402,9 @@ Commentary: |-
     I originally had very different art in mind for this track, but every time I heard it, it made me think of someone falling through the center of Derse. The use of the [[Atomyk Ebonpyre]] motif decided that that person would be Dave, and while it didn't really end up being the center of the planet, I feel like I captured the vibe well enough.
 ---
 Track: F∞ クライミング『CLIMBING』
+Directory: f-climbing
+Suffix Directory: true
 Originally Released As: track:f-climbing
-Directory: f-climbing-lofam5
 Duration: '2:50'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/f-climbing
@@ -435,7 +436,7 @@ Commentary: |-
     You know that old Windows screensaver? No no, not the flying toasters. No, not the maze one! I mean that one that your teachers always used so you just stared at it all period instead of getting work done. Yes, with the pipes! This is that but LOWAS, and also taking 20 minutes to render a frame instead of whatever fps the old screensaver ran at. The cost of beauty. It's an honor to make art for a LOFAM album, I've been listening to the older ones since I was a teenager. You could say that with this art I fulfilled a Pipe Dream.
 ---
 Track: Stab - Stab - Stab
-Directory: stab-stab-stab-lofam5
+Suffix Directory: true
 Originally Released As: track:stab-stab-stab
 Duration: '3:56'
 URLs:
@@ -473,7 +474,7 @@ Commentary: |-
     This was some of the first non-pixel digital art I ever did, and for that, I think it turned out pretty well. However, I had a real knack for doing things the hardest possible way, and oh my god, I never want to draw another clock again. I did all of this, with a keyboard and trackpad, on a free trial for a photoshop knockoff. That wallpaper? I didn't figure out how to use the copy-paste tool properly, and had to manually put in every detail on it. This was a nightmare to complete, (albeit a nightmare of my own making), so you all had better appreciate it.
 ---
 Track: Black (Electro Swing Remix)
-Directory: black-electro-swing-remix-lofam5
+Suffix Directory: true
 Originally Released As: Black - Electro Swing Remix
 Duration: '2:55'
 URLs:
@@ -490,7 +491,7 @@ Commentary: |-
     The art for this track is actually [a video](https://www.youtube.com/watch?v=okTNlwSViX8), so I had to combine a few frames into one, but you can probably get the gist. Damn it Bandcamp, add APNG support already.
 ---
 Track: Dance of Entropy
-Directory: dance-of-entropy-lofam5
+Suffix Directory: true
 Originally Released As: track:dance-of-entropy
 Duration: '2:08'
 URLs:
@@ -533,7 +534,7 @@ Commentary: |-
     Rose and Dave chilling on Derse, with some horrorterrors looming above. (I've taken some artistic liberties with the horrorterrors, in being conjoined into a single mass they kinda resemble the horrorterrors in my fanventure [The Tapestry](https://mspfa.com/?s=21688&p=1) more than canon Homestuck ones)
 ---
 Track: Wayward
-Directory: wayward-lofam5
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Shwan
@@ -611,7 +612,7 @@ Commentary: |-
     Also this tracks makes me want to eat ice cream for some reason.
 ---
 Track: She's a D8ddy L8ng L8gs
-Directory: shes-a-d8ddy-l8ng-l8gs-lofam5
+Suffix Directory: true
 Originally Released As: track:shes-a-d8ddy-lon8-l8gs
 Additional Names:
 - She's a Daddy Long Legs (quirk-free)
@@ -716,7 +717,7 @@ Commentary: |-
     Decided to focus on the handmaid and the condesce because of the female laughs in the track and also because they basically shaped the blood based society of alternia as it is. With a little nod to doc scratch through the handmaid.
 ---
 Track: Madame Controversielle 2
-Directory: madame-controversielle-2-lofam5
+Suffix Directory: true
 Originally Released As: track:madame-controversielle-2
 Duration: '2:43'
 URLs:
@@ -802,7 +803,6 @@ Commentary: |-
     It's hard to make a design like the unprototyped black king seem threatening.
 ---
 Track: Pondsquatter (Demaster/Demix)
-Directory: pondsquatter-demaster-demix
 Artists:
 - Mathias Ramalho
 Duration: '3:52'
@@ -842,7 +842,7 @@ Commentary: |-
     Opted for a simple panel redraw on this one, since it was going to be the backup art, and the musicians liked the panel choice.
 ---
 Track: Scratching Consequences
-Directory: scratching-consequences-lofam5
+Suffix Directory: true
 Originally Released As: track:scratching-consequences
 Duration: '1:44'
 URLs:
@@ -906,7 +906,7 @@ Commentary: |-
     From the artist who made the hit single flarezzzzzzz (from Cool And New Homestuck), bringing you..., another [[Flare|flare]] song.
 ---
 Track: The Dreamer and the Dream
-Directory: the-dreamer-and-the-dream-lofam5
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kal-la-kal-la
@@ -927,7 +927,7 @@ Commentary: |-
     I had a minute where I wanted to put shakuhachi in everything I did á la [[album:homestuck-vol-6|HS Volume 6]]
 ---
 Track: Sailing (In The Sea Of Stars)
-Directory: sailing-in-the-sea-of-stars-lofam5
+Suffix Directory: true
 Originally Released As: track:sailing-in-the-sea-of-stars
 Always Reference By Directory: true
 Duration: '4:22'
@@ -1006,8 +1006,8 @@ Commentary: |-
     I made this song shortly after reading Detective Pony, when Dirk Strider was fresh on my mind and skyrocketing to the top of my all-time favorite characters. I wanted to do something specifically for the offscreen period between the end of homestuck and the epilogues, his journey to becoming what he is now, his acceptance of becoming the villain, etc. Mainly, just really love Dirk. Also, it's an excuse to give some love to some of his more underrated songs. (Basically anything that isn't [[Beatdown (Strider Style)|Beatdown]].) I had never even heard [[Austin, Atlantis|Austin Atlantis]] before I started on this song, and man was I missing out, so it quickly became the basis for the whole thing. In retrospect I wish I could've put [[Orange Hat]] in there somewhere, mainly just cause that's also an awesome underrated song, but by the time I remembered, this was mostly done and it wouldn't have really fit anywhere. This might be the song I'm happiest with on this album.
 ---
 Track: Strain
+Suffix Directory: true
 Originally Released As: track:strain-canmt
-Directory: strain-lofam5
 Duration: '2:27'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/strain
@@ -1157,7 +1157,7 @@ Commentary: |-
     There was a lot going on in the production of this, and none of it had to do with the final track. A long, long time ago, before any of my other submissions, I was going to do a Caliborn track, with the intent of being presented as a track that Caliborn himself produced. But at that time, there weren't many other submissions for this album yet, and a disturbingly high percentage of them were cherub related, so I dropped it. A year later, I was working on a remix of the afterword theme from Pesterquest, but it wasn't really clicking right. The heavy bass synths and bitcrushed drums weren't working for the style of the track. Around the same time, I finally got my hands on the incredibly elusive midi of [[track:carne-vale]], which has been my favorite homestuck song since the first time I heard it, and has yet to be dethroned. So I had the crazy notion, that the instruments I was using for my Pesterquest remix would work fantastically if I decided to go back to a Caliborn track, now that I could properly reference [[track:carne-vale]]. (I had been trying to figure out that bassline by ear for, oh lord, something like 3 years.) And, I ended up with what might be one of my favorite compositions of mine to date. Had it stuck in my head for months. Cleaned up the mixing over the next little while, and the rest is history. I had two names for it for a while, Teeth and Blood, and Space Crusader. Originally I was going to go with both, have one of those little ~ things in between, but I decided that Space Crusader, while it fit the vibe of the song, didn't really fit the vibe of Caliborn, so I dropped it.
 ---
 Track: Predomination
-Directory: predomination-lofam5
+Suffix Directory: true
 Originally Released As: track:how-jack-and-calliope-ran-away
 Duration: '4:13'
 URLs:
@@ -1280,7 +1280,7 @@ Commentary: |-
     I like to think Caliborn worked really hard on this one, maybe it's hanging over a mantelpiece in Lord English's manor somewhere. He's added some tasteful JPEG artifacts and plastic wrap filters to his style, I'm so proud of him!
 ---
 Track: Reunion
-Directory: reunion-lofam5
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Not Eno
@@ -1555,8 +1555,8 @@ Commentary: |-
     Sorry he's not running. Just standing there. Give him a break, it's hard to run on a clock.
 ---
 Track: Event Horizon/Barium Starlight
+Suffix Directory: true
 Originally Released As: track:event-horizon-barium-starlight
-Directory: event-horizon-barium-starlight-lofam5
 Duration: '3:48'
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/event-horizon-barium-starlight
@@ -1662,7 +1662,7 @@ Commentary: |-
     You can just hear the love and effort that went into the track, it brings the nostalgia rushing back so I tried to create an art piece that would do that justice.
 ---
 Track: Abstract
-Directory: abstract-lofam5
+Suffix Directory: true
 Originally Released As: track:abstract
 Duration: '2:02'
 URLs:
@@ -1718,7 +1718,7 @@ Commentary: |-
     So if anything was pushed off to the last moment, it was this haha. This was probably the first one I started and the one I reworked the most when it came to the concept. In the end I basically scrapped it completely because I liked this idea better, even if it was less complex.
 ---
 Track: Crystallized Flowers DX
-Directory: crystallized-flowers-dx-lofam5
+Suffix Directory: true
 Originally Released As: track:crystallized-flowers-dx
 Duration: '4:25'
 URLs:
@@ -1758,7 +1758,7 @@ Commentary: |-
     I loved the ending to Pesterquest and wanted to do a track on it.
 ---
 Track: A Story That Consumes Itself
-Directory: a-story-that-consumes-itself-lofam5
+Suffix Directory: true
 Originally Released As: track:a-story-that-consumes-itself
 Always Reference By Directory: true
 Duration: '3:02'
@@ -1777,7 +1777,7 @@ Commentary: |-
     Inspired by the alternative title Ouroboros.
 ---
 Track: Ophiuchus (Full Suite)
-Directory: ophiuchus-full-suite-lofam5
+Suffix Directory: true
 Originally Released As: track:ophiuchus-full-suite
 Duration: '28:27'
 URLs:
@@ -1796,7 +1796,6 @@ Commentary: |-
     forgot to mention this in the artist commentary, but the coloring & linework is based on The Magician's Birthday
 ---
 Track: Swan Song/Until Next Time
-Directory: swan-song-until-next-time
 Artists:
 - Gryotharian
 Duration: '2:11'
diff --git a/album/lofam5a2.yaml b/album/lofam5a2.yaml
index 6bc5a366..9c95c15b 100644
--- a/album/lofam5a2.yaml
+++ b/album/lofam5a2.yaml
@@ -182,7 +182,7 @@ Commentary: |-
     "Breakbeat" and especially "Breakcore" sound like names of Homestuck fan-adventures after all the good names have been taken. That adventure would sadly never get past the introduction of the third kid, entering a hiatus after he captchalogues the hair gel used to maintain his 2000-style frosted tips. That guy might sound very unlike you and me, but I bet he would love this song, as you're about to.
 ---
 Track: Duet
-Directory: duet-lofam5a2
+Suffix Directory: true
 Originally Released As: track:duet
 Duration: '2:38'
 URLs:
@@ -233,7 +233,7 @@ Commentary: |-
     I felt very strongly about making this watercolor, but also, was too lazy to actually get my paints out. It was fun trying to replicate my watercolor style digitally.
 ---
 Track: Dictator
-Directory: dictator-lofam5a2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
@@ -372,7 +372,7 @@ Commentary: |-
     Really fits the vibe
 ---
 Track: Across Time
-Directory: across-time-lofam5a2
+Suffix Directory: true
 Originally Released As: track:across-time
 Duration: '2:38'
 URLs:
@@ -385,7 +385,7 @@ Commentary: |-
     This art was originally used to score the [\[S] Mika: Souviens-toi](https://www.youtube.com/watch?v=SH65pNyM2Pw) animation in the french fanventure [Heaven;Sent](https://discord.gg/hV3s6dXEuX).
 ---
 Track: Slow Dancing in the Clockwork Hall
-Directory: slow-dancing-in-the-clockwork-hall-lofam5a2
+Suffix Directory: true
 Originally Released As: track:slow-dancing-in-the-clockwork-hall
 Duration: '2:23'
 URLs:
@@ -431,7 +431,7 @@ Commentary: |-
     Diamonds Droog dubstep... Diamonds Drubstep? Dubmonds Droog? Is this anything????
 ---
 Track: Ruined Singularity
-Directory: ruined-singularity-lofam5a2
+Suffix Directory: true
 Originally Released As: track:ruined-singularity
 Duration: '3:14'
 URLs:
@@ -495,7 +495,7 @@ Commentary: |-
     HEY  EVERY  !! WE'VE GOT SOME FRESH \[[Pixel Art]] OFF THE GRILLBY \[[In the truest Silly Crossover FashionTM]]
 ---
 Track: Everyone Here, Fine and Happy, Let's Eat Some Cake and Play a Song
-Directory: everyone-here-fine-and-happy-lets-eat-some-cake-and-play-a-song-lofam5a2
+Suffix Directory: true
 Originally Released As: track:everyone-here-fine-and-happy-lets-eat-some-cake-and-play-a-song
 Duration: '3:34'
 URLs:
@@ -644,7 +644,7 @@ Commentary: |-
     this track was made for the [COUNTDOWN](https://www.youtube.com/watch?v=F41HZ9ZkzMM) flash of the [Paradox Struck](https://mspfa.com/?s=50076&p=1) fanventure. it is meant to envoke the urgency of the characters getting to the medium before their planets are obliterated by meteors
 ---
 Track: Make Them Pay
-Directory: make-them-pay-lofam5a2
+Suffix Directory: true
 Artists:
 - Grace Medley
 Duration: '3:06'
@@ -721,7 +721,7 @@ Commentary: |-
     Rose at the Incipisphere's edge. The funky-looking stuff along the margins is partially my own creation and partially edited from some fractal art SolusLunes posted on his Newgrounds page.
 ---
 Track: Beckoning
-Directory: beckoning-lofam5a2
+Suffix Directory: true
 Originally Released As: track:beckoning-colors-mayhem-vol-1
 Duration: '1:23'
 URLs:
@@ -794,7 +794,7 @@ Commentary: |-
     <img src="media/misc/lofam5a2piano.gif" width="150">
 ---
 Track: Cometfall
-Directory: cometfall-lofam5a2
+Suffix Directory: true
 Originally Released As: track:cometfall
 Duration: '3:07'
 URLs:
@@ -895,7 +895,7 @@ Commentary: |-
     maybe it’ll turn out better this time is a title that immediately reminded me of the retcon. in the cover art, i decided to highlight how the joy of the post retcon timeline almost completely overshadows the suffering of characters that we actually followed for years. idk, replacing these guys with slightly different versions of them always felt weird to me.
 ---
 Track: Lilith
-Directory: lilith-lofam5a2
+Suffix Directory: true
 Originally Released As: track:lilith
 Duration: '3:27'
 URLs:
@@ -1037,7 +1037,7 @@ Commentary: |-
     Anyway, about the actual lyrics: Grace gave me the suggestion to make the feelings real, but the imagery unreal, and that really guided my choices in creating the song. In the verses, I wanted to evoke the feeling of journeying through something man-made, but infinite in its repetition and growing with a life of its own. Something that you are experiencing in isolation and in a crowd of countless others. And something you can't re-create, even just in trying to explain it to someone else. I was a little stumped because the concept of the song seemed self-contradictory: How was I supposed to write imagery if its defining feature was supposed to be that it was inexplicable? The chorus idea came about as a way to reconcile that idea, by saying that the issue is in the listener receiving the meaning or feeling behind the imagery, not that the imagery itself can't be spoken. I'm proud of the way it turned out, and I hope you enjoy it too!
 ---
 Track: Prologue
-Directory: prologue-lofam5a2
+Suffix Directory: true
 Originally Released As: track:prologue-friendsim-2
 Duration: '2:53'
 URLs:
@@ -1111,7 +1111,7 @@ Commentary: |-
     This track was created as my love letter to [[group:toby-fox|Toby Fox's]] music style. The song "[[track:savior-of-the-waking-world|Savior of the Waking World]]" stuck with me as I read through Homestuck for the first time after initially being drawn to the webcomic because of Toby Fox's involvement with the soundtrack, so I decided to make a song that gives off a similar energy to the moment portrayed in the story. Recently, I pitched the song to be made into an S flash for [Paradox Swapped](https://mspfa.com/?s=32996), and will be featured in the fanventure very soon!
 ---
 Track: When the Curtains Part
-Directory: when-the-curtains-part-lofam5a2
+Suffix Directory: true
 Originally Released As: track:when-the-curtains-part
 Duration: '3:53'
 URLs:
@@ -1137,7 +1137,7 @@ Commentary: |-
     I was floored hearing this song. I very much love the epic part of the shitpost epic that Homestuck is. I also love songs including vocals in this fandom. (that means I can sing it and I very much did while drawing) I wish I could make something resembling chinese artwork to honor the song's concept. I tried but ultimately failed to. I took a pretty literal route with the track art instead, drawing from the lyrics.
 ---
 Track: Grimnarc Voodoo
-Directory: grimnarc-voodoo-lofam5a2
+Suffix Directory: true
 Originally Released As: track:grimnarc-voodoo
 Duration: '5:00'
 URLs:
@@ -1237,7 +1237,7 @@ Commentary: |-
     I inspired myself of the Moonsetter arttrack which had Dirk and was like... It feels more upbeat, I have to add some dirkjake endgame. So I referenced this one scene in [[flash:8130|[S]Credits]] with Robot Lord English and gave Jake the Lara Croft outfit because he looks stunning in it
 ---
 Track: Puppeteer
-Directory: puppeteer-lofam5a2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
@@ -1456,7 +1456,7 @@ Commentary: |-
     Aradia floating above a crystalline plane loosely inspired vibeswise by the Land of Quartz and Melody. It was a treat to get to do art for this one!
 ---
 Track: The Oligarch
-Directory: the-oligarch-lofam5a2
+Suffix Directory: true
 Originally Released As: track:the-oligarch
 Duration: '3:02'
 URLs:
@@ -1495,7 +1495,7 @@ Commentary: |-
     An underrated track, i hope i could represent the feelings it conveys well. It reminds me of Kanaya's statuesque poise and her active fierceness, with a deep sense of repressed anger, finally let loose, and the following exhaustion from over-extersion.  She is crowned in the dotted line of her impromputations and surrounded by a ring of rainbow blood. I know technically she shouldn't have both the lipstick, the chainsaw and an unperforated stomach at the same time, but i did it anyway for the sake of iconography. The lack of a symbol of her shirt is deliberate and a callback to her ancestor.
 ---
 Track: Slick Tricks
-Directory: slick-tricks-lofam5a2
+Suffix Directory: true
 Originally Released As: track:slick-tricks
 Duration: '2:49'
 URLs:
@@ -1514,7 +1514,7 @@ Commentary: |-
     I picked up a copy of Spades Slick's Pro Skater at the secondhand game store and boy, I was NOT disappointed!
 ---
 Track: Stepping Stones
-Directory: stepping-stones-lofam5a2
+Suffix Directory: true
 Originally Released As: track:stepping-stones
 Duration: '3:42'
 URLs:
@@ -1608,7 +1608,7 @@ Commentary: |-
     This is transparently based on the cover of the original Switched-On Bach, it was a fun style mix-up to build something on top of a photo.
 ---
 Track: Chroma
-Directory: chroma-lofam5a2
+Suffix Directory: true
 Originally Released As: track:chroma-heaven-sent
 Duration: '3:02'
 URLs:
@@ -1688,7 +1688,7 @@ Commentary: |-
     The track’s vibe immediately made me think of Jade, not sure why though. The image of her floating in space, looking down at a bunch of different dream bubbles, unsure of which she should go to or not, was immediately beamed into my head. Pretty simple, but it’s nice. Oh, also, this artwork features the only Nepeta in the whole album. Go ahead. Check.
 ---
 Track: Flushing Pale
-Directory: flushing-pale-lofam5a2
+Suffix Directory: true
 Originally Released As: track:flushing-pale
 Duration: '3:08'
 URLs:
@@ -1734,7 +1734,7 @@ Commentary: |-
     As soon as that bit of Penumbra Phantasm kicked in my mind drifted to [[flash:2927|[S] Jade: Enter]] - mainly how Bec's final act on Earth was to protect Jade before. Honestly? This song was a hard one to draw for. I can't even pinpoint the feelings and thoughts it evokes. The closest thing I can sum it up as is a reluctant goodbye.
 ---
 Track: Light in the Darkness
-Directory: light-in-the-darkness-lofam5a2
+Suffix Directory: true
 Originally Released As: track:light-in-the-darkness
 Duration: '7:52'
 URLs:
@@ -2673,7 +2673,7 @@ Commentary: |-
     I designed this album’s track order. Mostly I based it on secret subliminal messages I received from the lyrics of “[[track:im-a-member-of-the-midnight-crew|I’m a Member of the Midnight Crew]]” (long story). For this span of four tracks, though, there’s actually some ludoaudionarratively harmonic environmental storytelling going on. “Frost and Frogs” -> <span style="font-family: comic sans ms, courier, courier new">“dog”</span> -> “Arf!” -> ...
 ---
 Track: Frog Eater
-Directory: frog-eater-lofam5a2
+Suffix Directory: true
 Originally Released As: track:frog-eater
 Duration: '4:00'
 URLs:
@@ -2692,7 +2692,7 @@ Commentary: |-
     Come on, kid, eat up. You’ve barely even touched your mutant god-frog.
 ---
 Track: Movement
-Directory: movement-lofam5a2
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - ruby
@@ -2815,7 +2815,7 @@ Commentary: |-
     <small>You’re welcome for that <span style="color: magenta; font-family: comic sans ms, courier, courier new">UNREAL AIR......</span></small>
 ---
 Track: Ultramagnetoparakineticrystalphotogrammetry
-Directory: ultramagnetoparakineticrystalphotogrammetry-lofam5a2
+Suffix Directory: true
 Originally Released As: track:ultramagnetoparakineticrystalphotogrammetry
 Duration: '4:08'
 URLs:
@@ -2926,7 +2926,7 @@ Commentary: |-
     Since Dave is the subject matter of the track, I thought it would be kind of a no-brainer to feature him in LOHAC. After a lot of deliberating on what to do for the track art, I decided to draw a cool side profile of Dave, lit up from both sides by the lava surrounding him. I also thought it would be kinda lame just to have him staring into the distance without actively looking at something, so I added a reflection of Jack Noir in his sunglasses. For flavor.
 ---
 Track: "'Til Death, We Grieve"
-Directory: til-death-we-grieve-lofam5a2
+Suffix Directory: true
 Originally Released As: track:til-death-we-grieve
 Duration: '6:48'
 URLs:
diff --git a/album/loftlocked-vol-1.yaml b/album/loftlocked-vol-1.yaml
index 3570129b..f2bf0d95 100644
--- a/album/loftlocked-vol-1.yaml
+++ b/album/loftlocked-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Loftlocked Vol. 1
+Directory Suffix: loftlocked
 Date: July 1, 2014
 URLs:
 - https://loftlocked.bandcamp.com/album/loftlocked-vol-1
@@ -35,7 +36,7 @@ Additional Files:
 Section: Main album
 ---
 Track: Prelude
-Directory: prelude-loftlocked
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Veritas Unae
@@ -59,7 +60,7 @@ URLs:
 - https://loftlocked.bandcamp.com/track/written-page-2
 ---
 Track: Concession
-Directory: concession-loftlocked
+Suffix Directory: true
 Additional Names:
 - Concentration ([Bandcamp about blurb](https://loftlocked.bandcamp.com/track/concession))
 Always Reference By Directory: true
@@ -142,7 +143,7 @@ Referenced Tracks:
 - track:select-screen-the-legend-of-zelda-a-link-to-the-past
 ---
 Track: Resolve
-Directory: resolve-loftlocked
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - tiresiasArchivist
@@ -224,7 +225,7 @@ Commentary: |-
    While Pat may've not remembered if it was him who wrote the commentary for Flower Child; it's mostly likely him given that the other track commentaries are from [[artist:veritas-unae]].
 ---
 Track: Thunderhead
-Directory: thunderhead-loftlocked
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Veritas Unae
@@ -253,7 +254,7 @@ Commentary: |-
     considering people still make HS fanventures... yeah, I guess so. oh wait where are you going oh goodbye friend i hope you enjoy your trip!!
 ---
 Track: Obsidian
-Directory: obsidian-loftlocked
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Rnd
diff --git a/album/look-on-my-works-ye-mighty-and-despair.yaml b/album/look-on-my-works-ye-mighty-and-despair.yaml
index c6ffdbf1..bf572261 100644
--- a/album/look-on-my-works-ye-mighty-and-despair.yaml
+++ b/album/look-on-my-works-ye-mighty-and-despair.yaml
@@ -1,4 +1,5 @@
 Album: Look On My Works Ye Mighty And Despair
+Directory Suffix: look-on-my-works
 Artists:
 - Michael Guy Bowman
 Date: March 19, 2019
@@ -27,7 +28,8 @@ Additional Files:
   - bg.jpg
 ---
 Track: Mothership
-Directory: mothership-look-on-my-works
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '3:48'
 URLs:
 - https://bowman.bandcamp.com/track/mothership
@@ -236,7 +238,7 @@ Commentary: |-
     ([Music video!](https://www.youtube.com/watch?v=TGQn4ZUgHa4))
 ---
 Track: Unstoppable
-Directory: unstoppable-look-on-my-works
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:03'
 URLs:
diff --git a/album/made-up-yume-nikkis.yaml b/album/made-up-yume-nikkis.yaml
index f214ceff..88adeda8 100644
--- a/album/made-up-yume-nikkis.yaml
+++ b/album/made-up-yume-nikkis.yaml
@@ -18,21 +18,21 @@ Commentary: |-
     Track names are from Toby's post on tumblr, but the actual crops linked for each track are unofficial; the original cut has all the tracks in sequence, [[media:misc/archive/made up yume nikkis.mp3|in one MP3]].
 ---
 Track: dark tunnel
-Directory: dark-tunnel-made-up-yume-nikkis
+Suffix Directory: true
 Duration: 0:34
 URLs:
 - https://www.youtube.com/watch?v=DcBNBWUHplk
 - https://hsmusic.wiki/media/misc/archive/dark%20tunnel.mp3
 ---
 Track: amphitheater
-Directory: amphitheater-made-up-yume-nikkis
+Suffix Directory: true
 Duration: 0:19
 URLs:
 - https://www.youtube.com/watch?v=X6TYwG6coEQ
 - https://hsmusic.wiki/media/misc/archive/amphitheater.mp3
 ---
 Track: lonely room
-Directory: lonely-room-made-up-yume-nikkis
+Suffix Directory: true
 Duration: 0:20
 URLs:
 - https://www.youtube.com/watch?v=_075bxpZV0Y
diff --git a/album/magnum-opus.yaml b/album/magnum-opus.yaml
index 419bb067..7d7543bc 100644
--- a/album/magnum-opus.yaml
+++ b/album/magnum-opus.yaml
@@ -80,7 +80,7 @@ Referenced Tracks:
 - Slithering Samba
 ---
 Track: Catacombs
-Directory: catacombs-magnum-opus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - artist:kobacat
@@ -129,7 +129,7 @@ URLs:
 - https://vasterror.bandcamp.com/track/crown-jewels
 ---
 Track: Insecurity
-Directory: insecurity-magnum-opus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - artist:kobacat
@@ -208,7 +208,7 @@ Referenced Tracks:
 - track:perfection-vast-error
 ---
 Track: Soulbound
-Directory: soulbound-magnum-opus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Rabooski
@@ -319,7 +319,7 @@ Commentary:
 Section: Bonus tracks
 ---
 Track: Euphoria
-Directory: euphoria-magnum-opus
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/medium.yaml b/album/medium.yaml
index fed41172..484f5198 100644
--- a/album/medium.yaml
+++ b/album/medium.yaml
@@ -46,7 +46,7 @@ Commentary: |-
     Cover art by [[artist:cindy-dominguez]] and [[artist:andrew-hussie]]
 ---
 Track: Light
-Directory: light-medium
+Suffix Directory: true
 Duration: '5:36'
 URLs:
 - https://homestuck.bandcamp.com/track/light-4
@@ -73,7 +73,7 @@ URLs:
 - https://youtu.be/PI785pDsR88
 ---
 Track: Frost
-Directory: frost-medium
+Suffix Directory: true
 Duration: '5:54'
 URLs:
 - https://homestuck.bandcamp.com/track/frost-4
diff --git a/album/midnight-crew-drawing-dead.yaml b/album/midnight-crew-drawing-dead.yaml
index 4796f347..0a414806 100644
--- a/album/midnight-crew-drawing-dead.yaml
+++ b/album/midnight-crew-drawing-dead.yaml
@@ -1,4 +1,5 @@
 Album: 'Midnight Crew: Drawing Dead'
+Directory Suffix: mc-dd
 Date: February 4 2010
 Date Added: November 15, 2019
 URLs:
@@ -224,7 +225,6 @@ Commentary: |-
     It's hard to find things to say about this one. I wanted to make a slower song, compared to the other ones I did for Drawing Dead. I'm still technically new at writing jazz, so it was nice getting to practice it a bit more. Overall though, I think I liked the title best on this one; I enjoy a good pun.
 ---
 Track: The Ballad of Jack Noir
-Directory: the-ballad-of-jack-noir
 Artists:
 - Toby Fox
 Art Tags:
@@ -439,7 +439,7 @@ Sampled Tracks:
 - track:hauntjam
 ---
 Track: Nightlife (Extended)
-Directory: nightlife-extended-mc-dd
+Suffix Directory: true
 Originally Released As: track:nightlife-extended
 Duration: '2:34'
 URLs:
diff --git a/album/moons-of-theseus.yaml b/album/moons-of-theseus.yaml
index 95f7fd3c..f1faa25e 100644
--- a/album/moons-of-theseus.yaml
+++ b/album/moons-of-theseus.yaml
@@ -117,7 +117,7 @@ Commentary: |-
     The varied parts of Home take you by the hand and guide you on a journey throughout time and space. It is my belief that by listening, you're taking the same journey Grace, myself, and all the other creatives involved in this album took in the process of making the project a reality. It's been a long and winding road, but I wouldn't have had it any other way. Thank you.
 ---
 Track: Traveling
-Directory: traveling-moons-of-theseus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - keyboard cait
@@ -162,7 +162,7 @@ Commentary: |-
     Naturally when everyone else is going for wild, creative concepts, I fall back on making it Homestuck... when I heard Cait's song it made me think of the Battlefield, and when I read the lyrics, I thought, what better thing to depict than the moment Mobius Trip and Hadron Kaleido look into the clouds for the first time and witness the secrets of the universe?
 ---
 Track: Unchained
-Directory: unchained-moons-of-theseus
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kanishka
diff --git a/album/music-team-archive-16-21.yaml b/album/music-team-archive-16-21.yaml
index 634521df..3d89cd47 100644
--- a/album/music-team-archive-16-21.yaml
+++ b/album/music-team-archive-16-21.yaml
@@ -1,4 +1,6 @@
 Album: "Music Team Archive '16 - '21"
+Directory Suffix: archive
+Suffix Track Directories: true
 Artists:
 - artist:kobacat
 Date: January 21, 2022
@@ -30,7 +32,6 @@ Commentary: |-
 Section: '2016'
 ---
 Track: licord nacrasty
-Directory: licord-nacrasty-archive
 Originally Released As: track:licord-nacrasty
 Duration: '2:14'
 URLs:
@@ -50,7 +51,6 @@ Commentary: |-
     Track Type: Remix(?)
 ---
 Track: Lambda Doctor
-Directory: lambda-doctor-archive
 Originally Released As: track:lambda-doctor
 Duration: '01:01'
 URLs:
@@ -65,7 +65,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: Harmonize
-Directory: harmonize-archive
 Originally Released As: track:harmonize-canmt
 Duration: '05:55'
 URLs:
@@ -94,7 +93,6 @@ Commentary: |-
     Track Type: Original
 ---
 Track: Intentional Pokémon
-Directory: intentional-pokemon-archive
 Originally Released As: track:intentional-pokemon
 Duration: '03:28'
 URLs:
@@ -109,7 +107,6 @@ Commentary: |-
     Track Type: "Soundfont Swap" Remix (really bad)
 ---
 Track: XP Boogie
-Directory: xp-boogie-archive
 Originally Released As: track:xp-boogie
 Always Reference By Directory: true
 Duration: '00:52'
@@ -127,7 +124,6 @@ Commentary: |-
 Section: '2017'
 ---
 Track: Starry Midnight
-Directory: starry-midnight-archive
 Originally Released As: track:starry-midnight
 Duration: '02:16'
 URLs:
@@ -143,7 +139,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: licord midnight
-Directory: licord-midnight-archive
 Originally Released As: track:licord-midnight
 Duration: '02:29'
 URLs:
@@ -155,7 +150,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: BOWMANIA ~ TITLE SCREEN
-Directory: bowmania-title-screen-archive
 Originally Released As: track:bowmania-title-screen
 Duration: '01:33'
 URLs:
@@ -171,7 +165,6 @@ Commentary: |-
     Track Type: Remix(?)
 ---
 Track: Plagueback
-Directory: plagueback-archive
 Originally Released As: track:plagueback
 Duration: '01:48'
 URLs:
@@ -183,7 +176,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: feeling cool and new
-Directory: feeling-cool-and-new-archive
 Originally Released As: track:feeling-cool-and-new
 Duration: '02:18'
 URLs:
@@ -197,7 +189,6 @@ Commentary: |-
     Track Type: Future Funk / Remix
 ---
 Track: muse of reggie
-Directory: muse-of-reggie-archive
 Duration: '02:13'
 URLs:
 - https://kobacat.bandcamp.com/track/2017-muse-of-reggie
@@ -223,7 +214,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: Extra Boss Theme - Sonic Mania
-Directory: extra-boss-theme-sonic-mania-archive
 Duration: '03:45'
 URLs:
 - https://kobacat.bandcamp.com/track/2017-extra-boss-theme-sonic-mania
@@ -288,7 +278,6 @@ Commentary: |-
 Section: '2018'
 ---
 Track: this isnt even in key
-Directory: this-isnt-even-in-key-archive
 Duration: '02:59'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-this-isnt-even-in-key
@@ -379,7 +368,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: i never had a name for this song so lets just call it 'im not good at ambience'
-Directory: i-never-had-a-name-for-this-song-so-lets-just-call-it-im-not-good-at-ambience-archive
 Duration: '02:57'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-i-never-had-a-name-for-this-song-so-lets-just-call-it-im-not-good-at-ambience
@@ -400,7 +388,6 @@ Commentary: |-
     References: i have no idea i never wrote them down and there must be at least 5 different sources being referenced in this thing
 ---
 Track: 'jungle #3 but i used synths i made at 2 am'
-Directory: jungle-3-but-i-used-synths-i-made-at-2-am-archive
 Duration: '03:26'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-jungle-3-but-i-used-synths-i-made-at-2-am
@@ -411,7 +398,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: what the fuck is mastering
-Directory: what-the-fuck-is-mastering-archive
 Duration: '02:04'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-what-the-fuck-is-mastering
@@ -422,7 +408,7 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: インストルメンタル
-Directory: tonneru-o-sanpo-suru-archive
+Directory: tonneru-o-sanpo-suru # suffixed
 Originally Released As: track:tonneru-o-sanpo-suru
 Duration: '02:06'
 URLs:
@@ -437,7 +423,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: dont forget to save ur game
-Directory: dont-forget-to-save-ur-game-archive
 Originally Released As: track:dont-forget-to-save-ur-game
 Duration: '02:38'
 URLs:
@@ -447,7 +432,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: Alternative Orders
-Directory: alternative-orders-archive
 Originally Released As: track:alternative-orders
 Duration: '01:50'
 URLs:
@@ -457,7 +441,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: '[licord swim]'
-Directory: licord-swim-archive
 Originally Released As: track:licord-swim
 Duration: '02:13'
 URLs:
@@ -467,7 +450,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: Sin Pausa (Mission Failed) (Album Edition) - DJMAX RESPECT V
-Directory: sin-pausa-mission-failed-album-edition-djmax-respect-v-archive
 Duration: '00:53'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-sin-pausa-mission-failed-album-edition-djmax-respect-v
@@ -480,7 +462,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: Make it better (Ending) (BLΛNK MIX) - DJMAX RESPECT V
-Directory: make-it-better-ending-blank-mix-djmax-respect-v-archive
 Duration: '01:19'
 URLs:
 - https://kobacat.bandcamp.com/track/2018-make-it-better-ending-bl-nk-mix-djmax-respect-v
@@ -515,7 +496,6 @@ Commentary: |-
 Section: '2019'
 ---
 Track: Cool and New Animal Forest
-Directory: cool-and-new-animal-forest-archive
 Originally Released As: track:cool-and-new-animal-forest
 Duration: '01:21'
 URLs:
@@ -525,7 +505,6 @@ Commentary: |-
     Track Type: Remix
 ---
 Track: scrap.mp3
-Directory: scrap-mp3-archive
 Duration: '01:07'
 Artists:
 - artist:kobacat
@@ -539,7 +518,6 @@ Commentary: |-
     Track Type: Original
 ---
 Track: synth.mp3
-Directory: synth-mp3-archive
 Duration: '00:46'
 URLs:
 - https://kobacat.bandcamp.com/track/2019-synth-mp3
@@ -548,7 +526,6 @@ Commentary: |-
     Track Type: Original
 ---
 Track: Stabby (Alpha Version) - 9
-Directory: stabby-alpha-version-9-archive
 Duration: '02:17'
 URLs:
 - https://kobacat.bandcamp.com/track/2019-stabby-alpha-version-9
@@ -619,7 +596,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: New Leaf City - MapleStory
-Directory: new-leaf-city-maplestory-archive
 Duration: '02:18'
 URLs:
 - https://kobacat.bandcamp.com/track/2019-new-leaf-city-maplestory
@@ -632,7 +608,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: Bowman Combat
-Directory: bowman-combat-archive
 Duration: '03:17'
 URLs:
 - https://kobacat.bandcamp.com/track/2019-bowman-combat
@@ -746,7 +721,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: MeGaLoVania (New Remix) - Super Smash Bros. Ultimate
-Directory: megalovania-new-remix-ssbu-archive
 Duration: '02:32'
 URLs:
 - https://kobacat.bandcamp.com/track/2019-megalovania-new-remix-super-smash-bros-ultimate
@@ -763,7 +737,6 @@ Commentary: |-
 Section: '2020'
 ---
 Track: DANGANRONPA【2nd GIG】 - DANGANRONPA 2 - Goodbye Despair
-Directory: danganronpa-2nd-gig-danganronpa-2-goodbye-despair-archive
 Duration: '02:54'
 URLs:
 - https://kobacat.bandcamp.com/track/2020-danganronpa-2nd-gig-danganronpa-2-goodbye-despair
@@ -778,7 +751,6 @@ Commentary: |-
     Track Type: Mashup
 ---
 Track: Cool Morning - DANGANRONPA V3 - Killing Harmony
-Directory: cool-morning-danganronpa-v3-killing-harmony-archive
 Duration: '03:25'
 URLs:
 - https://kobacat.bandcamp.com/track/2020-cool-morning-danganronpa-v3-killing-harmony
@@ -793,7 +765,6 @@ Commentary: |-
 Section: '2021'
 ---
 Track: Twilight Rhythm
-Directory: twilight-rhythm-archive
 Originally Released As: track:twilight-rhythm
 Duration: '03:12'
 URLs:
diff --git a/album/namco-high-official-soundtrack.yaml b/album/namco-high-official-soundtrack.yaml
index 3d7d737d..2e12f820 100644
--- a/album/namco-high-official-soundtrack.yaml
+++ b/album/namco-high-official-soundtrack.yaml
@@ -1,4 +1,5 @@
 Album: NAMCO HIGH OFFICIAL SOUNDTRACK
+Directory Suffix: namco-high
 Has Track Numbers: false
 Color: '#ee4e9d'
 Date: December 17, 2013
@@ -29,7 +30,7 @@ Commentary: |-
     The in-game files, listed as additional names, include both .ogg and .m4a versions of each track. The digital soundtrack packages those same in-game tracks as .mp3 with proper metadata (except for track numbers).
 ---
 Track: Title Theme
-Directory: title-theme-namco-high
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - namcotheme (game filename)
diff --git a/album/nibiru.yaml b/album/nibiru.yaml
index 1ab60452..8e923407 100644
--- a/album/nibiru.yaml
+++ b/album/nibiru.yaml
@@ -75,13 +75,14 @@ URLs:
 - https://www.youtube.com/watch?v=DuH9Ul07rQ4
 ---
 Track: Redeye (feat. Kasane Teto)
+Directory: redeye
+Suffix Directory: true
+Always Reference By Directory: true
 Additional Names:
 - Name: >-
     Redeye
   Annotation: >-
     [YouTube album in-video](https://youtu.be/HWIbTv3W8Eo?t=41)
-Directory: redeye-nibiru
-Always Reference By Directory: true
 Duration: 3:38
 Artists:
 - Rainy
@@ -185,7 +186,7 @@ URLs:
 - https://desynced.bandcamp.com/track/dead-performance
 ---
 Track: BLASTED
-Directory: blasted-nibiru
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 1:21
 Artists:
@@ -513,7 +514,7 @@ Lyrics: |-
     (You ever dance with the devil in the pale moonlight)
 ---
 Track: Megalovania
-Directory: megalovania-nibiru
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/nice-wizards-electronic-extravaganza.yaml b/album/nice-wizards-electronic-extravaganza.yaml
index c5994335..56f5c3be 100644
--- a/album/nice-wizards-electronic-extravaganza.yaml
+++ b/album/nice-wizards-electronic-extravaganza.yaml
@@ -1,4 +1,5 @@
 Album: Nice Wizard's Electronic Extravaganza!
+Directory Suffix: nice-wizard
 Artists:
 - Nice Wizard
 Date: February 7, 2012
@@ -44,7 +45,7 @@ Commentary: |-
     And another land song! This one was actually written for a friend.
 ---
 Track: Sunrise
-Directory: sunrise-nice-wizard
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:32'
 URLs:
@@ -54,7 +55,7 @@ Commentary: |-
     An attempt at something more classical sounding than my usual stuff. It went pretty alright, I think!
 ---
 Track: Connect
-Directory: connect-nice-wizard
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:08'
 URLs:
@@ -64,7 +65,7 @@ Commentary: |-
     A song about that first time you really connect with somebody. Lots of personal meaning, oooh.
 ---
 Track: Machina
-Directory: machina-nice-wizard
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:22'
 URLs:
diff --git a/album/noirscape.yaml b/album/noirscape.yaml
index 3b72ddef..51522503 100644
--- a/album/noirscape.yaml
+++ b/album/noirscape.yaml
@@ -289,7 +289,7 @@ Commentary: |-
     [[track:double-midnight|“Double midnight”]] was a song Toby Fox made that we have not heard the full version of. A tragedy really. When I first suggested the album idea Rainy suggested that I do a version of that song for it. Which of course, just makes perfect sense. There already exists a couple of fanmade finished versions of this song, (see [[track:one-and-a-half-midnight|“One and a Half Midnight”]]) but still, I wanted to do my own version. I decided to start the song off with just the [[track:im-a-member-of-the-midnight-crew|“I’m a Member of the Midnight Crew”]] song, and to make it slowly glitch out until it gets to the line “Home with the milk in the morning”, which has a big placement spot in the short snippet of the original song that we do have. Then I had the main riff of the song play on a synth as a little intro to the actual first section. Once again, little bit of real guitar :3 . I originally wanted there to be guitar all throughout the track but changed my mind as I realized it was just muddying everything. So it’s only in this first section, then right after that it goes into the section with [[track:black|“Black”]], which we only hear the ladder of in the original, before it goes into the section where everything goes ham. As they always say, “Make her a member of the midnight crew!”. It was actually pretty fun trying to recreate something similar to the original part, the sample splicing should have been hell but was actually quite enjoyable, lol. Of course the final section is a reprise of the earlier one, (just now realizing I do that a lot, huh). And the song ends off with a final “Home with the milk in the morning”. As all good Dads do.
 ---
 Track: Breakout
-Directory: breakout-noirscape
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 2:56
 Cover Artists:
@@ -444,7 +444,7 @@ Commentary: |-
     Well done, you’ve won the battle of a lifetime.
 ---
 Track: Fin
-Directory: fin-noirscape
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 1:08
 Cover Artists:
diff --git a/album/nuclears-explosion-1.yaml b/album/nuclears-explosion-1.yaml
index 52c3736d..1657596f 100644
--- a/album/nuclears-explosion-1.yaml
+++ b/album/nuclears-explosion-1.yaml
@@ -1,4 +1,5 @@
 Album: Nuclear's Explosion 1
+Directory Suffix: nuclears-explosion
 Artists:
 - tempest2k
 Date: April 24, 2017
@@ -23,14 +24,14 @@ URLs:
 - https://nuclear333.bandcamp.com/track/a-little-birdy-told-me
 ---
 Track: Breakfast In Dead
-Directory: breakfast-in-dead-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:breakfast-in-dead
 Duration: '1:07'
 URLs:
 - https://nuclear333.bandcamp.com/track/breakfast-in-dead
 ---
 Track: Common Cents
-Directory: common-cents-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:common-cents
 Duration: '1:00'
 URLs:
@@ -42,7 +43,7 @@ URLs:
 - https://nuclear333.bandcamp.com/track/josh-battle
 ---
 Track: Phantasmic Foe
-Directory: phantasmic-foe-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:phantasmic-foe
 Duration: '1:18'
 URLs:
@@ -77,7 +78,7 @@ URLs:
 - https://nuclear333.bandcamp.com/track/land-of-jams-and-japes
 ---
 Track: Defuse a Bomb
-Directory: defuse-a-bomb-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:defuse-a-bomb
 Duration: '1:22'
 URLs:
@@ -174,7 +175,7 @@ URLs:
 - https://nuclear333.bandcamp.com/track/we-have-a-problem
 ---
 Track: Prying Time
-Directory: prying-time-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:prying-time
 Duration: 0:52
 URLs:
@@ -197,7 +198,7 @@ Commentary: |-
     Theme of Victoria from [Frank](https://www.youtube.com/watch?v=jvW_S2qrMMQ).
 ---
 Track: The Point of Going Home
-Directory: the-point-of-going-home-nuclears-explosion
+Suffix Directory: true
 Originally Released As: track:the-point-of-going-home
 Duration: '1:23'
 URLs:
diff --git a/album/oceanfables-ray-of-light.yaml b/album/oceanfables-ray-of-light.yaml
index 3319544c..020aca22 100644
--- a/album/oceanfables-ray-of-light.yaml
+++ b/album/oceanfables-ray-of-light.yaml
@@ -1,4 +1,5 @@
 Album: 'Oceanfables: Ray of Light'
+Directory Suffix: oceanfables
 Artists:
 - Ray Mike
 Date: March 18, 2022
@@ -54,21 +55,21 @@ Sampled Tracks:
 - Upward Movement (Dave Owns)
 ---
 Track: Chiptune
-Directory: chiptune-oceanfables
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:07'
 URLs:
 - https://nightslights.bandcamp.com/track/chiptune
 ---
 Track: Reed
-Directory: reed-oceanfables
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:36'
 URLs:
 - https://nightslights.bandcamp.com/track/reed
 ---
 Track: Starfish
-Directory: starfish-oceanfables
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:55'
 URLs:
@@ -82,7 +83,7 @@ Sampled Tracks:
 - dog samples from undertale, no?
 ---
 Track: Swag
-Directory: swag-oceanfables
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:40'
 URLs:
@@ -143,7 +144,7 @@ Art Tags:
 Section: Bonus track
 ---
 Track: Piano
-Directory: piano-oceanfables
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/oceanfalls-vol-1.yaml b/album/oceanfalls-vol-1.yaml
index 3d5878d4..bfa7f519 100644
--- a/album/oceanfalls-vol-1.yaml
+++ b/album/oceanfalls-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Oceanfalls Vol. 1
+Directory Suffix: oceanfalls
 Artists:
 - nights
 Date: May 17, 2017
@@ -45,7 +46,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: '---- In The Beginning ----'
-Directory: in-the-beginning-oceanfalls
+Suffix Directory: true
 Duration: '2:53'
 URLs:
 - https://nightslights.bandcamp.com/track/in-the-beginning
@@ -60,7 +61,7 @@ Art Tags:
 - Five (Oceanfalls)
 ---
 Track: Illusions
-Directory: illusions-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:37'
 URLs:
@@ -85,7 +86,7 @@ Art Tags:
 - Reed (Oceanfalls)
 ---
 Track: Surge
-Directory: surge-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:26'
 URLs:
@@ -112,7 +113,7 @@ Art Tags:
 - Kotori (Oceanfalls)
 ---
 Track: Iceshards
-Directory: iceshards-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:29'
 URLs:
@@ -132,7 +133,7 @@ Referenced Tracks:
 - Yellow and Purple
 ---
 Track: Performance
-Directory: performance-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:33'
 URLs:
@@ -160,7 +161,7 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: '--- Ending ---'
-Directory: ending-oceanfalls
+Suffix Directory: true
 Duration: '2:01'
 URLs:
 - https://nightslights.bandcamp.com/track/ending
@@ -170,7 +171,7 @@ Art Tags:
 Section: Bonus tracks
 ---
 Track: Firefly
-Directory: firefly-oceanfalls
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Firefly [bonus]
diff --git a/album/oceanfalls-vol-2.yaml b/album/oceanfalls-vol-2.yaml
index fa166514..e08e11a6 100644
--- a/album/oceanfalls-vol-2.yaml
+++ b/album/oceanfalls-vol-2.yaml
@@ -1,4 +1,5 @@
 Album: Oceanfalls Vol. 2
+Directory Suffix: oceanfalls
 Date: April 27, 2019
 Date Added: January 12, 2021
 URLs:
@@ -111,7 +112,7 @@ Cover Artists:
 - penelope
 ---
 Track: Reminiscence
-Directory: reminiscence-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - WHATISLOSTINTHEMINES
@@ -192,7 +193,7 @@ Art Tags:
 - 'cw: blood'
 ---
 Track: Crystalline
-Directory: crystalline-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Hadron
@@ -405,7 +406,7 @@ Art Tags:
 Section: Bonus tracks
 ---
 Track: Atomic
-Directory: atomic-oceanfalls
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Atomic (Bonus Track)
diff --git a/album/oceanfalls-vol-3.yaml b/album/oceanfalls-vol-3.yaml
index 3d51605e..3aa79bdb 100644
--- a/album/oceanfalls-vol-3.yaml
+++ b/album/oceanfalls-vol-3.yaml
@@ -1,4 +1,5 @@
 Album: Oceanfalls Vol. 3
+Directory Suffix: oceanfalls
 Date: October 11, 2020
 Date Added: December 12, 2020
 URLs:
@@ -62,7 +63,7 @@ Art Tags:
 - 'cw: body horror (abstract)'
 ---
 Track: Rambling
-Directory: rambling-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kusoro
@@ -185,7 +186,7 @@ Art Tags:
 - Corona (Oceanfalls)
 ---
 Track: Cinders
-Directory: cinders-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Hadron
diff --git a/album/oceanfalls-vol-five.yaml b/album/oceanfalls-vol-five.yaml
index d9310d33..76b68dd2 100644
--- a/album/oceanfalls-vol-five.yaml
+++ b/album/oceanfalls-vol-five.yaml
@@ -1,4 +1,5 @@
 Album: Oceanfalls Vol. Five
+Directory Suffix: oceanfalls
 Date: May 17, 2023
 Date Added: August 18, 2023
 URLs:
@@ -98,7 +99,7 @@ Referenced Tracks:
 - Happy Birthday to You
 ---
 Track: Mayday
-Directory: mayday-oceanfalls
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - RoZ8
diff --git a/album/on-the-rox.yaml b/album/on-the-rox.yaml
index d5ba0ed7..f90f7d37 100644
--- a/album/on-the-rox.yaml
+++ b/album/on-the-rox.yaml
@@ -176,7 +176,7 @@ Commentary: |-
     Continuing in the trend of songs about dreams is Communing With Fireflies. This track is kind of a weird love letter to the soundtrack of Earthbound. It utilizes a bunch of samples from the earthbound soundfont as well as some composition elements. I came up for the idea for this track listening to Calliope's half of the album [[album:cherubim|Cherubim]]. Listening to [[Stellarum Salve]] and the earthbound-y sound of that song inspired me to make communing with fireflies. Much like with [[Sleepwalker]], I utilized a bunch of effects to create a dreamy atmosphere. If sleepwalker was a voyage into a nebulous dreamscape, the Communing With Fireflies is a sweet dream you don't want to wake up from. Honestly I love Roxy's and Calliope's dynamic and i wanted to make a song to match.
 ---
 Track: Saboteur
-Directory: saboteur-on-the-rox
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:58'
 Cover Artists:
@@ -203,7 +203,7 @@ Commentary: |-
     Also if you're curious [[track:wilyesp-remix-attempt-wip|the original demo]] for this is on the soundtest
 ---
 Track: -Interlude-
-Directory: interlude-on-the-rox
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:11'
 Cover Artists:
@@ -292,7 +292,7 @@ Commentary: |-
     Another sad song. [[flash:6901|[S] Game Over]] is fairly major part of homestuck and it deserves to be considering what happens in it. However, the moment that always stuck with me was the aftermath of that flash where Rose dies in Roxy's arms. It was one of the most heartbreaking scenes in the entire comic and made me truly understand the gravity of the situation that the surviving cast was going through. For this song, I tried to convey that powerful sorrow through the use of synth and choir. I really wanted to sell the feeling the hopelessness and despair that would follow such a massive loss.
 ---
 Track: Choices
-Directory: choices-on-the-rox
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:54'
 Cover Artists:
@@ -339,7 +339,7 @@ Commentary: |-
     After a long period of grief, i think it's about time we start to hope again. That's what i said to myself when i started writing this song. I wanted to convey a sense of renewed hope and resolve that Roxy felt after talking with Nix. Not really much else to say honestly.
 ---
 Track: Reunion
-Directory: reunion-on-the-rox
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:11'
 Cover Artists:
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 8e0e723d..f0674ff3 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -234,7 +234,7 @@ Commentary: |-
     I just thought [[Skaianet]] needed an upgrade.
 ---
 Track: Whiteout
-Directory: whiteout-p-s
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - David Dycus
@@ -379,7 +379,7 @@ Lyrics: |-
     I'm just Stuck inside my Home!
 ---
 Track: Bane
-Directory: bane-p-s
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Mark J. Hadley
@@ -395,7 +395,7 @@ Commentary: |-
     This one goes back a long ways. I wrote the first version of Bane back in 2001, originally envisioned as a final boss fight. I really liked the theme, so I made different versions of it over the years, although [[track:bane-old|the last version]] I did was about 13 years ago in 2005. Several times I considered making a new version of it for Homestuck, but I always hesitated. I finally decided to go for it, since this was my last chance.
 ---
 Track: Interstellar
-Directory: interstellar-p-s
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
@@ -530,7 +530,7 @@ Referenced Tracks:
 - A World Awake
 ---
 Track: Requiem for Something Really Excellent (Demo)
-Directory: requiem-for-something-really-excellent-demo-p-s
+Suffix Directory: true
 Additional Names:
 - Name: >-
     [BONUS] Requiem for Something Really Excellent (Demo)
diff --git a/album/pale-rain.yaml b/album/pale-rain.yaml
index 34fff808..e784519b 100644
--- a/album/pale-rain.yaml
+++ b/album/pale-rain.yaml
@@ -1,5 +1,4 @@
 Album: Pale Rain
-Directory: pale-rain
 Artists:
 - imase
 - PUNPEE
diff --git a/album/pantheon.yaml b/album/pantheon.yaml
index dd0be9f5..2cc91b00 100644
--- a/album/pantheon.yaml
+++ b/album/pantheon.yaml
@@ -32,7 +32,8 @@ Commentary: |-
 Section: Main album
 ---
 Track: Prelude
-Directory: prelude-pantheon
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: 0:37
 URLs:
 - https://desynced.bandcamp.com/track/prelude
@@ -43,7 +44,7 @@ Referenced Tracks:
 - Divine Tapestry
 ---
 Track: Matriarch
-Directory: matriarch-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:39'
 URLs:
@@ -61,7 +62,7 @@ Referenced Tracks:
 - track:daughter-desynced
 ---
 Track: Tyrant
-Directory: tyrant-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:52'
 URLs:
@@ -75,7 +76,7 @@ Referenced Tracks:
 - Mirror Mirror
 ---
 Track: Luminary
-Directory: luminary-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:30'
 URLs:
@@ -92,7 +93,7 @@ Referenced Tracks:
 - Lunar Dance
 ---
 Track: Nemesis
-Directory: nemesis-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:52'
 URLs:
@@ -107,7 +108,7 @@ Referenced Tracks:
 - What was Ya'll Thinking?
 ---
 Track: Machina
-Directory: machina-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:47'
 URLs:
@@ -217,7 +218,7 @@ Referenced Tracks:
 - What was Ya'll Thinking?
 ---
 Track: Breakdown
-Directory: breakdown-pantheon
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/paths.yaml b/album/paths.yaml
index 4de5403e..683e5162 100644
--- a/album/paths.yaml
+++ b/album/paths.yaml
@@ -1,4 +1,5 @@
 Album: Paths
+Suffix Track Directories: true
 Artists:
 - Mark J. Hadley
 Date: February 16, 2020
@@ -27,14 +28,12 @@ Commentary: |-
     <img src="media/misc/paths_original.jpg" width="550">
 ---
 Track: Aggrievocation
-Directory: aggrievocation-paths
 Originally Released As: track:aggrievocation
 Duration: '3:39'
 URLs:
 - https://parsecproductions.bandcamp.com/track/aggrievocation
 ---
 Track: Slender
-Directory: slender-paths
 Originally Released As: track:slender
 Duration: '2:06'
 URLs:
@@ -44,46 +43,43 @@ Commentary: |-
     Originally appeared in "Slender: The Eight Pages"
 ---
 Track: Forge Multitask
-Directory: forge-multitask-paths
 Originally Released As: track:forge-multitask
 Duration: '3:28'
 URLs:
 - https://parsecproductions.bandcamp.com/track/forge-multitask
 ---
 Track: Train Hard!
+Suffix Directory: false
 Duration: '5:41'
 URLs:
 - https://parsecproductions.bandcamp.com/track/train-hard
 ---
 Track: Isolate
-Directory: isolate-paths
 Originally Released As: track:isolate-slender
 Duration: '2:45'
 URLs:
 - https://parsecproductions.bandcamp.com/track/isolate
 ---
 Track: Carefree Action
-Directory: carefree-action-paths
 Originally Released As: track:carefree-action
 Duration: '2:08'
 URLs:
 - https://parsecproductions.bandcamp.com/track/carefree-action
 ---
 Track: Edge of Worlds
-Directory: edge-of-worlds-paths
 Originally Released As: track:edge-of-worlds
 Duration: '3:25'
 URLs:
 - https://parsecproductions.bandcamp.com/track/edge-of-worlds-2
 ---
 Track: Galaxy Hearts
-Directory: galaxy-hearts-paths
 Originally Released As: track:galaxy-hearts
 Duration: '2:53'
 URLs:
 - https://parsecproductions.bandcamp.com/track/galaxy-hearts
 ---
 Track: Chromaestro
+Suffix Directory: false
 Duration: '9:48'
 URLs:
 - https://parsecproductions.bandcamp.com/track/chromaestro
@@ -92,49 +88,42 @@ Commentary: |-
     Originally appeared in "[Chromaestro](https://store.steampowered.com/app/652200/Chromaestro/)"
 ---
 Track: Lurk
-Directory: lurk-paths
 Originally Released As: track:lurk-a-nameless-inheritance
 Duration: '2:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/lurk-2
 ---
 Track: Furni-Chore
-Directory: furni-chore-paths
 Originally Released As: track:furni-chore
 Duration: '1:34'
 URLs:
 - https://parsecproductions.bandcamp.com/track/furni-chore
 ---
 Track: Bane
-Directory: bane-paths
 Originally Released As: track:bane-p-s
 Duration: '6:05'
 URLs:
 - https://parsecproductions.bandcamp.com/track/bane
 ---
 Track: Final Stand
-Directory: final-stand-paths
 Originally Released As: track:final-stand-dare
 Duration: '3:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/final-stand
 ---
 Track: Dawn
-Directory: dawn-paths
 Originally Released As: track:dawn-the-consuming-shadow
 Duration: '1:51'
 URLs:
 - https://parsecproductions.bandcamp.com/track/dawn-2
 ---
 Track: Song of Skaia
-Directory: song-of-skaia-paths
 Originally Released As: track:song-of-skaia
 Duration: '6:27'
 URLs:
 - https://parsecproductions.bandcamp.com/track/song-of-skaia-2
 ---
 Track: The Raddest
-Directory: the-raddest-paths
 Originally Released As: track:the-raddest
 Duration: '3:56'
 URLs:
diff --git a/album/perfectly-generic-album.yaml b/album/perfectly-generic-album.yaml
index 9ccccbc6..e5015799 100644
--- a/album/perfectly-generic-album.yaml
+++ b/album/perfectly-generic-album.yaml
@@ -1,4 +1,5 @@
 Album: Perfectly Generic Album
+Directory Suffix: pga
 Date: November 10, 2019
 Date Added: May 25, 2020
 Additional Names:
@@ -149,7 +150,7 @@ Commentary: |-
     *(Continued in [[track:thought-and-flow-pga]])*
 ---
 Track: Thought and Flow
-Directory: thought-and-flow-pga
+Suffix Directory: true
 Additional Names:
 - thought and flow ([YouTube](https://www.youtube.com/watch?v=3vE59Fdjdh4))
 Duration: '3:46'
@@ -231,7 +232,7 @@ Commentary: |-
 Section: Removed in 2022 release
 ---
 Track: Gaster's Theme
-Directory: gasters-theme-pga
+Suffix Directory: true
 Duration: '3:53'
 URLs:
 - https://www.youtube.com/watch?v=JK5G79GcSAg
diff --git a/album/perils-of-probability.yaml b/album/perils-of-probability.yaml
index 2b68edbb..e2215cb2 100644
--- a/album/perils-of-probability.yaml
+++ b/album/perils-of-probability.yaml
@@ -1,5 +1,6 @@
 Album: 'Perils Of Probability: The Technicolor Terror From Beyond The Hyperthetical!'
 Directory: perils-of-probability
+Directory Suffix: vast-error
 Date: October 31, 2022
 Date Added: April 13, 2024
 URLs:
@@ -372,7 +373,7 @@ Commentary: |-
     She’s already caused enough trouble.
 ---
 Track: Devolver
-Directory: devolver-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - artist:kobacat
@@ -432,7 +433,7 @@ Lyrics: |-
     I’ll see you in the next one.
 ---
 Track: Inevitability
-Directory: inevitability-vast-error
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - CASTIGADORA
diff --git a/album/pesterquest-soundtrack.yaml b/album/pesterquest-soundtrack.yaml
index b810699e..22fb8c43 100644
--- a/album/pesterquest-soundtrack.yaml
+++ b/album/pesterquest-soundtrack.yaml
@@ -1,4 +1,5 @@
 Album: Pesterquest Soundtrack
+Directory Suffix: pesterquest
 Color: '#5fdce6'
 Date: September 13, 2021
 Date Added: April 13, 2024
@@ -203,7 +204,6 @@ Commentary: |-
     for this one and the next routes music im gonna try and keep with the tradition of uploading it the morning of.
 ---
 Track: 24/7 lo fi anime beats to question your sexuality to
-Directory: 24-7-lo-fi-anime-beats-to-question-your-sexuality-to
 Additional Names:
 - Name: >-
     Dave's other Theme "24/7 lo fi anime beats to question your sexuality to"
@@ -304,7 +304,7 @@ Commentary: |-
     anyway i hope you've enjoyed the ride! its been a little bittersweet at times for me but i'll miss posting new stuff every two weeks.
 ---
 Track: Darling Kanaya
-Directory: darling-kanaya-pesterquest
+Suffix Directory: true
 Originally Released As: track:darling-kanaya
 Has Cover Art: false
 Duration: '2:03'
@@ -313,7 +313,7 @@ URLs:
 - https://www.youtube.com/watch?v=1Llz7cjM3uk
 ---
 Track: CRUSTacean
-Directory: crustacean-pesterquest
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -342,8 +342,8 @@ Commentary: |-
     there are a handful of people out there who really thought we were just gonna put [[track:karkalicious|karkalicious]] in there.
 ---
 Track: mIrAcLeS
+Suffix Directory: true
 Originally Released As: track:miracles
-Directory: miracles-pesterquest
 Additional Names:
 - Name: >-
     Gamzee's Theme "mIrAcLeS"
@@ -360,8 +360,8 @@ URLs:
 - https://www.youtube.com/watch?v=YHr0f-eM4ag
 ---
 Track: Midnight Calliope
+Suffix Directory: true
 Originally Released As: track:midnight-calliope
-Directory: midnight-calliope-pesterquest
 Additional Names:
 - Name: >-
     Gamzee's Other Theme "Midnight Calliope"
@@ -409,8 +409,8 @@ Commentary: |-
     dont actually do that you clowns
 ---
 Track: Indigo Heir
+Suffix Directory: true
 Originally Released As: track:indigo-heir
-Directory: indigo-heir-pesterquest
 Additional Names:
 - Name: >-
     Equius's Theme "Indigo Heir"
@@ -471,7 +471,7 @@ URLs:
 - https://www.youtube.com/watch?v=zrtnPsoAkQg
 ---
 Track: Requiem
-Directory: requiem-pesterquest
+Suffix Directory: true
 Originally Released As: track:requiem-labyrinths-heart
 Additional Names:
 - Name: >-
@@ -516,7 +516,7 @@ Commentary: |-
     in its base form this song used to be about a cat and is like more than a decade old
 ---
 Track: Love You
-Directory: love-you-pesterquest
+Suffix Directory: true
 Originally Released As: track:love-you-feferis-theme
 Additional Names:
 - Name: >-
@@ -587,7 +587,8 @@ URLs:
 - https://www.youtube.com/watch?v=eciwBYIR8_k
 ---
 Track: Even in Death (T'Morra's Belly Mix)
-Directory: even-in-death-pesterquest
+Directory: even-in-death
+Suffix Directory: true
 Originally Released As: track:even-in-death-tmorras-belly-mix
 Additional Names:
 - Name: >-
@@ -605,7 +606,7 @@ URLs:
 - https://www.youtube.com/watch?v=nKqLPb9YDnM
 ---
 Track: Unite Synchronization
-Directory: unite-synchronization-pesterquest
+Suffix Directory: true
 Originally Released As: track:unite-synchronization
 Additional Names:
 - Name: >-
@@ -623,6 +624,8 @@ URLs:
 - https://www.youtube.com/watch?v=X-kDKrpgPck
 ---
 Track: Beatup
+Suffix Directory: true
+Originally Released As: track:beatup
 Additional Names:
 - Name: >-
     Ultimate Dirk's Theme "Beatup"
@@ -632,8 +635,6 @@ Additional Names:
     Ultimate Dirk's Theme, *"Beatup"*
   Annotation: >-
     in-game credits
-Directory: beatup-pesterquest
-Originally Released As: track:beatup
 Has Cover Art: false
 Duration: '5:14'
 URLs:
diff --git a/album/play-the-rain.yaml b/album/play-the-rain.yaml
index b4e471f7..e3c546d2 100644
--- a/album/play-the-rain.yaml
+++ b/album/play-the-rain.yaml
@@ -105,7 +105,7 @@ Referenced Tracks:
 - 'BL1ND JUST1C3 : 1NV3ST1G4T1ON !!'
 ---
 Track: Stalemate
-Directory: stalemate-play-the-rain
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Lark Mordancy
diff --git a/album/pokemon-scarlet-violet-super-music-collection.yaml b/album/pokemon-scarlet-violet-super-music-collection.yaml
index 14c172b9..2c00a80a 100644
--- a/album/pokemon-scarlet-violet-super-music-collection.yaml
+++ b/album/pokemon-scarlet-violet-super-music-collection.yaml
@@ -1,5 +1,6 @@
 Album: 'Pokémon Scarlet & Pokémon Violet + The Hidden Treasure of Area Zero: Super Music Collection'
 Directory: pokemon-scarlet-violet-super-music-collection
+Directory Suffix: pokemon-scarlet-violet
 Artists:
 - Pokémon
 - GAME FREAK
@@ -53,7 +54,7 @@ Referenced Tracks:
 - The Academy
 ---
 Track: Home
-Directory: home-pokemon-scarlet-violet
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:11'
 Artists:
@@ -96,7 +97,7 @@ URLs:
 - https://www.youtube.com/watch?v=-BQBo66ir_Y
 ---
 Track: Obtained a Key Item!
-Directory: obtained-a-key-item-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Hitomi Sato
@@ -115,7 +116,7 @@ Referenced Tracks:
 - Cabo Poco
 ---
 Track: Battle! (Wild Pokémon)
-Directory: battle-wild-pokemon-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '2:50'
 Artists:
 - Minako Adachi (arranger)
@@ -125,7 +126,7 @@ URLs:
 - https://www.youtube.com/watch?v=S0bz0QVZ3j0
 ---
 Track: Victory! (Wild Pokémon)
-Directory: victory-wild-pokemon-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:05'
 Artists:
 - Minako Adachi
@@ -135,7 +136,7 @@ Referenced Tracks:
 - track:battle-wild-pokemon-pokemon-scarlet-violet
 ---
 Track: Obtained a Berry!
-Directory: obtained-a-berry-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Hitomi Sato
@@ -222,7 +223,7 @@ Referenced Tracks:
 - South Province
 ---
 Track: You Caught a Pokémon!
-Directory: you-caught-a-pokemon-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Hitomi Sato
@@ -232,7 +233,7 @@ Referenced Tracks:
 - Pokémon Caught (Pokémon Red / Pokémon Blue)
 ---
 Track: Pokémon Center
-Directory: pokemon-center-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '2:43'
 Artists:
 - Hitomi Sato
@@ -242,7 +243,7 @@ Referenced Tracks:
 - Pokémon Center (Pokémon Red / Pokémon Blue)
 ---
 Track: Pokémon Healed
-Directory: pokemon-healed-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:06'
 Artists:
 - Hitomi Sato
@@ -347,7 +348,7 @@ Referenced Tracks:
 - The Academy
 ---
 Track: A Short Rest
-Directory: a-short-rest-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:06'
 Artists:
 - Hitomi Sato
@@ -364,7 +365,7 @@ URLs:
 - https://www.youtube.com/watch?v=Fats_yOZLAs
 ---
 Track: Trainers' Eyes Meet (Trainer)
-Directory: trainers-eyes-meet-trainer-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:17'
 Artists:
 - Minako Adachi
@@ -374,7 +375,7 @@ Referenced Tracks:
 - track:battle-trainer-pokemon-scarlet-violet
 ---
 Track: Battle! (Trainer)
-Directory: battle-trainer-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '2:56'
 Artists:
 - Minako Adachi (arranger)
@@ -384,7 +385,7 @@ URLs:
 - https://www.youtube.com/watch?v=lxT27YJ1YNc
 ---
 Track: Victory! (Trainer)
-Directory: victory-trainer-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:31'
 Artists:
 - Minako Adachi
@@ -394,7 +395,7 @@ Referenced Tracks:
 - track:victory-trainer-battle-pokemon-red-blue
 ---
 Track: Level Up!
-Directory: level-up-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Minako Adachi
@@ -448,7 +449,7 @@ URLs:
 - https://www.youtube.com/watch?v=AG-7yxzTmns
 ---
 Track: Obtained an Egg!
-Directory: obtained-an-egg-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Hitomi Sato
@@ -458,7 +459,7 @@ Referenced Tracks:
 - Received a Pokémon Egg! (Pokémon Gold / Pokémon Silver)
 ---
 Track: Evolution
-Directory: evolution-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:33'
 Artists:
 - Hitomi Sato
@@ -468,7 +469,7 @@ Referenced Tracks:
 - Evolution (Pokémon Red / Pokémon Blue)
 ---
 Track: Congratulations! Your Pokémon Evolved!
-Directory: congratulations-your-pokemon-evolved-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:05'
 Artists:
 - Hitomi Sato
@@ -518,7 +519,7 @@ Referenced Tracks:
 - Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue)
 ---
 Track: Obtained a Badge!
-Directory: obtained-a-badge-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:09'
 Artists:
 - Hitomi Sato
@@ -528,7 +529,7 @@ Referenced Tracks:
 - Obtained a Gym Badge (Pokémon Red / Pokémon Blue)
 ---
 Track: Obtained a TM!
-Directory: obtained-a-tm-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Hitomi Sato
@@ -934,7 +935,7 @@ URLs:
 - https://www.youtube.com/watch?v=GcLEFnQlawY
 ---
 Track: The Pokémon League
-Directory: the-pokemon-league-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '2:21'
 Artists:
 - Hitomi Sato (composer & arranger)
@@ -1224,7 +1225,7 @@ Referenced Tracks:
 - The Academy
 ---
 Track: Mystery Gift
-Directory: mystery-git-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:39'
 Artists:
 - Hitomi Sato
@@ -1248,7 +1249,7 @@ URLs:
 - https://www.youtube.com/watch?v=RNqrin6f-yE
 ---
 Track: Pokédex Evaluation... It's Perfect!
-Directory: pokedex-evaluation-its-perfect-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '0:06'
 Artists:
 - Go Ichinose
@@ -1258,7 +1259,7 @@ Referenced Tracks:
 - Pokédex Evaluation... Complete! (Pokémon Gold / Pokémon Silver)
 ---
 Track: Title Screen
-Directory: title-screen-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '1:36'
 Artists:
 - Yuri Habuka
@@ -1430,7 +1431,7 @@ Referenced Tracks:
 - Area Zero
 ---
 Track: Twisted
-Directory: twisted-pokemon-scarlet-violet
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:15'
 Artists:
@@ -1834,7 +1835,7 @@ Referenced Tracks:
 - Battle! (Team Star Boss)
 ---
 Track: Relic Song
-Directory: relic-song-pokemon-scarlet-violet
+Suffix Directory: true
 Duration: '2:01'
 Artists:
 - Go Ichinose
@@ -1886,7 +1887,8 @@ Referenced Tracks:
 - Mochi Mayhem
 ---
 Track: Title Screen
-Directory: title-screen-2-pokemon-scarlet-violet
+Directory: title-screen-2
+Suffix Directory: true
 Duration: '2:08'
 Artists:
 - Hiromitsu Maeba
diff --git a/album/pokemon-sword-shield-super-music-collection.yaml b/album/pokemon-sword-shield-super-music-collection.yaml
index 72796506..5e3fc5a2 100644
--- a/album/pokemon-sword-shield-super-music-collection.yaml
+++ b/album/pokemon-sword-shield-super-music-collection.yaml
@@ -1,5 +1,6 @@
 Album: 'Pokémon Sword & Pokémon Shield + Expansion Pass: Super Music Collection'
 Directory: pokemon-sword-shield-super-music-collection
+Directory Suffix: pokemon-sword-shield
 Artists:
 - Pokémon
 - GAME FREAK
@@ -27,7 +28,7 @@ Section: Disc 1
 Color: '#00a2e7'
 ---
 Track: Title Screen
-Directory: title-screen-pokemon-sword-shield
+Suffix Directory: true
 Duration: '1:25'
 Artists:
 - Go Ichinose
@@ -59,7 +60,7 @@ URLs:
 - https://www.youtube.com/watch?v=TkOcfawy8vU
 ---
 Track: Route 1
-Directory: route-1-pokemon-sword-shield
+Suffix Directory: true
 Duration: '1:17'
 Artists:
 - Go Ichinose
@@ -81,7 +82,7 @@ URLs:
 - https://www.youtube.com/watch?v=tUzpeApK0k0
 ---
 Track: Take a Break
-Directory: take-a-break-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:06'
 Artists:
 - Minako Adachi
@@ -114,7 +115,7 @@ URLs:
 - https://www.youtube.com/watch?v=FidGR2tps-o
 ---
 Track: Obtained an Item!
-Directory: obtained-an-item-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Minako Adachi
@@ -138,7 +139,7 @@ URLs:
 - https://www.youtube.com/watch?v=sRHXOydAFxs
 ---
 Track: Obtained a Key Item!
-Directory: obtained-a-key-item-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:04'
 Artists:
 - Minako Adachi
@@ -148,7 +149,7 @@ Referenced Tracks:
 - Obtained a Pokémon (Pokémon Red / Pokémon Blue)
 ---
 Track: Pokémon Center
-Directory: pokemon-center-pokemon-sword-shield
+Suffix Directory: true
 Duration: '2:17'
 Artists:
 - Minako Adachi
@@ -158,7 +159,7 @@ Referenced Tracks:
 - Pokémon Center (Pokémon Red / Pokémon Blue)
 ---
 Track: Recovery
-Directory: recovery-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:05'
 Artists:
 - Go Ichinose
@@ -168,7 +169,7 @@ Referenced Tracks:
 - Pokémon Healed (Pokémon Red / Pokémon Blue)
 ---
 Track: Battle! (Wild Pokémon)
-Directory: battle-wild-pokemon-pokemon-sword-shield
+Suffix Directory: true
 Duration: '2:22'
 Artists:
 - Go Ichinose
@@ -176,7 +177,7 @@ URLs:
 - https://www.youtube.com/watch?v=lV30h2U-k-4
 ---
 Track: Victory! (Wild Pokémon)
-Directory: victory-wild-pokemon-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:31'
 Artists:
 - Go Ichinose
@@ -365,7 +366,7 @@ Section: Disc 2
 Color: '#dd005d'
 ---
 Track: Route 3
-Directory: route-3-pokemon-sword-shield
+Suffix Directory: true
 Duration: '2:57'
 Artists:
 - Go Ichinose
@@ -373,7 +374,7 @@ URLs:
 - https://www.youtube.com/watch?v=6oYY6ZfJ_KE
 ---
 Track: Trainers' Eyes Meet (Trainer)
-Directory: trainers-eyes-meet-trainer-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:18'
 Artists:
 - Go Ichinose
@@ -383,7 +384,7 @@ Referenced Tracks:
 - track:battle-trainer-battle-pokemon-sword-shield
 ---
 Track: Battle! (Trainer Battle)
-Directory: battle-trainer-battle-pokemon-sword-shield
+Suffix Directory: true
 Duration: '3:08'
 Artists:
 - Go Ichinose
@@ -393,7 +394,7 @@ Referenced Tracks:
 - Title Screen (Pokémon Red / Pokémon Blue)
 ---
 Track: Victory! (Trainer Battle)
-Directory: victory-trainer-battle-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:33'
 Artists:
 - Go Ichinose
@@ -403,7 +404,7 @@ Referenced Tracks:
 - Victory! (Trainer Battle) (Pokémon Red / Pokémon Blue)
 ---
 Track: Trainers' Eyes Meet (Lass)
-Directory: trainers-eyes-meet-lass-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:18'
 Artists:
 - Go Ichinose
@@ -413,7 +414,7 @@ Referenced Tracks:
 - A Trainer Appears (Girl Version) (Pokémon Red / Pokémon Blue)
 ---
 Track: Evolution
-Directory: evolution-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:59'
 Artists:
 - Minako Adachi
@@ -525,7 +526,7 @@ Referenced Tracks:
 - Gym Mission!
 ---
 Track: Battle! (Gym Leader)
-Directory: battle-gym-leader-pokemon-sword-shield
+Suffix Directory: true
 Duration: '5:14'
 Artists:
 - Minako Adachi
@@ -533,7 +534,7 @@ URLs:
 - https://www.youtube.com/watch?v=JJJZ5s1ddoI
 ---
 Track: Victory! (Gym Leader)
-Directory: victory-gym-leader-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:45'
 Artists:
 - Minako Adachi
@@ -543,7 +544,7 @@ Referenced Tracks:
 - Victory! (Gym Leader Battle) (Pokémon Red / Pokémon Blue)
 ---
 Track: Obtained a Gym Badge!
-Directory: obtained-a-gym-badge-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:10'
 Artists:
 - Minako Adachi
@@ -618,7 +619,7 @@ URLs:
 - https://www.youtube.com/watch?v=p7K2yebT0aQ
 ---
 Track: Route 6
-Directory: route-6-pokemon-sword-shield
+Suffix Directory: true
 Duration: '2:48'
 Artists:
 - Minako Adachi
@@ -628,7 +629,7 @@ Referenced Tracks:
 - Wild Area (North)
 ---
 Track: Trainers' Eyes Meet (Artist)
-Directory: trainers-eyes-meet-artist-pokemon-sword-shield
+Suffix Directory: true
 Duration: '0:31'
 Artists:
 - Go Ichinose
@@ -905,7 +906,7 @@ Referenced Tracks:
 ## lists Adachi as composer next to Masuda so probably referencing something else too, probably from this game
 ---
 Track: Battle Tower
-Directory: battle-tower-pokemon-sword-shield
+Suffix Directory: true
 Duration: '1:48'
 Artists:
 - Minako Adachi
@@ -1235,7 +1236,7 @@ URLs:
 - https://www.youtube.com/watch?v=1qRZMVbrPLM
 ---
 Track: Staff Credits
-Directory: staff-credits-pokemon-sword-shield
+Suffix Directory: true
 Duration: '3:30'
 Artists:
 - Minako Adachi
diff --git a/album/portalstuck-vol-1.yaml b/album/portalstuck-vol-1.yaml
index 95a7c3f7..cf38f731 100644
--- a/album/portalstuck-vol-1.yaml
+++ b/album/portalstuck-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Portalstuck Vol. 1
+Directory Suffix: portalstuck
 Artists:
 - yoyoYolo
 Date: August 21, 2022
@@ -21,7 +22,7 @@ Commentary: |-
     The first volume of [Portalstuck's](https://mspfa.com/?s=44132&p=1) soundtrack.
 ---
 Track: Awakening
-Directory: awakening-portalstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:27
 URLs:
@@ -67,7 +68,7 @@ URLs:
 - https://www.youtube.com/watch?v=qQkfaUOqymI
 ---
 Track: Malfunction
-Directory: malfunction-portalstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:06'
 URLs:
@@ -84,7 +85,7 @@ Referenced Tracks:
 - Even in Death
 ---
 Track: Invincible
-Directory: invincible-portalstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:22'
 URLs:
diff --git a/album/project-s-ost-vol-1.yaml b/album/project-s-ost-vol-1.yaml
index 91bc7015..7d34a63d 100644
--- a/album/project-s-ost-vol-1.yaml
+++ b/album/project-s-ost-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Project [S] OST - Vol. 1
+Directory Suffix: project-s
 Date: April 13, 2024
 Date Added: April 13, 2024
 Additional Names:
@@ -113,7 +114,7 @@ Referenced Tracks:
 - Under The Hat
 ---
 Track: Showtime (piano)
-Directory: showtime-piano-project-s
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Showtime (Qwerty's Refrain)
diff --git a/album/psycholonials-ep-2.yaml b/album/psycholonials-ep-2.yaml
index c90df0dd..a7de8dee 100644
--- a/album/psycholonials-ep-2.yaml
+++ b/album/psycholonials-ep-2.yaml
@@ -38,7 +38,8 @@ URLs:
 - https://open.spotify.com/track/0UhtxV3zRVSMNKGzrWFNuv
 ---
 Track: Together
-Directory: together-psycholonials-ep-2
+Suffix Directory: true
+Always Reference By Directory: true
 Sampled Tracks:
 - track:someday-clark-powell
 Duration: '2:04'
diff --git a/album/psycholonials-ep-4.yaml b/album/psycholonials-ep-4.yaml
index 1d096b59..c0a3f441 100644
--- a/album/psycholonials-ep-4.yaml
+++ b/album/psycholonials-ep-4.yaml
@@ -30,7 +30,8 @@ Additional Files:
   - banner.png
 ---
 Track: Outlaw
-Directory: outlaw-psycholonials-ep-4
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '3:57'
 Referenced Tracks:
 - Misbegotten
@@ -48,7 +49,7 @@ URLs:
 - https://open.spotify.com/track/0gnd9GNrY41ejYwqb5CNwq
 ---
 Track: Breakthroughs
-Directory: breakthroughs-psycholonials-ep-4
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:14'
 URLs:
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index baefaea6..145946f2 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -46,7 +46,7 @@ Referenced Tracks:
 - track:shoreline-labyrinths-heart
 ---
 Track: Threshold
-Directory: threshold-psycholonials-ep-9
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:47'
 URLs:
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index 74eaa69d..0265373f 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -1,4 +1,5 @@
 Album: Psycholonials
+Suffix Track Directories: true
 Artists:
 - Clark Powell
 Date: April 20, 2021 12:00:01
@@ -45,7 +46,6 @@ Commentary: |-
 Section: From EP 1
 ---
 Track: Summer That Never Was
-Directory: summer-that-never-was-psycholonials
 Originally Released As: Star I Never Caught
 Duration: '3:50'
 URLs:
@@ -55,7 +55,6 @@ URLs:
 - https://music.apple.com/album/summer-that-never-was/1573061072?i=1573061216
 ---
 Track: Morning Ritual
-Directory: morning-ritual-psycholonials
 Originally Released As: Puzzle I Never Solved
 Duration: '2:47'
 URLs:
@@ -65,7 +64,6 @@ URLs:
 - https://music.apple.com/album/morning-ritual/1573061072?i=1573061244
 ---
 Track: What's Wasting Me
-Directory: whats-wasting-me-psycholonials
 Originally Released As: track:whats-wasting-me
 Duration: '2:35'
 URLs:
@@ -77,7 +75,6 @@ URLs:
 Section: From EP 2
 ---
 Track: The Cold Hand
-Directory: the-cold-hand-psycholonials
 Originally Released As: Sigh I Never Breathed
 Duration: '2:21'
 URLs:
@@ -87,7 +84,6 @@ URLs:
 - https://music.apple.com/album/the-cold-hand/1573061072?i=1573061249
 ---
 Track: Together
-Directory: together-psycholonials
 Originally Released As: track:together-psycholonials-ep-2
 Duration: '2:04'
 URLs:
@@ -97,7 +93,6 @@ URLs:
 - https://music.apple.com/album/together/1573061072?i=1573061250
 ---
 Track: The Influencer
-Directory: the-influencer-psycholonials
 Originally Released As: Woman I Never Met
 Duration: '2:26'
 URLs:
@@ -107,7 +102,6 @@ URLs:
 - https://music.apple.com/album/the-influencer/1573061072?i=1573061251
 ---
 Track: Just Dreams
-Directory: just-dreams-psycholonials
 Originally Released As: People I Never Knew
 Duration: '3:10'
 URLs:
@@ -117,7 +111,6 @@ URLs:
 - https://music.apple.com/album/just-dreams/1573061072?i=1573061252
 ---
 Track: I Have Some Ideas
-Directory: i-have-some-ideas-psycholonials
 Originally Released As: track:i-have-some-ideas
 Duration: '4:10'
 URLs:
@@ -129,7 +122,6 @@ URLs:
 Section: From EP 3
 ---
 Track: Time Is Helpless
-Directory: time-is-helpless-psycholonials
 Originally Released As: track:requiem-labyrinths-heart
 Duration: '4:36'
 URLs:
@@ -139,7 +131,6 @@ URLs:
 - https://music.apple.com/album/time-is-helpless/1573061072?i=1573061440
 ---
 Track: Through The Play
-Directory: through-the-play-psycholonials
 Originally Released As: track:pleas-labyrinths-heart
 Duration: '3:13'
 URLs:
@@ -149,7 +140,6 @@ URLs:
 - https://music.apple.com/album/through-the-play/1573061072?i=1573061441
 ---
 Track: Just Almost
-Directory: just-almost-psycholonials
 Originally Released As: Song I Never Played
 Duration: '1:37'
 URLs:
@@ -161,7 +151,6 @@ URLs:
 Section: From EP 4
 ---
 Track: Outlaw
-Directory: outlaw-psycholonials
 Originally Released As: track:outlaw-psycholonials-ep-4
 Duration: '3:57'
 URLs:
@@ -171,7 +160,6 @@ URLs:
 - https://music.apple.com/album/outlaw/1573061072?i=1573061464
 ---
 Track: A Screaming Inside
-Directory: a-screaming-inside-psycholonials
 Originally Released As: Dante
 Duration: '2:14'
 URLs:
@@ -181,7 +169,6 @@ URLs:
 - https://music.apple.com/album/a-screaming-inside/1573061072?i=1573061526
 ---
 Track: Breakthroughs
-Directory: breakthroughs-psycholonials
 Originally Released As: track:breakthroughs-psycholonials-ep-4
 Duration: '2:14'
 URLs:
@@ -191,7 +178,6 @@ URLs:
 - https://music.apple.com/album/breakthroughs/1573061072?i=1573061529
 ---
 Track: Nervous Energy
-Directory: nervous-energy-psycholonials
 Originally Released As: A Romance of Protons and Neutrons
 Duration: '4:28'
 URLs:
@@ -201,7 +187,6 @@ URLs:
 - https://music.apple.com/album/nervous-energy/1573061072?i=1573061541
 ---
 Track: Now And Forever
-Directory: now-and-forever-psycholonials
 Originally Released As: track:now-and-forever
 Duration: '3:59'
 URLs:
@@ -213,7 +198,6 @@ URLs:
 Section: From EP 5
 ---
 Track: In The Works
-Directory: in-the-works-psycholonials
 Originally Released As: track:in-the-works
 Duration: '4:22'
 URLs:
@@ -223,7 +207,6 @@ URLs:
 - https://music.apple.com/album/in-the-works/1573061072?i=1573061547
 ---
 Track: Ephemeral Muse
-Directory: ephemeral-muse-psycholonials
 Originally Released As: track:harrigan-we-are-all-satellites
 Duration: '4:46'
 URLs:
@@ -233,7 +216,6 @@ URLs:
 - https://music.apple.com/album/ephemeral-muse/1573061072?i=1573061549
 ---
 Track: Blood On Their Hands
-Directory: blood-on-their-hands-psycholonials
 Originally Released As: track:blood-on-their-hands
 Duration: '2:46'
 URLs:
@@ -245,7 +227,6 @@ URLs:
 Section: From EP 6
 ---
 Track: The Administrator
-Directory: the-administrator-psycholonials
 Originally Released As: Cruel Ulysses
 Duration: '2:21'
 URLs:
@@ -255,7 +236,6 @@ URLs:
 - https://music.apple.com/album/the-administrator/1573061072?i=1573061552
 ---
 Track: Means Of Conquest
-Directory: means-of-conquest-psycholonials
 Originally Released As: Country I Never Saw
 Duration: '3:55'
 URLs:
@@ -265,7 +245,6 @@ URLs:
 - https://music.apple.com/album/means-of-conquest/1573061072?i=1573061553
 ---
 Track: Twelve Clown Salute
-Directory: twelve-clown-salute-psycholonials
 Originally Released As: track:twelve-clown-salute
 Duration: '2:19'
 URLs:
@@ -277,7 +256,6 @@ URLs:
 Section: From EP 7
 ---
 Track: The March
-Directory: the-march-psycholonials
 Originally Released As: track:the-march
 Duration: '2:46'
 URLs:
@@ -287,7 +265,6 @@ URLs:
 - https://music.apple.com/album/the-march/1573061072?i=1573061767
 ---
 Track: Such A Shame
-Directory: such-a-shame-psycholonials
 Originally Released As: track:miranda-we-are-all-satellites
 Duration: '3:25'
 URLs:
@@ -297,7 +274,6 @@ URLs:
 - https://music.apple.com/album/such-a-shame/1573061072?i=1573061768
 ---
 Track: Break This
-Directory: break-this-psycholonials
 Originally Released As: track:break-this
 Duration: '1:21'
 URLs:
@@ -309,7 +285,6 @@ URLs:
 Section: From EP 8
 ---
 Track: In The Loop
-Directory: in-the-loop-psycholonials
 Originally Released As: track:in-the-loop
 Duration: '2:38'
 URLs:
@@ -319,7 +294,6 @@ URLs:
 - https://music.apple.com/album/in-the-loop/1573061072?i=1573061772
 ---
 Track: 'Flare: Insurrection Remix'
-Directory: flare-insurrection-remix-psycholonials
 Originally Released As: track:flare-insurrection-remix
 Duration: '4:08'
 URLs:
@@ -329,7 +303,6 @@ URLs:
 - https://music.apple.com/album/flare-insurrection-remix/1573061072?i=1573061775
 ---
 Track: 'Summer That Never Was: Firebrand Remix'
-Directory: summer-that-never-was-firebrand-remix-psycholonials
 Originally Released As: track:summer-that-never-was-firebrand-remix
 Duration: '3:55'
 URLs:
@@ -341,7 +314,6 @@ URLs:
 Section: From EP 9
 ---
 Track: Fix This
-Directory: fix-this-psycholonials
 Originally Released As: track:fix-this
 Duration: '1:54'
 URLs:
@@ -351,7 +323,6 @@ URLs:
 - https://music.apple.com/album/fix-this/1573061072?i=1573061782
 ---
 Track: Edge Of Dawn
-Directory: edge-of-dawn-psycholonials
 Originally Released As: track:edge-of-dawn
 Duration: '4:33'
 URLs:
@@ -361,7 +332,6 @@ URLs:
 - https://music.apple.com/album/edge-of-dawn/1573061072?i=1573061784
 ---
 Track: Threshold
-Directory: threshold-psycholonials
 Originally Released As: track:threshold-psycholonials-ep-9
 Duration: '1:47'
 URLs:
@@ -371,7 +341,6 @@ URLs:
 - https://music.apple.com/album/threshold/1573061072?i=1573061790
 ---
 Track: We Were Right About Everything
-Directory: we-were-right-about-everything-psycholonials
 Originally Released As: track:lunatic-we-are-all-satellites
 Duration: '5:51'
 URLs:
@@ -381,7 +350,6 @@ URLs:
 - https://music.apple.com/album/we-were-right-about-everything/1573061072?i=1573061791
 ---
 Track: Feeling I Can't Shake
-Directory: feeling-i-cant-shake-psycholonials
 Originally Released As: track:feeling-i-cant-shake
 Duration: '2:26'
 URLs:
@@ -391,7 +359,6 @@ URLs:
 - https://music.apple.com/album/feeling-i-cant-shake/1573061072?i=1573061793
 ---
 Track: Zhen
-Directory: zhen-psycholonials
 Originally Released As: track:zhen
 Duration: '2:42'
 URLs:
@@ -401,7 +368,6 @@ URLs:
 - https://music.apple.com/album/zhen/1573061072?i=1573062096
 ---
 Track: The Successor
-Directory: the-successor-psycholonials
 Originally Released As: track:forgotten-labyrinths-heart
 Duration: '4:22'
 URLs:
@@ -411,7 +377,6 @@ URLs:
 - https://music.apple.com/album/the-successor/1573061072?i=1573062100
 ---
 Track: Love Song
-Directory: love-song-psycholonials
 Originally Released As: track:love-song
 Duration: '3:54'
 URLs:
@@ -421,7 +386,6 @@ URLs:
 - https://music.apple.com/album/love-song/1573061072?i=1573062101
 ---
 Track: 'Ephemeral Muse: Final Remix'
-Directory: ephemeral-muse-final-remix-psycholonials
 Originally Released As: track:ephemeral-muse-final-remix
 Duration: '4:08'
 URLs:
@@ -433,6 +397,7 @@ URLs:
 Section: Bonus tracks
 ---
 Track: 'Together: Vocal Remix'
+Suffix Directory: false
 Duration: '2:56'
 Sampled Tracks:
 - track:together-psycholonials-ep-2
diff --git a/album/qualia.yaml b/album/qualia.yaml
index 291b2437..c3aa13ec 100644
--- a/album/qualia.yaml
+++ b/album/qualia.yaml
@@ -16,7 +16,7 @@ Commentary: |-
     I hope it's not a disappointment.
 ---
 Track: The Intro
-Directory: the-intro-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:13'
 URLs:
@@ -27,7 +27,7 @@ Commentary: |-
     Somewhere, in the cosmos, a story begins.
 ---
 Track: Science
-Directory: science-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:04'
 URLs:
@@ -38,7 +38,7 @@ Commentary: |-
     The science team thinks they have made a breakthrough! But at what cost?
 ---
 Track: The Sewer
-Directory: the-sewer-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:45
 URLs:
@@ -49,7 +49,7 @@ Commentary: |-
     We have to get our feet wet.
 ---
 Track: The Race
-Directory: the-race-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:49'
 URLs:
@@ -69,7 +69,7 @@ Commentary: |-
     Anna is who you imagine when you hear her sing this. Isn't she lovely?
 ---
 Track: The Demon
-Directory: the-demon-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:41'
 URLs:
@@ -90,7 +90,7 @@ Commentary: |-
     I don't know if it's the earth, but we're bound to find out.
 ---
 Track: Game Over
-Directory: game-over-qualia
+Suffix Directory: true
 Duration: '1:33'
 URLs:
 - https://buzinkaistudios.bandcamp.com/track/game-over
@@ -100,7 +100,7 @@ Commentary: |-
     You'll come back, right?
 ---
 Track: Phoenix
-Directory: phoenix-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:25'
 URLs:
@@ -111,7 +111,7 @@ Commentary: |-
     From the ashes.
 ---
 Track: Staff Roll
-Directory: staff-roll-qualia
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:50
 URLs:
diff --git a/album/rappets-davekat-collection.yaml b/album/rappets-davekat-collection.yaml
index f1375ad8..be02bb56 100644
--- a/album/rappets-davekat-collection.yaml
+++ b/album/rappets-davekat-collection.yaml
@@ -1,5 +1,6 @@
 Album: Rappets Davekat Collection
 Directory: rappets-davekat-collection
+Directory Suffix: rappets
 Date: October 21, 2023
 Date Added: October 25, 2023
 URLs:
@@ -27,7 +28,7 @@ Commentary: |-
     (if you really really really want canonical context for this, just imagine it taking place in the dream bubbles)
 ---
 Track: Davekat
-Directory: davekat-rappets
+Suffix Directory: true
 Always Reference By Directory: true
 Contributors:
 - KawaiiMochiORA (voice acting)
diff --git a/album/redditstuck-vol-1.yaml b/album/redditstuck-vol-1.yaml
index f98d0d61..2646b7e2 100644
--- a/album/redditstuck-vol-1.yaml
+++ b/album/redditstuck-vol-1.yaml
@@ -1,4 +1,5 @@
 Album: Redditstuck Vol. 1
+Directory Suffix: redditstuck
 Date: October 25, 2016
 Date Added: June 12, 2024
 URLs:
@@ -54,7 +55,7 @@ Commentary: |-
     Currently available for download [at File Garden](https://filegarden.com/users/644418ca5425ed42805dc8fc/garden/#ZmYtGp5QlkbVUny_).
 ---
 Track: Cogs
-Directory: cogs-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
@@ -67,7 +68,7 @@ Art Tags:
 - LoSaB (Redditstuck)
 ---
 Track: Hobbyist
-Directory: hobbyist-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
@@ -80,7 +81,7 @@ Art Tags:
 - Chelsea (Redditstuck)
 ---
 Track: Spool
-Directory: spool-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
@@ -110,7 +111,7 @@ Commentary: |-
     <img src="media/misc/crushing-weight-soundcloud.png" width="225">
 ---
 Track: Assertion
-Directory: assertion-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Emelia K.
@@ -146,7 +147,7 @@ Art Tags:
 - Luke (Redditstuck)
 ---
 Track: Incubation
-Directory: incubation-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -191,7 +192,7 @@ Referenced Tracks:
 - track:hobbyist-redditstuck
 ---
 Track: Alloy
-Directory: alloy-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -288,7 +289,7 @@ Art Tags:
 - Earth
 ---
 Track: Effervescence
-Directory: effervescence-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -422,7 +423,7 @@ Art Tags:
 - Earth
 ---
 Track: Hyperion
-Directory: hyperion-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Kal-la-kal-la
diff --git a/album/redditstuck-vol-2.yaml b/album/redditstuck-vol-2.yaml
index d4d8d8a2..29ac929d 100644
--- a/album/redditstuck-vol-2.yaml
+++ b/album/redditstuck-vol-2.yaml
@@ -1,4 +1,5 @@
 Album: Redditstuck Vol. 2
+Directory Suffix: redditstuck
 Date: January 14, 2017
 Date Added: June 12, 2024
 URLs:
@@ -85,7 +86,7 @@ Art Tags:
 - LoGaM (Redditstuck)
 ---
 Track: Inflection
-Directory: inflection-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
@@ -98,7 +99,7 @@ Art Tags:
 - Jay (Redditstuck)
 ---
 Track: Halcyon
-Directory: halcyon-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
@@ -162,7 +163,7 @@ Commentary: |-
     In his tower, hidden from the world, the magician works his Forbyddyn Majyyyks
 ---
 Track: Siphon
-Directory: siphon-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -254,7 +255,7 @@ Art Tags:
 - Sly (Redditstuck)
 ---
 Track: Gnade
-Directory: gnade-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Gordian
@@ -434,7 +435,7 @@ Cover Artists:
 - David Burt
 ---
 Track: Maelstrom
-Directory: maelstrom-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - JJ Pollution
diff --git a/album/redditstuck-vol-3.yaml b/album/redditstuck-vol-3.yaml
index b91e079f..8b8a5727 100644
--- a/album/redditstuck-vol-3.yaml
+++ b/album/redditstuck-vol-3.yaml
@@ -1,5 +1,6 @@
 Album: 'Redditstuck Vol. 3: Small Medium at Large'
 Directory: redditstuck-vol-3
+Directory Suffix: redditstuck
 Date: August 15, 2017
 Date Added: June 12, 2024
 URLs:
@@ -353,7 +354,7 @@ Commentary: |-
     Ypsilanti: I think Lazic just pulled the art out of his ass based vaguely on Kal's liner notes, but you can think of it as inspired by LORAS
 ---
 Track: Hubris
-Directory: hubris-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Gordian
@@ -381,7 +382,7 @@ Commentary: |-
     unironic ironic trap drums
 ---
 Track: Robot
-Directory: robot-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Gordian
@@ -443,7 +444,7 @@ Commentary: |-
     Basically just references.
 ---
 Track: Bygone
-Directory: bygone-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Bin
@@ -538,7 +539,7 @@ Commentary: |-
     <span style="font-family: Comic Sans MS, cursive">Old horsograph</span>
 ---
 Track: Wanderlust
-Directory: wanderlust-redditstuck
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/repiton.yaml b/album/repiton.yaml
index 4f6c9025..ea1288d9 100644
--- a/album/repiton.yaml
+++ b/album/repiton.yaml
@@ -18,7 +18,7 @@ Groups:
 Section: Main album
 ---
 Track: Methodology
-Directory: methodology-repiton
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:56'
 URLs:
@@ -72,7 +72,7 @@ Sampled Tracks:
 - The Lego Movie
 ---
 Track: Survival
-Directory: survival-repiton
+Suffix Directory: true
 Always Reference By Directory: true
 Cover Artists:
 - grechushka
@@ -84,7 +84,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/repiton?track=survival
 ---
 Track: Home
-Directory: home-repiton
+Suffix Directory: true
 Cover Artists:
 - rigamo12
 Duration: '2:08'
@@ -93,14 +93,15 @@ URLs:
 # - https://music.deconreconstruction.com/albums/repiton?track=home
 ---
 Track: 'INTERMISSION: Risk'
-Directory: risk-vast-error
+Directory: risk
+Suffix Directory: true
 Duration: '4:17'
 URLs:
 - https://vasterror.bandcamp.com/track/intermission-risk
 # - https://music.deconreconstruction.com/albums/repiton?track=intermission-risk
 ---
 Track: Moonlight
-Directory: moonlight-repiton
+Suffix Directory: true
 Always Reference By Directory: true
 Cover Artists:
 - koroke
@@ -118,7 +119,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/repiton?track=through-it-all
 ---
 Track: Tyrant
-Directory: tyrant-repiton
+Suffix Directory: true
 Cover Artists:
 - big chalupa
 Duration: '3:17'
@@ -147,7 +148,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/repiton?track=nailed-it
 ---
 Track: Remember?
-Directory: remember-repiton
+Suffix Directory: true
 Cover Artists:
 - Xamag
 Duration: '3:10'
@@ -156,7 +157,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/repiton?track=remember
 ---
 Track: Promise
-Directory: promise-repiton
+Suffix Directory: true
 Always Reference By Directory: true
 Cover Artists:
 - Calibratorg
diff --git a/album/reprise.yaml b/album/reprise.yaml
index 072b732e..54ec8fe8 100644
--- a/album/reprise.yaml
+++ b/album/reprise.yaml
@@ -64,7 +64,7 @@ Referenced Tracks:
 Section: Bonus track
 ---
 Track: A New World
-Directory: a-new-world-reprise
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/retcon-2018.yaml b/album/retcon-2018.yaml
index 3e36c3cd..21f5fcd8 100644
--- a/album/retcon-2018.yaml
+++ b/album/retcon-2018.yaml
@@ -1,4 +1,5 @@
 Album: Retcon (2018)
+Directory Suffix: retcon
 Artists:
 - The Cat Herd
 Date: April 13, 2018
@@ -30,7 +31,7 @@ Additional Files:
   - banner.png
 ---
 Track: Time
-Directory: time-retcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:38'
 URLs:
@@ -39,7 +40,8 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: '-'
-Directory: descend-retcon
+Directory: descend
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:19'
 URLs:
@@ -48,7 +50,7 @@ Referenced Tracks:
 - track:descend
 ---
 Track: Space
-Directory: space-retcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:37'
 URLs:
@@ -64,7 +66,7 @@ Referenced Tracks:
 - Explore
 ---
 Track: Regicide
-Directory: regicide-retcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '06:45'
 URLs:
@@ -94,7 +96,7 @@ Referenced Tracks:
 - Eternity Served Cold
 ---
 Track: Closure...?
-Directory: closure-retcon
+Suffix Directory: true
 Duration: '03:42'
 URLs:
 - https://8-bitshit.bandcamp.com/track/closure
diff --git a/album/riddle-of-dixy-path-of-mind-ost.yaml b/album/riddle-of-dixy-path-of-mind-ost.yaml
index ba6ed091..06793d4a 100644
--- a/album/riddle-of-dixy-path-of-mind-ost.yaml
+++ b/album/riddle-of-dixy-path-of-mind-ost.yaml
@@ -1,4 +1,5 @@
 Album: 'Riddle of Dixy: Path of Mind OST'
+Directory Suffix: riddle-of-dixy
 Artists:
 - Xszelor
 - Dvojka
@@ -28,7 +29,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Main Menu Theme
-Directory: main-menu-theme-riddle-of-dixy
+Suffix Directory: true
 Duration: '02:33'
 URLs:
 - https://dvojka.bandcamp.com/track/main-menu-theme
@@ -54,7 +55,8 @@ URLs:
 - https://dvojka.bandcamp.com/track/slough-of-despond
 ---
 Track: Dragonfly
-Directory: dragonfly-riddle-of-dixy
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '01:47'
 URLs:
 - https://dvojka.bandcamp.com/track/dragonfly
@@ -65,7 +67,8 @@ URLs:
 - https://dvojka.bandcamp.com/track/indigo-fortune-teller
 ---
 Track: Anthill
-Directory: anthill-riddle-of-dixy
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '02:04'
 URLs:
 - https://dvojka.bandcamp.com/track/anthill
@@ -100,7 +103,7 @@ Referenced Tracks:
 - Crystalanthemums
 ---
 Track: Chucklevoodoos
-Directory: chucklevoodoos-riddle-of-dixy
+Suffix Directory: true
 Duration: '02:33'
 URLs:
 - https://dvojka.bandcamp.com/track/chucklevoodoos
@@ -130,7 +133,8 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Deliverance
-Directory: deliverance-riddle-of-dixy
+Suffix Directory: true
+Always Reference By Directory: true
 Additional Names:
 - Name: >-
     Deliverance (BONUS)
diff --git a/album/rose-of-winter.yaml b/album/rose-of-winter.yaml
index 1a0b5b5b..6ea424d3 100644
--- a/album/rose-of-winter.yaml
+++ b/album/rose-of-winter.yaml
@@ -1,4 +1,6 @@
 Album: Rose of Winter
+Suffix Track Directories: true
+Always Reference Tracks By Directory: true
 Artists:
 - Toby Fox
 Date: October 17, 2016
@@ -23,8 +25,6 @@ Groups:
 - Beyond
 ---
 Track: Theme
-Directory: theme-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:37'
@@ -32,8 +32,6 @@ URLs:
 - https://youtu.be/vWhUfWQX8-Q
 ---
 Track: Danger
-Directory: danger-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:57'
@@ -41,6 +39,8 @@ URLs:
 - https://youtu.be/_-sb17SXsKg
 ---
 Track: Sad (Lower)
+Suffix Directory: false
+Always Reference By Directory: false
 Artists:
 - Toby Fox
 Duration: '1:42'
@@ -50,8 +50,6 @@ Referenced Tracks:
 - track:emotionless-rose-of-winter
 ---
 Track: Emotionless
-Directory: emotionless-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:42'
@@ -59,8 +57,6 @@ URLs:
 - https://youtu.be/8l76d6yzdmw
 ---
 Track: Heroism
-Directory: heroism-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:00'
@@ -70,8 +66,6 @@ Referenced Tracks:
 - track:theme-rose-of-winter
 ---
 Track: Legend
-Directory: legend-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '1:04'
@@ -81,8 +75,6 @@ Referenced Tracks:
 - track:heroism-rose-of-winter
 ---
 Track: Tension
-Directory: tension-rose-of-winter
-Always Reference By Directory: true
 Artists:
 - Toby Fox
 Duration: '0:51'
diff --git a/album/rowing.yaml b/album/rowing.yaml
index 95bde6c0..95d2e3f3 100644
--- a/album/rowing.yaml
+++ b/album/rowing.yaml
@@ -1,4 +1,6 @@
 Album: Rowing
+Suffix Track Directories: true
+Always Reference Tracks By Directory: true
 Artists:
 - James Dever
 Date: March 12, 2013
@@ -57,8 +59,6 @@ Commentary: |-
     The album referred to as the 'second half' of Rowing never materialized.
 ---
 Track: Adagio
-Directory: adagio-rowing
-Always Reference By Directory: true
 Duration: '4:13'
 URLs:
 - https://tylerdever.bandcamp.com/track/adagio
@@ -68,8 +68,6 @@ Commentary: |-
     Adagio is a calm etude for piano written as a commission for Alexander Pollock.
 ---
 Track: Valse
-Directory: valse-rowing
-Always Reference By Directory: true
 Duration: '5:26'
 URLs:
 - https://tylerdever.bandcamp.com/track/valse
@@ -79,8 +77,6 @@ Commentary: |-
     Valse is a duet for piano and cello.
 ---
 Track: Meadows
-Directory: meadows-rowing
-Always Reference By Directory: true
 Additional Names:
 - Our Hope is Lost (WIP name)
 Duration: '3:39'
@@ -102,8 +98,6 @@ Commentary: |-
     I hope you enjoy <b>Meadows</b>
 ---
 Track: Icarus
-Directory: icarus-rowing
-Always Reference By Directory: true
 Duration: '2:52'
 URLs:
 - https://tylerdever.bandcamp.com/track/icarus
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index e35dfaf7..8d2e9b7d 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -1,4 +1,5 @@
 Album: '[S] Collide.'
+Directory Suffix: collide
 Date: April 6, 2016
 Date Added: November 15, 2019
 URLs:
@@ -112,7 +113,7 @@ Referenced Tracks:
 - Typheus
 ---
 Track: Heir of Grief
-Directory: heir-of-grief-collide
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Tensei
diff --git a/album/s-press-play.yaml b/album/s-press-play.yaml
index 76ad12ed..353ff56e 100644
--- a/album/s-press-play.yaml
+++ b/album/s-press-play.yaml
@@ -1,4 +1,5 @@
 Album: '[S] Press Play'
+Directory Suffix: press-play
 Date: January 4, 2021
 Date Added: January 1, 2023
 Additional Names:
@@ -206,7 +207,7 @@ Referenced Tracks:
 - Title (The Legend of Zelda)
 ---
 Track: Planet Healer
-Directory: planet-healer-press-play
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - awsomfaic
diff --git a/album/sbahj-the-album.yaml b/album/sbahj-the-album.yaml
index dfb150aa..07c10656 100644
--- a/album/sbahj-the-album.yaml
+++ b/album/sbahj-the-album.yaml
@@ -66,7 +66,7 @@ Commentary: |-
     merging my two favorite fandoms at the time (emo and homestuck) felt natural
 ---
 Track: Intro
-Directory: intro-sbahj-the-album
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/sburb-funkin-edition-ost.yaml b/album/sburb-funkin-edition-ost.yaml
index 56aee918..b598eb2d 100644
--- a/album/sburb-funkin-edition-ost.yaml
+++ b/album/sburb-funkin-edition-ost.yaml
@@ -1,5 +1,6 @@
 Album: "SBURB: Funkin' Edition OST"
 Directory: sburb-funkin-edition-ost
+Directory Suffix: sburb-funkin-edition
 Date: October 18, 2023
 Date Added: October 25, 2023
 URLs:
@@ -61,7 +62,7 @@ Commentary: |-
     <img src="media/misc/sburb-funkin-edition-collage.png" width="250">
 ---
 Track: ABSCOND
-Directory: abscond-sburb-funkin-edition
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
@@ -82,7 +83,7 @@ URLs:
 - https://soundcloud.com/rerollroxy/friday-night-funkin-sburb-funkin-edition-abscond-dave-vs-bro
 ---
 Track: gamzee
-Directory: gamzee-sburb-funkin-edition
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Name: >-
diff --git a/album/sburb-ost.yaml b/album/sburb-ost.yaml
index f1c7f613..e38a2588 100644
--- a/album/sburb-ost.yaml
+++ b/album/sburb-ost.yaml
@@ -72,7 +72,8 @@ Commentary: |-
 Section: Disk 1
 ---
 Track: ~~~~DISK 1~~~~
-Directory: disk1-sburb-ost
+Directory: disk1
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:11
@@ -784,7 +785,8 @@ Commentary: |-
 Section: Disk 2
 ---
 Track: ~~~~DISK 2~~~~
-Directory: disk2-sburb-ost
+Directory: disk2
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:09
@@ -1145,7 +1147,7 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: ~~~~BONUS~~~~
-Directory: bonus-sburb-ost
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: 0:17
diff --git a/album/sburban-neighborhood.yaml b/album/sburban-neighborhood.yaml
index d8bd0069..dbcf3854 100644
--- a/album/sburban-neighborhood.yaml
+++ b/album/sburban-neighborhood.yaml
@@ -95,7 +95,7 @@ Commentary: |-
     This was inspired by listening to a lot of Gemini and Frankie Knuckles, I wasn't able to really replicate their sound (mainly cause my voice sucks) but it was a great challenge and a lot of fun. The name of the track is based off of all of the house sets that I love that are always labeled Live at (insert venue here).

 ---

 Track: Remember

-Directory: remember-sburban-neighborhood

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Cerulean

diff --git a/album/sburbmon-ost.yaml b/album/sburbmon-ost.yaml
index 8ee909db..61eb1727 100644
--- a/album/sburbmon-ost.yaml
+++ b/album/sburbmon-ost.yaml
@@ -1,5 +1,6 @@
 Album: Sburbmon Original Soundtrack
 Directory: sburbmon-ost
+Directory Suffix: sburbmon
 Date: October 10, 2019
 Date Added: June 12, 2024
 URLs:
@@ -64,7 +65,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Title Screen
-Directory: title-screen-sburbmon
+Suffix Directory: true
 Additional Names:
 - Title Screen [Sburban Jungle] (download filename)
 Duration: '0:56'
@@ -299,7 +300,7 @@ MIDI Project Files:
   - 'Center of Brilliance - Twix Stix.mid'
 ---
 Track: Skaianet
-Directory: skaianet-sburbmon
+Suffix Directory: true
 Always Reference By Directory: true
 Additional Names:
 - Skaianet [Skaianet]
@@ -446,7 +447,7 @@ MIDI Project Files:
 Section: Bonus track
 ---
 Track: Music Box
-Directory: music-box-sburbmon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '0:07'
 Referenced Tracks:
diff --git a/album/seven-seas.yaml b/album/seven-seas.yaml
index fc9d5e50..d59e66b0 100644
--- a/album/seven-seas.yaml
+++ b/album/seven-seas.yaml
@@ -42,7 +42,7 @@ URLs:
 - https://soundcloud.com/worthikids/5-witch-of-life
 ---
 Track: Meteor
-Directory: meteor-seven-seas
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:15'
 Referenced Tracks:
diff --git a/album/shortcuts.yaml b/album/shortcuts.yaml
index 73efe760..e1113ef4 100644
--- a/album/shortcuts.yaml
+++ b/album/shortcuts.yaml
@@ -125,7 +125,8 @@ Commentary: |-
     Loop 1 is the formal name for the Mopac Expressway in Austin, Texas. On the occasions where it's not crowded with stop-and-go commuters, it's a quick way to cut through the quieter reaches of town, navigating through rolling prairie and surreal corporate offices. This track pulls from the sound of krautrock, copping the motorik beat and droning sensibilities of Neu! - a recording from the inside of a car riding along this would-be-autobahn slowly fades in over the escalating loops.
 ---
 Track: Pulse
-Directory: pulse-shortcuts
+Suffix Directory: true
+Always Reference By Directory: true
 Artists:
 - David Ellis
 Contributors:
diff --git a/album/skaian-synthesis.yaml b/album/skaian-synthesis.yaml
index 51d8c2d3..77727c35 100644
--- a/album/skaian-synthesis.yaml
+++ b/album/skaian-synthesis.yaml
@@ -1,4 +1,6 @@
 Album: 【SKAIAN SYNTHESIS】
+Suffix Track Directories: true
+Always Reference Tracks By Directory: true
 Artists:
 - Funk McLovin
 Date: August 19, 2023
@@ -28,6 +30,8 @@ Commentary: |-
     I've been working on this for a while now and it's been fun. I hope everyone enjoys! I made it for the people who love Homestuck music and want to hear more.
 ---
 Track: Skaian Synthesis
+Suffix Directory: false
+Always Reference By Directory: false
 Duration: '4:38'
 URLs:
 - https://funkmclovin.bandcamp.com/track/skaian-synthesis
@@ -37,8 +41,6 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: Heir of Grief
-Directory: heir-of-grief-skaian-synthesis
-Always Reference By Directory: true
 Duration: '3:09'
 URLs:
 - https://funkmclovin.bandcamp.com/track/heir-of-grief
@@ -47,8 +49,6 @@ Referenced Tracks:
 - Heir of Grief
 ---
 Track: Sburban Jungle
-Directory: sburban-jungle-skaian-synthesis
-Always Reference By Directory: true
 Duration: '3:08'
 URLs:
 - https://funkmclovin.bandcamp.com/track/sburban-jungle
@@ -57,8 +57,6 @@ Referenced Tracks:
 - Sburban Jungle
 ---
 Track: Moonsetter
-Directory: moonsetter-skaian-synthesis
-Always Reference By Directory: true
 Duration: '2:48'
 URLs:
 - https://funkmclovin.bandcamp.com/track/moonsetter-2
@@ -67,8 +65,6 @@ Referenced Tracks:
 - track:moonsetter
 ---
 Track: Beatdown
-Directory: beatdown-skaian-synthesis
-Always Reference By Directory: true
 Duration: '2:05'
 URLs:
 - https://funkmclovin.bandcamp.com/track/beatdown
@@ -85,8 +81,6 @@ Referenced Tracks:
 - track:megalovania-ebhh
 ---
 Track: Black
-Directory: black-skaian-synthesis
-Always Reference By Directory: true
 Duration: '2:40'
 URLs:
 - https://funkmclovin.bandcamp.com/track/black
@@ -95,8 +89,6 @@ Referenced Tracks:
 - track:liquid-negrocity
 ---
 Track: Sunslammer
-Directory: sunslammer-skaian-synthesis
-Always Reference By Directory: true
 Duration: '2:04'
 URLs:
 - https://funkmclovin.bandcamp.com/track/sunslammer
diff --git a/album/skaias-the-limit.yaml b/album/skaias-the-limit.yaml
index e7e53c81..a504435a 100644
--- a/album/skaias-the-limit.yaml
+++ b/album/skaias-the-limit.yaml
@@ -1,4 +1,5 @@
 Album: SKAIA'S THE LIMIT
+Directory Suffix: sahcon
 Date: July 16, 2022
 Date Added: January 1, 2023
 Additional Names:
@@ -18,7 +19,7 @@ Groups:
 - Fandom
 ---
 Track: Beatdown
-Directory: beatdown-sahcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:43'
 Artists:
@@ -61,7 +62,7 @@ Commentary: |-
     lyrics: i forgot to write them down. they don't make sense on purpose. don't worry about it lmao
 ---
 Track: Paradox Space
-Directory: paradox-space-sahcon
+Suffix Directory: true
 Duration: '5:02'
 Artists:
 - Levc
@@ -166,7 +167,7 @@ Commentary: |-
     Joey song! I feel like my homegirl is underrapresented. Based on [[artist:erik-scheele|Jit's]] great [[track:joey-play-haunting-melody]] from [[album:lofam5]], I wanted to see if I could reimagine it as a more traditional [[album:homestuck-vol-1-4]] style kid theme of sorts. Alas, I could not come up with a clever 8 letter title, but we can't always get what we want.
 ---
 Track: Megalovania SUPER LUCKY Edition
-Directory: megalovania-super-lucky-edition-sahcon
+Suffix Directory: true
 Originally Released As: track:megalovania-super-lucky-edition
 Duration: '2:32'
 URLs:
@@ -177,7 +178,7 @@ Commentary: |-
 ---
 Track: The World as We Know It
 Originally Released As: track:the-world-as-we-know-it
-Directory: the-world-as-we-know-it-sahcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:09'
 URLs:
@@ -187,7 +188,7 @@ Commentary: |-
     I was thinking about Earth B before the game began. I composed this track in 2018, hence the old productionless piano soundfont style.
 ---
 Track: I'm A Member of the Midnight Crew
-Directory: im-a-member-of-the-midnight-crew-sahcon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:18'
 Artists:
@@ -243,7 +244,7 @@ Commentary: |-
     Wanted to finish a postpunk song about Jade Harley but time didn't allow for it so instead here's an arrangement of the midnight crew that was cobbled together in the last 48 hours.
 ---
 Track: Hot Pink Denial
-Directory: hot-pink-denial-sahcon
+Suffix Directory: true
 Duration: '2:03'
 Artists:
 - articulatelyComposed
diff --git a/album/slender-the-arrival-soundtrack.yaml b/album/slender-the-arrival-soundtrack.yaml
index f1341948..11f9f9b3 100644
--- a/album/slender-the-arrival-soundtrack.yaml
+++ b/album/slender-the-arrival-soundtrack.yaml
@@ -1,4 +1,5 @@
 Album: 'Slender: The Arrival Soundtrack'
+Directory Suffix: slender
 Artists:
 - Mark J. Hadley
 Date: March 26, 2013
@@ -26,7 +27,7 @@ URLs:
 - https://www.youtube.com/watch?v=NhDV2okAlVg
 ---
 Track: Ponder
-Directory: ponder-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '0:29'
 URLs:
@@ -38,14 +39,14 @@ URLs:
 - https://www.youtube.com/watch?v=pfcSoHRAdCQ
 ---
 Track: Tainted
-Directory: tainted-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:48
 URLs:
 - https://www.youtube.com/watch?v=vOMY2jq9h4k
 ---
 Track: Shadowed
-Directory: shadowed-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:24'
 URLs:
@@ -57,35 +58,35 @@ Referenced Tracks:
 - Page 7 theme
 ---
 Track: Distance
-Directory: distance-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:00'
 URLs:
 - https://www.youtube.com/watch?v=NHnyYa8doiY
 ---
 Track: Conceal
-Directory: conceal-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=5l54zDcgC-g
 ---
 Track: Isolate
-Directory: isolate-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:45'
 URLs:
 - https://www.youtube.com/watch?v=VKh67R27_No
 ---
 Track: Suspended
-Directory: suspended-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:21'
 URLs:
 - https://www.youtube.com/watch?v=99FpMNJrPvs
 ---
 Track: Constricted
-Directory: constricted-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:06'
 URLs:
@@ -97,21 +98,21 @@ URLs:
 - https://www.youtube.com/watch?v=sH7IZv_eeaM
 ---
 Track: Flicker
-Directory: flicker-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:24'
 URLs:
 - https://www.youtube.com/watch?v=sewYudRzDEU
 ---
 Track: Corrupted
-Directory: corrupted-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:56
 URLs:
 - https://www.youtube.com/watch?v=ji-Jm15fe2Y
 ---
 Track: Responsible
-Directory: responsible-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:00'
 URLs:
@@ -131,7 +132,7 @@ Cover Artists:
 - Blue Isle Studios
 ---
 Track: Willow
-Directory: willow-slender
+Suffix Directory: true
 Always Reference By Directory: true
 Date First Released: October 15, 2014
 Artists:
diff --git a/album/solar-sessions.yaml b/album/solar-sessions.yaml
index 9cc00ca0..1134f03c 100644
--- a/album/solar-sessions.yaml
+++ b/album/solar-sessions.yaml
@@ -103,7 +103,8 @@ Lyrics: |-
     A kinder ending
 ---
 Track: Earth ♁
-Directory: earth-solar-sessions
+Directory: earth
+Suffix Directory: true
 Artists:
 - psithurist
 Duration: '4:45'
diff --git a/album/some-other-horizon.yaml b/album/some-other-horizon.yaml
index b42d0c89..16a335f1 100644
--- a/album/some-other-horizon.yaml
+++ b/album/some-other-horizon.yaml
@@ -46,7 +46,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/idyllic
 ---
 Track: Sundae
-Directory: sundae-some-other-horizon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:51'
 URLs:
@@ -58,7 +58,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/break-the-world
 ---
 Track: Crescent
-Directory: crescent-some-other-horizon
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:11'
 Cover Artists:
@@ -67,7 +67,7 @@ URLs:
 - https://circlejourney.bandcamp.com/track/crescent
 ---
 Track: Bee Safe
-Directory: bee-safe-some-other-horizon
+Suffix Directory: true
 Always Reference By Directory: true
 Cover Artists:
 - Lovisa Lassen
diff --git a/album/somnium-remastered.yaml b/album/somnium-remastered.yaml
index f0555a4c..237ebef3 100644
--- a/album/somnium-remastered.yaml
+++ b/album/somnium-remastered.yaml
@@ -23,14 +23,14 @@ Commentary: |-
     This 11 track album, however is the remaster and reedit of the original.
 ---
 Track: Soothe
-Directory: soothe-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:40'
 URLs:
 - https://solatrus.bandcamp.com/album/somnium-remastered
 ---
 Track: Shadows
-Directory: shadows-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '7:06'
 URLs:
@@ -47,21 +47,21 @@ URLs:
 - https://solatrus.bandcamp.com/track/below-the-surface
 ---
 Track: Lucidity
-Directory: lucidity-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '6:04'
 URLs:
 - https://solatrus.bandcamp.com/track/lucidity
 ---
 Track: Body
-Directory: body-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:59'
 URLs:
 - https://solatrus.bandcamp.com/track/body
 ---
 Track: Mind
-Directory: mind-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '6:39'
 Referenced Tracks:
@@ -70,7 +70,7 @@ URLs:
 - https://solatrus.bandcamp.com/track/mind
 ---
 Track: Soul
-Directory: soul-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '6:31'
 Referenced Tracks:
@@ -89,7 +89,7 @@ URLs:
 - https://solatrus.bandcamp.com/track/primus
 ---
 Track: Awaken
-Directory: awaken-somnium-remastered
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '6:22'
 URLs:
diff --git a/album/songs-for-doomed-timelines.yaml b/album/songs-for-doomed-timelines.yaml
index 50202b96..62568c6e 100644
--- a/album/songs-for-doomed-timelines.yaml
+++ b/album/songs-for-doomed-timelines.yaml
@@ -32,7 +32,7 @@ Commentary: |-
     All of the track art for this album has been taken from the SoundCloud uploads of the tracks.
 ---
 Track: Sweet
-Directory: sweet-songs-for-doomed-timelines
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:57'
 URLs:
@@ -117,7 +117,7 @@ Lyrics: |-
     Haa (haa) haa (haa) haa (haa)
 ---
 Track: Fool
-Directory: fool-songs-for-doomed-timelines
+Suffix Directory: true
 Originally Released As: track:fool
 Duration: '5:19'
 URLs:
@@ -400,7 +400,7 @@ Lyrics: |-
     My thin line, my thin line
 ---
 Track: Nobodies
-Directory: nobodies-songs-for-doomed-timelines
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:07'
 URLs:
@@ -559,7 +559,7 @@ Lyrics: |-
     Lying
 ---
 Track: Home
-Directory: home-songs-for-doomed-timelines
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:47'
 URLs:
diff --git a/album/songs-for-sad-trolls.yaml b/album/songs-for-sad-trolls.yaml
index 438c94ff..41fad1a2 100644
--- a/album/songs-for-sad-trolls.yaml
+++ b/album/songs-for-sad-trolls.yaml
@@ -143,7 +143,7 @@ Lyrics: |-
     Finally I’ve flown
 ---
 Track: Double Time
-Directory: double-time-songs-for-sad-trolls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:22'
 URLs:
@@ -374,7 +374,7 @@ Lyrics: |-
     That I’m still on your side, and that’s furever, furever, furever
 ---
 Track: Mary
-Directory: mary-songs-for-sad-trolls
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:04'
 URLs:
@@ -662,7 +662,7 @@ Lyrics: |-
     Page…
 ---
 Track: Ugly Story
-Directory: ugly-story-songs-for-sad-trolls
+Suffix Directory: true
 Originally Released As: track:ugly-story
 Duration: '3:19'
 URLs:
diff --git a/album/songs-from-the-planet-earth.yaml b/album/songs-from-the-planet-earth.yaml
index 9de85add..a9b8991b 100644
--- a/album/songs-from-the-planet-earth.yaml
+++ b/album/songs-from-the-planet-earth.yaml
@@ -1,4 +1,5 @@
 Album: Songs from the Planet Earth
+Directory Suffix: planet-earth
 Date: September 9, 2019
 Date Added: January 1, 2023
 URLs:
@@ -36,7 +37,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Growing Up
-Directory: growing-up-planet-earth
+Suffix Directory: true
 Artists:
 - Jordan Chin
 Duration: '2:33'
@@ -105,7 +106,7 @@ Commentary: |-
     I think maybe the way it navigates through different musical styles. I've never had an easy time editing my choices in instrumentation, but I realized that part of what I love about the original soundtrack is its diversity. There are jazz, chiptune, showtune, and trip-hop influences scattered throughout, and I thought it would be a challenge to do them all (and in under 3 minutes). In this particular case, it felt good not to have to start with any preconceptions about what genre the track needed to be.
 ---
 Track: Haven't You Noticed (I'm A Star)
-Directory: havent-you-noticed-im-a-star-planet-earth
+Suffix Directory: true
 Artists:
 - Michael Guy Bowman
 Duration: '2:42'
@@ -359,7 +360,7 @@ Lyrics: |-
     (Everything I ever did, I did for her. Now she's gone. But I'm still here. Sometimes... I wonder if she can see me. What would she think of me now?)
 ---
 Track: Pink
-Directory: pink-planet-earth
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Levc
@@ -835,7 +836,7 @@ Referenced Tracks:
 - Drift Away
 ---
 Track: Home
-Directory: home-planet-earth
+Suffix Directory: true
 Artists:
 - Veritas Unae
 Duration: '3:19'
@@ -886,7 +887,7 @@ Referenced Tracks:
 - Stronger Than You
 ---
 Track: Mistakes
-Directory: mistakes-planet-earth
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Cerulean
diff --git a/album/songs-of-rivervale.yaml b/album/songs-of-rivervale.yaml
index b174022f..d1e6db0d 100644
--- a/album/songs-of-rivervale.yaml
+++ b/album/songs-of-rivervale.yaml
@@ -1,4 +1,5 @@
 Album: Songs of Rivervale
+Directory Suffix: rivervale
 Artists:
 - James Roach
 Date: June 30, 2013
@@ -80,7 +81,7 @@ Commentary: |-
     Théo sets out to uncover the mysteries of the Cloud Factory and save the valley.
 ---
 Track: Lakeside
-Directory: lakeside-rivervale
+Suffix Directory: true
 Duration: '03:24'
 URLs:
 - https://cloudfactorycomics.bandcamp.com/track/lakeside
diff --git a/album/songs-unsung.yaml b/album/songs-unsung.yaml
index 830ceb7a..66b487ec 100644
--- a/album/songs-unsung.yaml
+++ b/album/songs-unsung.yaml
@@ -26,7 +26,6 @@ URLs:
 - https://youtu.be/1Uk3PWyUJCQ
 ---
 Track: Heir of Grief
-Directory: heir-of-grief
 Duration: '5:22'
 URLs:
 - https://tenseimusic.bandcamp.com/track/heir-of-grief
diff --git a/album/soul-of-sovereignty-prelude-ost.yaml b/album/soul-of-sovereignty-prelude-ost.yaml
index 8af450f8..15e12cec 100644
--- a/album/soul-of-sovereignty-prelude-ost.yaml
+++ b/album/soul-of-sovereignty-prelude-ost.yaml
@@ -1,4 +1,5 @@
 Album: Soul of Sovereignty Prelude OST
+Directory Suffix: soul-of-sovereignty
 Date: January 15, 2024
 Date Added: April 13, 2024
 URLs:
@@ -79,7 +80,7 @@ Commentary: |-
     those are the biggest points i can think of! it was such a joy working together on this soundtrack and i’m looking forward to more.
 ---
 Track: Prelude
-Directory: prelude-soul-of-sovereignty
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:56'
 Artists:
@@ -88,7 +89,7 @@ URLs:
 - https://gigidigi.bandcamp.com/track/prelude
 ---
 Track: Whisper
-Directory: whisper-soul-of-sovereignty
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:38'
 Artists:
@@ -113,7 +114,7 @@ URLs:
 - https://gigidigi.bandcamp.com/track/small-theme-for-a-sad-girl
 ---
 Track: Snowfall
-Directory: snowfall-soul-of-sovereignty
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:52'
 URLs:
@@ -124,7 +125,7 @@ Commentary: |-
     the general direction we went in with [for the album] was “ps1 rpg,” but i ended up taking a lot of influence from ffxi in my own compositions (“snowfall” in particular.)
 ---
 Track: Unease
-Directory: unease-soul-of-sovereignty
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:19'
 Artists:
@@ -172,7 +173,7 @@ URLs:
 - https://gigidigi.bandcamp.com/track/frenzied-rite-pt-2
 ---
 Track: Sunflowers
-Directory: sunflowers-soul-of-sovereignty
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:15'
 Artists:
diff --git a/album/spelunky-classic.yaml b/album/spelunky-classic.yaml
index 64c6abf7..a0e81025 100644
--- a/album/spelunky-classic.yaml
+++ b/album/spelunky-classic.yaml
@@ -1,4 +1,7 @@
 Album: Spelunky Classic
+Directory Suffix: spelunky
+Suffix Track Directories: true
+Always Reference Tracks By Directory: true
 Date: December 21, 2008
 Date Added: August 18, 2023
 Color: '#c7ac92'
@@ -16,7 +19,6 @@ Commentary: |-
     Spelunky Classic's retro-style, fondly-remembered soundtrack was composed by [[artist:buzinkai]] and [[artist:jon-perry]], the former of whom only a year or so later composed renowned tracks of the Homestuck discography [[Doctor]], [[Explore]], [[Endless Climb]] and more; Jon Perry has been designing hands-on and video games alike for many years, including other collaborations with Derek Yu.
 ---
 Track: Title
-Directory: title-spelunky
 Duration: '0:41'
 Artists:
 - Buzinkai
@@ -24,7 +26,6 @@ URLs:
 - https://www.youtube.com/watch?v=Z_8v8GSRHYk
 ---
 Track: Cave
-Directory: cave-spelunky
 Duration: '1:37'
 Artists:
 - Buzinkai
@@ -32,7 +33,6 @@ URLs:
 - https://www.youtube.com/watch?v=jg6cWfXqdJs
 ---
 Track: Jungle
-Directory: jungle-spelunky
 Duration: '1:12'
 Artists:
 - Jon Perry
@@ -40,7 +40,6 @@ URLs:
 - https://www.youtube.com/watch?v=y666_TBBH_E
 ---
 Track: Ice Caves
-Directory: ice-caves-spelunky
 Duration: '1:40'
 Artists:
 - Jon Perry
@@ -48,7 +47,6 @@ URLs:
 - https://www.youtube.com/watch?v=j_3_4Y_9pms
 ---
 Track: Temple
-Directory: temple-spelunky
 Duration: '1:55'
 Artists:
 - Jon Perry
@@ -56,7 +54,6 @@ URLs:
 - https://www.youtube.com/watch?v=wS2_XFza4iE
 ---
 Track: Olmec
-Directory: olmec-spelunky
 Duration: '1:34'
 Artists:
 - Jon Perry
@@ -64,7 +61,6 @@ URLs:
 - https://www.youtube.com/watch?v=qEZzrpWzsKA
 ---
 Track: Victory
-Directory: victory-spelunky
 Duration: '0:37'
 Artists:
 - Jon Perry
@@ -72,7 +68,6 @@ URLs:
 - https://www.youtube.com/watch?v=sibaWhTam0g
 ---
 Track: Ending
-Directory: ending-spelunky
 Duration: '0:37'
 Artists:
 - Buzinkai
diff --git a/album/spiritwake.yaml b/album/spiritwake.yaml
index c3841bf8..2f1eefd3 100644
--- a/album/spiritwake.yaml
+++ b/album/spiritwake.yaml
@@ -47,7 +47,7 @@ Commentary: |-
     One of a set of songs I'm composing for a video game. It's turning out to be a really fun project so far!
 ---
 Track: Haven
-Directory: haven-spiritwake
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '2:40'
@@ -84,7 +84,7 @@ Commentary: |-
     I think I need to tweak the lead at the end of the song, though... hah.
 ---
 Track: Tempest
-Directory: tempest-spiritwake
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '3:20'
diff --git a/album/stlap.yaml b/album/stlap.yaml
index bcbc2f60..9c2da4be 100644
--- a/album/stlap.yaml
+++ b/album/stlap.yaml
@@ -74,7 +74,8 @@ Additional Files:
 Section: Disc 1
 ---
 Track: ~~Disc 1~~
-Directory: disc1-stlap
+Directory: disc1
+Suffix Directory: true
 Artists:
 - apatheticPianist
 Duration: '0:34'
@@ -198,7 +199,6 @@ Commentary: |-
     As you've probably gathered from listening to it, this song is themed around the first five acts of Homestuck! It has a similar structure to [[track:cue-the-curtains|Cue the Curtains]], but with five parts instead of four (which is oddly appropriate, in retrospect - five parts, five acts): John, Rose, Dave and Jade, Bec Noir and Vriska's machinations that led to him, and finally the kids' ascensions and the Scratch. The title uses Vriska's quirk for two reasons: because she had a pretty big hand in the creation of Bec Noir... and also becasue she's "stealing the spotlight" from the Beta Kids. Anyways, a huge thanks to [[artist:pascal-van-den-bos|PotatoBoss]] for mastering this song, and I hope y'all enjoy it!
 ---
 Track: Me/Ga/Lo/Vania
-Directory: me-ga-lo-vania
 Artists:
 - Frost Carter
 Cover Artists:
@@ -216,7 +216,7 @@ Commentary: |-
     It's funny, you can't seem to go two steps on the internet without stumbling across a remix of [[track:megalovania-undertale|one certain song]] that shall not be named. Y'know, that [[track:megalovania-ssbu|one song]] that's associated with that [[track:sans|one character]] from that [[album:undertale-soundtrack|one game]]? Yeah, you know what I'm talking about. Well, I decided to add to the pile with this remix of [[track:megalovania-ebhh|the OG version of that song]], complete with a sound effect from that other game that probably helped inspire that first game that I mentioned. Gosh, this commentary would probably look so ridicuolous to anyone who hasn't ever been on the internet.
 ---
 Track: Hospitalized
-Directory: hospitalized-stlap
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
@@ -265,7 +265,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: ~~Disc 2~~
-Directory: disc2-stlap
+Directory: disc2
+Suffix Directory: true
 Artists:
 - Frost Carter
 Cover Artists:
@@ -335,7 +336,7 @@ Commentary: |-
     "Rooftop-shenanigans-with-Dirk" might as well be the title since that's what it is. I had an idea where I could make a song on FamiTracker and then master it on FL Studio, so I did! This idea turned out well, I just had to export each track on FamiTracker separately and then import them all to FL Studio and so I could just mix it as much as i wanted like some kind of evil scientist, but way less exciting...
 ---
 Track: Daydreamer
-Directory: daydreamer-stlap
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Pascal van den Bos
@@ -449,7 +450,8 @@ Commentary: |-
 Section: Disc 3
 ---
 Track: ~~Disc 3~~
-Directory: disc3-stlap
+Directory: disc3
+Suffix Directory: true
 Artists:
 - Caelan Kier
 Cover Artists:
@@ -552,7 +554,7 @@ Commentary: |-
     (Vriska ascends to god tier bluh)
 ---
 Track: Wander
-Directory: wander-stlap
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Thomas Ferkol
@@ -626,7 +628,8 @@ Commentary: |-
 Section: Disc 4
 ---
 Track: ~~Disc 4~~
-Directory: disc4-stlap
+Directory: disc4
+Suffix Directory: true
 Artists:
 - Pascal van den Bos
 Cover Artists:
@@ -710,7 +713,7 @@ Commentary: |-
     I was originally just going to play [[track:gardener|Gardener]] as a cover, but then I realised that's completely unoriginal and i remembered i can play some other random songs. So i just mixed those in and improvised some parts of Gardener and you get this! Fun fact: i had to play this like 30 times over because i kept fucking up (wow that wasn't fun at all).
 ---
 Track: Starsetter
-Directory: starsetter-stlap
+Suffix Directory: true
 Artists:
 - CALIKID
 Cover Artists:
diff --git a/album/stlap2.yaml b/album/stlap2.yaml
index 9643238a..6bd1c7d6 100644
--- a/album/stlap2.yaml
+++ b/album/stlap2.yaml
@@ -80,7 +80,8 @@ Commentary: |-
 Section: Disc 1
 ---
 Track: ~~Disc 1~~
-Directory: disc1-stlap2
+Directory: disc1
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Disc 1
@@ -389,7 +390,8 @@ Commentary: |-
 Section: Disc 2
 ---
 Track: ~~Disc 2~~
-Directory: disc2-stlap2
+Directory: disc2
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Disc 2
@@ -410,7 +412,7 @@ Commentary: |-
     Got bored one day and wanted to write a quick little song that turned into Disc 2... that's pretty much it lmao
 ---
 Track: Insurrection
-Directory: insurrection-stlap2
+Suffix Directory: true
 Artists:
 - Caelan Kier
 Duration: 4:04
@@ -434,7 +436,7 @@ Commentary: |-
     I remember like thinking that [my Mutiny remix](https://www.youtube.com/watch?v=3znbbnDOChY) could be totally better, so like I only made this a while after that was uploaded (that's why it sounds so much like my old stuff). I didn't even plan for the song to be said remix, I was just bored in FL Studio and placed down the [[track:mutiny|Mutiny]] melody in there and somehow just kept going until it turned into a full song. I was gonna put it in [[album:stlap|STLaP 1]], but then didn't because [[track:fetch-the-bullet|there was already a Mutiny remix]], so first chance I got I dunked it into STLaP 2.
 ---
 Track: Lust
-Directory: lust-stlap2
+Suffix Directory: true
 Artists:
 - Pascal van den Bos
 Duration: 4:03
@@ -794,7 +796,8 @@ Review Points:
 Section: Disc 3
 ---
 Track: ~~Disc 3~~
-Directory: disc3-stlap2
+Directory: disc3
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Disc 3
@@ -906,12 +909,12 @@ Commentary: |-
     Yeah.. that’s all. It’s not some secret musical analogy of the Green Sun really causing this or that. I just like it this way, though if you can somehow find the analogy that isn’t there, good for you! It’s just like poetry!
 ---
 Track: Vaporsecata - ベーパセタ
+Directory: vaporsecata
 Additional Names:
 - Name: >-
     Vaporsecata
   Annotation: >-
     name in booklet
-Directory: vaporsecata
 Artists:
 - Pascal van den Bos
 Duration: 4:05
@@ -1140,9 +1143,9 @@ Commentary: |-
     Honestly I don't have much to say about this, I don't remember starting this song, I guess I just put down some drums and then put down some synths and then put down some samples and then boom it's a song now.
 ---
 Track: Turntables
+Suffix Directory: true
 Additional Names:
 - TurnTables (booklet name)
-Directory: turntables-stlap2
 Artists:
 - Asian
 Duration: 1:33
@@ -1206,7 +1209,8 @@ Commentary: |-
 Section: Disc 4
 ---
 Track: ~~Disc 4~~
-Directory: disc4-stlap2
+Directory: disc4
+Suffix Directory: true
 Additional Names:
 - Name: >-
     Disc 4
@@ -1381,7 +1385,7 @@ Commentary: |-
     I’ve wanted to remix [[track:an-orange-blue-rose|“An Orange Blue Rose”]] since i first heard it, and here i finally got around to doing so. I tried to make some sort of [[track:savior-of-the-waking-world|SOTWW]] style Orchestral remix of AOBR. I think it worked pretty well, i’m most proud of the intro which is a mix of epic bitcrush effects and a recording i made of the wind outside my house when they were burning stuff at an energy plant.
 ---
 Track: Lifesaver
-Directory: lifesaver-stlap2
+Suffix Directory: true
 Artists:
 - Rainy
 Duration: 4:57
@@ -1405,7 +1409,7 @@ Commentary: |-
     Check the commentary for [[track:minuteman|“Minuteman”]] the full context, but this song is from an old solo album idea. Originally this song was going to have a bunch more references to Jane songs (I.E [[track:cyan-beast|Cyan Beast]], [[track:jane-dargason|Jane Dargason]], Etc), but I decided against this. The reason for this is that I felt like most of the songs I did for this album did not have enough of my own original composition and relied too heavily on references. So I decided to merge the references I had already planned with some original writing. I kept the references to [[track:first-steps|“First Steps”]] by David Ellis and added a reference to an unreleased song called [[track:crock-n-roll|Crock N’ Roll]] by RJ Lake. As my last song for the album, I’m pretty proud of this one and I hope you enjoy.
 ---
 Track: Contentment
-Directory: contentment-stlap2
+Suffix Directory: true
 Artists:
 - Rowyn Berlan
 Duration: 3:51
@@ -1638,7 +1642,6 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: Caring, Compassion, Kindness. The 3 Elements of SALE!
-Directory: caring-compassion-kindness-the-3-elements-of-sale
 Artists:
 - Pascal van den Bos
 Duration: 1:06
diff --git a/album/stlap3.yaml b/album/stlap3.yaml
index 6c8c4fb7..7bb7b86f 100644
--- a/album/stlap3.yaml
+++ b/album/stlap3.yaml
@@ -69,7 +69,8 @@ Commentary: |-
 Section: Disc 1

 ---

 Track: ~~Disc 1~~

-Directory: disc1-stlap3

+Directory: disc1

+Suffix Directory: true

 Artists:

 - Rainy

 Duration: 0:38

@@ -108,7 +109,7 @@ Commentary: |-
     So for Disk 1 I decided to write a character select theme in the vain of Street Fighter 2. I thought it would be a perfect fit for the art [[artist:kiddlescribbles|Kiddles]] made (which is really good btw).

 ---

 Track: Escapade

-Directory: escapade-stlap3

+Suffix Directory: true

 Originally Released As: track:escapade-desynced

 Always Reference By Directory: true

 Additional Names:

@@ -250,7 +251,7 @@ Review Points:
     URL: https://discord.com/channels/749042497610842152/954144431051788370/1241437277708619796

 ---

 Track: Splinter

-Directory: splinter-stlap3

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Rowyn Berlan

@@ -341,7 +342,8 @@ Commentary: |-
 Section: Disc 2

 ---

 Track: ~~Disc 2~~

-Directory: disc2-stlap3

+Directory: disc2

+Suffix Directory: true

 Artists:

 - Caelan Kier

 Duration: 0:27

@@ -524,7 +526,7 @@ Commentary: |-
     One day I was bored and wrote a song. The End... is what I would say if it stopped there, but alas the story continues. That song I wrote ended up becoming the main original melody in Heirflow after I found out that a handful of John motifs complimented it nicely. From there I arranged everything together to the best of my ability by adding distinct sections in between the main melody that introduced the different motifs. I also added an amen break for whatever reason, but it works. This was also my first time heavily using portamento and modulation on my lead which I really like and feel dumb for not diong sooner. Composition wise this might be my favorite song I made on STLaP 3 and I hope to make more songs like it in the future.

 ---

 Track: Snowfall

-Directory: snowfall-stlap3

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Rainy

@@ -612,7 +614,7 @@ Commentary: |-
     Last summer my girlfriend had just visited from italy, she had been here for about a bit over 2 months. my neighbor gave me an M-Audio midi keyboard just for free a few days after she left, i was pretty sad at that time because i was completely alone now with just my dog. So one evening i was just improvising on this keyboard and i played the opening piano that you now hear in Color of the Ocean and decided to make it a song. I noticed [[track:love-you-feferis-theme|Love You]] fit with it perfectly too so i made it an entire Love You remix because the original doesnt have enough DVS Sax lol. Anyway i guess you could say this song is a big ol love letter to my girlfriend. Love You!

 ---

 Track: Threshold

-Directory: threshold-stlap3

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Beau Brian

@@ -642,7 +644,8 @@ Commentary: |-
 Section: Disc 3

 ---

 Track: ~~Disc 3~~

-Directory: disc3-stlap3

+Directory: disc3

+Suffix Directory: true

 Artists:

 - Pascal van den Bos

 Duration: 0:28

@@ -907,7 +910,8 @@ Commentary: |-
 Section: Disc 4

 ---

 Track: ~~Disc 4~~

-Directory: disc4-stlap3

+Directory: disc4

+Suffix Directory: true

 Artists:

 - Rowyn Berlan

 Duration: 0:39

@@ -928,7 +932,7 @@ Commentary: |-
     So this is me sampling the original piano sketch for my song [[Lullaby for a Drifter]] and layering it with a rhodes. Lullaby for a Drifter was made for the MSPFA [[group:desynced]] ([Go check it out it epic](https://desynced.xyz/)) for a carapacian girl named Jill which is what the art is a reference to. That's it really...

 ---

 Track: Photoluminescence

-Directory: photoluminescence-stlap3

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Beau Brian

@@ -1133,7 +1137,7 @@ Commentary: |-
     Making this was actually pretty exciting, it was the first time I actually finished a LSDj song which I was trying to do for a few weeks now. I came to love the tracker because a lot of my favorite chiptune artists used it and I've grown to love the sound. I eventually bought it, spent a while figuring it out, then spent way longer trying to make a finished song out of it. I'm kind of a sucker for Sollux songs and I thought the timbre of Game Boy fidelity-majyykz were underutilized, hence the inspiration. I especially wanted that kinda pseudo-edm, hard chiptune-esque writing since I dunno I thought it sounded cool and sounded like Sollux aswell <!-- [sic] --> as doom.

 ---

 Track: Collapse

-Directory: collapse-stlap3

+Suffix Directory: true

 Always Reference By Directory: true

 Artists:

 - Pascal van den Bos

diff --git a/album/strife-2.yaml b/album/strife-2.yaml
index 19cedc51..6077e753 100644
--- a/album/strife-2.yaml
+++ b/album/strife-2.yaml
@@ -474,7 +474,7 @@ Commentary: |-
     Something I started today. It’s gonna be a song for evil!Jade. Title is “Heel, Girl”
 ---
 Track: daet with roze
-Directory: daet-with-roze-strife-2
+Suffix Directory: true
 Originally Released As: track:daet-with-roze
 Duration: '1:21'
 URLs:
diff --git a/album/stuckhome-syndrome-part-one-v1.yaml b/album/stuckhome-syndrome-part-one-v1.yaml
index 86e86763..4afe075c 100644
--- a/album/stuckhome-syndrome-part-one-v1.yaml
+++ b/album/stuckhome-syndrome-part-one-v1.yaml
@@ -1,5 +1,6 @@
 Album: 'Stuckhome Syndrome Part One V1: Years In the Past'
 Directory: stuckhome-syndrome-part-one-v1
+Directory Suffix: stuckhome-syndrome
 Artists:
 - Robert J! Lake
 Date: April 13, 2016
@@ -129,7 +130,6 @@ Commentary: |-
     Like [[track:crock-n-roll|Crock n’ Roll]], this is an Alpha kid thing; I think I wrote it right after the Scratch? The original, also like Crock n’ Roll, was all PSG and OPM before I touched it up. Quite successfully, I think, too; this is my second favorite of the ones here. The bassline was really fun to write; I haven’t really done much stuff this funky before!
 ---
 Track: Null/Void
-Directory: null-void
 Duration: '03:32'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/null-void
@@ -192,7 +192,7 @@ URLs:
 - https://spellmynamewithabang.bandcamp.com/track/alone-but-not-lonely-2
 ---
 Track: Lost
-Directory: lost-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:22'
 URLs:
@@ -247,7 +247,7 @@ URLs:
 - https://spellmynamewithabang.bandcamp.com/track/d
 ---
 Track: Premonition
-Directory: premonition-stuckhome-syndrome
+Suffix Directory: true
 Duration: '02:29'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/premonition
@@ -265,7 +265,7 @@ URLs:
 - https://spellmynamewithabang.bandcamp.com/track/tempo-rarely
 ---
 Track: Game Over
-Directory: game-over-stuckhome-syndrome
+Suffix Directory: true
 Duration: '02:30'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/game-over-3
@@ -306,7 +306,7 @@ Sampled Tracks:
 - Afraid of the Darko
 ---
 Track: (flow)
-Directory: flow-stuckhome-syndrome
+Suffix Directory: true
 Duration: '01:36'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/flow-2
@@ -428,7 +428,7 @@ Track: Curb Stomp the Finale (Remotivate Yourself!)
 Duration: '02:38'
 ---
 Track: Entropy
-Directory: entropy-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:26'
 ---
@@ -459,7 +459,6 @@ Commentary: |-
     Embarassingly, I don’t actually totally remember the context for this one (I think it’s a troll romance thing; there are a lot of incidents though where my themes got pretty loose, even in tracks that made it onto albums. I’ll be the first to admit, for instance, that [[track:whistling-jackhammer|Whistling Jackhammer]] is almost more inspired by Hussie’s earlier comic Whistles (hence the title) than Homestuck), but I do know that I reused the title for a game concept I had a few years later I never really went public with. Either way, it’s probably getting moved past track 43 as well; it’s good, and I’m proud of it, (the melodies are very inspired by George & Jonathan, which is a favorite group of mine) but it doesn’t quite feel right where it is. It’s finished, though, as is. A weirdo, for sure.
 ---
 Track: Pleasant/Pressure
-Directory: pleasant-pressure
 Duration: '03:02'
 Commentary: |-
     <i>Robert J! Lake:</i> ([Tumblr](https://www.tumblr.com/spellmynamewithabang/140421474563/pre-order-post-mortem), excerpt)
@@ -568,7 +567,7 @@ Lyrics: |-
     Oh, I'm afraid I just "blue" myself.
 ---
 Track: Islander
-Directory: islander-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:45'
 ---
@@ -609,7 +608,7 @@ Track: Go Rest Our Heroes
 Duration: '01:23'
 ---
 Track: Hope
-Directory: hope-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:08'
 ---
@@ -641,7 +640,7 @@ Track: A Day in the Kingdom of Light
 Duration: '01:17'
 ---
 Track: Exiled
-Directory: exiled-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:05'
 ---
@@ -669,7 +668,7 @@ Track: Sleepytime Tea for Sleepytime Me
 Duration: '01:33'
 ---
 Track: Sunglasses
-Directory: sunglasses-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:45'
 ---
@@ -677,7 +676,7 @@ Track: Spades' Licks
 Duration: '02:09'
 ---
 Track: Sandles
-Directory: sandles-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:09'
 ---
@@ -697,7 +696,7 @@ Track: Bad Taste
 Duration: '00:30'
 ---
 Track: Pocketwatch
-Directory: pocketwatch-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:35'
 Sampled Tracks:
@@ -709,7 +708,6 @@ Referenced Tracks:
 - A Mom's Mom
 ---
 Track: Mess With/Get With
-Directory: mess-with-get-with
 Duration: '01:02'
 ---
 Track: We've All Been Dead Again
@@ -740,7 +738,7 @@ Track: Walking and Walking and Waiting and Waiting
 Duration: '00:40'
 ---
 Track: Prototyping
-Directory: prototyping-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:43'
 ---
@@ -757,7 +755,7 @@ Track: Tech Hop
 Duration: '00:23'
 ---
 Track: Questline
-Directory: questline-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:33'
 ---
@@ -784,7 +782,7 @@ Sampled Tracks:
 - Amen, Brother
 ---
 Track: Cruxtruder
-Directory: cruxtruder-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:21'
 ---
@@ -804,7 +802,7 @@ Track: Some Today I'll Get This Right
 Duration: '01:57'
 ---
 Track: Cloudling
-Directory: cloudling-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:35'
 ---
@@ -812,12 +810,12 @@ Track: Ghosts, Buster
 Duration: '01:32'
 ---
 Track: Halfways
-Directory: halfways-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:14'
 ---
 Track: Hardly
-Directory: hardly-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:45'
 ---
@@ -825,7 +823,6 @@ Track: Harley's Quin
 Duration: '01:39'
 ---
 Track: Harley's + David's Son
-Directory: harleys-plus-davids-son
 Duration: '00:40'
 Referenced Tracks:
 - Harley's Quin
@@ -897,7 +894,7 @@ Track: Paranoise
 Duration: '01:39'
 ---
 Track: Other
-Directory: other-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:53'
 ---
@@ -908,7 +905,7 @@ Track: 3 AM
 Duration: '00:50'
 ---
 Track: The End of Something Really Excellent
-Directory: the-end-of-something-really-excellent-stuckhome-syndrome
+Suffix Directory: true
 Duration: '02:05'
 Referenced Tracks:
 - The Beginning of Something Really Excellent
@@ -987,7 +984,7 @@ Track: Imp Party
 Duration: '00:27'
 ---
 Track: Subspace
-Directory: subspace-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:36'
 ---
@@ -1073,7 +1070,7 @@ Track: Inflammable Infirmary
 Duration: '02:27'
 ---
 Track: Crush
-Directory: crush-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:49'
 ---
@@ -1093,7 +1090,6 @@ Track: Useless Garbage Junk Mail
 Duration: '02:12'
 ---
 Track: Coolkid/Grandkid
-Directory: coolkid-grandkid
 Duration: '02:10'
 ---
 Track: A Lot of Breeding
@@ -1144,7 +1140,8 @@ Track: try to keep in touch
 Duration: '02:18'
 ---
 Track: ==>
-Directory: next-arrow-stuckhome-syndrome
+Directory: next-arrow
+Suffix Directory: true
 Duration: '01:15'
 ---
 Track: This Factory is Asphyxiating My Heart
@@ -1172,7 +1169,7 @@ Track: Meme Number
 Duration: '00:15'
 ---
 Track: Within
-Directory: within-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:40'
 ---
@@ -1219,7 +1216,7 @@ Sampled Tracks:
 - Heat
 ---
 Track: Weirdo
-Directory: weirdo-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:19'
 ---
@@ -1233,7 +1230,7 @@ Track: bad music
 Duration: '01:25'
 ---
 Track: Underneath
-Directory: underneath-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:10'
 ---
@@ -1264,7 +1261,6 @@ Track: Industrial Hellfire
 Duration: '01:25'
 ---
 Track: Ten/25
-Directory: ten-25
 Duration: '00:42'
 ---
 Track: Speakercrab
@@ -1295,7 +1291,7 @@ Track: No Going Back.
 Duration: '00:32'
 ---
 Track: Static
-Directory: static-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '02:18'
 ---
@@ -1390,7 +1386,7 @@ Track: Queen of Tiny Teenies
 Duration: '00:47'
 ---
 Track: Nerds
-Directory: nerds-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:23'
 ---
@@ -1404,7 +1400,7 @@ Track: Squiddlesneaks
 Duration: '00:51'
 ---
 Track: Pesterchum
-Directory: pesterchum-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:22'
 ---
@@ -1527,7 +1523,7 @@ Track: THREE DIMENSIONAL JPEG ARTIFACTS
 Duration: '01:49'
 ---
 Track: Cornered
-Directory: cornered-stuckhome-syndrome
+Suffix Directory: true
 Duration: '00:40'
 ---
 Track: Hugsound
@@ -1620,7 +1616,6 @@ Track: Dial in the Frequency
 Duration: '01:04'
 ---
 Track: One Two 3/4
-Directory: one-two-3-4
 Duration: '12:34'
 ---
 Track: Graffiti Children
@@ -1686,7 +1681,7 @@ Track: Groove Row
 Duration: '03:12'
 ---
 Track: Smoothly
-Directory: smoothly-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '00:48'
 ---
@@ -1726,7 +1721,7 @@ Track: Sandy Beach on Saturn
 Duration: '03:39'
 ---
 Track: Moonlit
-Directory: moonlit-stuckhome-syndrome
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '01:25'
 ---
diff --git a/album/sunday-night-strifin-act-1-plus-2-ost.yaml b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
index c8bbc1f8..0295366c 100644
--- a/album/sunday-night-strifin-act-1-plus-2-ost.yaml
+++ b/album/sunday-night-strifin-act-1-plus-2-ost.yaml
@@ -1,5 +1,6 @@
 Album: Sunday Night Strifin' Act 1+2 OST
 Directory: sunday-night-strifin-act-1-plus-2-ost
+Directory Suffix: sunday-night-strifin
 Date: October 24, 2023
 Date Added: October 25, 2023
 URLs:
@@ -151,7 +152,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/cant-abscond
 ---
 Track: Sleepwalk
-Directory: sleepwalk-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - bould
@@ -171,7 +172,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/sleepwalk
 ---
 Track: Verdancy
-Directory: verdancy-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - WorldEndWonder
@@ -188,7 +189,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/verdancy
 ---
 Track: Grimdark
-Directory: grimdark-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - bould
@@ -300,7 +301,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/check-it
 ---
 Track: Playtime
-Directory: playtime-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - TeeDeeGee
@@ -323,7 +324,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/playtime
 ---
 Track: Halloween Hack
-Directory: halloween-hack-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - bould
@@ -338,7 +339,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/halloween-hack
 ---
 Track: Catfight
-Directory: catfight-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - TeeDeeGee
@@ -356,7 +357,7 @@ URLs:
 - https://youtu.be/Wt5t0XMtY6g
 ---
 Track: Heinous
-Directory: heinous-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - WorldEndWonder
@@ -416,7 +417,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/8r8k
 ---
 Track: Shenanigans
-Directory: shenanigans-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - bould
@@ -440,7 +441,7 @@ URLs:
 - https://strifinsoundteam.bandcamp.com/track/breakdown-ss
 ---
 Track: Cooldown
-Directory: cooldown-sunday-night-strifin
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - DreamilyDrifting
@@ -473,8 +474,8 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Trepidation
+Suffix Directory: true
 Always Reference By Directory: true
-Directory: trepidation-sunday-night-strifin
 Artists:
 - Mabsoot
 Duration: '2:00'
diff --git a/album/super-smash-bros-ultimate.yaml b/album/super-smash-bros-ultimate.yaml
index 0b8e93c2..5a8f8677 100644
--- a/album/super-smash-bros-ultimate.yaml
+++ b/album/super-smash-bros-ultimate.yaml
@@ -1,5 +1,7 @@
 Album: Super Smash Bros. Ultimate
 Directory: super-smash-bros-ultimate
+Directory Suffix: ssbu
+Suffix Track Directories: true # Many tracks have custom directories, too.
 Date: December 7, 2018
 Date Added: April 13, 2024
 URLs:
@@ -25,6 +27,7 @@ Commentary: |-
 Section: Super Smash Bros.
 ---
 Track: Lifelight (JP)
+Suffix Directory: false
 # JP: ロウラル城
 # No official release
 Artists:
@@ -77,6 +80,7 @@ Lyrics: |-
     hateshi naku tsudzuite ku doko ma demo nagare yuku hikari (<i>Continue endlessly, light which flows everywhere</i>)
 ---
 Track: Lifelight
+Suffix Directory: false
 # No official release
 Artists:
 - Super Smash Bros.
@@ -158,7 +162,6 @@ Artists:
 - Super Smash Bros.
 - Junichi Nakatsuru
 Duration: '2:47'
-Directory: menu-ssbu
 URLs:
 - https://www.youtube.com/watch?v=o0eCgMjA8vo
 Referenced Tracks:
@@ -169,7 +172,6 @@ Artists:
 - Super Smash Bros.
 - Junichi Nakatsuru
 Duration: 2:44
-Directory: battlefield-ssbu
 URLs:
 - https://www.youtube.com/watch?v=nW5bQ39Ldp8
 Referenced Tracks:
@@ -180,7 +182,6 @@ Artists:
 - Super Smash Bros.
 - Yu Sugimoto
 Duration: '2:44'
-Directory: final-destination-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Mo0WvygPNBg
 Referenced Tracks:
@@ -191,13 +192,13 @@ Artists:
 - Super Smash Bros.
 - Yoshihito Yano
 Duration: '3:04'
-Directory: mob-smash-ssbu
 URLs:
 - https://www.youtube.com/watch?v=EOY9qPkzAdU
 Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Classic Mode: Mural'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yusuke Yamauchi
@@ -208,6 +209,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Classic Mode: Defeat'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Torine
@@ -218,6 +220,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Classic Mode: Final Results'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Rio Hamamoto
@@ -228,6 +231,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Classic Mode: Bonus Stage'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Takafumi Sato
@@ -242,7 +246,6 @@ Artists:
 - Super Smash Bros.
 - LindaAI-CUE
 Duration: '1:58'
-Directory: master-hand-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Jvic6UnRIpY
 Referenced Tracks:
@@ -253,13 +256,13 @@ Artists:
 - Super Smash Bros.
 - LindaAI-CUE
 Duration: '1:57'
-Directory: crazy-hand-ssbu
 URLs:
 - https://www.youtube.com/watch?v=jt1oKLoYP-U
 Referenced Tracks:
 - Master Hand / Crazy Hand
 ---
 Track: Master Hand / Crazy Hand
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - LindaAI-CUE
@@ -270,6 +273,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'The Light Realm: Prologue'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Torine
@@ -280,6 +284,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'The Light Realm: March'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Torine
@@ -290,6 +295,7 @@ Referenced Tracks:
 - 'The Light Realm: Prologue'
 ---
 Track: 'The Light Realm: Base'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yusuke Yamauchi
@@ -298,6 +304,7 @@ URLs:
 - https://www.youtube.com/watch?v=66FQpcsKhdU
 ---
 Track: The Dark Realm
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Rio Hamamoto
@@ -308,6 +315,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'The Dark Realm: The Mysterious Space'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yoshinori Hirai
@@ -316,6 +324,7 @@ URLs:
 - https://www.youtube.com/watch?v=vBsjwX-XV4s
 ---
 Track: The Final Battle
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Rio Hamamoto
@@ -324,6 +333,7 @@ URLs:
 - https://www.youtube.com/watch?v=kfiDr7opPQk
 ---
 Track: 'The Final Battle: After the Transformation'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Rio Hamamoto
@@ -334,6 +344,7 @@ Referenced Tracks:
 - The Final Battle
 ---
 Track: Galeem
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Keisuke Ito
@@ -344,6 +355,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: Dharkon
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Keisuke Ito
@@ -354,6 +366,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: Galeem / Dharkon
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Hideki Sakamoto
@@ -364,17 +377,19 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: Main Theme Piano Solo
+Directory: main-theme-ssbu-piano-solo
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Hideki Sakamoto
 Duration: '3:16'
-Directory: main-theme-ssbu-piano-solo
 URLs:
 - https://www.youtube.com/watch?v=QqZdtRF4aK0
 Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: Free the Spirit!
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yusuke Kudo
@@ -385,6 +400,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Spirits: Collection'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yoshinori Hirai
@@ -395,6 +411,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Spirits: Inventory/Items'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yusuke Yamauchi
@@ -405,6 +422,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Tourney: Battle List'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Yusuke Yamauchi
@@ -415,6 +433,7 @@ Referenced Tracks:
 - track:ssbu-main-theme-e3-version
 ---
 Track: 'Tourney: Winner Announcement'
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Katsuro Tajima
@@ -429,7 +448,6 @@ Artists:
 - Super Smash Bros.
 - Takafumi Sato
 Duration: '2:43'
-Directory: training-ssbu
 URLs:
 - https://www.youtube.com/watch?v=92cqx2F3bCU
 Referenced Tracks:
@@ -440,7 +458,6 @@ Artists:
 - Super Smash Bros.
 - Yoshinori Kawamoto
 Duration: '1:51'
-Directory: vault-ssbu
 URLs:
 - https://www.youtube.com/watch?v=rPEvVj7oEBw
 Referenced Tracks:
@@ -451,7 +468,6 @@ Artists:
 - Super Smash Bros.
 - Yoshinori Kawamoto
 Duration: '1:04'
-Directory: shop-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wukiddYeTXw
 Referenced Tracks:
@@ -462,7 +478,6 @@ Artists:
 - Super Smash Bros.
 - Yu Sugimoto
 Duration: '1:09'
-Directory: practice-fights-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Nw_QIDI4SEM
 Referenced Tracks:
@@ -475,13 +490,12 @@ Artists:
 Duration: '1:00'
 URLs:
 - https://www.youtube.com/watch?v=wkznOlJfX8I
-Directory: spectate-ssbu
 ---
 Track: How to Play - Super Smash Bros. Melee
+Directory: how-to-play # suffixed
 Artists:
 - Super Smash Bros.
 - Motoi Sakuraba
-Directory: how-to-play-ssbu
 Duration: '2:31'
 URLs:
 - https://www.youtube.com/watch?v=MqgGdSI_QEY
@@ -489,11 +503,12 @@ Referenced Tracks:
 - track:how-to-play-melee
 ---
 Track: Super Smash Bros. Ultimate Main Theme (E3 2018 version)
+Directory: ssbu-main-theme-e3-version
+Suffix Directory: false
 Artists:
 - Super Smash Bros.
 - Hideki Sakamoto
 Duration: '3:04'
-Directory: ssbu-main-theme-e3-version
 URLs:
 - https://www.youtube.com/watch?v=envO76P5uFA
 Commentary: |-
@@ -504,22 +519,22 @@ Section: Mario
 Color: '#f21213'
 ---
 Track: Ground Theme - Super Mario Bros 2.
+Directory: ground-theme-smb2
 Artists:
 - Super Mario
 - Keiichi Okabe
 Duration: '2:43'
-Directory: ground-theme-smb2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=BKEyzDtOwu4
 Referenced Tracks:
 - track:ground-theme-smb2
 ---
 Track: Ground Theme - Super Mario Bros 3.
+Directory: ground-theme-smb3
 Artists:
 - Super Mario
 - Masafumi Takada
 Duration: '2:36'
-Directory: ground-theme-smb3-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Hqme62D8JaI
 Referenced Tracks:
@@ -528,11 +543,11 @@ Referenced Tracks:
 - track:world-1-smb3
 ---
 Track: Fortress Boss - Super Mario Bros. 3
+Directory: fortress-boss-smb3
 Artists:
 - Super Mario
 - Akihiro Honda
 Duration: '2:37'
-Directory: fortress-boss-smb3-ssbu
 URLs:
 - https://www.youtube.com/watch?v=iItEloWT8_c
 Referenced Tracks:
@@ -541,11 +556,11 @@ Referenced Tracks:
 - track:world-8-smb3
 ---
 Track: King Bowser - Super Mario Bros 3.
+Directory: king-bowser-smb3
 Artists:
 - Super Mario
 - Koji Kondo
 Duration: '2:27'
-Directory: king-bowser-smb3-ssbu
 URLs:
 - https://www.youtube.com/watch?v=xe8X5Qt6ZJQ
 Referenced Tracks:
@@ -557,7 +572,6 @@ Artists:
 - Super Mario
 - Noriyuki Iwadare
 Duration: '2:39'
-Directory: delfino-plaza-ssbu
 URLs:
 - https://www.youtube.com/watch?v=TTxC-DJlrSE
 Referenced Tracks:
@@ -568,7 +582,6 @@ Artists:
 - Super Mario
 - Maasa Miyoshi
 Duration: '2:39'
-Directory: main-theme-luigis-mansion-ssbu
 URLs:
 - https://www.youtube.com/watch?v=OrJqaO_4kEY
 Referenced Tracks:
@@ -581,6 +594,7 @@ Section: Donkey Kong
 Color: '#c46327'
 ---
 Track: Donkey Kong / Donkey Kong Jr. Medley
+Suffix Directory: false
 Artists:
 - Donkey Kong
 - Yusuke Takahama
@@ -602,6 +616,7 @@ Referenced Tracks:
 - Level 4 Clear (All Clear!) (Donkey Kong Jr.)
 ---
 Track: The Map Page / Bonus Level
+Suffix Directory: false
 Artists:
 - Donkey Kong
 - Hiroshi Yamaguchi
@@ -617,7 +632,6 @@ Artists:
 - Donkey Kong
 - Kumi Tanioka
 Duration: '2:04'
-Directory: snakey-chantey-ssbu
 URLs:
 - https://www.youtube.com/watch?v=SbFIq256Pao
 Referenced Tracks:
@@ -629,7 +643,6 @@ Artists:
 - Donkey Kong
 - artist:ace-tomori-kudo-chico
 Duration: '2:42'
-Directory: gang-plank-galleon-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Y_jlo952yP0
 Referenced Tracks:
@@ -640,7 +653,6 @@ Artists:
 - Donkey Kong
 - Soshi Abe
 Duration: '2:23'
-Directory: crocodile-cacophony-ssbu
 URLs:
 - https://www.youtube.com/watch?v=J2skbG1WHXw
 Referenced Tracks:
@@ -655,7 +667,6 @@ Artists:
 - The Legend of Zelda
 - Akihiro Honda
 Duration: '2:43'
-Directory: death-mountain-ssbu
 URLs:
 - https://www.youtube.com/watch?v=5dJUlJ5MqiQ
 Referenced Tracks:
@@ -674,7 +685,6 @@ Contributors: # https://twitter.com/shotakageyama/status/1072403314137071617
 - Hiroaki Tsutsumi (electric guitar)
 - Akio Noguchi (tin whistle)
 Duration: '2:59'
-Directory: termina-field-ssbu
 URLs:
 - https://www.youtube.com/watch?v=yQFfBPUFhTo
 Referenced Tracks:
@@ -685,7 +695,6 @@ Artists:
 - The Legend of Zelda
 - Kumi Tanioka
 Duration: '2:27'
-Directory: molgera-ssbu
 URLs:
 - https://www.youtube.com/watch?v=5mv5LhnEFIo
 Referenced Tracks:
@@ -696,7 +705,6 @@ Artists:
 - The Legend of Zelda
 - Hideaki Kobayashi
 Duration: '3:02'
-Directory: midnas-lament-ssbu
 URLs:
 - https://www.youtube.com/watch?v=WTutDmXbzJE
 Referenced Tracks:
@@ -707,11 +715,11 @@ Referenced Tracks:
 - The whole new world ##The main theme of the Phantasy Star Online games, og which Hideaki Kobayashi is the composer. Kobayashi's Midna's Lament remix includes a quick nod to the song before the loop.
 ---
 Track: 'Main Theme - The Legend of Zelda: Tri Force Heroes'
+Directory: main-theme-tri-force-heroes
 Artists:
 - The Legend of Zelda
 - Manami Kiyota
 Duration: '2:33'
-Directory: main-theme-tri-force-heroes-ssbu
 URLs:
 - https://www.youtube.com/watch?v=1i6lFWnuZTo
 Referenced Tracks:
@@ -722,7 +730,6 @@ Artists:
 - The Legend of Zelda
 - Ryo Nagamatsu
 Duration: '2:47'
-Directory: nintendo-switch-presentation-2017-trailer-bgm-ssbu
 URLs:
 - https://www.youtube.com/watch?v=i4STlqB_AAw
 Referenced Tracks:
@@ -730,11 +737,11 @@ Referenced Tracks:
 - 'Main Theme (The Legend of Zelda: Breath of the Wild)'
 ---
 Track: 'Main Theme - The Legend of Zelda: Breath of the Wild'
+Directory: main-theme-botw
 Artists:
 - The Legend of Zelda
 - Yoshino Aoki
 Duration: '2:16'
-Directory: main-theme-botw-ssbu
 URLs:
 - https://www.youtube.com/watch?v=0F-soqQ5Ero
 Referenced Tracks:
@@ -745,7 +752,6 @@ Artists:
 - The Legend of Zelda
 - Yoko Shimomura
 Duration: '1:46'
-Directory: kasss-theme-ssbu
 URLs:
 - https://www.youtube.com/watch?v=nq6jS2-XDeA
 Referenced Tracks:
@@ -759,7 +765,6 @@ Artists:
 - Metroid
 - Yasushi Asada
 Duration: '2:24'
-Directory: brinstar-depths-ssbu
 URLs:
 - https://www.youtube.com/watch?v=yadudv62LvA
 Referenced Tracks:
@@ -770,7 +775,6 @@ Artists:
 - Metroid
 - Yusuke Takahama
 Duration: '2:44'
-Directory: vs-ridley-ssbu
 URLs:
 - https://www.youtube.com/watch?v=olT8zrRJdYI
 Referenced Tracks:
@@ -782,7 +786,6 @@ Artists:
 - Metroid
 - Motoi Sakuraba
 Duration: '2:31'
-Directory: vs-parasite-queen-ssbu
 URLs:
 - https://www.youtube.com/watch?v=OC_ZpiycKvQ
 Referenced Tracks:
@@ -798,7 +801,6 @@ Artists:
 Contributors: #https://twitter.com/shotakageyama/status/1072403474313302017
 - Hiroaki Tsutsumi (acoustic guitar)
 Duration: '2:45'
-Directory: main-theme-yoshis-new-island-ssbu
 URLs:
 - https://www.youtube.com/watch?v=xR05rGtF9Iw
 Referenced Tracks:
@@ -812,7 +814,6 @@ Artists:
 - Kirby
 - MASAKI
 Duration: '2:09'
-Directory: staff-credit-kirbys-dream-land-ssbu
 URLs:
 - https://www.youtube.com/watch?v=GAHVF4Lj0jE
 Referenced Tracks:
@@ -824,7 +825,6 @@ Artists:
 - Kirby
 - Noriyuki Iwadare
 Duration: '2:30'
-Directory: city-trial-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wy2MpyEN9yU
 Referenced Tracks:
@@ -838,7 +838,6 @@ Artists:
 - Pokémon
 - Soshi Abe
 Duration: '2:12'
-Directory: battle-steven-ssbu
 URLs:
 - https://www.youtube.com/watch?v=1aUFtRYt_aM
 Referenced Tracks:
@@ -852,7 +851,6 @@ Contributors: #https://twitter.com/shotakageyama/status/1072402796341792768
 - Kon Shirasu (violin)
 - Hiroaki Tsutsumi (electric guitar)
 Duration: '2:37'
-Directory: battle-lorekeeper-zinnia-ssbu
 URLs:
 - https://www.youtube.com/watch?v=QYP0-a9OswA
 Referenced Tracks:
@@ -863,7 +861,6 @@ Artists:
 - Pokémon
 - Hiroyuki Kawada
 Duration: '2:14'
-Directory: battle-wild-pokemon-sun-pokemon-moon-ssbu
 URLs:
 - https://www.youtube.com/watch?v=U1w7E4y7jNM
 Referenced Tracks:
@@ -875,7 +872,6 @@ Artists:
 - Pokémon
 - Yasushi Asada
 Duration: '2:17'
-Directory: battle-trainer-pokemon-sun-pokemon-moon-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Ss_H-Wej4S4
 Referenced Tracks:
@@ -886,7 +882,6 @@ Artists:
 - Pokémon
 - Yasuaki Iwata
 Duration: '2:07'
-Directory: battle-island-kahuna-ssbu
 URLs:
 - https://www.youtube.com/watch?v=yxYB3Wo9QR8
 Referenced Tracks:
@@ -897,13 +892,13 @@ Artists:
 - Pokémon
 - Manami Kiyota
 Duration: '2:59'
-Directory: battle-gladion-ssbu
 URLs:
 - https://www.youtube.com/watch?v=3oq85Ivd0XY
 Referenced Tracks:
 - track:battle-gladion
 ---
 Track: Battle! (Elite Four) / Battle! (Solgaleo / Lunala)
+Suffix Directory: false
 Artists:
 - Pokémon
 - Akihiro Honda
@@ -921,7 +916,6 @@ Artists:
 Contributors: #https://twitter.com/shotakageyama/status/1072402954710323200
 - Hiroaki Tsutsumi (electric guitar)
 Duration: '2:52'
-Directory: the-battle-at-the-summit-ssbu
 URLs:
 - https://www.youtube.com/watch?v=szrgNdQ-iqQ
 Referenced Tracks:
@@ -935,7 +929,6 @@ Artists:
 - F-ZERO
 - Takeshi Kuramochi
 Duration: '2:20'
-Directory: big-blue-ssbu
 URLs:
 - https://www.youtube.com/watch?v=XTYHopsf5gM
 Referenced Tracks:
@@ -946,13 +939,13 @@ Artists:
 - F-ZERO
 - Hirokazu Tanaka
 Duration: '2:12'
-Directory: sand-ocean-ssbu
 URLs:
 - https://www.youtube.com/watch?v=KMcW4wza4mA
 Referenced Tracks:
 - track:sand-ocean
 ---
 Track: F-ZERO Medley
+Suffix Directory: false
 Artists:
 - F-ZERO
 - Takenobu Mitsuyoshi
@@ -1015,7 +1008,6 @@ Artists:
 - Mother
 - Motoi Sakuraba
 Duration: '2:32'
-Directory: magicant-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Uz7yQxyIEIg
 Referenced Tracks:
@@ -1026,7 +1018,6 @@ Artists:
 - Mother
 - Motoi Sakuraba
 Duration: '2:31'
-Directory: fourside-ssbu
 URLs:
 - https://www.youtube.com/watch?v=gz3Q4IzJWjk
 Referenced Tracks:
@@ -1041,7 +1032,6 @@ Artists:
 - Fire Emblem
 - Hideki Sakamoto
 Duration: '2:37'
-Directory: fire-emblem-theme-heroic-origins-ssbu
 URLs:
 - https://www.youtube.com/watch?v=D-QqAKovpXM
 Referenced Tracks:
@@ -1052,7 +1042,6 @@ Artists:
 - Fire Emblem
 - Takeshi Kuramochi
 Duration: '2:28'
-Directory: under-this-banner-ssbu
 URLs:
 - https://www.youtube.com/watch?v=4r7LS9SBWc0
 Referenced Tracks:
@@ -1063,7 +1052,6 @@ Artists:
 - Fire Emblem
 - Takeshi Kuramochi
 Duration: '2:14'
-Directory: advance-ssbu
 URLs:
 - https://www.youtube.com/watch?v=549qOP2kkxE
 Referenced Tracks:
@@ -1074,7 +1062,6 @@ Artists:
 - Fire Emblem
 - Yuka Tsujiyoko
 Duration: '2:53'
-Directory: edge-of-adversity-ssbu
 URLs:
 - https://www.youtube.com/watch?v=6ccVAz7vwJs
 Referenced Tracks:
@@ -1085,7 +1072,6 @@ Artists:
 - Fire Emblem
 - Takeshi Kuramochi
 Duration: '2:11'
-Directory: beyond-distant-skies-roys-departure-ssbu
 URLs:
 - https://www.youtube.com/watch?v=oj2tZwzIchE
 Referenced Tracks:
@@ -1096,7 +1082,6 @@ Artists:
 - Fire Emblem
 - Tetsuya Shibata
 Duration: '2:30'
-Directory: prelude-ablaze-ssbu
 URLs:
 - https://www.youtube.com/watch?v=PEsuxxISlNw
 Referenced Tracks:
@@ -1107,7 +1092,6 @@ Artists:
 - Fire Emblem
 - Akihiro Honda
 Duration: '2:37'
-Directory: destiny-ablaze-ssbu
 URLs:
 - https://www.youtube.com/watch?v=_n1pniBZdFg
 Referenced Tracks:
@@ -1118,7 +1102,6 @@ Artists:
 - Fire Emblem
 - Takeshi Kuramochi
 Duration: '2:23'
-Directory: id-purpose-ssbu
 URLs:
 - https://www.youtube.com/watch?v=nbyl2-Jesfo
 Referenced Tracks:
@@ -1129,7 +1112,6 @@ Artists:
 - Fire Emblem
 - Masato Coda
 Duration: '2:41'
-Directory: lost-in-thoughts-all-alone-ssbu
 URLs:
 - https://www.youtube.com/watch?v=keIopiUtkHs
 Referenced Tracks:
@@ -1141,7 +1123,6 @@ Artists:
 - Fire Emblem
 - Hiroki Morishita
 Duration: '2:29'
-Directory: gear-up-for-ssbu
 URLs:
 - https://www.youtube.com/watch?v=UArv-g-Ghrs
 Referenced Tracks:
@@ -1156,7 +1137,6 @@ Artists:
 Contributors:
 - Caro (vocals)
 Duration: '2:35'
-Directory: fire-emblem-three-houses-main-theme-jp-ssbu
 URLs:
 - https://www.youtube.com/watch?v=5wexrlhrk1U
 Lyrics: |-
@@ -1179,7 +1159,6 @@ Artists:
 Contributors:
 - Buttercup (vocals)
 Duration: '2:35'
-Directory: fire-emblem-three-houses-main-theme-ssbu
 URLs:
 - https://www.youtube.com/watch?v=_L8gSzy82Ss
 Lyrics: |-
@@ -1206,7 +1185,6 @@ Artists:
 - Pikmin
 - Hideki Sakamoto
 Duration: '2:28'
-Directory: main-theme-pikmin-ssbu
 URLs:
 - https://www.youtube.com/watch?v=3fLAqWdTrVE
 Referenced Tracks:
@@ -1217,7 +1195,6 @@ Artists:
 - Pikmin
 - Yoshino Aoki
 Duration: '2:24'
-Directory: garden-of-hope-ssbu
 URLs:
 - https://www.youtube.com/watch?v=A6qKUSb97g8
 Referenced Tracks:
@@ -1231,7 +1208,6 @@ Artists:
 - Animal Crossing
 - artist:ace-tomori-kudo-chico
 Duration: '2:53'
-Directory: title-theme-animal-crossing-ssbu
 URLs:
 - https://www.youtube.com/watch?v=6eJ14axIyi4
 Referenced Tracks:
@@ -1242,7 +1218,6 @@ Artists:
 - Animal Crossing
 - Maki Kirioka
 Duration: '2:43'
-Directory: title-theme-animal-crossing-wild-world-ssbu
 URLs:
 - https://www.youtube.com/watch?v=ZHVa13Qyye0
 Referenced Tracks:
@@ -1255,7 +1230,6 @@ Artists:
 - Animal Crossing
 - Kazumi Totaka
 Duration: '2:35'
-Directory: title-theme-animal-crossing-happy-home-designer-ssbu
 URLs:
 - https://www.youtube.com/watch?v=PctpOHX5vT0
 Referenced Tracks:
@@ -1269,7 +1243,6 @@ Artists:
 - Wii Fit
 - Kumi Tanioka
 Duration: '1:58'
-Directory: main-menu-wii-fit-ssbu
 URLs:
 - https://www.youtube.com/watch?v=QwaSOJnmA28
 Referenced Tracks:
@@ -1283,7 +1256,6 @@ Artists:
 - Wii Fit
 - Hiroki Morishita
 Duration: '2:36'
-Directory: training-menu-wii-fit-u-ssbu
 URLs:
 - https://www.youtube.com/watch?v=UzAZf27vcZk
 Referenced Tracks:
@@ -1293,6 +1265,7 @@ Section: Xenoblade Chronicles
 Color: '#ff0000'
 ---
 Track: Xenoblade Chronicles 2 Medley
+Suffix Directory: false
 Date First Released: March 4, 2021
 Artists:
 - Xenoblade Chronicles
@@ -1314,7 +1287,6 @@ Artists:
 - Xenoblade Chronicles
 - Yuzo Koshiro
 Duration: '2:35'
-Directory: tiger-tiger-ssbu
 URLs:
 - https://www.youtube.com/watch?v=T_9worwFUmw
 Referenced Tracks:
@@ -1326,7 +1298,6 @@ Artists:
 - Xenoblade Chronicles
 - Nobuko Toda
 Duration: '3:24'
-Directory: counterattack-ssbu
 URLs:
 - https://www.youtube.com/watch?v=FgZMrlJ6cwo
 Referenced Tracks:
@@ -1340,7 +1311,6 @@ Artists:
 - Splatoon
 - Shohei Tsuchiya
 Duration: '2:40'
-Directory: splattack-ssbu
 URLs:
 - https://www.youtube.com/watch?v=9E2wr79BnnY
 Referenced Tracks:
@@ -1353,7 +1323,6 @@ Artists:
 - Splatoon
 - Hirokazu Tanaka
 Duration: '1:26'
-Directory: seaskape-ssbu
 URLs:
 - https://www.youtube.com/watch?v=ZwDRTGxqiM8
 Referenced Tracks:
@@ -1364,7 +1333,6 @@ Artists:
 - Splatoon
 - Yuzo Koshiro
 Duration: '2:33'
-Directory: now-or-never-ssbu
 URLs:
 - https://www.youtube.com/watch?v=NiyCOn-NfY0
 Referenced Tracks:
@@ -1375,7 +1343,6 @@ Artists:
 - Splatoon
 - Tomoya Ohtani
 Duration: '2:36'
-Directory: bomb-rush-blush-ssbu
 URLs:
 - https://www.youtube.com/watch?v=TDImryskrN0
 Referenced Tracks:
@@ -1392,7 +1359,6 @@ Artists:
 - Metal Gear
 - Masami Ueda
 Duration: '2:43'
-Directory: theme-of-solid-snake-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wVkNurOWJUQ
 Referenced Tracks:
@@ -1403,7 +1369,6 @@ Artists:
 - Metal Gear
 - Nobuko Toda
 Duration: '2:02'
-Directory: snake-eater-ssbu
 URLs:
 - https://www.youtube.com/watch?v=1WwgtWIxxHo
 Referenced Tracks:
@@ -1417,7 +1382,6 @@ Artists:
 - Mega Man
 - artist:ace-tomori-kudo-chico
 Duration: '2:44'
-Directory: guts-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=NroZMgf9q1g
 Referenced Tracks:
@@ -1428,7 +1392,6 @@ Artists:
 - Mega Man
 - Yasushi Asada
 Duration: '2:23'
-Directory: ice-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=6W5PFqAmhx0
 Referenced Tracks:
@@ -1439,7 +1402,6 @@ Artists:
 - Mega Man
 - Nobuko Toda
 Duration: '1:56'
-Directory: bomb-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=tHEhbPLJp0E
 Referenced Tracks:
@@ -1450,7 +1412,6 @@ Artists:
 - Mega Man
 - Nobuko Toda
 Duration: '2:18'
-Directory: fire-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=iaZ5pGMRfYE
 Referenced Tracks:
@@ -1461,7 +1422,6 @@ Artists:
 - Mega Man
 - Yusuke Takahama
 Duration: '2:26'
-Directory: metal-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=A-VXCjFVsLY
 Referenced Tracks:
@@ -1473,7 +1433,6 @@ Artists:
 - Mega Man
 - Nobuko Toda
 Duration: '1:53'
-Directory: crash-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=jbKlV9Ap4PE
 Referenced Tracks:
@@ -1484,14 +1443,12 @@ Artists:
 - Mega Man
 - Keiichi Okabe
 Duration: '3:00'
-Directory: flash-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Na3-W5eoFlo
 Referenced Tracks:
 - track:flash-man-stage
 ---
 Track: Wood Man Stage
-Directory: wood-man-stage-ssbu
 Always Reference By Directory: true
 Artists:
 - Mega Man
@@ -1509,7 +1466,6 @@ Artists:
 Contributors: #https://twitter.com/shotakageyama/status/1072403141306580992
 - Yujin Imanishi (electric guitar)
 Duration: '2:23'
-Directory: hard-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wOwLfg6eO2M
 Referenced Tracks:
@@ -1520,7 +1476,6 @@ Artists:
 - Mega Man
 - Noriyuki Iwadare
 Duration: '2:44'
-Directory: top-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Mt3ExeByYAo
 Referenced Tracks:
@@ -1531,13 +1486,13 @@ Artists:
 - Mega Man
 - Hideki Sakamoto
 Duration: '2:33'
-Directory: snake-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=luaJsIMl2J4
 Referenced Tracks:
 - track:snake-man-stage
 ---
 Track: Mega Man 4 Medley
+Suffix Directory: false
 Artists:
 - Mega Man
 - Jun Senoue
@@ -1557,7 +1512,6 @@ Artists:
 - Mega Man
 - Yumi Takahashi
 Duration: '2:30'
-Directory: gravity-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=0MQaIB28PIw
 Referenced Tracks:
@@ -1568,7 +1522,6 @@ Artists:
 - Mega Man
 - Naoto Kubo
 Duration: '2:32'
-Directory: napalm-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=piIsGkudKFg
 Referenced Tracks:
@@ -1581,7 +1534,6 @@ Artists:
 - Mega Man
 - Hiroki Morishita
 Duration: '2:28'
-Directory: dark-man-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=XroMQj8EvMY
 Referenced Tracks:
@@ -1596,18 +1548,17 @@ Artists:
 - Mega Man
 - Yu Shimoda
 Duration: '3:01'
-Directory: were-robots-dr-wily-stage-2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=AqbifZkP2vs
 Referenced Tracks:
 - track:were-robots-dr-wily-stage-2
 ---
 Track: Opening Stage
+Directory: opening-stage-mmx
 Artists:
 - Mega Man
 - Yusuke Takahama
 Duration: '2:26'
-Directory: opening-stage-mmx-ssbu
 URLs:
 - https://www.youtube.com/watch?v=WcXO1bdF3DI
 Referenced Tracks:
@@ -1617,6 +1568,7 @@ Section: PAC-MAN
 Color: '#ffff00'
 ---
 Track: Galaga Medley
+Suffix Directory: false
 Artists:
 - Galaga
 - Yusuke Takahama
@@ -1631,6 +1583,7 @@ Referenced Tracks:
 - Name Entry (1st) (Galaga)
 ---
 Track: Mappy Medley
+Suffix Directory: false
 Artists:
 - Mappy
 - Masafumi Takada
@@ -1654,7 +1607,6 @@ Track: Area 1 - Dragon Spirit
 Artists:
 - Dragon Spirit
 - Maki Kirioka
-Directory: area-1-dragon-spirit-ssbu
 Duration: '2:37'
 Color: '#f3c000'
 URLs:
@@ -1670,7 +1622,6 @@ Artists:
 - Street Fighter
 - Yuzo Koshiro
 Duration: '2:49'
-Directory: guile-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=YIA6b1xfyyw
 Referenced Tracks:
@@ -1681,7 +1632,6 @@ Artists:
 - Street Fighter
 - Yoko Shimomura
 Duration: '2:26'
-Directory: vega-stage-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Nxb0x5GTn3M
 Referenced Tracks:
@@ -1696,7 +1646,6 @@ Artists:
 - Final Fantasy
 - Yuzo Koshiro
 Duration: '3:46'
-Directory: opening-bombing-mission-ssbu
 URLs:
 - https://www.youtube.com/watch?v=z2A_4m4gGDc
 Referenced Tracks:
@@ -1708,7 +1657,6 @@ Artists:
 - Final Fantasy
 - Keiichi Okabe
 Duration: '2:19'
-Directory: aeriths-theme-ssbu
 URLs:
 - https://www.youtube.com/watch?v=W3M9iDlz34M
 Referenced Tracks:
@@ -1720,7 +1668,6 @@ Artists:
 - Final Fantasy
 - Motoi Sakuraba
 Duration: '2:43'
-Directory: main-theme-of-final-fantasy-vii-ssbu
 URLs:
 - https://www.youtube.com/watch?v=ql0_Q2Cl88E
 Referenced Tracks:
@@ -1732,7 +1679,6 @@ Artists:
 - Final Fantasy
 - Yoko Shimomura
 Duration: '2:17'
-Directory: cosmo-canyon-ssbu
 URLs:
 - https://www.youtube.com/watch?v=2x9gd3U_yAk
 Referenced Tracks:
@@ -1746,13 +1692,13 @@ Artists:
 - Castlevania
 - Shinji Ushiroda
 Duration: '2:45'
-Directory: vampire-killer-ssbu
 URLs:
 - https://www.youtube.com/watch?v=E0pKKixMbfc
 Referenced Tracks:
 - Vampire Killer (Castlevania Judgment)
 ---
 Track: Starker / Wicked Child
+Suffix Directory: false
 Artists:
 - Castlevania
 - Hideki Sakamoto
@@ -1768,13 +1714,13 @@ Artists:
 - Castlevania
 - Yasushi Asada
 Duration: '2:25'
-Directory: out-of-time-ssbu
 URLs:
 - https://www.youtube.com/watch?v=4DxqyKS6t7U
 Referenced Tracks:
 - Out of Time (Clock Tower BGM)
 ---
 Track: Bloody Tears / Monster Dance
+Suffix Directory: false
 Artists:
 - Castlevania
 - Michiko Naruke
@@ -1790,7 +1736,6 @@ Artists:
 - Castlevania
 - Takeshi Kuramochi
 Duration: '2:44'
-Directory: cross-your-heart-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wtvdyjJTJaw
 Referenced Tracks:
@@ -1801,7 +1746,6 @@ Artists:
 - Castlevania
 - Kenji Ito
 Duration: '1:51'
-Directory: beginning-ssbu
 URLs:
 - https://www.youtube.com/watch?v=lZSV4_IQTX8
 Referenced Tracks:
@@ -1812,7 +1756,6 @@ Artists:
 - Castlevania
 - Yoshito Sekigawa
 Duration: '2:45'
-Directory: aquarius-ssbu
 URLs:
 - https://www.youtube.com/watch?v=-CAFIGK3PJE
 Referenced Tracks:
@@ -1823,7 +1766,6 @@ Artists:
 - Castlevania
 - Yasushi Asada
 Duration: '2:28'
-Directory: divine-bloodlines-ssbu
 URLs:
 - https://www.youtube.com/watch?v=qwNsj7PY8jQ
 Referenced Tracks:
@@ -1834,7 +1776,6 @@ Artists:
 - Castlevania
 - Manami Kiyota
 Duration: '2:33'
-Directory: iron-blue-intention-ssbu
 URLs:
 - https://www.youtube.com/watch?v=APd-54g6Ixw
 Referenced Tracks:
@@ -1845,7 +1786,6 @@ Artists:
 - Castlevania
 - Masafumi Ueda
 Duration: '2:44'
-Directory: dance-of-gold-ssbu
 URLs:
 - https://www.youtube.com/watch?v=UznrxEa2wPg
 Referenced Tracks:
@@ -1856,18 +1796,17 @@ Artists:
 - Castlevania
 - Tetsuya Shibata
 Duration: '1:58'
-Directory: lost-painting-ssbu
 URLs:
 - https://www.youtube.com/watch?v=au4u8SstZAw
 Referenced Tracks:
 - track:lost-painting
 ---
 Track: Awake
+Directory: awake-castlevania
 Artists:
 - Castlevania
 - Yoshito Sekigawa
 Duration: '2:43'
-Directory: awake-castlevania-ssbu
 URLs:
 - https://www.youtube.com/watch?v=-P7Bgyy9J68
 Referenced Tracks:
@@ -1878,7 +1817,6 @@ Artists:
 - Castlevania
 - artist:ace-tomori-kudo-chico
 Duration: '2:50'
-Directory: lament-of-innocence-ssbu
 URLs:
 - https://www.youtube.com/watch?v=3m4MnV8bGXg
 Referenced Tracks:
@@ -1895,7 +1833,6 @@ Artists:
 Contributors:
 - Lyn (vocals)
 Duration: '3:00'
-Directory: beneath-the-mask-ssbu
 URLs:
 - https://www.youtube.com/watch?v=UAG9iTOTUFw
 Referenced Tracks:
@@ -1961,7 +1898,6 @@ Artists:
 - Persona
 - Yusuke Yamauchi
 Duration: '2:13'
-Directory: ill-face-myself-ssbu
 Color: '#ffeb19'
 URLs:
 - https://www.youtube.com/watch?v=mRVW3LE_kko
@@ -1974,7 +1910,6 @@ Artists:
 - Persona
 - Mitsuhiro Kitadani
 Duration: '2:30'
-Directory: aria-of-the-soul-ssbu
 Color: '#00bbfa'
 URLs:
 - https://www.youtube.com/watch?v=785x2m-LU-k
@@ -1990,7 +1925,6 @@ Artists:
 - Banjo Kazooie
 - Masafumi Takada
 Duration: '3:01'
-Directory: main-theme-banjo-kazooie-ssbu
 URLs:
 - https://www.youtube.com/watch?v=4tMGMq3p86k
 Referenced Tracks:
@@ -2002,7 +1936,6 @@ Artists:
 - Banjo Kazooie
 - Grant Kirkhope
 Duration: '2:41'
-Directory: spiral-mountain-ssbu
 URLs:
 - https://www.youtube.com/watch?v=jKdrWMKeBP0
 Referenced Tracks:
@@ -2019,7 +1952,6 @@ Artists:
 - Banjo Kazooie
 - Hiroki Hashimoto
 Duration: '2:38'
-Directory: mumbos-mountain-ssbu
 URLs:
 - https://www.youtube.com/watch?v=i4hQ_5PKSWM
 Referenced Tracks:
@@ -2031,7 +1963,6 @@ Artists:
 - Banjo Kazooie
 - Yoko Shimomura
 Duration: '2:19'
-Directory: treasure-trove-cove-ssbu
 URLs:
 - https://www.youtube.com/watch?v=gSNBOQSe_tQ
 Referenced Tracks:
@@ -2043,7 +1974,6 @@ Artists:
 - Banjo Kazooie
 - Yuji Masubuchi
 Duration: '2:39'
-Directory: gobis-valley-ssbu
 URLs:
 - https://www.youtube.com/watch?v=wYLAe7BscQA
 Referenced Tracks:
@@ -2056,7 +1986,6 @@ Artists:
 - Banjo Kazooie
 - Michiko Naruke
 Duration: '2:12'
-Directory: mad-monster-mansion-ssbu
 URLs:
 - https://www.youtube.com/watch?v=pNmm1kIwZlM
 Referenced Tracks:
@@ -2068,7 +1997,6 @@ Artists:
 - Banjo Kazooie
 - Hideki Sakamoto
 Duration: '2:01'
-Directory: vs-klungo-ssbu
 URLs:
 - https://www.youtube.com/watch?v=P6ppit379SU
 Referenced Tracks:
@@ -2078,72 +2006,72 @@ Section: FATAL FURY
 Color: '#ff401e'
 ---
 Track: Haremar Faith Capoeira School - Song of the Fight (Believers Will Be Saved) - FATAL FURY
+Directory: haremar-faith-capoeira-school
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Masafumi Takada
 Duration: '3:12'
-Directory: haremar-faith-capoeira-school-ssbu
 URLs:
 - https://www.youtube.com/watch?v=P04f5yXjDhc
 Referenced Tracks:
 - Haremar Faith Capoeira School - Song of the Fight [Believers Will Be Saved] (Richard Meyer's Theme)
 ---
 Track: Kurikinton - FATAL FURY 2
+Directory: kurikinton-ff2
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Noriyuki Iwadare
 Duration: '2:37'
-Directory: kurikinton-ff2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=UZld28TkIjU
 Referenced Tracks:
 - Kurikinton (America Stage I) Terry Bogard
 ---
 Track: Pasta - FATAL FURY 2
+Directory: pasta-ff2
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Yoko Shimomura
 Duration: '2:00'
-Directory: pasta-ff2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=4YSE0vX-pEk
 Referenced Tracks:
 - Pasta (Italy Stage) Andy Bogard
 ---
 Track: Tarkun and Kitapy - FATAL FURY 2
+Directory: tarkun-and-kitapy-ff2
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Yusuke Takahama
 Duration: '2:48'
-Directory: tarkun-and-kitapy-ff2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Q9_7Hvgg_pc
 Referenced Tracks:
 - Tarkun and Kitapy (Australia Stage) Big Bear
 ---
 Track: Let's Go to Seoul! - FATAL FURY 2
+Directory: lets-go-to-seoul-ff2
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Michiko Naruke
 Duration: '2:39'
-Directory: lets-go-to-seoul-ff2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Q4djoV7zODg
 Referenced Tracks:
 - Let's Go to Seoul! (Korea Stage) Kim
 ---
 Track: The London March - FATAL FURY 2
+Directory: the-london-march-ff2
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Yusuke Takahama
 Duration: '2:43'
-Directory: the-london-march-ff2-ssbu
 URLs:
 - https://www.youtube.com/watch?v=ngIQcADZYP4
 Referenced Tracks:
@@ -2151,12 +2079,12 @@ Referenced Tracks:
 - The London March (Billy Kane)
 ---
 Track: 11th Street - FATAL FURY WILD AMBITION
+Directory: 11th-street-ffwa
 Date First Released: November 6, 2019
 Artists:
 - Fatal Fury
 - Junichi Nakatsuru
 Duration: '2:42'
-Directory: 11th-street-ffwa-ssbu
 URLs:
 - https://www.youtube.com/watch?v=Mn2BWh9VPNs
 Referenced Tracks:
@@ -2164,12 +2092,12 @@ Referenced Tracks:
 - 11th Street (Terry Bogard)
 ---
 Track: Stormy Saxophone 2 - KOF '96
+Directory: stormy-saxophone-2-kof96
 Date First Released: November 6, 2019
 Artists:
 - The King of Fighters
 - Noriyuki Iwadare
 Duration: '2:52'
-Directory: stormy-saxophone-2-kof96-ssbu
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=bKiDS4FqgR8
@@ -2182,7 +2110,6 @@ Artists:
 - Alpha Mission
 - Yoshihito Yano
 Duration: '2:27'
-Directory: theme-of-syd-alpha-mission-ssbu
 Color: '#429c25'
 URLs:
 - https://www.youtube.com/watch?v=kOxccMQ27Gk
@@ -2196,7 +2123,6 @@ Artists:
 - Athena
 - Takafumi Sato
 Duration: '2:19'
-Directory: forest-world-athena-ssbu
 Color: '#ed75a6'
 URLs:
 - https://www.youtube.com/watch?v=mWRVerJlyys
@@ -2211,7 +2137,6 @@ Artists:
 Contributors:
 - Kanako Kotera (vocals)
 Duration: '3:13'
-Directory: psycho-soldier-theme-ssbu
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=AbdGGPuNEpE
@@ -2246,6 +2171,8 @@ Lyrics: |-
     FAIA! FAIA! SAIKO SORUJĀ (<i>Fire! Fire! Psycho Soldier</i>)
 ---
 Track: Psycho Soldier Theme (Overseas Version)
+Directory: psycho-soldier-theme-ssbu-overseas
+Suffix Directory: false
 Date First Released: November 6, 2019
 Artists:
 - Athena
@@ -2253,7 +2180,6 @@ Artists:
 Contributors:
 - Kanako Kotera (vocals)
 Duration: '3:13'
-Directory: psycho-soldier-theme-ssbu-overseas
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=RdRXYKj7D-U
@@ -2273,12 +2199,12 @@ Lyrics: |-
     Fire! Fire! Psycho Soldier
 ---
 Track: ART of FIGHT - Art of Fighting
+Directory: art-of-fight-aof
 Date First Released: November 6, 2019
 Artists:
 - Art of Fighting
 - Rio Hamamoto
 Duration: '2:42'
-Directory: art-of-fight-aof-ssbu
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=HEmkAWYlFCw
@@ -2286,12 +2212,12 @@ Referenced Tracks:
 - ART of FIGHT (Ryuhaku Todoh Stage)
 ---
 Track: Banquet of Nature - SAMURAI SHODOWN
+Directory: banquet-of-nature-ss
 Date First Released: November 6, 2019
 Artists:
 - Samurai Shodown
 - Masami Ueda
 Duration: '3:04'
-Directory: banquet-of-nature-ss-ssbu
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=L_sNdv5hAP4
@@ -2299,12 +2225,12 @@ Referenced Tracks:
 - Banquet of Nature (Nakoruru)
 ---
 Track: Gaia - SAMURAI SHODOWN
+Directory: gaia-ss
 Date First Released: November 6, 2019
 Artists:
 - Samurai Shodown
 - Yasushi Asada
 Duration: '2:23'
-Directory: gaia-ss-ssbu
 Color: '#e61b00'
 URLs:
 - https://www.youtube.com/watch?v=jmy9Zhe4qTs
@@ -2312,12 +2238,12 @@ Referenced Tracks:
 - Gaia (Earthquake)
 ---
 Track: Main Theme from Metal Slug - METAL SLUG
+Directory: main-theme-from-metal-slug
 Date First Released: November 6, 2019
 Artists:
 - Metal Slug
 - Yasushi Asada
 Duration: '2:25'
-Directory: main-theme-from-metal-slug-ssbu
 Color: '#ffbd06'
 URLs:
 - https://www.youtube.com/watch?v=tF_j9C_9F4s
@@ -2325,12 +2251,12 @@ Referenced Tracks:
 - Main Theme from Metal Slug
 ---
 Track: Assault Theme - METAL SLUG 1-3
+Directory: assault-theme-metal-slug
 Date First Released: November 6, 2019
 Artists:
 - Metal Slug
 - LindaAI-CUE
 Duration: '2:19'
-Directory: assault-theme-metal-slug-ssbu
 Color: '#ffbd06'
 URLs:
 - https://www.youtube.com/watch?v=xBGcj2ITQpg
@@ -2347,7 +2273,6 @@ Artists:
 - ARMS
 - Atsuko Asahi
 Duration: '2:34'
-Directory: arms-grand-prix-official-theme-song-ssbu
 URLs:
 - https://www.youtube.com/watch?v=PVvJfo_3Fsc
 Referenced Tracks:
@@ -2361,7 +2286,6 @@ Artists:
 - ARMS
 - Atsuko Asahi
 Duration: '2:33'
-Directory: ramen-bowl-ssbu
 URLs:
 - https://www.youtube.com/watch?v=3HZR-Fme0ZQ
 Referenced Tracks:
@@ -2373,6 +2297,7 @@ Section: Minecraft
 Color: '#60af27'
 ---
 Track: Halland / Dalarna
+Suffix Directory: false
 Date First Released: October 13, 2020
 Artists:
 - Minecraft
@@ -2394,7 +2319,6 @@ Artists:
 - Minecraft
 - Mitsuhiro Kitadani
 Duration: '2:47'
-Directory: earth-ssbu
 URLs:
 - https://www.youtube.com/watch?v=VEGzANstbXo
 Referenced Tracks:
@@ -2406,7 +2330,6 @@ Artists:
 - Minecraft
 - Yuzo Koshiro
 Duration: '2:28'
-Directory: toys-on-a-tear-ssbu
 URLs:
 - https://www.youtube.com/watch?v=iqutxbdYnzo
 Referenced Tracks:
@@ -2418,7 +2341,6 @@ Artists:
 - Minecraft
 - Yoko Shimomura
 Duration: '2:12'
-Directory: dance-of-the-blocks-ssbu
 URLs:
 - https://www.youtube.com/watch?v=G6uouYyQasM
 Referenced Tracks:
@@ -2430,7 +2352,6 @@ Artists:
 - Minecraft
 - Hiroki Hashimoto
 Duration: '2:49'
-Directory: glide-ssbu
 URLs:
 - https://www.youtube.com/watch?v=aJ3xJGhgz8o
 Referenced Tracks:
@@ -2442,7 +2363,6 @@ Artists:
 - Minecraft
 - Motoi Sakuraba
 Duration: '2:42'
-Directory: the-arch-illager-ssbu
 URLs:
 - https://www.youtube.com/watch?v=hEq9wm-49c8
 Referenced Tracks:
@@ -2457,7 +2377,6 @@ Artists:
 - Tekken
 - Yusuke Kudo
 Duration: '3:21'
-Directory: kazuya-mishima-devil-kazuya-ssbu
 URLs:
 - https://www.youtube.com/watch?v=xXZ99R-TEj4
 Referenced Tracks:
@@ -2469,7 +2388,6 @@ Artists:
 - Tekken
 - Nobuko Toda
 Duration: '2:37'
-Directory: dist-thins-out-ssbu
 URLs:
 - https://www.youtube.com/watch?v=6oxwKmhUQlQ
 Referenced Tracks:
@@ -2481,7 +2399,6 @@ Artists:
 - Tekken
 - Nobuko Toda
 Duration: '2:51'
-Directory: karma-ssbu
 URLs:
 - https://www.youtube.com/watch?v=rjGk22YQdv8
 Referenced Tracks:
@@ -2493,13 +2410,13 @@ Artists:
 - Tekken
 - artist:ace-tomori-kudo-chico
 Duration: '3:01'
-Directory: landscape-under-the-ghost-kaminano-ssbu
 URLs:
 - https://www.youtube.com/watch?v=xmnb9jJ_JP4
 Referenced Tracks:
 - Landscape Under The Ghost -Kaminano (AD2012)
 ---
 Track: Dojo (Japanese-Style Mix)
+Suffix Directory: false
 Date First Released: June 29, 2021
 Artists:
 - Tekken
@@ -2516,7 +2433,6 @@ Artists:
 - Tekken
 - Yoko Shimomura
 Duration: '2:18'
-Directory: moonsiders-1st-ssbu
 URLs:
 - https://www.youtube.com/watch?v=_l_bni7nisM
 Referenced Tracks:
@@ -2528,7 +2444,6 @@ Artists:
 - Tekken
 - Nobuko Toda
 Duration: '3:06'
-Directory: desperate-struggle-ssbu
 URLs:
 - https://www.youtube.com/watch?v=cbGn4trKAjU
 Referenced Tracks:
@@ -2540,7 +2455,6 @@ Artists:
 - Tekken
 - Yu Sugimoto
 Duration: '2:45'
-Directory: aloneness-ssbu
 URLs:
 - https://www.youtube.com/watch?v=BNqJI-PogHU
 Referenced Tracks:
@@ -2551,6 +2465,7 @@ Section: Other
 Color: '#7f7f7f'
 ---
 Track: Duck Hunt Medley
+Suffix Directory: false
 Artists:
 - Duck Hunt
 - Maki Kirioka
@@ -2568,6 +2483,7 @@ Referenced Tracks:
 - Game Over (Duck Hunt)
 ---
 Track: Wrecking Crew Medley
+Suffix Directory: false
 Artists:
 - Wrecking Crew
 - Tetsuya Shibata
@@ -2581,6 +2497,7 @@ Referenced Tracks:
 ---
 Track: Yūyūki Medley
 Directory: yuyuki-medley
+Suffix Directory: false
 Artists:
 - Yūyūki
 - Yuka Tsujiyoko
@@ -2605,7 +2522,6 @@ Artists:
 - Pilotwings
 - Noriyuki Iwadare
 Duration: '2:53'
-Directory: light-plane-ssbu
 Color: '#5f79ec'
 URLs:
 - https://www.youtube.com/watch?v=Zo8mQ8Cw4yQ
@@ -2617,7 +2533,6 @@ Artists:
 - Super Smash Bros.
 - Noriyuki Iwadare
 Duration: '2:46'
-Directory: electroplankton-ssbu
 Color: '#5ae50c'
 URLs:
 - https://www.youtube.com/watch?v=yvHcvbm8u2U
@@ -2630,7 +2545,6 @@ Artists:
 - nintendogs
 - Maki Kirioka
 Duration: '2:34'
-Directory: bathtime-theme-ssbu
 Color: '#c19065'
 URLs:
 - https://www.youtube.com/watch?v=YWGuMJw2B54
@@ -2643,7 +2557,6 @@ Artists:
 - Wii Sports
 - Keiki Kobayashi
 Duration: '1:57'
-Directory: title-theme-wii-sports-ssbu
 Color: '#1ab7ea'
 URLs:
 - https://www.youtube.com/watch?v=8EFqTOyharM
@@ -2655,7 +2568,6 @@ Artists:
 - Wii Sports
 - Nobuko Toda
 Duration: '2:18'
-Directory: title-theme-wii-sports-club-ssbu
 Color: '#1ab7ea'
 URLs:
 - https://www.youtube.com/watch?v=hpfLKzShlbs
@@ -2667,7 +2579,6 @@ Artists:
 - Tomodachi Life
 - Masafumi Takada
 Duration: '2:47'
-Directory: afternoon-on-the-island-ssbu
 Color: '#f57823'
 URLs:
 - https://www.youtube.com/watch?v=XMlUohm4mKY
@@ -2676,6 +2587,7 @@ Referenced Tracks:
 - Afternoon on the Island (Tomodachi Life)
 ---
 Track: Find Mii / Find Mii II Medley
+Suffix Directory: false
 Artists:
 - Mii
 - Ryo Nagamatsu
@@ -2694,7 +2606,6 @@ Artists:
 - 'Code Name: S.T.E.A.M.'
 - Yoshito Sekigawa
 Duration: '2:41'
-Directory: trouble-brewing-ii-ssbu
 Color: '#fcc30a'
 URLs:
 - https://www.youtube.com/watch?v=5ncFMnorX2U
@@ -2707,7 +2618,6 @@ Artists:
 - Snipperclips
 - Maki Kirioka
 Duration: '2:43'
-Directory: noisy-notebook-ssbu
 Color: '#ee3f66'
 URLs:
 - https://www.youtube.com/watch?v=O-PqtjHkZtQ
@@ -2716,7 +2626,6 @@ Referenced Tracks:
 ---
 Track: MEGALOVANIA
 Date First Released: September 4, 2019
-Directory: megalovania-ssbu
 Color: '#b962b9'
 Artists:
 - Toby Fox
diff --git a/album/svert-ost-volume-one.yaml b/album/svert-ost-volume-one.yaml
index be4419e3..2611e706 100644
--- a/album/svert-ost-volume-one.yaml
+++ b/album/svert-ost-volume-one.yaml
@@ -1,4 +1,5 @@
 Album: SVERT OST - Volume One
+Directory Suffix: svert
 Date: December 7, 2021
 Date Added: April 13, 2024
 URLs:
@@ -253,7 +254,7 @@ URLs:
 - https://youtu.be/MAFdUEBWjEc
 ---
 Track: Eclipse
-Directory: eclipse-svert
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:07'
 Artists:
@@ -366,7 +367,7 @@ URLs:
 - https://youtu.be/G_seN5ojeyw
 ---
 Track: Homesick
-Directory: homesick-svert
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:06'
 Artists:
diff --git a/album/symphony-impossible-to-play.yaml b/album/symphony-impossible-to-play.yaml
index 042c2998..ecbc61e0 100644
--- a/album/symphony-impossible-to-play.yaml
+++ b/album/symphony-impossible-to-play.yaml
@@ -1,4 +1,5 @@
 Album: Symphony Impossible to Play
+Directory Suffix: symphony
 Artists:
 - Clark Powell
 Date: August 1, 2012
@@ -74,7 +75,8 @@ Referenced Tracks:
 - Even in Death
 ---
 Track: II - Sarabande
-Directory: sarabande-symphony
+Directory: sarabande
+Suffix Directory: true
 Contributors:
 - Erik Scheele (piano)
 Duration: '2:36'
@@ -85,7 +87,8 @@ Referenced Tracks:
 - track:sarabande-vol5
 ---
 Track: III - Serenade
-Directory: serenade-symphony
+Directory: serenade
+Suffix Directory: true
 Duration: '5:44'
 URLs:
 - https://homestuck.bandcamp.com/track/iii-serenade-2
diff --git a/album/synthetica.yaml b/album/synthetica.yaml
index cd08b3b8..250f3fc8 100644
--- a/album/synthetica.yaml
+++ b/album/synthetica.yaml
@@ -73,7 +73,8 @@ Artists:
 Duration: '5:54'
 ---
 Track: Crystalline
-Directory: crystalline-synthetica
+Suffix Directory: true
+Always Reference By Directory: true
 Additional Names:
 - Name: >-
     Crystalline (Final)
@@ -176,7 +177,7 @@ Artists:
 Duration: '6:59'
 ---
 Track: Destiny
-Directory: destiny-synthetica
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Hoxon
diff --git a/album/team-paradox.yaml b/album/team-paradox.yaml
index 6071e6d5..6328ea78 100644
--- a/album/team-paradox.yaml
+++ b/album/team-paradox.yaml
@@ -108,7 +108,7 @@ Art Tags:
 - Alternia
 ---
 Track: Pure
-Directory: pure-team-paradox
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Sadochist
@@ -170,7 +170,7 @@ Art Tags:
 - Alternia
 ---
 Track: Hollow
-Directory: hollow-team-paradox
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Sadochist
@@ -311,7 +311,7 @@ Art Tags:
 - BQ
 ---
 Track: Advanse
-Directory: advanse-team-paradox
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - mediokreKarapase
diff --git a/album/the-changing-light.yaml b/album/the-changing-light.yaml
index e44a8339..6b493b5a 100644
--- a/album/the-changing-light.yaml
+++ b/album/the-changing-light.yaml
@@ -33,7 +33,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Summer by the Sea
-Directory: summer-by-the-sea-the-changing-light
+Suffix Directory: true
 Originally Released As: track:summer-by-the-sea
 Always Reference By Directory: true
 Duration: '02:24'
diff --git a/album/the-consuming-shadow-ost.yaml b/album/the-consuming-shadow-ost.yaml
index 280e10e0..f95a84bc 100644
--- a/album/the-consuming-shadow-ost.yaml
+++ b/album/the-consuming-shadow-ost.yaml
@@ -1,4 +1,5 @@
 Album: The Consuming Shadow OST
+Directory Suffix: the-consuming-shadow
 Artists:
 - Mark J. Hadley
 Date: June 19, 2017
@@ -22,7 +23,7 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/the-consuming-shadow
 ---
 Track: Driven
-Directory: driven-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:00'
 URLs:
@@ -34,42 +35,42 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/rust-debris
 ---
 Track: Rotund
-Directory: rotund-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/rotund
 ---
 Track: Unnatural
-Directory: unnatural-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/unnatural
 ---
 Track: Haunted
-Directory: haunted-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/haunted
 ---
 Track: Secretive
-Directory: secretive-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/secretive
 ---
 Track: Unfathomable
-Directory: unfathomable-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/unfathomable
 ---
 Track: Sacrifice
-Directory: sacrifice-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:51'
 URLs:
@@ -88,7 +89,7 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/eternal-servant
 ---
 Track: Broken
-Directory: broken-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:51'
 URLs:
@@ -102,21 +103,21 @@ URLs:
 - https://parsecproductions.bandcamp.com/track/stored-away
 ---
 Track: Encompass
-Directory: encompass-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:30
 URLs:
 - https://parsecproductions.bandcamp.com/track/encompass
 ---
 Track: Ancient
-Directory: ancient-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:40
 URLs:
 - https://parsecproductions.bandcamp.com/track/ancient
 ---
 Track: Dawn
-Directory: dawn-the-consuming-shadow
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:51'
 URLs:
diff --git a/album/the-funk-mclovin-homestuck-experience.yaml b/album/the-funk-mclovin-homestuck-experience.yaml
index eedbe86a..f7de5d31 100644
--- a/album/the-funk-mclovin-homestuck-experience.yaml
+++ b/album/the-funk-mclovin-homestuck-experience.yaml
@@ -16,7 +16,7 @@ Groups:
 - Fandom
 ---
 Track: Introduction
-Directory: introduction-the-funk-mclovin-homestuck-experience
+Suffix Directory: true
 Duration: 0:50
 URLs:
 - https://funkmclovin.bandcamp.com/track/introduction
diff --git a/album/the-green-box-set-1.yaml b/album/the-green-box-set-1.yaml
index 1a23814a..a5fe027c 100644
--- a/album/the-green-box-set-1.yaml
+++ b/album/the-green-box-set-1.yaml
@@ -45,7 +45,7 @@ Commentary: |-
     Track art is an edited portion of "Losange."
 ---
 Track: Stargazer
-Directory: stargazer-the-green-box-set-1
+Suffix Directory: true
 Duration: '03:10'
 Date First Released: November 23, 2017
 Cover Artists:
@@ -281,7 +281,7 @@ Commentary: |-
     Intended for use in ["Adventures in the consumption of breads."](https://mspfa.com/?s=20650)
 ---
 Track: Viridian Suede
-Directory: viridian-suede-the-green-box-set-1
+Suffix Directory: true
 Originally Released As: track:viridian-suede
 Date First Released: May 15, 2018
 Duration: '02:40'
diff --git a/album/the-nobles.yaml b/album/the-nobles.yaml
index 9c6ea453..fb56d440 100644
--- a/album/the-nobles.yaml
+++ b/album/the-nobles.yaml
@@ -1,5 +1,4 @@
 Album: The Nobles

-Directory: the-nobles

 Date: October 25, 2019

 Date Added: June 12, 2024

 Artists:

@@ -73,7 +72,7 @@ Commentary: |-
 Section: Side 1

 ---

 Track: ~~Side 1~~

-Directory: side-1-the-nobles

+Suffix Directory: true

 Artists:

 - Rowyn Berlan

 Duration: '0:42'

@@ -205,7 +204,7 @@ Commentary: |-
 Section: Side 2

 ---

 Track: ~~Side 2~~

-Directory: side-2-the-nobles

+Suffix Directory: true

 Duration: '0:36'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/side-2

@@ -257,7 +256,7 @@ Commentary: |-
     [[artist:rowyn-berlan|Timeless]] originally wanted me to use my guitar sample library for the original version of this track. I'm not sure what happened but they decided to scrap that original version. I thought the original demo had promise so I asked them for a midi of the track. Eventually they offered to let me collab with them in order to finish the track. A lot of the elements from that original demo are still present in the finishing version albeit heavily modified and extended. I took the original melody and chords timeless wrote and messed around until I got this fun sounding progression and from there it all came together pretty naturally. Unfortunately, there came a point where timeless could no longer use the project file and so he wasn't able to have as much input as i would have liked. Despite that collabing on this was a pretty fun experience and I wouldn't mind doing it again.

 ---

 Track: Broken Dreams

-Directory: broken-dreams-the-nobles

+Suffix Directory: true

 Duration: '1:50'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/broken-dreams

@@ -308,7 +307,7 @@ Commentary:
     It was a really fun albeit rather shortlived experience helping [[artist:rowyn-berlan|Rowyn]] with this collab. Simply put, they said they didn't know what to do with it past a certain point and we discussed a collaboration. After a bit, they tossed over a copy of the project file and the things it used, and I did my best to go to town on it. I only got the smallest bit added - A piano medley, a little bloopity part, a half a bass break - before I got p tired and hit the hay. I didn't have time to work on it the next morning, so I sent it back to Rowyn knowing I'd be spending all my spare time the next few days at work. By the time I *could* get around to opening the file again, my computer had practically bricked itself..? I couldn't work on the project at all, but Rowyn did an amazing job completing. They'll probably say they were stuck, but in reality when they was given just the slightest push they jet right into it, and did a hell of a good job along the way.

 ---

 Track: Terminus

-Directory: terminus-the-nobles

+Suffix Directory: true

 Duration: '3:00'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/terminus

@@ -377,7 +376,6 @@ Commentary: |-
 Track: The Nobles (Reprise)

 Additional Names:

 - Goodnight (alternate title)

-Directory: the-nobles-reprise

 Duration: '2:19'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/the-nobles-reprise

diff --git a/album/the-planets.yaml b/album/the-planets.yaml
index c1a2f816..85fd002a 100644
--- a/album/the-planets.yaml
+++ b/album/the-planets.yaml
@@ -1,4 +1,5 @@
 Album: The Planets
+Suffix Track Directories: true
 Always Reference Tracks By Directory: true
 Artists:
 - Ducky Senpai
@@ -90,7 +91,6 @@ Commentary: |-
     <img src="media/album-art/the-planets/cover.jpg" width="320">
 ---
 Track: Shade
-Directory: shade-the-planets
 Duration: 2:09
 Color: '#666fe9'
 URLs:
@@ -101,7 +101,6 @@ Commentary: |-
     Land of Wind and Shade
 ---
 Track: Rain
-Directory: rain-the-planets
 Duration: 2:51
 Color: '#b536da'
 URLs:
@@ -112,7 +111,6 @@ Commentary: |-
     Land of Light and Rain
 ---
 Track: Clockwork
-Directory: clockwork-the-planets
 Duration: 2:45
 Color: '#e00707'
 URLs:
@@ -123,7 +121,6 @@ Commentary: |-
     Land of Heat and Clockwork
 ---
 Track: Frost
-Directory: frost-the-planets
 Duration: 2:39
 Color: '#4ac925'
 URLs:
@@ -134,7 +131,6 @@ Commentary: |-
     Land of Frost and Frogs
 ---
 Track: Helium
-Directory: helium-the-planets
 Duration: 3:39
 Color: '#00d5f2'
 URLs:
@@ -145,7 +141,6 @@ Commentary: |-
     Land of Crypts and Helium
 ---
 Track: Xenon
-Directory: xenon-the-planets
 Duration: 2:38
 Color: '#1f9400'
 URLs:
@@ -156,7 +151,6 @@ Commentary: |-
     Land of Mounds and Xenon
 ---
 Track: Neon
-Directory: neon-the-planets
 Duration: 3:01
 Color: '#ff6ff2'
 URLs:
@@ -167,7 +161,6 @@ Commentary: |-
     Land of Pyramids and Neon
 ---
 Track: Krypton
-Directory: krypton-the-planets
 Duration: 2:47
 Color: '#f2a400'
 URLs:
@@ -178,7 +171,6 @@ Commentary: |-
     Land of Tombs and Krypton
 ---
 Track: Melody
-Directory: melody-the-planets
 Duration: 2:08
 Color: '#eb0000'
 URLs:
@@ -189,7 +181,6 @@ Commentary: |-
     Land of Quartz and Melody
 ---
 Track: Zephyr
-Directory: zephyr-the-planets
 Duration: 3:00
 Color: '#c36100'
 URLs:
@@ -200,7 +191,6 @@ Commentary: |-
     Land of Sand and Zephyr
 ---
 Track: Fire
-Directory: fire-the-planets
 Duration: 2:29
 Color: '#a1a100'
 URLs:
@@ -211,7 +201,6 @@ Commentary: |-
     Land of Brains and Fire
 ---
 Track: Haze
-Directory: haze-the-planets
 Duration: 2:54
 Color: '#ff0000'
 URLs:
@@ -222,7 +211,6 @@ Commentary: |-
     Land of Pulse and Haze
 ---
 Track: Tea
-Directory: tea-the-planets
 Duration: 1:32
 Color: '#588a00'
 URLs:
@@ -233,7 +221,6 @@ Commentary: |-
     Land of Little Cubes and Tea
 ---
 Track: Rays
-Directory: rays-the-planets
 Duration: 2:10
 Color: '#008f48'
 URLs:
@@ -244,7 +231,6 @@ Commentary: |-
     Land of Rays and Frogs
 ---
 Track: Flow
-Directory: flow-the-planets
 Duration: 2:36
 Color: '#008b8b'
 URLs:
@@ -255,7 +241,6 @@ Commentary: |-
     Land of Thought and Flow
 ---
 Track: Treasure
-Directory: treasure-the-planets
 Duration: 1:10
 Color: '#3796c6'
 URLs:
@@ -266,7 +251,6 @@ Commentary: |-
     Land of Maps and Treasure
 ---
 Track: Silence
-Directory: silence-the-planets
 Duration: 2:35
 Color: '#487aef'
 URLs:
@@ -277,7 +261,6 @@ Commentary: |-
     Land of Caves and Silence
 ---
 Track: Mirth
-Directory: mirth-the-planets
 Duration: 2:18
 Color: '#a34bff'
 URLs:
@@ -288,7 +271,6 @@ Commentary: |-
     Land of Tents and Mirth
 ---
 Track: Angels
-Directory: angels-the-planets
 Duration: 2:33
 Color: '#db00db'
 URLs:
@@ -299,7 +281,6 @@ Commentary: |-
     Land of Wrath and Angels
 ---
 Track: Glass
-Directory: glass-the-planets
 Duration: 2:11
 Color: '#e30072'
 URLs:
@@ -310,7 +291,6 @@ Commentary: |-
     Lands of Dew and Glass
 ---
 Track: Mayhem
-Directory: mayhem-the-planets
 Duration: 3:04
 Color: '#888888'
 URLs:
diff --git a/album/the-rebornening.yaml b/album/the-rebornening.yaml
index 19a27d1c..38c02732 100644
--- a/album/the-rebornening.yaml
+++ b/album/the-rebornening.yaml
@@ -73,7 +73,7 @@ Commentary: |-
     <b>I LIKE TO THINK OF THIS ONE AS AN EDUCATION PIECE.<br>IT TELLS US THAT SOMETIMES.<br>THE RULES NEED TO BEND TO YOUR WHIM.<br>SO THAT YOU CAN MAKE A CHANGE.<br>CHANGE LIKE THE PRIMITIVE MONETARY VALUES THE WORLD ONCE KNEW BEFORE FUCKING THEMSELVES OVER.<br>THINK OF THIS AS MY METAMORPHOSIS COMPOSED.<br>ONLY MY CHANGE IS IN THE AMOUNT OF BOONS AND CORPSES IM COLLECTING.</b>
 ---
 Track: BASS.
-Directory: bass-the-rebornening
+Suffix Directory: true
 Duration: '3:42'
 URLs:
 - https://thenewcaliborn.bandcamp.com/track/bass
diff --git a/album/the-sky-beyond-our-bay.yaml b/album/the-sky-beyond-our-bay.yaml
index 835dcec9..1caa6e0a 100644
--- a/album/the-sky-beyond-our-bay.yaml
+++ b/album/the-sky-beyond-our-bay.yaml
@@ -26,7 +26,7 @@ Commentary: |-
 Section: Main album
 ---
 Track: Seastorm
-Directory: seastorm-the-sky-beyond-our-bay
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:42'
 URLs:
@@ -285,7 +285,7 @@ Lyrics: |-
     The last to get better
 ---
 Track: Vanish
-Directory: vanish-the-sky-beyond-our-bay
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:41'
 URLs:
diff --git a/album/the-sky-is-ours.yaml b/album/the-sky-is-ours.yaml
index e7d363c8..f617d9df 100644
--- a/album/the-sky-is-ours.yaml
+++ b/album/the-sky-is-ours.yaml
@@ -89,7 +89,7 @@ URLs:
 - https://music.apple.com/album/daughter-of-drought-and-rain/1528257836?i=1528257842
 ---
 Track: Immortal
-Directory: immortal-the-sky-is-ours
+Suffix Directory: true
 Originally Released As: track:immortal-vast-error
 Always Reference By Directory: true
 Duration: '03:26'
@@ -124,7 +124,7 @@ URLs:
 - https://music.apple.com/album/the-light-left-under-trees/1528257836?i=1528258027
 ---
 Track: Nebula
-Directory: nebula-the-sky-is-ours
+Suffix Directory: true
 Originally Released As: track:nebula-vast-error
 Always Reference By Directory: true
 Duration: '05:35'
@@ -144,7 +144,7 @@ URLs:
 ---
 Track: Fly Away
 Originally Released As: track:fly-away-single
-Directory: fly-away-the-sky-is-ours
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '03:32'
 URLs:
@@ -156,14 +156,14 @@ URLs:
 Section: Bonus tracks
 ---
 Track: Dreamt
-Directory: dreamt-the-sky-is-ours
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:12'
 Referenced Tracks:
 - track:dreamt-compass
 ---
 Track: I Forgot That You Existed
-Directory: i-forgot-that-you-existed-the-sky-is-ours
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:44'
 Referenced Tracks:
diff --git a/album/the-strider-mixtape.yaml b/album/the-strider-mixtape.yaml
index 6681199f..96dd0124 100644
--- a/album/the-strider-mixtape.yaml
+++ b/album/the-strider-mixtape.yaml
@@ -1,5 +1,5 @@
 Album: The Strider Mixtape

-Directory: the-strider-mixtape

+Directory Suffix: strider-mixtape

 Artists:

 - Pascal van den Bos

 Date: July 19, 2019

@@ -191,7 +191,7 @@ Commentary: |-
     Hey another attempt at a genre i'm unfamiliar with, i wanted to make a Synthwave track to fit with the theme of 2001: A Space Odyssey references like the title and the art for Hal. After this i actually made a full synthwave album because i liked the genre so much.

 ---

 Track: Shattered

-Directory: shattered-strider-mixtape

+Suffix Directory: true

 Duration: '2:03'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/shattered

@@ -371,7 +371,7 @@ Lyrics: |-
     (Go, go, go, go, go, go, go GameBro)

 ---

 Track: Rematch

-Directory: rematch-strider-mixtape

+Suffix Directory: true

 Duration: '2:15'

 URLs:

 - https://pascalpotatovandenbos.bandcamp.com/track/rematch

diff --git a/album/the-vriska-mixt8pe.yaml b/album/the-vriska-mixt8pe.yaml
index 0aef497b..9c32874f 100644
--- a/album/the-vriska-mixt8pe.yaml
+++ b/album/the-vriska-mixt8pe.yaml
@@ -1,4 +1,5 @@
 Album: The Vriska Mixt8pe
+Suffix Track Directories: true
 Date: August 8, 2019
 Date Added: April 13, 2024
 Additional Names:
@@ -25,7 +26,6 @@ Commentary: |-
 ---
 Track: Vriska's Theme
 Always Reference By Directory: true
-Directory: vriskas-theme-the-vriska-mixt8pe
 Duration: '1:43'
 Referenced Tracks:
 - Vriska's Theme
@@ -34,7 +34,6 @@ URLs:
 ---
 Track: MEGALOVANIA
 Always Reference By Directory: true
-Directory: megalovania-vriska-the-vriska-mixt8pe
 Duration: '3:00'
 Referenced Tracks:
 - track:megalovania-undertale
@@ -43,7 +42,6 @@ URLs:
 ---
 Track: Moonsetter
 Always Reference By Directory: true
-Directory: moonsetter-vriska-the-vriska-mixt8pe
 Duration: '2:24'
 Referenced Tracks:
 - Moonsetter
@@ -52,7 +50,6 @@ URLs:
 ---
 Track: Rex Duodecim Angelus
 Always Reference By Directory: true
-Directory: rex-duodecim-angelus-vriska-the-vriska-mixt8pe
 Duration: '6:29'
 Referenced Tracks:
 - Rex Duodecim Angelus
@@ -61,7 +58,6 @@ URLs:
 ---
 Track: Cobalt Thief
 Always Reference By Directory: true
-Directory: cobalt-thief-vriska-the-vriska-mixt8pe
 Duration: '2:12'
 Referenced Tracks:
 - Cobalt Thief
@@ -69,6 +65,7 @@ URLs:
 - https://funkmclovin.bandcamp.com/track/cobalt-thief
 ---
 Track: Vriska's Theme Reprise
+Suffix Directory: false
 Duration: '1:54'
 Referenced Tracks:
 - track:vriskas-theme-the-vriska-mixt8pe
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index c3ad4e62..691c29ec 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -1,4 +1,5 @@
 Album: There's No Place Like Home
+Directory Suffix: no-place-like-home
 Artists:
 - Tee-vee
 Date: April 15, 2020
@@ -24,7 +25,7 @@ Commentary: |-
     Thanks to PotatoBoss for his feedback and help with credits checking<br>HP : [potatoboss.net](http://potatoboss.net/)<br>Twitter : [twitter.com/potatomoosik](https://twitter.com/potatomoosik)<br>Youtube : [www.youtube.com/channel/UCx8RbZLXx8lcr-yBHPEr_vA](https://www.youtube.com/channel/UCx8RbZLXx8lcr-yBHPEr_vA)<br>Bandcamp : [potatoboss.bandcamp.com](https://potatoboss.bandcamp.com/)
 ---
 Track: Confined
-Directory: confined-no-place-like-home
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:04'
 URLs:
@@ -211,7 +212,8 @@ Referenced Tracks:
 - Descend
 ---
 Track: MeGaLoVania (cover)
-Directory: megalovania-no-place-like-home
+Directory: megalovania
+Suffix Directory: true
 Additional Names:
 - Name: MeGaLoVania (cover)
   Annotation: normalized
diff --git a/album/time-and-tide.yaml b/album/time-and-tide.yaml
index 8c2ebf2b..8d31de77 100644
--- a/album/time-and-tide.yaml
+++ b/album/time-and-tide.yaml
@@ -73,7 +73,8 @@ Commentary: |-
     Splitsuns for production feedback on this track!
 ---
 Track: Zeitgeist
-Directory: zeitgeist-time-and-tide
+Suffix Directory: true
+Always Reference By Directory: true
 Duration: '04:00'
 Referenced Tracks:
 - Rasputin
@@ -93,9 +94,9 @@ Commentary: |-
     Nighttime cityscapes are a favourite subject of mine, and here I thought it would really fit the feel of the track: metropolitan, up-tempo, and retrofuturistic.
 ---
 Track: Cosmic Significance
-Originally Released As: track:cosmic-significance
-Directory: cosmic-significance-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
+Originally Released As: track:cosmic-significance
 Duration: '03:53'
 URLs:
 - https://circlejourney.bandcamp.com/track/cosmic-significance
@@ -194,7 +195,7 @@ Commentary: |-
     Pictured in the track illustration is a pair of characters from one of the ideas I had while pondering the setting: a couple of flappers who regularly meet at the speakeasy, romancing each other and parting only when the sun comes up.
 ---
 Track: Chariot
-Directory: chariot-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:45'
 URLs:
@@ -262,7 +263,7 @@ Commentary: |-
     Splitsuns for the invaluable production feedback on this track, and helping me iron out some modulations!
 ---
 Track: Emptiness
-Directory: emptiness-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '04:22'
 URLs:
@@ -343,7 +344,7 @@ Commentary: |-
     It was incredibly satisfying to draw and adjust blending modes on the glass shards in the image, which form a half-mask over the face.
 ---
 Track: Shipwreck
-Directory: shipwreck-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Circlejourney
@@ -448,7 +449,7 @@ Commentary: |-
 ---
 Track: Waterside Sunset
 Has Cover Art: false
-Directory: waterside-sunset-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:06'
 Referenced Tracks:
@@ -465,7 +466,7 @@ Commentary: |-
     This one was made for no rhyme or reason; the melody came to me, and I liked it and built the rest of the track around it. Brash and very hard-rock, I didn’t feel like I could do it justice until I got my hands on some better instruments. It was almost a year before I took it the draft and finished it up. Later on, I decided to make it a song played by a band formed of a few of my characters.
 ---
 Track: Wineglasses
-Directory: wineglasses-time-and-tide
+Suffix Directory: true
 Always Reference By Directory: true
 Has Cover Art: false
 Duration: '1:32'
diff --git a/album/triassic-slump.yaml b/album/triassic-slump.yaml
index 22e47ac0..653902ae 100644
--- a/album/triassic-slump.yaml
+++ b/album/triassic-slump.yaml
@@ -375,7 +375,7 @@ Lyrics: |-
     and I think I want to die alone
 ---
 Track: Meteors
-Directory: meteors-triassic-slump
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '7:24'
 URLs:
diff --git a/album/troleplanet.yaml b/album/troleplanet.yaml
index c73256c8..2ae2049a 100644
--- a/album/troleplanet.yaml
+++ b/album/troleplanet.yaml
@@ -61,7 +61,7 @@ Referenced Tracks:
 - Vriska's Theme
 ---
 Track: Mischief
-Directory: mischief-troleplanet
+Suffix Directory: true
 Artists:
 - cctv
 Duration: '01:55'
diff --git a/album/tumblrstuck-bent-ost-volume-0.yaml b/album/tumblrstuck-bent-ost-volume-0.yaml
index 7ac50f19..ddecdd42 100644
--- a/album/tumblrstuck-bent-ost-volume-0.yaml
+++ b/album/tumblrstuck-bent-ost-volume-0.yaml
@@ -1,5 +1,4 @@
 Album: 'Tumblrstuck/bent OST: Volume 0'
-Directory: tumblrstuck-bent-ost-volume-0
 Artists:
 - Samm Neiland
 Date: March 27, 2011
diff --git a/album/tumblrstuck-bent-ost-volume-1.yaml b/album/tumblrstuck-bent-ost-volume-1.yaml
index c9e4c14d..309b43aa 100644
--- a/album/tumblrstuck-bent-ost-volume-1.yaml
+++ b/album/tumblrstuck-bent-ost-volume-1.yaml
@@ -1,5 +1,4 @@
 Album: 'Tumblrstuck/bent OST: Volume 1'
-Directory: tumblrstuck-bent-ost-volume-1
 Artists:
 - Samm Neiland
 Date: February 24, 2012
diff --git a/album/tumblrstuck-bent-ost-volume-2.yaml b/album/tumblrstuck-bent-ost-volume-2.yaml
index 42e2d7fc..7abf29ee 100644
--- a/album/tumblrstuck-bent-ost-volume-2.yaml
+++ b/album/tumblrstuck-bent-ost-volume-2.yaml
@@ -1,5 +1,5 @@
 Album: 'Tumblrstuck/bent OST: Volume 2'
-Directory: tumblrstuck-bent-ost-volume-2
+Directory Suffix: tumblrstuck
 Artists:
 - Samm Neiland
 Date: March 11, 2013
@@ -112,7 +112,7 @@ Commentary: |-
 Section: Bonus tracks
 ---
 Track: Surmount
-Directory: surmount-tumblrstuck
+Suffix Directory: true
 Duration: '1:43'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/Surmount.mp3
diff --git a/album/ulterior-motives.yaml b/album/ulterior-motives.yaml
index e8bd0758..e783d5bf 100644
--- a/album/ulterior-motives.yaml
+++ b/album/ulterior-motives.yaml
@@ -262,7 +262,7 @@ Lyrics: |-
     Fall in love with a girl like you
 ---
 Track: Communion
-Directory: communion-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:24'
 URLs:
@@ -325,7 +325,7 @@ Lyrics: |-
     Just a piece to remain when you die
 ---
 Track: Sabotage
-Directory: sabotage-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '4:08'
 URLs:
@@ -468,7 +468,7 @@ Lyrics: |-
     When I think about you
 ---
 Track: Interlude
-Directory: interlude-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '0:53'
 URLs:
@@ -480,7 +480,7 @@ Lyrics: |-
     (Strange, the way time goes by.)
 ---
 Track: Mechanism
-Directory: mechanism-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:00'
 URLs:
@@ -548,7 +548,7 @@ Lyrics: |-
     The mechanism of the heart (Mechanism of the heart)
 ---
 Track: Saint
-Directory: saint-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:41'
 URLs:
@@ -643,7 +643,7 @@ Lyrics: |-
     And I know that man is me
 ---
 Track: Powerline
-Directory: powerline-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '2:43'
 URLs:
@@ -711,7 +711,7 @@ Lyrics: |-
     Come get electric
 ---
 Track: Utopia
-Directory: utopia-ulterior-motives
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '3:20'
 URLs:
diff --git a/album/unbeatable-demo-tapes.yaml b/album/unbeatable-demo-tapes.yaml
index 76a143ec..ea7f67d6 100644
--- a/album/unbeatable-demo-tapes.yaml
+++ b/album/unbeatable-demo-tapes.yaml
@@ -1,5 +1,5 @@
 Album: 'UNBEATABLE: DEMO TAPES'
-Directory: unbeatable-demo-tapes
+Directory Suffix: unbeatable
 Artists:
 - peak divide
 Date: May 6, 2021
@@ -76,13 +76,13 @@ Lyrics: |-
     even though i do not know your name
 ---
 Track: WAITING
+Suffix Directory: true
 Contributors:
 - Andrew Cleveland (guitar solo)
 - Rachel Lake (composition, vocals)
 - Robert J! Lake (composition, arrangement, lyrics)
 - Clara Maddux (composition, arrangement, guitars, bass, drums, lyrics)
 - Vasily Nikolaev (composition, synths, mixing, mastering)
-Directory: waiting-unbeatable
 Duration: 3:59
 URLs:
 - https://peakdivide.bandcamp.com/track/waiting
diff --git a/album/unbound-battle-selection-original-soundtrack.yaml b/album/unbound-battle-selection-original-soundtrack.yaml
index 90975702..8911b0b7 100644
--- a/album/unbound-battle-selection-original-soundtrack.yaml
+++ b/album/unbound-battle-selection-original-soundtrack.yaml
@@ -1,5 +1,6 @@
 Album: 'Unbound: Battle Selection (Original Soundtrack)'
-Directory: unbound-battle-selection-original-soundtrack
+Directory Suffix: battle-selection
+Suffix Track Directories: true
 Date: May 8, 2024
 #Date Added: October 4, 2024
 URLs:
@@ -61,7 +62,6 @@ Commentary: |-
     Maria Panaiotti
 ---
 Track: The Shadows
-Directory: the-shadows-battle-selection
 Originally Released As: track:the-shadows
 Duration: '0:41'
 URLs:
@@ -70,7 +70,6 @@ URLs:
 - https://open.spotify.com/track/6XKT2NdpVWtguwKdByNh6I
 ---
 Track: Battle! Shadow Grunt
-Directory: battle-shadow-grunt-battle-selection
 Originally Released As: track:battle-shadow-grunt
 Duration: '1:49'
 URLs:
@@ -79,7 +78,6 @@ URLs:
 - https://open.spotify.com/track/4aV3h0AYIFuJr3nunG30Gb
 ---
 Track: Victory Against The Shadows!
-Directory: victory-against-the-shadows-battle-selection
 Originally Released As: track:victory-against-the-shadows
 Duration: '0:36'
 URLs:
@@ -88,7 +86,6 @@ URLs:
 - https://open.spotify.com/track/0k0NJz2JXDRwrMbMLLGkbM
 ---
 Track: Encounter! Rival
-Directory: encounter-rival-battle-selection
 Originally Released As: track:encounter-rival
 Duration: '0:47'
 URLs:
@@ -97,7 +94,6 @@ URLs:
 - https://open.spotify.com/track/5lCP7hJ3izdQTu737fMLnn
 ---
 Track: Battle! Rival
-Directory: battle-rival-pokemon-unbound-battle-selection
 Originally Released As: track:battle-rival-pokemon-unbound
 Duration: '2:13'
 URLs:
@@ -106,7 +102,6 @@ URLs:
 - https://open.spotify.com/track/27pTZ9yCD4E4Weiz9LNpzT
 ---
 Track: Encounter! Youngster
-Directory: encounter-youngster-battle-selection
 Originally Released As: track:encounter-youngster
 Duration: '0:37'
 URLs:
@@ -115,7 +110,6 @@ URLs:
 - https://open.spotify.com/track/2vKA4buK1yEeJSDZV7Klpk
 ---
 Track: Battle! Wild Encounter
-Directory: battle-wild-encounter-battle-selection
 Originally Released As: track:battle-wild-pokemon-pokemon-unbound
 Duration: '2:24'
 URLs:
@@ -124,7 +118,6 @@ URLs:
 - https://open.spotify.com/track/5dUqayvBgUawvXIoIBZhEH
 ---
 Track: Encounter! Hiker
-Directory: encounter-hiker-battle-selection
 Originally Released As: track:encounter-hiker
 Duration: '0:32'
 URLs:
@@ -133,7 +126,6 @@ URLs:
 - https://open.spotify.com/track/6zgO4ZExoCgDUh7FjsEhdv
 ---
 Track: Battle! Strong Wild Encounter
-Directory: battle-strong-wild-encounter-battle-selection
 Originally Released As: track:battle-strong-wild-pokemon-pokemon-unbound
 Duration: '2:19'
 URLs:
@@ -142,7 +134,6 @@ URLs:
 - https://open.spotify.com/track/3m6hp31uHWBSSNiapWzPCJ
 ---
 Track: Battle! Zeph
-Directory: battle-zeph-battle-selection
 Originally Released As: track:battle-zeph
 Duration: '2:16'
 URLs:
@@ -151,7 +142,6 @@ URLs:
 - https://open.spotify.com/track/08vjs9ODcj78WuPZCQm4NT
 ---
 Track: Encounter! Lass
-Directory: encounter-lass-battle-selection
 Originally Released As: track:encounter-lass
 Duration: '0:43'
 URLs:
@@ -160,7 +150,6 @@ URLs:
 - https://open.spotify.com/track/51RLlVIFJUSaFNPynlp8ml
 ---
 Track: Battle! Trainer
-Directory: battle-trainer-pokemon-unbound-battle-selection
 Originally Released As: track:battle-trainer-pokemon-unbound
 Duration: '3:18'
 URLs:
@@ -169,7 +158,6 @@ URLs:
 - https://open.spotify.com/track/5756YTOJLHzeMOiOoWqKiL
 ---
 Track: Encounter! Fisherman
-Directory: encounter-fisherman-battle-selection
 Originally Released As: track:encounter-fisherman
 Duration: '0:42'
 URLs:
@@ -178,7 +166,6 @@ URLs:
 - https://open.spotify.com/track/4L83QfU1Z2zlq0i5tKKZ3o
 ---
 Track: Battle! Marlon
-Directory: battle-marlon-battle-selection
 Originally Released As: track:battle-marlon
 Duration: '1:58'
 URLs:
@@ -187,7 +174,6 @@ URLs:
 - https://open.spotify.com/track/6SrKk7zS8tNapLnMlo4IGT
 ---
 Track: Battle! Ivory
-Directory: battle-ivory-battle-selection
 Originally Released As: track:battle-ivory
 Duration: '2:00'
 URLs:
@@ -196,7 +182,6 @@ URLs:
 - https://open.spotify.com/track/2AowylWOV9Fu0C6YsjU54X
 ---
 Track: Encounter! Birdkeeper
-Directory: encounter-birdkeeper-battle-selection
 Originally Released As: track:encounter-birdkeeper
 Duration: '0:26'
 URLs:
@@ -205,7 +190,6 @@ URLs:
 - https://open.spotify.com/track/576qTQGE08ILPeIruGXDzx
 ---
 Track: Battle! Gym Leader
-Directory: battle-gym-leader-pokemon-unbound-battle-selection
 Originally Released As: track:battle-gym-leader-pokemon-unbound
 Duration: '2:24'
 URLs:
@@ -214,7 +198,6 @@ URLs:
 - https://open.spotify.com/track/5XHQySQoKxD4u59owVVt5D
 ---
 Track: Encounter! Twins
-Directory: encounter-twins-battle-selection
 Originally Released As: track:encounter-twins
 Duration: '0:30'
 URLs:
@@ -223,7 +206,6 @@ URLs:
 - https://open.spotify.com/track/0OZprJKvR09iBOtTWwxEGJ
 ---
 Track: Black Emboar Appears!
-Directory: black-emboar-appears-battle-selection
 Originally Released As: track:black-emboar-appears
 Duration: '0:21'
 URLs:
@@ -232,7 +214,6 @@ URLs:
 - https://open.spotify.com/track/3pCsfcGy1tf4U98F9532IO
 ---
 Track: Battle! Black Emboar
-Directory: battle-black-emboar-battle-selection
 Originally Released As: track:battle-black-emboar
 Duration: '1:42'
 URLs:
@@ -241,7 +222,6 @@ URLs:
 - https://open.spotify.com/track/7jqYMPJ4PULFdXoMtVeaBq
 ---
 Track: Encounter! Painter
-Directory: encounter-painter-battle-selection
 Originally Released As: track:encounter-painter
 Duration: '0:27'
 URLs:
@@ -250,7 +230,6 @@ URLs:
 - https://open.spotify.com/track/2BzH4caLxMxXwYeAJYlGKJ
 ---
 Track: Terror Granbull Appears!
-Directory: terror-granbull-appears-battle-selection
 Originally Released As: track:terror-granbull-appears
 Duration: '1:32'
 URLs:
@@ -259,7 +238,6 @@ URLs:
 - https://open.spotify.com/track/09yksJ7xc2Y1flZgqMKkCI
 ---
 Track: Battle! Terror Granbull
-Directory: battle-terror-granbull-battle-selection
 Originally Released As: track:battle-terror-granbull
 Duration: '2:23'
 URLs:
@@ -268,7 +246,6 @@ URLs:
 - https://open.spotify.com/track/2OYvuexp912DabbKwOiAeu
 ---
 Track: Encounter! Psychic
-Directory: encounter-psychic-battle-selection
 Originally Released As: track:encounter-psychic
 Duration: '0:55'
 URLs:
@@ -277,7 +254,6 @@ URLs:
 - https://open.spotify.com/track/0aEY9bsQxqAt3hEoMGJYBn
 ---
 Track: Black Ferrothorn Appears!
-Directory: black-ferrothorn-appears-battle-selection
 Originally Released As: track:black-ferrothorn-appears
 Duration: '0:56'
 URLs:
@@ -286,7 +262,6 @@ URLs:
 - https://open.spotify.com/track/3LVyTh7cWR4VqTY3qWjwRf
 ---
 Track: Battle! Black Ferrothorn Goon
-Directory: battle-black-ferrothorn-goon-battle-selection
 Originally Released As: track:battle-black-ferrothorn-goon
 Duration: '3:30'
 URLs:
@@ -295,7 +270,6 @@ URLs:
 - https://open.spotify.com/track/1ZnlFXHce6y3lktbeUmJcu
 ---
 Track: Battle! Barbs
-Directory: battle-barbs-battle-selection
 Originally Released As: track:battle-barbs
 Duration: '2:27'
 URLs:
@@ -304,7 +278,6 @@ URLs:
 - https://open.spotify.com/track/4YS3K2YpVgpemJ99jfxICd
 ---
 Track: Encounter! Aroma Lady
-Directory: encounter-aroma-lady-battle-selection
 Originally Released As: track:encounter-aroma-lady
 Duration: '0:35'
 URLs:
@@ -313,7 +286,6 @@ URLs:
 - https://open.spotify.com/track/0lu5Mmzc44fmXF2QQiH1A2
 ---
 Track: Battle! Successor
-Directory: battle-successor-battle-selection
 Originally Released As: track:battle-successor
 Duration: '1:26'
 URLs:
@@ -322,7 +294,6 @@ URLs:
 - https://open.spotify.com/track/0IMVaKF8kDBdXRabo5bgkQ
 ---
 Track: Encounter! Collector
-Directory: encounter-collector-battle-selection
 Originally Released As: track:encounter-pokemon-collector
 Duration: '0:34'
 URLs:
@@ -331,7 +302,6 @@ URLs:
 - https://open.spotify.com/track/3ApEL2kaCtQ7dWwsmgpCL2
 ---
 Track: Light of Ruin Appears!
-Directory: light-of-ruin-appears-battle-selection
 Originally Released As: track:light-of-ruin-appears
 Duration: '0:42'
 URLs:
@@ -340,7 +310,6 @@ URLs:
 - https://open.spotify.com/track/4abcK7FDvGZQfp0unGjniT
 ---
 Track: Battle! Light of Ruin Grunt
-Directory: battle-light-of-ruin-grunt-battle-selection
 Originally Released As: track:battle-light-of-ruin-grunt
 Duration: '2:13'
 URLs:
@@ -349,7 +318,6 @@ URLs:
 - https://open.spotify.com/track/0zUL05YmT6P5YDuRfo3bB4
 ---
 Track: Victory Against Light of Ruin!
-Directory: victory-against-light-of-ruin-battle-selection
 Originally Released As: track:victory-against-light-of-ruin
 Duration: '0:28'
 URLs:
@@ -358,7 +326,6 @@ URLs:
 - https://open.spotify.com/track/2lC9mABrHlA3aQSFVUYchh
 ---
 Track: Battle! Aklove
-Directory: battle-aklove-battle-selection
 Originally Released As: track:battle-aklove
 Duration: '3:31'
 URLs:
@@ -367,7 +334,6 @@ URLs:
 - https://open.spotify.com/track/4D2zpB6KHKu0G6xMZjUrVC
 ---
 Track: Encounter! Hoopa
-Directory: encounter-hoopa-battle-selection
 Originally Released As: track:encounter-hoopa
 Duration: '0:25'
 URLs:
@@ -376,7 +342,6 @@ URLs:
 - https://open.spotify.com/track/6aY6Jk5yS07sunQZjLnjQZ
 ---
 Track: Battle! Hoopa
-Directory: battle-hoopa-battle-selection
 Originally Released As: track:battle-hoopa
 Duration: '2:30'
 URLs:
@@ -385,7 +350,6 @@ URLs:
 - https://open.spotify.com/track/5K9OTivCWLAd0i3eHa3Q19
 ---
 Track: Science Society Appears!
-Directory: science-society-appears-battle-selection
 Originally Released As: track:science-society-appears
 Duration: '0:27'
 URLs:
@@ -394,7 +358,6 @@ URLs:
 - https://open.spotify.com/track/7IUk24Q7mHCkOZZJt6TRyb
 ---
 Track: Battle! Science Society Scientist
-Directory: battle-science-society-scientist-battle-selection
 Originally Released As: track:battle-science-society-scientist
 Duration: '2:10'
 URLs:
@@ -403,7 +366,6 @@ URLs:
 - https://open.spotify.com/track/504FvBr8ZqxZO9B44Q17fD
 ---
 Track: Battle! Fey
-Directory: battle-fey-battle-selection
 Originally Released As: track:battle-fey
 Duration: '2:17'
 URLs:
@@ -412,7 +374,6 @@ URLs:
 - https://open.spotify.com/track/4JdWGH5peEQDDigfWt1Xri
 ---
 Track: Black Horizon Appears!
-Directory: black-horizon-appears-battle-selection
 Originally Released As: track:black-horizon-appears
 Duration: '0:43'
 URLs:
@@ -421,7 +382,6 @@ URLs:
 - https://open.spotify.com/track/6EybLXFabjSFk8hiqqeLDT
 ---
 Track: Battle! Black Horizon Goon
-Directory: battle-black-horizon-goon-battle-selection
 Originally Released As: track:battle-black-horizon-goon
 Duration: '2:30'
 URLs:
@@ -430,7 +390,6 @@ URLs:
 - https://open.spotify.com/track/18wgyVAHftR38BOKtcaRrI
 ---
 Track: Battle! Black Horizon Boss
-Directory: battle-black-horizon-boss-battle-selection
 Originally Released As: track:battle-black-horizon-boss
 Duration: '2:44'
 URLs:
@@ -439,7 +398,6 @@ URLs:
 - https://open.spotify.com/track/0sSpQGosJvE5arBpuZsqMr
 ---
 Track: Encounter! Ace Trainer
-Directory: encounter-ace-trainer-battle-selection
 Originally Released As: track:encounter-ace-trainer
 Duration: '0:28'
 URLs:
@@ -448,7 +406,6 @@ URLs:
 - https://open.spotify.com/track/1YbY7u66ZfzLGOKjyUpWZm
 ---
 Track: Elite 4 Appears!
-Directory: elite-4-appears-battle-selection
 Originally Released As: track:elite-4-appears
 Duration: '0:42'
 URLs:
@@ -457,7 +414,6 @@ URLs:
 - https://open.spotify.com/track/7qdgArvR9HEjyx4NfaAJ2m
 ---
 Track: Battle! Elite 4
-Directory: battle-elite-4-battle-selection
 Originally Released As: track:battle-elite-4
 Duration: '2:15'
 URLs:
@@ -466,7 +422,6 @@ URLs:
 - https://open.spotify.com/track/00baoZjMJ4xnJGsRg1Tk7p
 ---
 Track: Victory Against Elite 4!
-Directory: victory-against-elite-4-battle-selection
 Originally Released As: track:victory-against-elite-4
 Duration: '0:40'
 URLs:
@@ -475,7 +430,6 @@ URLs:
 - https://open.spotify.com/track/6nY6LMgRmtfuST4P3JSfPm
 ---
 Track: Encounter! Jax
-Directory: encounter-jax-battle-selection
 Originally Released As: track:encounter-jax
 Duration: '0:42'
 URLs:
@@ -484,7 +438,6 @@ URLs:
 - https://open.spotify.com/track/46KWOoVFswvFxD0dubagn3
 ---
 Track: Battle! Jax
-Directory: battle-jax-battle-selection
 Originally Released As: track:battle-jax
 Duration: '2:04'
 URLs:
@@ -493,7 +446,6 @@ URLs:
 - https://open.spotify.com/track/7rpvkLhdVRJ5hmW48vOJmT
 ---
 Track: Victory! Champion Title Match
-Directory: victory-champion-title-match-battle-selection
 Originally Released As: track:victory-champion-title-match
 Duration: '0:27'
 URLs:
diff --git a/album/unbound-day-selection-original-soundtrack.yaml b/album/unbound-day-selection-original-soundtrack.yaml
index 8599abe9..8fedb3a6 100644
--- a/album/unbound-day-selection-original-soundtrack.yaml
+++ b/album/unbound-day-selection-original-soundtrack.yaml
@@ -1,5 +1,6 @@
 Album: 'Unbound: Day Selection (Original Soundtrack)'
-Directory: unbound-day-selection-original-soundtrack
+Directory Suffix: day-selection
+Suffix Track Directories: true
 Date: August 11, 2024
 #Date Added: October 4, 2024
 URLs:
@@ -61,7 +62,6 @@ Commentary: |-
     Criminon
 ---
 Track: Skeli Games Logo
-Directory: skeli-games-logo-day-selection
 Originally Released As: track:skeli-games-logo
 Duration: '0:10'
 URLs:
@@ -69,7 +69,6 @@ URLs:
 - https://open.spotify.com/track/0njfL7JrEjb3Wvk2PMFpsC
 ---
 Track: Borrian History
-Directory: borrian-history-day-selection
 Originally Released As: track:borrian-history
 Duration: '1:13'
 URLs:
@@ -77,7 +76,6 @@ URLs:
 - https://open.spotify.com/track/1kGO7VP33aDMyua1B89Ybu
 ---
 Track: Shadow Base
-Directory: shadow-base-day-selection
 Originally Released As: track:shadow-base
 Duration: '0:56'
 URLs:
@@ -85,7 +83,6 @@ URLs:
 - https://open.spotify.com/track/6s6BJRbKTnRB8J8RJeFbpE
 ---
 Track: Frozen Heights (Day)
-Directory: frozen-heights-day-day-selection
 Originally Released As: track:frozen-heights-day
 Duration: '0:59'
 URLs:
@@ -93,7 +90,6 @@ URLs:
 - https://open.spotify.com/track/6AbPxl2lHKJUeKPEJAozkr
 ---
 Track: Professor Log
-Directory: professor-log-day-selection
 Originally Released As: track:professor-log
 Duration: '0:34'
 URLs:
@@ -101,7 +97,6 @@ URLs:
 - https://open.spotify.com/track/65tvOJcaplUAeBpJHVH5v9
 ---
 Track: Professor Log's Lab
-Directory: professor-logs-lab-day-selection
 Originally Released As: track:professor-logs-lab
 Duration: '0:49'
 URLs:
@@ -109,7 +104,6 @@ URLs:
 - https://open.spotify.com/track/6aFlQI26REREENZLjsybh4
 ---
 Track: Route 1
-Directory: route-1-pokemon-unbound-day-selection
 Originally Released As: track:route-1-pokemon-unbound
 Duration: '1:03'
 URLs:
@@ -117,7 +111,6 @@ URLs:
 - https://open.spotify.com/track/7HxFUD5YxoCRDCYQEtoQM0
 ---
 Track: Bellin Town (Day)
-Directory: bellin-town-day-day-selection
 Originally Released As: track:bellin-town-day
 Duration: '0:52'
 URLs:
@@ -125,7 +118,6 @@ URLs:
 - https://open.spotify.com/track/0KgOwcUSI6UajNaQ3EuqxM
 ---
 Track: Icicle Cave
-Directory: icicle-cave-day-selection
 Originally Released As: track:icicle-cave
 Duration: '1:07'
 URLs:
@@ -133,7 +125,6 @@ URLs:
 - https://open.spotify.com/track/36OFeTXXdeiFojCeUJTGzh
 ---
 Track: Route 2
-Directory: route-2-pokemon-unbound-day-selection
 Originally Released As: track:route-2-pokemon-unbound
 Duration: '0:50'
 URLs:
@@ -141,7 +132,6 @@ URLs:
 - https://open.spotify.com/track/3LeEkWuY0MNxUMFlq7Y44y
 ---
 Track: Dresco Town (Day)
-Directory: dresco-town-day-day-selection
 Originally Released As: track:dresco-town-day
 Duration: '1:02'
 URLs:
@@ -149,7 +139,6 @@ URLs:
 - https://open.spotify.com/track/6QH1O6yJPUtgnmzJ6zQTYV
 ---
 Track: Route 3
-Directory: route-3-pokemon-unbound-day-selection
 Originally Released As: track:route-3-pokemon-unbound
 Duration: '0:58'
 URLs:
@@ -157,7 +146,6 @@ URLs:
 - https://open.spotify.com/track/4K4ockJKa5leJlv5uDAprc
 ---
 Track: Flower Paradise
-Directory: flower-paradise-day-selection
 Originally Released As: track:flower-paradise
 Duration: '1:09'
 URLs:
@@ -165,7 +153,6 @@ URLs:
 - https://open.spotify.com/track/2hG9eeIAA3a0g9yGSPotXU
 ---
 Track: Grim Woods
-Directory: grim-woods-day-selection
 Originally Released As: track:grim-woods
 Duration: '1:28'
 URLs:
@@ -173,7 +160,6 @@ URLs:
 - https://open.spotify.com/track/0IlRrcZUJag6C6t6ew665y
 ---
 Track: Cinder Volcano
-Directory: cinder-volcano-day-selection
 Originally Released As: track:cinder-volcano
 Duration: '1:20'
 URLs:
@@ -181,7 +167,6 @@ URLs:
 - https://open.spotify.com/track/7Dvva2Dr2sNnAnHiNTqqXU
 ---
 Track: Route 4 & 5
-Directory: route-4-and-5-day-selection
 Originally Released As: track:route-4-and-5
 Duration: '1:07'
 URLs:
@@ -189,7 +174,6 @@ URLs:
 - https://open.spotify.com/track/5IFaYqG9O6DDkyMnVZ35yR
 ---
 Track: Crater Town (Day)
-Directory: crater-town-day-day-selection
 Originally Released As: track:crater-town-day
 Duration: '0:56'
 URLs:
@@ -197,7 +181,6 @@ URLs:
 - https://open.spotify.com/track/1xI2dqbxAMdH8XEz0A6rCJ
 ---
 Track: KBT Expressway
-Directory: kbt-expressway-day-selection
 Originally Released As: track:kbt-expressway
 Duration: '1:02'
 URLs:
@@ -205,7 +188,6 @@ URLs:
 - https://open.spotify.com/track/3gMLjXkt6klun9EthXWk5W
 ---
 Track: Valley Cave
-Directory: valley-cave-day-selection
 Originally Released As: track:valley-cave
 Duration: '0:58'
 URLs:
@@ -213,7 +195,6 @@ URLs:
 - https://open.spotify.com/track/2xNKbLiZMHmENOJ0Q3ODln
 ---
 Track: Route 6 & 7
-Directory: route-6-and-7-day-selection
 Originally Released As: track:route-6-and-7
 Duration: '0:56'
 URLs:
@@ -221,7 +202,6 @@ URLs:
 - https://open.spotify.com/track/6EHsu9YCbUhNaLDErWqZJz
 ---
 Track: Frost Mt.
-Directory: frost-mt-day-selection
 Originally Released As: track:frost-mt
 Duration: '1:36'
 URLs:
@@ -229,7 +209,6 @@ URLs:
 - https://open.spotify.com/track/0MpUv9N429tBwFKRAqzswA
 ---
 Track: Route 8
-Directory: route-8-pokemon-unbound-day-selection
 Originally Released As: track:route-8-pokemon-unbound
 Duration: '1:05'
 URLs:
@@ -237,7 +216,6 @@ URLs:
 - https://open.spotify.com/track/0LwvprZY6cqHVyflBnwTyY
 ---
 Track: Blizzard City (Day)
-Directory: blizzard-city-day-day-selection
 Originally Released As: track:blizzard-city-day
 Duration: '1:24'
 URLs:
@@ -245,7 +223,6 @@ URLs:
 - https://open.spotify.com/track/4kwNyrJWR1H9vImlKORo89
 ---
 Track: Fallshore City (Day)
-Directory: fallshore-city-day-day-selection
 Originally Released As: track:fallshore-city-day
 Duration: '1:13'
 URLs:
@@ -253,7 +230,6 @@ URLs:
 - https://open.spotify.com/track/3XchJYuzyGWNRUzmiEPDpf
 ---
 Track: Auburn Waterway
-Directory: auburn-waterway-day-selection
 Originally Released As: track:auburn-waterway
 Duration: '2:00'
 URLs:
@@ -261,7 +237,6 @@ URLs:
 - https://open.spotify.com/track/44LjueGuw2l8tDGRngxLDQ
 ---
 Track: Tehl Town (Day)
-Directory: tehl-town-day-day-selection
 Originally Released As: track:tehl-town-day
 Duration: '1:00'
 URLs:
@@ -269,7 +244,6 @@ URLs:
 - https://open.spotify.com/track/6JwTW8psA1SNFzhV5N2n0x
 ---
 Track: Underground Path
-Directory: underground-path-pokemon-unbound-day-selection
 Originally Released As: track:underground-path-pokemon-unbound
 Duration: '1:01'
 URLs:
@@ -277,7 +251,6 @@ URLs:
 - https://open.spotify.com/track/5Bab4TI3xvuRBTYaAE8baP
 ---
 Track: Route 11
-Directory: route-11-pokemon-unbound-day-selection
 Originally Released As: track:route-11-pokemon-unbound
 Duration: '1:08'
 URLs:
@@ -285,7 +258,6 @@ URLs:
 - https://open.spotify.com/track/4aYNQHNqFSPqEqT8S6gzHD
 ---
 Track: Epidimy Town (Day)
-Directory: epidimy-town-day-day-selection
 Originally Released As: track:epidimy-town-day
 Duration: '0:54'
 URLs:
@@ -293,7 +265,6 @@ URLs:
 - https://open.spotify.com/track/7nuUGZrVAqHE4g7mOamavN
 ---
 Track: Tarmigan Town (Day)
-Directory: tarmigan-town-day-day-selection
 Originally Released As: track:tarmigan-town-day
 Duration: '0:58'
 URLs:
@@ -301,7 +272,6 @@ URLs:
 - https://open.spotify.com/track/7bFd8OtoPouanYzTsPC2P7
 ---
 Track: Tarmigan Mansion
-Directory: tarmigan-mansion-day-selection
 Originally Released As: track:tarmigan-mansion
 Duration: '0:58'
 URLs:
@@ -309,7 +279,6 @@ URLs:
 - https://open.spotify.com/track/5hvTLJB4Y8xjUzkuy6dcKp
 ---
 Track: The Shadows at Thundercap Mt.
-Directory: the-shadows-at-thundercap-mt-day-selection
 Originally Released As: track:the-shadows-at-thundercap-mt
 Duration: '1:06'
 URLs:
@@ -317,7 +286,6 @@ URLs:
 - https://open.spotify.com/track/0ClwwBMnGDWeMH4c7ot6rC
 ---
 Track: Route 12 & 18
-Directory: route-12-and-18-day-selection
 Originally Released As: track:route-12-and-18
 Duration: '1:10'
 URLs:
@@ -325,7 +293,6 @@ URLs:
 - https://open.spotify.com/track/4wHVOysLcTHvUbtgpOEUt1
 ---
 Track: Dehara City (Day)
-Directory: dehara-city-day-day-selection
 Originally Released As: track:dehara-city-day
 Duration: '1:09'
 URLs:
@@ -333,7 +300,6 @@ URLs:
 - https://open.spotify.com/track/2SfZN89WTePsSE5oP6iu95
 ---
 Track: Happening at the Ruins of Void
-Directory: happening-at-the-ruins-of-void-day-selection
 Originally Released As: track:happening-at-the-ruins-of-void
 Duration: '1:01'
 URLs:
@@ -341,7 +307,6 @@ URLs:
 - https://open.spotify.com/track/4jGZ2iVlSGtzikW6ogIGZB
 ---
 Track: Cube Space
-Directory: cube-space-day-selection
 Originally Released As: track:cube-space
 Duration: '1:12'
 URLs:
@@ -349,7 +314,6 @@ URLs:
 - https://open.spotify.com/track/06GdGRGKq9BcpjfVhhB0kY
 ---
 Track: An Emotional Moment
-Directory: an-emotional-moment-day-selection
 Originally Released As: track:an-emotional-moment
 Duration: '0:58'
 URLs:
@@ -357,7 +321,6 @@ URLs:
 - https://open.spotify.com/track/62L4uAyLYnT9mH3bCedtVh
 ---
 Track: The Great Desert
-Directory: the-great-desert-day-selection
 Originally Released As: track:the-great-desert
 Duration: '1:13'
 URLs:
@@ -365,7 +328,6 @@ URLs:
 - https://open.spotify.com/track/5eV7PV9gIWeXTDI1pOT6D3
 ---
 Track: Gurun Town (Day)
-Directory: gurun-town-day-day-selection
 Originally Released As: track:gurun-town-day
 Duration: '1:05'
 URLs:
@@ -373,7 +335,6 @@ URLs:
 - https://open.spotify.com/track/3pMZAGVD5d9yrRVKVeb5Di
 ---
 Track: Vivill Town in Peril
-Directory: vivill-town-in-peril-day-selection
 Originally Released As: track:vivill-town-in-peril
 Duration: '1:04'
 URLs:
@@ -381,7 +342,6 @@ URLs:
 - https://open.spotify.com/track/6hB92114xuItPmJuNGAPtL
 ---
 Track: Vivill Town Warehouse Ambushed!
-Directory: vivill-town-warehouse-ambushed-day-selection
 Originally Released As: track:vivill-town-warehouse-ambushed
 Duration: '1:00'
 URLs:
@@ -389,7 +349,6 @@ URLs:
 - https://open.spotify.com/track/3mXhy9wS94iymfj7xZEcvh
 ---
 Track: Route 16 & 17
-Directory: route-16-and-17-day-selection
 Originally Released As: track:route-16-and-17
 Duration: '0:54'
 URLs:
@@ -397,7 +356,6 @@ URLs:
 - https://open.spotify.com/track/6JSZY70y7B43YhvovzDHmb
 ---
 Track: Antisis City (Day)
-Directory: antisis-city-day-day-selection
 Originally Released As: track:antisis-city-day
 Duration: '1:15'
 URLs:
@@ -405,7 +363,6 @@ URLs:
 - https://open.spotify.com/track/12GvztsvstZwcTBVVc2VzJ
 ---
 Track: Seaport City (Day)
-Directory: seaport-city-day-day-selection
 Originally Released As: track:seaport-city-day
 Duration: '1:11'
 URLs:
@@ -413,7 +370,6 @@ URLs:
 - https://open.spotify.com/track/5qjbrelzepC9aisGpzl1jz
 ---
 Track: Polder Town (Day)
-Directory: polder-town-day-day-selection
 Originally Released As: track:polder-town-day
 Duration: '1:04'
 URLs:
@@ -421,7 +377,6 @@ URLs:
 - https://open.spotify.com/track/26hyQhEhqVEspVr6baUjOU
 ---
 Track: Cootes Bog
-Directory: cootes-bog-day-selection
 Originally Released As: track:cootes-bog
 Duration: '1:44'
 URLs:
@@ -429,7 +384,6 @@ URLs:
 - https://open.spotify.com/track/5SSC2upliz3XhfPbDlSI4v
 ---
 Track: Magnolia Town (Day)
-Directory: magnolia-town-day-day-selection
 Originally Released As: track:magnolia-town-day
 Duration: '1:48'
 URLs:
@@ -437,7 +391,6 @@ URLs:
 - https://open.spotify.com/track/1vpPepNPvpHlaIsk4981Ii
 ---
 Track: Rush to the Top of Crystal Peak!
-Directory: rush-to-the-top-of-crystal-peak-day-selection
 Originally Released As: track:rush-to-the-top-of-crystal-peak
 Duration: '1:58'
 URLs:
@@ -445,7 +398,6 @@ URLs:
 - https://open.spotify.com/track/2IdoHBVkoLpuqzwA2O3wHK
 ---
 Track: Magnolia Fields
-Directory: magnolia-fields-day-selection
 Originally Released As: track:magnolia-fields
 Duration: '1:18'
 URLs:
@@ -453,7 +405,6 @@ URLs:
 - https://open.spotify.com/track/0wFQt9W9m37YTIm8s2SBem
 ---
 Track: Redwood Village (Day)
-Directory: redwood-village-day-day-selection
 Originally Released As: track:redwood-village-day
 Duration: '1:19'
 URLs:
diff --git a/album/undertale-soundtrack.yaml b/album/undertale-soundtrack.yaml
index 24a728fc..a74c77f3 100644
--- a/album/undertale-soundtrack.yaml
+++ b/album/undertale-soundtrack.yaml
@@ -1,4 +1,5 @@
 Album: UNDERTALE Soundtrack
+Directory Suffix: undertale
 Artists:
 - Toby Fox
 Date: September 15, 2015
@@ -61,7 +62,7 @@ URLs:
 - https://open.spotify.com/track/6gJTgSwOw2TqAPCnk2gTlk
 ---
 Track: Fallen Down
-Directory: fallen-down-undertale
+Suffix Directory: true
 Duration: 0:57
 Sampled Tracks:
 - track:fallen-down
@@ -77,7 +78,7 @@ Commentary: |-
     Someone recently asked me how I create songs that fit the characters and scenarios in the game so perfectly. Well, given the fact that some of them weren't created for UNDERTALE... I actually think I'm just good at using the fact that the human mind loves to make associations. Whatever you hear first in a scenario will be the thing that "fits."
 ---
 Track: Ruins
-Directory: ruins-undertale
+Suffix Directory: true
 Duration: '1:32'
 URLs:
 - https://tobyfox.bandcamp.com/track/ruins-2
@@ -129,7 +130,7 @@ URLs:
 - https://open.spotify.com/track/3KHbBpwYdlM6uKJirvCrEA
 ---
 Track: Home
-Directory: home-undertale
+Suffix Directory: true
 Duration: '2:03'
 URLs:
 - https://tobyfox.bandcamp.com/track/home-2
@@ -235,7 +236,7 @@ Commentary: |-
     I really liked playing this one on the piano. Whenever I played it my mom would get it stuck in her head and whistle it. So I'm quite proud of it.
 ---
 Track: Shop
-Directory: shop-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:50
 URLs:
@@ -281,7 +282,7 @@ Referenced Tracks:
 - Snowdin Town
 ---
 Track: Premonition
-Directory: premonition-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:01'
 URLs:
@@ -335,7 +336,7 @@ Referenced Tracks:
 - track:ruins-undertale
 ---
 Track: Memory
-Directory: memory-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:15'
 URLs:
@@ -383,7 +384,7 @@ Referenced Tracks:
 - Ghost Fight
 ---
 Track: Spooktune
-Directory: spooktune-undertale
+Suffix Directory: true
 Duration: 0:23
 URLs:
 - https://tobyfox.bandcamp.com/track/spooktune
@@ -409,7 +410,7 @@ Referenced Tracks:
 - The One Horse Open Sleigh
 ---
 Track: Chill
-Directory: chill-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:56
 URLs:
@@ -522,7 +523,7 @@ Referenced Tracks:
 - Enemy Approaching
 ---
 Track: Hotel
-Directory: hotel-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:27'
 URLs:
@@ -543,7 +544,7 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: Confession
-Directory: confession-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:42
 URLs:
@@ -720,7 +721,7 @@ URLs:
 - https://open.spotify.com/track/7g2vS40kPg9PVMc8muxzBb
 ---
 Track: Barrier
-Directory: barrier-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: 0:31
 URLs:
@@ -769,7 +770,7 @@ Referenced Tracks:
 - Terezi's Theme
 ---
 Track: Finale
-Directory: finale-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:52'
 URLs:
@@ -884,7 +885,7 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: Reunited
-Directory: reunited-undertale
+Suffix Directory: true
 Duration: '4:44'
 URLs:
 - https://www.youtube.com/watch?v=8K0npQ--ACw
@@ -903,7 +904,7 @@ Referenced Tracks:
 - Once Upon a Time
 ---
 Track: Respite
-Directory: respite-undertale
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '1:54'
 URLs:
@@ -965,7 +966,7 @@ Referenced Tracks:
 - Battle Against a True Hero
 ---
 Track: MEGALOVANIA
-Directory: megalovania-undertale
+Suffix Directory: true
 Duration: '2:36'
 URLs:
 - https://www.youtube.com/watch?v=c5daGZ96QGU
diff --git a/album/unknown-diva.yaml b/album/unknown-diva.yaml
index 41caa025..0d7a5c2d 100644
--- a/album/unknown-diva.yaml
+++ b/album/unknown-diva.yaml
@@ -1,5 +1,4 @@
 Album: Unknown DIVA
-Directory: unknown-diva
 Artists:
 - Amane Kanata
 Date: March 13, 2024
@@ -21,7 +20,7 @@ Wallpaper Artists:
 - Oshioshio (supervision)
 ---
 Track: Oracle
-Directory: oracle-unknown-diva
+Suffix Directory: true
 Always Reference By Directory: true
 Artists:
 - Amane Kanata (vocals)
diff --git a/album/us.yaml b/album/us.yaml
index f91f0c58..62ea9abe 100644
--- a/album/us.yaml
+++ b/album/us.yaml
@@ -36,7 +36,7 @@ URLs:
 - https://iodbc.bandcamp.com/track/ill-green
 ---
 Track: Solace
-Directory: solace-us
+Suffix Directory: true
 Always Reference By Directory: true
 Duration: '5:04'
 URLs:
diff --git a/album/vast-error-vol-1-3.yaml b/album/vast-error-vol-1-3.yaml
index 761e56f6..34994c6b 100644
--- a/album/vast-error-vol-1-3.yaml
+++ b/album/vast-error-vol-1-3.yaml
@@ -1,4 +1,6 @@
 Album: Vast Error Vol. 1-3
+Directory Suffix: vol-1-3
+Suffix Track Directories: true
 Date: June 1, 2021
 Date Added: August 18, 2023
 Wallpaper Style: 'opacity: 0.85;'
@@ -22,7 +24,6 @@ Groups:
 Section: Main album
 ---
 Track: The Static
-Directory: the-static-vol-1-3
 Originally Released As: The Static
 Cover Artists:
 - Radical Dude 42
@@ -32,7 +33,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=the-static
 ---
 Track: Curtain Call
-Directory: curtain-call-vol-1-3
 Originally Released As: Curtain Call
 Cover Artists:
 - ChasingStarlightz
@@ -42,7 +42,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=curtain-call
 ---
 Track: Blood Right
-Directory: blood-right-vol-1-3
 Originally Released As: Blood Right
 Cover Artists:
 - pavizi
@@ -52,7 +51,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=blood-right
 ---
 Track: Cosmic Significance
-Directory: cosmic-significance-vol-1-3
 Originally Released As: Cosmic Significance
 Cover Artists:
 - Sam Garcia
@@ -62,7 +60,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=cosmic-significance
 ---
 Track: Star Children
-Directory: star-children-vol-1-3
 Originally Released As: Star Children
 Cover Artists:
 - Joyfulldreams
@@ -72,7 +69,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=star-children
 ---
 Track: A New World
-Directory: a-new-world-vol-1-3
 Originally Released As: A New World
 Cover Artists:
 - Captainquestion
@@ -82,7 +78,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=a-new-world
 ---
 Track: Razzmatazz
-Directory: razzmatazz-vol-1-3
 Originally Released As: Razzmatazz
 Cover Artists:
 - Joyfulldreams
@@ -92,7 +87,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=razzmatazz
 ---
 Track: Mammory Master
-Directory: mammory-master-vol-1-3
 Originally Released As: Mammory Master
 Cover Artists:
 - trip
@@ -102,7 +96,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=mammory-master
 ---
 Track: Striving For A Future
-Directory: striving-for-a-future-vol-1-3
 Originally Released As: Striving For A Future
 Cover Artists:
 - Sam Garcia
@@ -114,7 +107,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=striving-for-a-future
 ---
 Track: A Very Active Imagination
-Directory: a-very-active-imagination-vol-1-3
 Originally Released As: A Very Active Imagination
 Cover Artists:
 - Sparaze
@@ -124,7 +116,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=a-very-active-imagination
 ---
 Track: Bias
-Directory: bias-vol-1-3
 Originally Released As: track:bias-vast-error
 Cover Artists:
 - Joyfulldreams
@@ -134,7 +125,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=bias
 ---
 Track: Six By Six
-Directory: six-by-six-vol-1-3
 Originally Released As: Six By Six
 Cover Artists:
 - groeuf
@@ -144,7 +134,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=six-by-six
 ---
 Track: Ferocity Weaving
-Directory: ferocity-weaving-vol-1-3
 Originally Released As: Ferocity Weaving
 Cover Artists:
 - nights
@@ -154,7 +143,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=ferocity-weaving
 ---
 Track: Radioactive Ore
-Directory: radioactive-ore-vol-1-3
 Originally Released As: Radioactive Ore
 Cover Artists:
 - Calicorn
@@ -166,7 +154,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=radioactive-ore
 ---
 Track: Starry Night
-Directory: starry-night-vol-1-3
 Originally Released As: Starry Night
 Cover Artists:
 - ChasingStarlightz
@@ -177,6 +164,8 @@ URLs:
 ---
 Track: Clamor
 Directory: clamor-vast-error
+Suffix Directory: false
+Always Reference By Directory: true
 Artists:
 - Husr
 Cover Artists:
@@ -189,7 +178,6 @@ Referenced Tracks:
 - Sortir
 ---
 Track: Song For The Lost
-Directory: song-for-the-lost-vol-1-3
 Originally Released As: Song For The Lost
 Cover Artists:
 - Radical Dude 42
@@ -199,7 +187,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=song-for-the-lost
 ---
 Track: Woof-
-Directory: woof-vol-1-3
 Originally Released As: Woof-
 Cover Artists:
 - Joyfulldreams
@@ -209,7 +196,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=woof-
 ---
 Track: Sunrise
-Directory: sunrise-vol-1-3
 Originally Released As: track:sunrise-vast-error
 Cover Artists:
 - YoItsCro
@@ -219,7 +205,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=sunrise
 ---
 Track: J-Jitterbug
-Directory: j-jitterbug-vol-1-3
 Originally Released As: J-Jitterbug
 Cover Artists:
 - Chumi
@@ -229,7 +214,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=j-jitterbug
 ---
 Track: Extra Worse
-Directory: extra-worse-vol-1-3
 Originally Released As: Extra Worse
 Cover Artists:
 - Joyfulldreams
@@ -239,7 +223,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=extra-worse
 ---
 Track: On Repeat
-Directory: on-repeat-vol-1-3
 Originally Released As: On Repeat (Intermission)
 Cover Artists:
 - Sparaze
@@ -249,7 +232,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=on-repeat
 ---
 Track: Commercial Break
-Directory: commercial-break-vol-1-3
 Originally Released As: Commercial Break
 Cover Artists:
 - Calicorn
@@ -259,7 +241,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=commercial-break
 ---
 Track: 'INTERMISSION: Beyond The Wall'
-Directory: beyond-the-wall-vol-1-3
 Originally Released As: Beyond the Wall (Intermission)
 Duration: '03:13'
 URLs:
@@ -267,7 +248,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=intermission-beyond-the-wall
 ---
 Track: Third Eye
-Directory: third-eye-vol-1-3
 Originally Released As: Third Eye
 Cover Artists:
 - Sparaze
@@ -279,7 +259,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=third-eye
 ---
 Track: Oversaturated
-Directory: oversaturated-vol-1-3
 Originally Released As: track:oversaturated-vast-error
 Cover Artists:
 - razzberrysheep
@@ -289,7 +268,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=oversaturated
 ---
 Track: Paint The Town Black
-Directory: paint-the-town-black-vol-1-3
 Originally Released As: Paint The Town Black
 Cover Artists:
 - Selan Pike
@@ -299,7 +277,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=paint-the-town-black
 ---
 Track: Final Bow
-Directory: final-bow-vol-1-3
 Originally Released As: Final Bow
 Cover Artists:
 - Cakelets
@@ -309,7 +286,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=final-bow
 ---
 Track: You'd Do It For Randolph Scott
-Directory: youd-do-it-for-randolph-scott-vol-1-3
 Originally Released As: You'd Do It For Randolph Scott
 Cover Artists:
 - Rain847
@@ -319,7 +295,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=youd-do-it-for-randolph-scott
 ---
 Track: Alone In The Rain
-Directory: alone-in-the-rain-vol-1-3
 Originally Released As: Alone In The Rain
 Cover Artists:
 - tamyarts
@@ -329,7 +304,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=alone-in-the-rain
 ---
 Track: Poetic
-Directory: poetic-vol-1-3
 Originally Released As: track:poetic-vast-error
 Cover Artists:
 - groeuf
@@ -339,7 +313,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=poetic
 ---
 Track: Zehanpuryu
-Directory: zehanpuryu-vol-1-3
 Originally Released As: Zehanpuryu
 Cover Artists:
 - Chumi
@@ -349,7 +322,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=zehanpuryu
 ---
 Track: Revelations
-Directory: revelations-vol-1-3
 Originally Released As: track:revelations-vast-error
 Cover Artists:
 - Aeritus
@@ -359,7 +331,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=revelations
 ---
 Track: The Day After Spring Began
-Directory: the-day-after-spring-began-vol-1-3
 Originally Released As: The Day After Spring Began
 Cover Artists:
 - Firewolf
@@ -369,7 +340,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=the-day-after-spring-began
 ---
 Track: Terran Wanderer
-Directory: terran-wanderer-vol-1-3
 Originally Released As: Terran Wanderer
 Cover Artists:
 - Radical Dude 42
@@ -379,7 +349,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=terran-wanderer
 ---
 Track: Invigorated Wasteland
-Directory: invigorated-wasteland-vol-1-3
 Originally Released As: Invigorated Wasteland
 Cover Artists:
 - Cosmic
@@ -389,7 +358,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=invigorated-wasteland
 ---
 Track: Scarred For Life
-Directory: scarred-for-life-vol-1-3
 Originally Released As: Scarred For Life
 Cover Artists:
 - Aeritus
@@ -399,7 +367,7 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=scarred-for-life
 ---
 Track: Curtain Call (psithurist's "the game isn't sgrub" remix)
-Directory: curtain-call-remix-vol-1-3
+Directory: curtain-call-remix # suffixed
 Originally Released As: Curtain Call (psithurist's "the game isn't sgrub" remix)
 Cover Artists:
 - Radical Dude 42
@@ -409,7 +377,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=curtain-call-psithurists-the-game-isnt-sgrub-remix
 ---
 Track: Polkafighter!
-Directory: polkafighter-vol-1-3
 Originally Released As: Polkafighter!
 Cover Artists:
 - Joyfulldreams
@@ -419,7 +386,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=polkafighter
 ---
 Track: Mantle Piece
-Directory: mantle-piece-vol-1-3
 Originally Released As: Mantle Piece
 Cover Artists:
 - ValkyrieMoon
@@ -429,7 +395,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=mantle-piece
 ---
 Track: Mother Of The Stars
-Directory: mother-of-the-stars-vol-1-3
 Originally Released As: Mother Of The Stars
 Cover Artists:
 - Chumi
@@ -439,7 +404,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=mother-of-the-stars
 ---
 Track: Sickly Green Glow
-Directory: sickly-green-glow-vol-1-3
 Originally Released As: Sickly Green Glow
 Cover Artists:
 - Ephemerald
@@ -449,7 +413,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=sickly-green-glow
 ---
 Track: Waltz In The Static Void
-Directory: waltz-in-the-static-void-vol-1-3
 Originally Released As: Waltz In The Static Void
 Cover Artists:
 - Bluebird
@@ -459,7 +422,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=waltz-in-the-static-void
 ---
 Track: Code Red And Existential Dread
-Directory: code-red-and-existential-dread-vol-1-3
 Originally Released As: Code Red And Existential Dread
 Cover Artists:
 - Gene
@@ -469,7 +431,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=code-red-and-existential-dread
 ---
 Track: Sortir
-Directory: sortir-vol-1-3
 Originally Released As: Sortir
 Cover Artists:
 - Sparaze
@@ -479,7 +440,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=sortir
 ---
 Track: Vast Error
-Directory: vast-error-vol-1-3
 Originally Released As: Vast Error
 Cover Artists:
 - Joyfulldreams
@@ -489,7 +449,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=vast-error
 ---
 Track: Ultima Hoc Fatum
-Directory: ultima-hoc-fatum-vol-1-3
 Originally Released As: Ultima Hoc Fatum
 Cover Artists:
 - Circlejourney
@@ -499,7 +458,6 @@ URLs:
 # - https://music.deconreconstruction.com/albums/vast-error-vol-1-3?track=ultima-hoc-fatum
 ---
 Track: Gone
-Directory: gone-vol-1-3
 Originally Released As: track:gone-vast-error
 Cover Artists:
 - SilentNeptune
@@ -511,7 +469,6 @@ URLs:
 Section: Download-only tracks
 ---
 Track: Sortir (Alpha Demo)
-Directory: sortir-alpha-demo-vol-1-3
 Originally Released As: Sortir (Alpha Demo)
 Cover Artists:
 - Vast Error
@@ -520,7 +477,7 @@ URLs:
 - https://www.youtube.com/watch?v=W1_g9SDfm68
 ---
 Track: Distortion
-Directory: distortion-vast-error-vol-1-3
+Directory: distortion-vast-error # suffixed
 Originally Released As: track:distortion-vast-error
 Duration: '00:02'
 URLs: