diff --git a/tests/functional/openlp_core/ui/test_thememanager.py b/tests/functional/openlp_core/ui/test_thememanager.py
index 79d467583..1347fc73b 100644
--- a/tests/functional/openlp_core/ui/test_thememanager.py
+++ b/tests/functional/openlp_core/ui/test_thememanager.py
@@ -34,7 +34,7 @@ from openlp.core.common.registry import Registry
 from openlp.core.common.path import Path
 from openlp.core.ui import ThemeManager
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 
 
 class TestThemeManager(TestCase):
@@ -60,7 +60,7 @@ class TestThemeManager(TestCase):
         """
         # GIVEN: A new ThemeManager instance.
         theme_manager = ThemeManager()
-        theme_manager.theme_path = Path(TEST_RESOURCES_PATH, 'themes')
+        theme_manager.theme_path = RESOURCE_PATH / 'themes'
         mocked_zipfile_init.return_value = None
 
         # WHEN: The theme is exported
@@ -68,7 +68,7 @@ class TestThemeManager(TestCase):
 
         # THEN: The zipfile should be created at the given path
         mocked_zipfile_init.assert_called_with(os.path.join('some', 'path', 'Default.otz'), 'w')
-        mocked_zipfile_write.assert_called_with(os.path.join(TEST_RESOURCES_PATH, 'themes', 'Default', 'Default.xml'),
+        mocked_zipfile_write.assert_called_with(str(RESOURCE_PATH / 'themes' / 'Default' / 'Default.xml'),
                                                 os.path.join('Default', 'Default.xml'))
 
     def test_initial_theme_manager(self):
@@ -100,8 +100,8 @@ class TestThemeManager(TestCase):
         mocked_theme.extract_formatted_xml.return_value = 'fake_theme_xml'.encode()
 
         # WHEN: Calling _write_theme with path to the same image, but the path written slightly different
-        file_name1 = Path(TEST_RESOURCES_PATH, 'church.jpg')
-        theme_manager._write_theme(mocked_theme, file_name1, file_name1)
+        file_path_1 = RESOURCE_PATH / 'church.jpg'
+        theme_manager._write_theme(mocked_theme, file_path_1, file_path_1)
 
         # THEN: The mocked_copyfile should not have been called
         assert mocked_copyfile.called is False, 'copyfile should not be called'
@@ -123,9 +123,9 @@ class TestThemeManager(TestCase):
         mocked_theme.filename = "filename"
 
         # WHEN: Calling _write_theme with path to different images
-        file_name1 = Path(TEST_RESOURCES_PATH, 'church.jpg')
-        file_name2 = Path(TEST_RESOURCES_PATH, 'church2.jpg')
-        theme_manager._write_theme(mocked_theme, file_name1, file_name2)
+        file_path_1 = RESOURCE_PATH / 'church.jpg'
+        file_path_2 = RESOURCE_PATH / 'church2.jpg'
+        theme_manager._write_theme(mocked_theme, file_path_1, file_path_2)
 
         # THEN: The mocked_copyfile should not have been called
         assert mocked_copyfile.called is True, 'copyfile should be called'
@@ -200,10 +200,10 @@ class TestThemeManager(TestCase):
             theme_manager.generate_and_save_image = MagicMock()
             theme_manager.theme_path = None
             folder_path = Path(mkdtemp())
-            theme_file = Path(TEST_RESOURCES_PATH, 'themes', 'Moss_on_tree.otz')
+            theme_file_path = RESOURCE_PATH / 'themes' / 'Moss_on_tree.otz'
 
             # WHEN: We try to unzip it
-            theme_manager.unzip_theme(theme_file, folder_path)
+            theme_manager.unzip_theme(theme_file_path, folder_path)
 
             # THEN: Files should be unpacked
             assert (folder_path / 'Moss on tree' / 'Moss on tree.xml').exists() is True
diff --git a/tests/functional/openlp_plugins/presentations/test_impresscontroller.py b/tests/functional/openlp_plugins/presentations/test_impresscontroller.py
index 9a124921d..66839a183 100644
--- a/tests/functional/openlp_plugins/presentations/test_impresscontroller.py
+++ b/tests/functional/openlp_plugins/presentations/test_impresscontroller.py
@@ -32,7 +32,7 @@ from openlp.core.common.path import Path
 from openlp.plugins.presentations.lib.impresscontroller import ImpressController, ImpressDocument, TextType
 from openlp.plugins.presentations.presentationplugin import __default_settings__
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 
@@ -134,7 +134,7 @@ class TestImpressDocument(TestCase):
         mocked_plugin = MagicMock()
         mocked_plugin.settings_section = 'presentations'
         Settings().extend_default_settings(__default_settings__)
-        self.file_name = Path(TEST_RESOURCES_PATH, 'presentations', 'test.pptx')
+        self.file_name = RESOURCE_PATH / 'presentations' / 'test.pptx'
         self.ppc = ImpressController(mocked_plugin)
         self.doc = ImpressDocument(self.ppc, self.file_name)
 
diff --git a/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py b/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
index 12e64334e..1ba777cad 100644
--- a/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
+++ b/tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
@@ -35,7 +35,7 @@ from openlp.core.common.settings import Settings
 from openlp.core.common.path import Path
 from openlp.core.display.screens import ScreenList
 
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {
@@ -99,7 +99,7 @@ class TestPdfController(TestCase, TestMixin):
         Test loading of a Pdf using the PdfController
         """
         # GIVEN: A Pdf-file
