From b87a797b3902d5413807f61b0b7b3463688c06a9 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Sun, 24 Dec 2017 08:22:41 +0000 Subject: [PATCH] Move song test resource files --- .../chordpro}/swing-low.chordpro | 0 .../chordpro}/swing-low.json | 0 .../easyslides}/Amazing Grace.json | 0 .../easyslides}/Export_2017-01-12_BB.json | 0 .../easyslides}/Export_2017-01-12_BB.xml | 0 .../easyslides}/amazing-grace.xml | 0 .../easyworship}/Songs.DB | Bin .../easyworship}/Songs.MB | Bin .../easyworship}/ew6/Databases/Data/SongWords.db | Bin .../easyworship}/ew6/Databases/Data/Songs.db | Bin .../easyworship}/test1.ews | Bin .../resources/{lyrixsongs => songs/lyrix}/A002.TXT | 0 tests/resources/{lyrixsongs => songs/lyrix}/A06.TXT | 0 .../resources/{lyrixsongs => songs/lyrix}/AO05.TXT | 0 .../{lyrixsongs => songs/lyrix}/Amazing Grace.json | 0 .../{lyrixsongs => songs/lyrix}/Amazing Grace2.json | 0 .../lyrix}/in die regterhand.json | 0 .../openlyrics}/What a friend we have in Jesus.xml | 0 .../openlyrics}/duchu-tags.xml | 0 .../{opensongsongs => songs/opensong}/Amazing Grace | 0 .../opensong}/Amazing Grace with bad CCLI | 0 .../opensong}/Amazing Grace without CCLI.json | 0 .../opensong}/Amazing Grace.json | 0 .../opensong}/Amazing Grace2 | 0 .../opensong}/Beautiful Garden Of Prayer | 0 .../opensong}/Beautiful Garden Of Prayer.json | 0 .../opensong}/One, Two, Three, Four, Five | 0 .../opensong}/One, Two, Three, Four, Five.json | 0 .../opspro}/Amazing Grace.json | 0 .../opspro}/Amazing Grace3.json | 0 .../opspro}/You are so faithful.json | 0 .../{opsprosongs => songs/opspro}/amazing grace.txt | 0 .../opspro}/amazing grace2.txt | 0 .../opspro}/amazing grace3.txt | 0 .../opspro}/you are so faithfull.txt | 0 .../powerpraise}/Naher, mein Gott zu Dir.json | 0 .../powerpraise}/Naher, mein Gott zu Dir.ppl | 0 .../powerpraise}/You are so faithful.json | 0 .../powerpraise}/You are so faithful.ppl | 0 .../presentationmanager}/Amazing Grace.json | 0 .../presentationmanager}/Amazing Grace.sng | Bin .../Great Is Thy Faithfulness.json | 0 .../Great Is Thy Faithfulness.sng | 0 .../propresenter}/Amazing Grace.json | 0 .../propresenter}/Amazing Grace.pro4 | 0 .../propresenter}/Amazing Grace.pro5 | 0 .../propresenter}/Amazing Grace.pro6 | 0 .../songbeamer}/Amazing Grace.json | 0 .../songbeamer}/Amazing Grace.sng | 0 .../songbeamer}/Lobsinget dem Herrn.json | 0 .../songbeamer}/Lobsinget dem Herrn.sng | 0 .../songbeamer}/When I Call On You.json | 0 .../songbeamer}/When I Call On You.sng | 0 .../songbeamer}/cp1252song.json | 0 .../songbeamer}/cp1252song.sng | 0 .../songpro}/Amazing Grace.json | 0 .../songpro}/amazing-grace.txt | 0 .../songshowplus}/Amazing Grace.json | 0 .../songshowplus}/Amazing Grace.sbsong | Bin .../songshowplus}/Beautiful Garden Of Prayer.json | 0 .../songshowplus}/Beautiful Garden Of Prayer.sbsong | Bin .../songshowplus}/a mighty fortress is our god.json | 0 .../a mighty fortress is our god.sbsong | Bin .../songshowplus}/cleanse-me.json | 0 .../songshowplus}/cleanse-me.sbsong | Bin .../sundayplus}/Amazing Grace.json | 0 .../sundayplus}/Amazing Grace.ptf | 0 .../videopsalm}/as-safe-a-stronghold.json | 0 .../videopsalm}/as-safe-a-stronghold2.json | 0 .../videopsalm-as-safe-a-stronghold.json | 0 .../videopsalm-as-safe-a-stronghold2.json | 0 .../wordsofworship}/Amazing Grace (6 Verses).json | 0 .../Amazing Grace (6 Verses).wow-song | Bin .../Holy Holy Holy Lord God Almighty.json | 0 .../Holy Holy Holy Lord God Almighty.wow-song | Bin .../When morning gilds the skies.json | 0 .../When morning gilds the skies.wsg | Bin .../worshipassistant}/du_herr.csv | 0 .../worshipassistant}/du_herr.json | 0 .../worshipassistant}/would_you_be_free.csv | 0 .../worshipassistant}/would_you_be_free.json | 0 .../worshipassistant}/would_you_be_free2.csv | 0 .../{zionworxsongs => songs/zionworx}/zionworx.csv | 0 .../{zionworxsongs => songs/zionworx}/zionworx.json | 0 84 files changed, 0 insertions(+), 0 deletions(-) rename tests/resources/{chordprosongs => songs/chordpro}/swing-low.chordpro (100%) rename tests/resources/{chordprosongs => songs/chordpro}/swing-low.json (100%) rename tests/resources/{easyslidessongs => songs/easyslides}/Amazing Grace.json (100%) rename tests/resources/{easyslidessongs => songs/easyslides}/Export_2017-01-12_BB.json (100%) rename tests/resources/{easyslidessongs => songs/easyslides}/Export_2017-01-12_BB.xml (100%) rename tests/resources/{easyslidessongs => songs/easyslides}/amazing-grace.xml (100%) rename tests/resources/{easyworshipsongs => songs/easyworship}/Songs.DB (100%) rename tests/resources/{easyworshipsongs => songs/easyworship}/Songs.MB (100%) rename tests/resources/{easyworshipsongs => songs/easyworship}/ew6/Databases/Data/SongWords.db (100%) rename tests/resources/{easyworshipsongs => songs/easyworship}/ew6/Databases/Data/Songs.db (100%) rename tests/resources/{easyworshipsongs => songs/easyworship}/test1.ews (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/A002.TXT (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/A06.TXT (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/AO05.TXT (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/Amazing Grace.json (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/Amazing Grace2.json (100%) rename tests/resources/{lyrixsongs => songs/lyrix}/in die regterhand.json (100%) rename tests/resources/{openlyricssongs => songs/openlyrics}/What a friend we have in Jesus.xml (100%) rename tests/resources/{openlyricssongs => songs/openlyrics}/duchu-tags.xml (100%) rename tests/resources/{opensongsongs => songs/opensong}/Amazing Grace (100%) rename tests/resources/{opensongsongs => songs/opensong}/Amazing Grace with bad CCLI (100%) rename tests/resources/{opensongsongs => songs/opensong}/Amazing Grace without CCLI.json (100%) rename tests/resources/{opensongsongs => songs/opensong}/Amazing Grace.json (100%) rename tests/resources/{opensongsongs => songs/opensong}/Amazing Grace2 (100%) rename tests/resources/{opensongsongs => songs/opensong}/Beautiful Garden Of Prayer (100%) rename tests/resources/{opensongsongs => songs/opensong}/Beautiful Garden Of Prayer.json (100%) rename tests/resources/{opensongsongs => songs/opensong}/One, Two, Three, Four, Five (100%) rename tests/resources/{opensongsongs => songs/opensong}/One, Two, Three, Four, Five.json (100%) rename tests/resources/{opsprosongs => songs/opspro}/Amazing Grace.json (100%) rename tests/resources/{opsprosongs => songs/opspro}/Amazing Grace3.json (100%) rename tests/resources/{opsprosongs => songs/opspro}/You are so faithful.json (100%) rename tests/resources/{opsprosongs => songs/opspro}/amazing grace.txt (100%) rename tests/resources/{opsprosongs => songs/opspro}/amazing grace2.txt (100%) rename tests/resources/{opsprosongs => songs/opspro}/amazing grace3.txt (100%) rename tests/resources/{opsprosongs => songs/opspro}/you are so faithfull.txt (100%) rename tests/resources/{powerpraisesongs => songs/powerpraise}/Naher, mein Gott zu Dir.json (100%) rename tests/resources/{powerpraisesongs => songs/powerpraise}/Naher, mein Gott zu Dir.ppl (100%) rename tests/resources/{powerpraisesongs => songs/powerpraise}/You are so faithful.json (100%) rename tests/resources/{powerpraisesongs => songs/powerpraise}/You are so faithful.ppl (100%) rename tests/resources/{presentationmanagersongs => songs/presentationmanager}/Amazing Grace.json (100%) rename tests/resources/{presentationmanagersongs => songs/presentationmanager}/Amazing Grace.sng (100%) rename tests/resources/{presentationmanagersongs => songs/presentationmanager}/Great Is Thy Faithfulness.json (100%) rename tests/resources/{presentationmanagersongs => songs/presentationmanager}/Great Is Thy Faithfulness.sng (100%) rename tests/resources/{propresentersongs => songs/propresenter}/Amazing Grace.json (100%) rename tests/resources/{propresentersongs => songs/propresenter}/Amazing Grace.pro4 (100%) rename tests/resources/{propresentersongs => songs/propresenter}/Amazing Grace.pro5 (100%) rename tests/resources/{propresentersongs => songs/propresenter}/Amazing Grace.pro6 (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/Amazing Grace.json (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/Amazing Grace.sng (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/Lobsinget dem Herrn.json (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/Lobsinget dem Herrn.sng (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/When I Call On You.json (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/When I Call On You.sng (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/cp1252song.json (100%) rename tests/resources/{songbeamersongs => songs/songbeamer}/cp1252song.sng (100%) rename tests/resources/{songprosongs => songs/songpro}/Amazing Grace.json (100%) rename tests/resources/{songprosongs => songs/songpro}/amazing-grace.txt (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/Amazing Grace.json (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/Amazing Grace.sbsong (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/Beautiful Garden Of Prayer.json (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/Beautiful Garden Of Prayer.sbsong (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/a mighty fortress is our god.json (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/a mighty fortress is our god.sbsong (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/cleanse-me.json (100%) rename tests/resources/{songshowplussongs => songs/songshowplus}/cleanse-me.sbsong (100%) rename tests/resources/{sundayplussongs => songs/sundayplus}/Amazing Grace.json (100%) rename tests/resources/{sundayplussongs => songs/sundayplus}/Amazing Grace.ptf (100%) rename tests/resources/{videopsalmsongs => songs/videopsalm}/as-safe-a-stronghold.json (100%) rename tests/resources/{videopsalmsongs => songs/videopsalm}/as-safe-a-stronghold2.json (100%) rename tests/resources/{videopsalmsongs => songs/videopsalm}/videopsalm-as-safe-a-stronghold.json (100%) rename tests/resources/{videopsalmsongs => songs/videopsalm}/videopsalm-as-safe-a-stronghold2.json (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/Amazing Grace (6 Verses).json (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/Amazing Grace (6 Verses).wow-song (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/Holy Holy Holy Lord God Almighty.json (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/Holy Holy Holy Lord God Almighty.wow-song (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/When morning gilds the skies.json (100%) rename tests/resources/{wordsofworshipsongs => songs/wordsofworship}/When morning gilds the skies.wsg (100%) rename tests/resources/{worshipassistantsongs => songs/worshipassistant}/du_herr.csv (100%) rename tests/resources/{worshipassistantsongs => songs/worshipassistant}/du_herr.json (100%) rename tests/resources/{worshipassistantsongs => songs/worshipassistant}/would_you_be_free.csv (100%) rename tests/resources/{worshipassistantsongs => songs/worshipassistant}/would_you_be_free.json (100%) rename tests/resources/{worshipassistantsongs => songs/worshipassistant}/would_you_be_free2.csv (100%) rename tests/resources/{zionworxsongs => songs/zionworx}/zionworx.csv (100%) rename tests/resources/{zionworxsongs => songs/zionworx}/zionworx.json (100%) diff --git a/tests/resources/chordprosongs/swing-low.chordpro b/tests/resources/songs/chordpro/swing-low.chordpro similarity index 100% rename from tests/resources/chordprosongs/swing-low.chordpro rename to tests/resources/songs/chordpro/swing-low.chordpro diff --git a/tests/resources/chordprosongs/swing-low.json b/tests/resources/songs/chordpro/swing-low.json similarity index 100% rename from tests/resources/chordprosongs/swing-low.json rename to tests/resources/songs/chordpro/swing-low.json diff --git a/tests/resources/easyslidessongs/Amazing Grace.json b/tests/resources/songs/easyslides/Amazing Grace.json similarity index 100% rename from tests/resources/easyslidessongs/Amazing Grace.json rename to tests/resources/songs/easyslides/Amazing Grace.json diff --git a/tests/resources/easyslidessongs/Export_2017-01-12_BB.json b/tests/resources/songs/easyslides/Export_2017-01-12_BB.json similarity index 100% rename from tests/resources/easyslidessongs/Export_2017-01-12_BB.json rename to tests/resources/songs/easyslides/Export_2017-01-12_BB.json diff --git a/tests/resources/easyslidessongs/Export_2017-01-12_BB.xml b/tests/resources/songs/easyslides/Export_2017-01-12_BB.xml similarity index 100% rename from tests/resources/easyslidessongs/Export_2017-01-12_BB.xml rename to tests/resources/songs/easyslides/Export_2017-01-12_BB.xml diff --git a/tests/resources/easyslidessongs/amazing-grace.xml b/tests/resources/songs/easyslides/amazing-grace.xml similarity index 100% rename from tests/resources/easyslidessongs/amazing-grace.xml rename to tests/resources/songs/easyslides/amazing-grace.xml diff --git a/tests/resources/easyworshipsongs/Songs.DB b/tests/resources/songs/easyworship/Songs.DB similarity index 100% rename from tests/resources/easyworshipsongs/Songs.DB rename to tests/resources/songs/easyworship/Songs.DB diff --git a/tests/resources/easyworshipsongs/Songs.MB b/tests/resources/songs/easyworship/Songs.MB similarity index 100% rename from tests/resources/easyworshipsongs/Songs.MB rename to tests/resources/songs/easyworship/Songs.MB diff --git a/tests/resources/easyworshipsongs/ew6/Databases/Data/SongWords.db b/tests/resources/songs/easyworship/ew6/Databases/Data/SongWords.db similarity index 100% rename from tests/resources/easyworshipsongs/ew6/Databases/Data/SongWords.db rename to tests/resources/songs/easyworship/ew6/Databases/Data/SongWords.db diff --git a/tests/resources/easyworshipsongs/ew6/Databases/Data/Songs.db b/tests/resources/songs/easyworship/ew6/Databases/Data/Songs.db similarity index 100% rename from tests/resources/easyworshipsongs/ew6/Databases/Data/Songs.db rename to tests/resources/songs/easyworship/ew6/Databases/Data/Songs.db diff --git a/tests/resources/easyworshipsongs/test1.ews b/tests/resources/songs/easyworship/test1.ews similarity index 100% rename from tests/resources/easyworshipsongs/test1.ews rename to tests/resources/songs/easyworship/test1.ews diff --git a/tests/resources/lyrixsongs/A002.TXT b/tests/resources/songs/lyrix/A002.TXT similarity index 100% rename from tests/resources/lyrixsongs/A002.TXT rename to tests/resources/songs/lyrix/A002.TXT diff --git a/tests/resources/lyrixsongs/A06.TXT b/tests/resources/songs/lyrix/A06.TXT similarity index 100% rename from tests/resources/lyrixsongs/A06.TXT rename to tests/resources/songs/lyrix/A06.TXT diff --git a/tests/resources/lyrixsongs/AO05.TXT b/tests/resources/songs/lyrix/AO05.TXT similarity index 100% rename from tests/resources/lyrixsongs/AO05.TXT rename to tests/resources/songs/lyrix/AO05.TXT diff --git a/tests/resources/lyrixsongs/Amazing Grace.json b/tests/resources/songs/lyrix/Amazing Grace.json similarity index 100% rename from tests/resources/lyrixsongs/Amazing Grace.json rename to tests/resources/songs/lyrix/Amazing Grace.json diff --git a/tests/resources/lyrixsongs/Amazing Grace2.json b/tests/resources/songs/lyrix/Amazing Grace2.json similarity index 100% rename from tests/resources/lyrixsongs/Amazing Grace2.json rename to tests/resources/songs/lyrix/Amazing Grace2.json diff --git a/tests/resources/lyrixsongs/in die regterhand.json b/tests/resources/songs/lyrix/in die regterhand.json similarity index 100% rename from tests/resources/lyrixsongs/in die regterhand.json rename to tests/resources/songs/lyrix/in die regterhand.json diff --git a/tests/resources/openlyricssongs/What a friend we have in Jesus.xml b/tests/resources/songs/openlyrics/What a friend we have in Jesus.xml similarity index 100% rename from tests/resources/openlyricssongs/What a friend we have in Jesus.xml rename to tests/resources/songs/openlyrics/What a friend we have in Jesus.xml diff --git a/tests/resources/openlyricssongs/duchu-tags.xml b/tests/resources/songs/openlyrics/duchu-tags.xml similarity index 100% rename from tests/resources/openlyricssongs/duchu-tags.xml rename to tests/resources/songs/openlyrics/duchu-tags.xml diff --git a/tests/resources/opensongsongs/Amazing Grace b/tests/resources/songs/opensong/Amazing Grace similarity index 100% rename from tests/resources/opensongsongs/Amazing Grace rename to tests/resources/songs/opensong/Amazing Grace diff --git a/tests/resources/opensongsongs/Amazing Grace with bad CCLI b/tests/resources/songs/opensong/Amazing Grace with bad CCLI similarity index 100% rename from tests/resources/opensongsongs/Amazing Grace with bad CCLI rename to tests/resources/songs/opensong/Amazing Grace with bad CCLI diff --git a/tests/resources/opensongsongs/Amazing Grace without CCLI.json b/tests/resources/songs/opensong/Amazing Grace without CCLI.json similarity index 100% rename from tests/resources/opensongsongs/Amazing Grace without CCLI.json rename to tests/resources/songs/opensong/Amazing Grace without CCLI.json diff --git a/tests/resources/opensongsongs/Amazing Grace.json b/tests/resources/songs/opensong/Amazing Grace.json similarity index 100% rename from tests/resources/opensongsongs/Amazing Grace.json rename to tests/resources/songs/opensong/Amazing Grace.json diff --git a/tests/resources/opensongsongs/Amazing Grace2 b/tests/resources/songs/opensong/Amazing Grace2 similarity index 100% rename from tests/resources/opensongsongs/Amazing Grace2 rename to tests/resources/songs/opensong/Amazing Grace2 diff --git a/tests/resources/opensongsongs/Beautiful Garden Of Prayer b/tests/resources/songs/opensong/Beautiful Garden Of Prayer similarity index 100% rename from tests/resources/opensongsongs/Beautiful Garden Of Prayer rename to tests/resources/songs/opensong/Beautiful Garden Of Prayer diff --git a/tests/resources/opensongsongs/Beautiful Garden Of Prayer.json b/tests/resources/songs/opensong/Beautiful Garden Of Prayer.json similarity index 100% rename from tests/resources/opensongsongs/Beautiful Garden Of Prayer.json rename to tests/resources/songs/opensong/Beautiful Garden Of Prayer.json diff --git a/tests/resources/opensongsongs/One, Two, Three, Four, Five b/tests/resources/songs/opensong/One, Two, Three, Four, Five similarity index 100% rename from tests/resources/opensongsongs/One, Two, Three, Four, Five rename to tests/resources/songs/opensong/One, Two, Three, Four, Five diff --git a/tests/resources/opensongsongs/One, Two, Three, Four, Five.json b/tests/resources/songs/opensong/One, Two, Three, Four, Five.json similarity index 100% rename from tests/resources/opensongsongs/One, Two, Three, Four, Five.json rename to tests/resources/songs/opensong/One, Two, Three, Four, Five.json diff --git a/tests/resources/opsprosongs/Amazing Grace.json b/tests/resources/songs/opspro/Amazing Grace.json similarity index 100% rename from tests/resources/opsprosongs/Amazing Grace.json rename to tests/resources/songs/opspro/Amazing Grace.json diff --git a/tests/resources/opsprosongs/Amazing Grace3.json b/tests/resources/songs/opspro/Amazing Grace3.json similarity index 100% rename from tests/resources/opsprosongs/Amazing Grace3.json rename to tests/resources/songs/opspro/Amazing Grace3.json diff --git a/tests/resources/opsprosongs/You are so faithful.json b/tests/resources/songs/opspro/You are so faithful.json similarity index 100% rename from tests/resources/opsprosongs/You are so faithful.json rename to tests/resources/songs/opspro/You are so faithful.json diff --git a/tests/resources/opsprosongs/amazing grace.txt b/tests/resources/songs/opspro/amazing grace.txt similarity index 100% rename from tests/resources/opsprosongs/amazing grace.txt rename to tests/resources/songs/opspro/amazing grace.txt diff --git a/tests/resources/opsprosongs/amazing grace2.txt b/tests/resources/songs/opspro/amazing grace2.txt similarity index 100% rename from tests/resources/opsprosongs/amazing grace2.txt rename to tests/resources/songs/opspro/amazing grace2.txt diff --git a/tests/resources/opsprosongs/amazing grace3.txt b/tests/resources/songs/opspro/amazing grace3.txt similarity index 100% rename from tests/resources/opsprosongs/amazing grace3.txt rename to tests/resources/songs/opspro/amazing grace3.txt diff --git a/tests/resources/opsprosongs/you are so faithfull.txt b/tests/resources/songs/opspro/you are so faithfull.txt similarity index 100% rename from tests/resources/opsprosongs/you are so faithfull.txt rename to tests/resources/songs/opspro/you are so faithfull.txt diff --git a/tests/resources/powerpraisesongs/Naher, mein Gott zu Dir.json b/tests/resources/songs/powerpraise/Naher, mein Gott zu Dir.json similarity index 100% rename from tests/resources/powerpraisesongs/Naher, mein Gott zu Dir.json rename to tests/resources/songs/powerpraise/Naher, mein Gott zu Dir.json diff --git a/tests/resources/powerpraisesongs/Naher, mein Gott zu Dir.ppl b/tests/resources/songs/powerpraise/Naher, mein Gott zu Dir.ppl similarity index 100% rename from tests/resources/powerpraisesongs/Naher, mein Gott zu Dir.ppl rename to tests/resources/songs/powerpraise/Naher, mein Gott zu Dir.ppl diff --git a/tests/resources/powerpraisesongs/You are so faithful.json b/tests/resources/songs/powerpraise/You are so faithful.json similarity index 100% rename from tests/resources/powerpraisesongs/You are so faithful.json rename to tests/resources/songs/powerpraise/You are so faithful.json diff --git a/tests/resources/powerpraisesongs/You are so faithful.ppl b/tests/resources/songs/powerpraise/You are so faithful.ppl similarity index 100% rename from tests/resources/powerpraisesongs/You are so faithful.ppl rename to tests/resources/songs/powerpraise/You are so faithful.ppl diff --git a/tests/resources/presentationmanagersongs/Amazing Grace.json b/tests/resources/songs/presentationmanager/Amazing Grace.json similarity index 100% rename from tests/resources/presentationmanagersongs/Amazing Grace.json rename to tests/resources/songs/presentationmanager/Amazing Grace.json diff --git a/tests/resources/presentationmanagersongs/Amazing Grace.sng b/tests/resources/songs/presentationmanager/Amazing Grace.sng similarity index 100% rename from tests/resources/presentationmanagersongs/Amazing Grace.sng rename to tests/resources/songs/presentationmanager/Amazing Grace.sng diff --git a/tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.json b/tests/resources/songs/presentationmanager/Great Is Thy Faithfulness.json similarity index 100% rename from tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.json rename to tests/resources/songs/presentationmanager/Great Is Thy Faithfulness.json diff --git a/tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.sng b/tests/resources/songs/presentationmanager/Great Is Thy Faithfulness.sng similarity index 100% rename from tests/resources/presentationmanagersongs/Great Is Thy Faithfulness.sng rename to tests/resources/songs/presentationmanager/Great Is Thy Faithfulness.sng diff --git a/tests/resources/propresentersongs/Amazing Grace.json b/tests/resources/songs/propresenter/Amazing Grace.json similarity index 100% rename from tests/resources/propresentersongs/Amazing Grace.json rename to tests/resources/songs/propresenter/Amazing Grace.json diff --git a/tests/resources/propresentersongs/Amazing Grace.pro4 b/tests/resources/songs/propresenter/Amazing Grace.pro4 similarity index 100% rename from tests/resources/propresentersongs/Amazing Grace.pro4 rename to tests/resources/songs/propresenter/Amazing Grace.pro4 diff --git a/tests/resources/propresentersongs/Amazing Grace.pro5 b/tests/resources/songs/propresenter/Amazing Grace.pro5 similarity index 100% rename from tests/resources/propresentersongs/Amazing Grace.pro5 rename to tests/resources/songs/propresenter/Amazing Grace.pro5 diff --git a/tests/resources/propresentersongs/Amazing Grace.pro6 b/tests/resources/songs/propresenter/Amazing Grace.pro6 similarity index 100% rename from tests/resources/propresentersongs/Amazing Grace.pro6 rename to tests/resources/songs/propresenter/Amazing Grace.pro6 diff --git a/tests/resources/songbeamersongs/Amazing Grace.json b/tests/resources/songs/songbeamer/Amazing Grace.json similarity index 100% rename from tests/resources/songbeamersongs/Amazing Grace.json rename to tests/resources/songs/songbeamer/Amazing Grace.json diff --git a/tests/resources/songbeamersongs/Amazing Grace.sng b/tests/resources/songs/songbeamer/Amazing Grace.sng similarity index 100% rename from tests/resources/songbeamersongs/Amazing Grace.sng rename to tests/resources/songs/songbeamer/Amazing Grace.sng diff --git a/tests/resources/songbeamersongs/Lobsinget dem Herrn.json b/tests/resources/songs/songbeamer/Lobsinget dem Herrn.json similarity index 100% rename from tests/resources/songbeamersongs/Lobsinget dem Herrn.json rename to tests/resources/songs/songbeamer/Lobsinget dem Herrn.json diff --git a/tests/resources/songbeamersongs/Lobsinget dem Herrn.sng b/tests/resources/songs/songbeamer/Lobsinget dem Herrn.sng similarity index 100% rename from tests/resources/songbeamersongs/Lobsinget dem Herrn.sng rename to tests/resources/songs/songbeamer/Lobsinget dem Herrn.sng diff --git a/tests/resources/songbeamersongs/When I Call On You.json b/tests/resources/songs/songbeamer/When I Call On You.json similarity index 100% rename from tests/resources/songbeamersongs/When I Call On You.json rename to tests/resources/songs/songbeamer/When I Call On You.json diff --git a/tests/resources/songbeamersongs/When I Call On You.sng b/tests/resources/songs/songbeamer/When I Call On You.sng similarity index 100% rename from tests/resources/songbeamersongs/When I Call On You.sng rename to tests/resources/songs/songbeamer/When I Call On You.sng diff --git a/tests/resources/songbeamersongs/cp1252song.json b/tests/resources/songs/songbeamer/cp1252song.json similarity index 100% rename from tests/resources/songbeamersongs/cp1252song.json rename to tests/resources/songs/songbeamer/cp1252song.json diff --git a/tests/resources/songbeamersongs/cp1252song.sng b/tests/resources/songs/songbeamer/cp1252song.sng similarity index 100% rename from tests/resources/songbeamersongs/cp1252song.sng rename to tests/resources/songs/songbeamer/cp1252song.sng diff --git a/tests/resources/songprosongs/Amazing Grace.json b/tests/resources/songs/songpro/Amazing Grace.json similarity index 100% rename from tests/resources/songprosongs/Amazing Grace.json rename to tests/resources/songs/songpro/Amazing Grace.json diff --git a/tests/resources/songprosongs/amazing-grace.txt b/tests/resources/songs/songpro/amazing-grace.txt similarity index 100% rename from tests/resources/songprosongs/amazing-grace.txt rename to tests/resources/songs/songpro/amazing-grace.txt diff --git a/tests/resources/songshowplussongs/Amazing Grace.json b/tests/resources/songs/songshowplus/Amazing Grace.json similarity index 100% rename from tests/resources/songshowplussongs/Amazing Grace.json rename to tests/resources/songs/songshowplus/Amazing Grace.json diff --git a/tests/resources/songshowplussongs/Amazing Grace.sbsong b/tests/resources/songs/songshowplus/Amazing Grace.sbsong similarity index 100% rename from tests/resources/songshowplussongs/Amazing Grace.sbsong rename to tests/resources/songs/songshowplus/Amazing Grace.sbsong diff --git a/tests/resources/songshowplussongs/Beautiful Garden Of Prayer.json b/tests/resources/songs/songshowplus/Beautiful Garden Of Prayer.json similarity index 100% rename from tests/resources/songshowplussongs/Beautiful Garden Of Prayer.json rename to tests/resources/songs/songshowplus/Beautiful Garden Of Prayer.json diff --git a/tests/resources/songshowplussongs/Beautiful Garden Of Prayer.sbsong b/tests/resources/songs/songshowplus/Beautiful Garden Of Prayer.sbsong similarity index 100% rename from tests/resources/songshowplussongs/Beautiful Garden Of Prayer.sbsong rename to tests/resources/songs/songshowplus/Beautiful Garden Of Prayer.sbsong diff --git a/tests/resources/songshowplussongs/a mighty fortress is our god.json b/tests/resources/songs/songshowplus/a mighty fortress is our god.json similarity index 100% rename from tests/resources/songshowplussongs/a mighty fortress is our god.json rename to tests/resources/songs/songshowplus/a mighty fortress is our god.json diff --git a/tests/resources/songshowplussongs/a mighty fortress is our god.sbsong b/tests/resources/songs/songshowplus/a mighty fortress is our god.sbsong similarity index 100% rename from tests/resources/songshowplussongs/a mighty fortress is our god.sbsong rename to tests/resources/songs/songshowplus/a mighty fortress is our god.sbsong diff --git a/tests/resources/songshowplussongs/cleanse-me.json b/tests/resources/songs/songshowplus/cleanse-me.json similarity index 100% rename from tests/resources/songshowplussongs/cleanse-me.json rename to tests/resources/songs/songshowplus/cleanse-me.json diff --git a/tests/resources/songshowplussongs/cleanse-me.sbsong b/tests/resources/songs/songshowplus/cleanse-me.sbsong similarity index 100% rename from tests/resources/songshowplussongs/cleanse-me.sbsong rename to tests/resources/songs/songshowplus/cleanse-me.sbsong diff --git a/tests/resources/sundayplussongs/Amazing Grace.json b/tests/resources/songs/sundayplus/Amazing Grace.json similarity index 100% rename from tests/resources/sundayplussongs/Amazing Grace.json rename to tests/resources/songs/sundayplus/Amazing Grace.json diff --git a/tests/resources/sundayplussongs/Amazing Grace.ptf b/tests/resources/songs/sundayplus/Amazing Grace.ptf similarity index 100% rename from tests/resources/sundayplussongs/Amazing Grace.ptf rename to tests/resources/songs/sundayplus/Amazing Grace.ptf diff --git a/tests/resources/videopsalmsongs/as-safe-a-stronghold.json b/tests/resources/songs/videopsalm/as-safe-a-stronghold.json similarity index 100% rename from tests/resources/videopsalmsongs/as-safe-a-stronghold.json rename to tests/resources/songs/videopsalm/as-safe-a-stronghold.json diff --git a/tests/resources/videopsalmsongs/as-safe-a-stronghold2.json b/tests/resources/songs/videopsalm/as-safe-a-stronghold2.json similarity index 100% rename from tests/resources/videopsalmsongs/as-safe-a-stronghold2.json rename to tests/resources/songs/videopsalm/as-safe-a-stronghold2.json diff --git a/tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json b/tests/resources/songs/videopsalm/videopsalm-as-safe-a-stronghold.json similarity index 100% rename from tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json rename to tests/resources/songs/videopsalm/videopsalm-as-safe-a-stronghold.json diff --git a/tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json b/tests/resources/songs/videopsalm/videopsalm-as-safe-a-stronghold2.json similarity index 100% rename from tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json rename to tests/resources/songs/videopsalm/videopsalm-as-safe-a-stronghold2.json diff --git a/tests/resources/wordsofworshipsongs/Amazing Grace (6 Verses).json b/tests/resources/songs/wordsofworship/Amazing Grace (6 Verses).json similarity index 100% rename from tests/resources/wordsofworshipsongs/Amazing Grace (6 Verses).json rename to tests/resources/songs/wordsofworship/Amazing Grace (6 Verses).json diff --git a/tests/resources/wordsofworshipsongs/Amazing Grace (6 Verses).wow-song b/tests/resources/songs/wordsofworship/Amazing Grace (6 Verses).wow-song similarity index 100% rename from tests/resources/wordsofworshipsongs/Amazing Grace (6 Verses).wow-song rename to tests/resources/songs/wordsofworship/Amazing Grace (6 Verses).wow-song diff --git a/tests/resources/wordsofworshipsongs/Holy Holy Holy Lord God Almighty.json b/tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty.json similarity index 100% rename from tests/resources/wordsofworshipsongs/Holy Holy Holy Lord God Almighty.json rename to tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty.json diff --git a/tests/resources/wordsofworshipsongs/Holy Holy Holy Lord God Almighty.wow-song b/tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty.wow-song similarity index 100% rename from tests/resources/wordsofworshipsongs/Holy Holy Holy Lord God Almighty.wow-song rename to tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty.wow-song diff --git a/tests/resources/wordsofworshipsongs/When morning gilds the skies.json b/tests/resources/songs/wordsofworship/When morning gilds the skies.json similarity index 100% rename from tests/resources/wordsofworshipsongs/When morning gilds the skies.json rename to tests/resources/songs/wordsofworship/When morning gilds the skies.json diff --git a/tests/resources/wordsofworshipsongs/When morning gilds the skies.wsg b/tests/resources/songs/wordsofworship/When morning gilds the skies.wsg similarity index 100% rename from tests/resources/wordsofworshipsongs/When morning gilds the skies.wsg rename to tests/resources/songs/wordsofworship/When morning gilds the skies.wsg diff --git a/tests/resources/worshipassistantsongs/du_herr.csv b/tests/resources/songs/worshipassistant/du_herr.csv similarity index 100% rename from tests/resources/worshipassistantsongs/du_herr.csv rename to tests/resources/songs/worshipassistant/du_herr.csv diff --git a/tests/resources/worshipassistantsongs/du_herr.json b/tests/resources/songs/worshipassistant/du_herr.json similarity index 100% rename from tests/resources/worshipassistantsongs/du_herr.json rename to tests/resources/songs/worshipassistant/du_herr.json diff --git a/tests/resources/worshipassistantsongs/would_you_be_free.csv b/tests/resources/songs/worshipassistant/would_you_be_free.csv similarity index 100% rename from tests/resources/worshipassistantsongs/would_you_be_free.csv rename to tests/resources/songs/worshipassistant/would_you_be_free.csv diff --git a/tests/resources/worshipassistantsongs/would_you_be_free.json b/tests/resources/songs/worshipassistant/would_you_be_free.json similarity index 100% rename from tests/resources/worshipassistantsongs/would_you_be_free.json rename to tests/resources/songs/worshipassistant/would_you_be_free.json diff --git a/tests/resources/worshipassistantsongs/would_you_be_free2.csv b/tests/resources/songs/worshipassistant/would_you_be_free2.csv similarity index 100% rename from tests/resources/worshipassistantsongs/would_you_be_free2.csv rename to tests/resources/songs/worshipassistant/would_you_be_free2.csv diff --git a/tests/resources/zionworxsongs/zionworx.csv b/tests/resources/songs/zionworx/zionworx.csv similarity index 100% rename from tests/resources/zionworxsongs/zionworx.csv rename to tests/resources/songs/zionworx/zionworx.csv diff --git a/tests/resources/zionworxsongs/zionworx.json b/tests/resources/songs/zionworx/zionworx.json similarity index 100% rename from tests/resources/zionworxsongs/zionworx.json rename to tests/resources/songs/zionworx/zionworx.json