diff --git a/songs/blessed-be-your-name/BlessedBeYourName-Tree63-Db.latex b/songs/blessed-be-your-name-tree63/BlessedBeYourName-Tree63-Db.latex
similarity index 100%
rename from songs/blessed-be-your-name/BlessedBeYourName-Tree63-Db.latex
rename to songs/blessed-be-your-name-tree63/BlessedBeYourName-Tree63-Db.latex
diff --git a/songs/blessed-be-your-name/notes.txt b/songs/blessed-be-your-name-tree63/notes.txt
similarity index 100%
rename from songs/blessed-be-your-name/notes.txt
rename to songs/blessed-be-your-name-tree63/notes.txt
diff --git a/songs/defend-us/Defend+Us+Chord+Chart(Original).pdf b/songs/defend-us-jessica-digiovani/Defend+Us+Chord+Chart(Original).pdf
similarity index 100%
rename from songs/defend-us/Defend+Us+Chord+Chart(Original).pdf
rename to songs/defend-us-jessica-digiovani/Defend+Us+Chord+Chart(Original).pdf
diff --git a/songs/defend-us/DefendUs-JessicaDiGiovanni-E.latex b/songs/defend-us-jessica-digiovani/DefendUs-JessicaDiGiovanni-E.latex
similarity index 100%
rename from songs/defend-us/DefendUs-JessicaDiGiovanni-E.latex
rename to songs/defend-us-jessica-digiovani/DefendUs-JessicaDiGiovanni-E.latex
diff --git a/songs/defend-us/notes.txt b/songs/defend-us-jessica-digiovani/notes.txt
similarity index 100%
rename from songs/defend-us/notes.txt
rename to songs/defend-us-jessica-digiovani/notes.txt
diff --git a/songs/healing-is-here/notes.txt b/songs/healing-is-here-deluge/notes.txt
similarity index 100%
rename from songs/healing-is-here/notes.txt
rename to songs/healing-is-here-deluge/notes.txt
diff --git a/songs/holy-spirit/HolySpirit-KariJobe-E.latex b/songs/holy-spirit-kari-jobe/HolySpirit-KariJobe-E.latex
similarity index 100%
rename from songs/holy-spirit/HolySpirit-KariJobe-E.latex
rename to songs/holy-spirit-kari-jobe/HolySpirit-KariJobe-E.latex
diff --git a/songs/holy-spirit/notes.txt b/songs/holy-spirit-kari-jobe/notes.txt
similarity index 100%
rename from songs/holy-spirit/notes.txt
rename to songs/holy-spirit-kari-jobe/notes.txt
diff --git a/songs/i-will-bless-the-lord/IWillBlessTheLord-EddieJames-F.latex b/songs/i-will-bless-the-lord-eddie-james/IWillBlessTheLord-EddieJames-F.latex
similarity index 100%
rename from songs/i-will-bless-the-lord/IWillBlessTheLord-EddieJames-F.latex
rename to songs/i-will-bless-the-lord-eddie-james/IWillBlessTheLord-EddieJames-F.latex