-        test_file = Path(TEST_RESOURCES_PATH, 'presentations', 'pdf_test1.pdf')
+        test_file_path = RESOURCE_PATH / 'presentations' / 'pdf_test1.pdf'
 
         # WHEN: The Pdf is loaded
         controller = PdfController(plugin=self.mock_plugin)
@@ -107,7 +107,7 @@ class TestPdfController(TestCase, TestMixin):
             raise SkipTest('Could not detect mudraw or ghostscript, so skipping PDF test')
         controller.temp_folder = self.temp_folder_path
         controller.thumbnail_folder = self.thumbnail_folder_path
-        document = PdfDocument(controller, test_file)
+        document = PdfDocument(controller, test_file_path)
         loaded = document.load_presentation()
 
         # THEN: The load should succeed and we should be able to get a pagecount
@@ -119,7 +119,7 @@ class TestPdfController(TestCase, TestMixin):
         Test loading of a Pdf and check size of generate pictures
         """
         # GIVEN: A Pdf-file
-        test_file = Path(TEST_RESOURCES_PATH, 'presentations', 'pdf_test1.pdf')
+        test_file_path = RESOURCE_PATH / 'presentations' / 'pdf_test1.pdf'
 
         # WHEN: The Pdf is loaded
         controller = PdfController(plugin=self.mock_plugin)
@@ -127,7 +127,7 @@ class TestPdfController(TestCase, TestMixin):
             raise SkipTest('Could not detect mudraw or ghostscript, so skipping PDF test')
         controller.temp_folder = self.temp_folder_path
         controller.thumbnail_folder = self.thumbnail_folder_path
-        document = PdfDocument(controller, test_file)
+        document = PdfDocument(controller, test_file_path)
         loaded = document.load_presentation()
 
         # THEN: The load should succeed and pictures should be created and have been scales to fit the screen
diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
index 0546b8a93..6f8b4bb60 100644
--- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
+++ b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py
@@ -32,7 +32,7 @@ from openlp.core.common import is_win
 from openlp.core.common.path import Path
 
 from tests.helpers.testmixin import TestMixin
-from tests.utils.constants import TEST_RESOURCES_PATH
+from tests.utils.constants import RESOURCE_PATH
 
 
 class TestPptviewController(TestCase, TestMixin):
@@ -172,7 +172,7 @@ class TestPptviewDocument(TestCase):
         """
         # GIVEN: mocked PresentationController.save_titles_and_notes and a pptx file
         doc = PptviewDocument(self.mock_controller, self.mock_presentation)
-        doc.file_path = Path(TEST_RESOURCES_PATH, 'presentations', 'test.pptx')
+        doc.file_path = RESOURCE_PATH / 'presentations' / 'test.pptx'
         doc.save_titles_and_notes = MagicMock()
 
         # WHEN reading the titles and notes
@@ -216,7 +216,7 @@ class TestPptviewDocument(TestCase):
             mocked_is_zf.return_value = False
             mocked_open.filesize = 10
             doc = PptviewDocument(self.mock_controller, self.mock_presentation)
-            doc.file_path = Path(TEST_RESOURCES_PATH, 'presentations', 'test.ppt')
+            doc.file_path = RESOURCE_PATH / 'presentations' / 'test.ppt'
             doc.save_titles_and_notes = MagicMock()
 
             # WHEN: reading the titles and notes
diff --git a/tests/functional/openlp_plugins/songs/test_chordproimport.py b/tests/functional/openlp_plugins/songs/test_chordproimport.py
index 685ec355d..0755494f0 100644
--- a/tests/functional/openlp_plugins/songs/test_chordproimport.py
+++ b/tests/functional/openlp_plugins/songs/test_chordproimport.py
@@ -27,7 +27,7 @@ from unittest.mock import patch, MagicMock
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'chordprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'chordpro'
 
 
 class TestChordProFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_easyslidesimport.py b/tests/functional/openlp_plugins/songs/test_easyslidesimport.py
index d82a0f7de..e58b3dcc9 100644
--- a/tests/functional/openlp_plugins/songs/test_easyslidesimport.py
+++ b/tests/functional/openlp_plugins/songs/test_easyslidesimport.py
@@ -24,7 +24,7 @@ This module contains tests for the EasySlides song importer.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'easyslidessongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'easyslides'
 
 
 class TestEasySlidesFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_ewimport.py b/tests/functional/openlp_plugins/songs/test_ewimport.py
index 47d343ef5..779d711eb 100644
--- a/tests/functional/openlp_plugins/songs/test_ewimport.py
+++ b/tests/functional/openlp_plugins/songs/test_ewimport.py
@@ -31,7 +31,7 @@ from openlp.plugins.songs.lib.importers.easyworship import EasyWorshipSongImport
 
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'easyworshipsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'easyworship'
 SONG_TEST_DATA = [
     {'title': 'Amazing Grace',
      'authors': ['John Newton'],
diff --git a/tests/functional/openlp_plugins/songs/test_lyriximport.py b/tests/functional/openlp_plugins/songs/test_lyriximport.py
index 815c170a0..145711a8a 100644
--- a/tests/functional/openlp_plugins/songs/test_lyriximport.py
+++ b/tests/functional/openlp_plugins/songs/test_lyriximport.py
@@ -24,7 +24,7 @@ This module contains tests for the LyriX song importer.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'lyrixsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'lyrix'
 
 
 class TestLyrixFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_openlyricsimport.py b/tests/functional/openlp_plugins/songs/test_openlyricsimport.py
index 88bc968ab..e231b6eed 100644
--- a/tests/functional/openlp_plugins/songs/test_openlyricsimport.py
+++ b/tests/functional/openlp_plugins/songs/test_openlyricsimport.py
@@ -37,7 +37,7 @@ from openlp.plugins.songs.lib.openlyricsxml import OpenLyrics
 from tests.helpers.testmixin import TestMixin
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'openlyricssongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'openlyrics'
 SONG_TEST_DATA = {
     'What a friend we have in Jesus.xml': {
         'title': 'What A Friend We Have In Jesus',
diff --git a/tests/functional/openlp_plugins/songs/test_opensongimport.py b/tests/functional/openlp_plugins/songs/test_opensongimport.py
index 961cd6563..6ccfdb3c6 100644
--- a/tests/functional/openlp_plugins/songs/test_opensongimport.py
+++ b/tests/functional/openlp_plugins/songs/test_opensongimport.py
@@ -31,7 +31,7 @@ from openlp.plugins.songs.lib.importers.opensong import OpenSongImport
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'opensongsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'opensong'
 
 
 class TestOpenSongFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_opsproimport.py b/tests/functional/openlp_plugins/songs/test_opsproimport.py
index 13a09a516..5651e3081 100644
--- a/tests/functional/openlp_plugins/songs/test_opsproimport.py
+++ b/tests/functional/openlp_plugins/songs/test_opsproimport.py
@@ -35,7 +35,7 @@ except ImportError:
 from tests.utils import load_external_result_data
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'opsprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'opspro'
 
 
 def _get_item(data, key):
diff --git a/tests/functional/openlp_plugins/songs/test_powerpraiseimport.py b/tests/functional/openlp_plugins/songs/test_powerpraiseimport.py
index 8c20e5c1a..f895188bf 100644
--- a/tests/functional/openlp_plugins/songs/test_powerpraiseimport.py
+++ b/tests/functional/openlp_plugins/songs/test_powerpraiseimport.py
@@ -26,7 +26,7 @@ ProPresenter song files into the current installation database.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'powerpraisesongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'powerpraise'
 
 
 class TestPowerPraiseFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py b/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py
index a83384126..e1ab39af2 100644
--- a/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py
+++ b/tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py
@@ -25,7 +25,7 @@ This module contains tests for the PresentationManager song importer.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'presentationmanagersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'presentationmanager'
 
 
 class TestPresentationManagerFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_propresenterimport.py b/tests/functional/openlp_plugins/songs/test_propresenterimport.py
index 941866c8a..4b98e8619 100644
--- a/tests/functional/openlp_plugins/songs/test_propresenterimport.py
+++ b/tests/functional/openlp_plugins/songs/test_propresenterimport.py
@@ -26,7 +26,7 @@ ProPresenter song files into the current installation database.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'propresentersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'propresenter'
 
 
 class TestProPresenterFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_songbeamerimport.py b/tests/functional/openlp_plugins/songs/test_songbeamerimport.py
index d85e92231..01c8867c2 100644
--- a/tests/functional/openlp_plugins/songs/test_songbeamerimport.py
+++ b/tests/functional/openlp_plugins/songs/test_songbeamerimport.py
@@ -31,7 +31,7 @@ from openlp.plugins.songs.lib.importers.songbeamer import SongBeamerImport, Song
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songbeamersongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songbeamer'
 
 
 class TestSongBeamerFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_songproimport.py b/tests/functional/openlp_plugins/songs/test_songproimport.py
index 379e9e4e4..d33d652e2 100644
--- a/tests/functional/openlp_plugins/songs/test_songproimport.py
+++ b/tests/functional/openlp_plugins/songs/test_songproimport.py
@@ -26,7 +26,7 @@ SongPro song files into the current installation database.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songprosongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songpro'
 
 
 class TestSongProFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_songselect.py b/tests/functional/openlp_plugins/songs/test_songselect.py
index f892b82ab..b35457b83 100644
--- a/tests/functional/openlp_plugins/songs/test_songselect.py
+++ b/tests/functional/openlp_plugins/songs/test_songselect.py
@@ -38,7 +38,7 @@ from tests.helpers.songfileimport import SongImportTestHelper
 from tests.helpers.testmixin import TestMixin
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songselect'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songselect'
 
 
 class TestSongSelectImport(TestCase, TestMixin):
diff --git a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
index 5119dabb1..e15e1458d 100644
--- a/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
+++ b/tests/functional/openlp_plugins/songs/test_songshowplusimport.py
@@ -31,7 +31,7 @@ from openlp.plugins.songs.lib.importers.songshowplus import SongShowPlusImport
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'songshowplussongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'songshowplus'
 
 
 class TestSongShowPlusFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_sundayplusimport.py b/tests/functional/openlp_plugins/songs/test_sundayplusimport.py
index 769647d8f..6c56bef88 100644
--- a/tests/functional/openlp_plugins/songs/test_sundayplusimport.py
+++ b/tests/functional/openlp_plugins/songs/test_sundayplusimport.py
@@ -26,7 +26,7 @@ from unittest.mock import patch
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'sundayplussongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'sundayplus'
 
 
 class TestSundayPlusFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_videopsalm.py b/tests/functional/openlp_plugins/songs/test_videopsalm.py
index b4caddd0f..170d7a1bc 100644
--- a/tests/functional/openlp_plugins/songs/test_videopsalm.py
+++ b/tests/functional/openlp_plugins/songs/test_videopsalm.py
@@ -26,7 +26,7 @@ from unittest.mock import patch, MagicMock
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'videopsalmsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'videopsalm'
 
 
 class TestVideoPsalmFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py b/tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py
index ab3a8f8d6..fccc38704 100644
--- a/tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py
+++ b/tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py
@@ -25,7 +25,7 @@ This module contains tests for the Words of Worship song importer.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'wordsofworshipsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'wordsofworship'
 
 
 class TestWordsOfWorshipFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py b/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py
index 68190d0fc..4bfb79383 100644
--- a/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py
+++ b/tests/functional/openlp_plugins/songs/test_worshipassistantimport.py
@@ -26,7 +26,7 @@ WorshipAssistant song files into the current installation database.
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'worshipassistantsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'worshipassistant'
 
 
 class TestWorshipAssistantFileImport(SongImportTestHelper):
diff --git a/tests/functional/openlp_plugins/songs/test_zionworximport.py b/tests/functional/openlp_plugins/songs/test_zionworximport.py
index 69808481e..a4929cbbb 100644
--- a/tests/functional/openlp_plugins/songs/test_zionworximport.py
+++ b/tests/functional/openlp_plugins/songs/test_zionworximport.py
@@ -32,7 +32,7 @@ from openlp.plugins.songs.lib.importers.zionworx import ZionWorxImport
 from tests.helpers.songfileimport import SongImportTestHelper
 from tests.utils.constants import RESOURCE_PATH
 
-TEST_PATH = RESOURCE_PATH / 'zionworxsongs'
+TEST_PATH = RESOURCE_PATH / 'songs' / 'zionworx'
 
 
 class TestZionWorxImport(TestCase):
diff --git a/tests/interfaces/openlp_core/common/test_utils.py b/tests/interfaces/openlp_core/common/test_utils.py
index 9669e3038..64ecb0764 100644
--- a/tests/interfaces/openlp_core/common/test_utils.py
+++ b/tests/interfaces/openlp_core/common/test_utils.py
@@ -25,8 +25,8 @@ Functional tests to test the AppLocation class and related methods.
 from unittest import TestCase
 
 from openlp.core.common import is_not_image_file
-from openlp.core.common.path import Path
-from tests.utils.constants import TEST_RESOURCES_PATH
+
+from tests.utils.constants import RESOURCE_PATH
 from tests.helpers.testmixin import TestMixin
 
 
@@ -59,10 +59,10 @@ class TestUtils(TestCase, TestMixin):
         Test the method handles an image file
         """
         # Given and empty string
-        file_name = Path(TEST_RESOURCES_PATH, 'church.jpg')
+        file_path = RESOURCE_PATH / 'church.jpg'
 
         # WHEN testing for it
-        result = is_not_image_file(file_name)
+        result = is_not_image_file(file_path)
 
         # THEN the result is false
         assert result is False, 'The file is present so the test should return False'
@@ -72,10 +72,10 @@ class TestUtils(TestCase, TestMixin):
         Test the method handles a non image file
         """
         # Given and empty string
-        file_name = Path(TEST_RESOURCES_PATH, 'serviceitem_custom_1.osj')
+        file_path = RESOURCE_PATH / 'serviceitem_custom_1.osj'
 
         # WHEN testing for it
-        result = is_not_image_file(file_name)
+        result = is_not_image_file(file_path)
 
         # THEN the result is false
         assert result is True, 'The file is not an image file so the test should return True'
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/songselect/TestSong-bin.json b/tests/resources/songs/songselect/TestSong-bin.json
similarity index 100%
rename from tests/resources/songselect/TestSong-bin.json
rename to tests/resources/songs/songselect/TestSong-bin.json
diff --git a/tests/resources/songselect/TestSong-txt.json b/tests/resources/songs/songselect/TestSong-txt.json
similarity index 100%
rename from tests/resources/songselect/TestSong-txt.json
rename to tests/resources/songs/songselect/TestSong-txt.json
diff --git a/tests/resources/songselect/TestSong.bin b/tests/resources/songs/songselect/TestSong.bin
similarity index 100%
rename from tests/resources/songselect/TestSong.bin
rename to tests/resources/songs/songselect/TestSong.bin
diff --git a/tests/resources/songselect/TestSong.txt b/tests/resources/songs/songselect/TestSong.txt
similarity index 100%
rename from tests/resources/songselect/TestSong.txt
rename to tests/resources/songs/songselect/TestSong.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