diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 158b1d2ff57..70ef63e7cad 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit bootstrap="tests/Unit/bootstrap.php" colors="false">
 	<testsuites>
 		<testsuite name="Unit">
-			<directory suffix="Test.php">./tests/Unit</directory>
+			<directory suffix="Test.php">./tests/Unit/Libraries</directory>
 		</testsuite>
 		<testsuite name="Integration">
 			<directory suffix="Test.php">./tests/Integration/Libraries</directory>
diff --git a/tests/Unit/libraries/src/Access/RuleTest.php b/tests/Unit/Libraries/Cms/Access/RuleTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Access/RuleTest.php
rename to tests/Unit/Libraries/Cms/Access/RuleTest.php
diff --git a/tests/Unit/libraries/src/Access/RulesTest.php b/tests/Unit/Libraries/Cms/Access/RulesTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Access/RulesTest.php
rename to tests/Unit/Libraries/Cms/Access/RulesTest.php
diff --git a/tests/Unit/libraries/src/Application/ConsoleApplicationTest.php b/tests/Unit/Libraries/Cms/Application/ConsoleApplicationTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Application/ConsoleApplicationTest.php
rename to tests/Unit/Libraries/Cms/Application/ConsoleApplicationTest.php
diff --git a/tests/Unit/libraries/src/Console/ExtensionDiscoverCommandTest.php b/tests/Unit/Libraries/Cms/Console/ExtensionDiscoverCommandTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Console/ExtensionDiscoverCommandTest.php
rename to tests/Unit/Libraries/Cms/Console/ExtensionDiscoverCommandTest.php
diff --git a/tests/Unit/libraries/src/Console/ExtensionDiscoverInstallCommandTest.php b/tests/Unit/Libraries/Cms/Console/ExtensionDiscoverInstallCommandTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Console/ExtensionDiscoverInstallCommandTest.php
rename to tests/Unit/Libraries/Cms/Console/ExtensionDiscoverInstallCommandTest.php
diff --git a/tests/Unit/libraries/src/Console/ExtensionDiscoverListCommandTest.php b/tests/Unit/Libraries/Cms/Console/ExtensionDiscoverListCommandTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Console/ExtensionDiscoverListCommandTest.php
rename to tests/Unit/Libraries/Cms/Console/ExtensionDiscoverListCommandTest.php
diff --git a/tests/Unit/libraries/src/Console/Loader/WritableContainerLoaderTest.php b/tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Console/Loader/WritableContainerLoaderTest.php
rename to tests/Unit/Libraries/Cms/Console/Loader/WritableContainerLoaderTest.php
diff --git a/tests/Unit/libraries/src/Date/DateTest.php b/tests/Unit/Libraries/Cms/Date/DateTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Date/DateTest.php
rename to tests/Unit/Libraries/Cms/Date/DateTest.php
diff --git a/tests/Unit/libraries/src/Document/DocumentTest.php b/tests/Unit/Libraries/Cms/Document/DocumentTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Document/DocumentTest.php
rename to tests/Unit/Libraries/Cms/Document/DocumentTest.php
diff --git a/tests/Unit/libraries/src/Environment/BrowserTest.php b/tests/Unit/Libraries/Cms/Environment/BrowserTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Environment/BrowserTest.php
rename to tests/Unit/Libraries/Cms/Environment/BrowserTest.php
diff --git a/tests/Unit/libraries/src/Feed/FeedEntryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/FeedEntryTest.php
rename to tests/Unit/Libraries/Cms/Feed/FeedEntryTest.php
diff --git a/tests/Unit/libraries/src/Feed/FeedFactoryTest.php b/tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/FeedFactoryTest.php
rename to tests/Unit/Libraries/Cms/Feed/FeedFactoryTest.php
diff --git a/tests/Unit/libraries/src/Feed/FeedLinkTest.php b/tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/FeedLinkTest.php
rename to tests/Unit/Libraries/Cms/Feed/FeedLinkTest.php
diff --git a/tests/Unit/libraries/src/Feed/FeedParserTest.php b/tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/FeedParserTest.php
rename to tests/Unit/Libraries/Cms/Feed/FeedParserTest.php
diff --git a/tests/Unit/libraries/src/Feed/FeedTest.php b/tests/Unit/Libraries/Cms/Feed/FeedTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/FeedTest.php
rename to tests/Unit/Libraries/Cms/Feed/FeedTest.php
diff --git a/tests/Unit/libraries/src/Feed/Parser/AtomParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/Parser/AtomParserTest.php
rename to tests/Unit/Libraries/Cms/Feed/Parser/AtomParserTest.php
diff --git a/tests/Unit/libraries/src/Feed/Parser/RssParserTest.php b/tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Feed/Parser/RssParserTest.php
rename to tests/Unit/Libraries/Cms/Feed/Parser/RssParserTest.php
diff --git a/tests/Unit/libraries/src/Filter/OutputFilterTest.php b/tests/Unit/Libraries/Cms/Filter/OutputFilterTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Filter/OutputFilterTest.php
rename to tests/Unit/Libraries/Cms/Filter/OutputFilterTest.php
diff --git a/tests/Unit/libraries/src/Form/Field/AccessiblemediaFieldTest.php b/tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Form/Field/AccessiblemediaFieldTest.php
rename to tests/Unit/Libraries/Cms/Form/Field/AccessiblemediaFieldTest.php
diff --git a/tests/Unit/libraries/src/Form/Rule/FilePathRuleTest.php b/tests/Unit/Libraries/Cms/Form/Rule/FilePathRuleTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Form/Rule/FilePathRuleTest.php
rename to tests/Unit/Libraries/Cms/Form/Rule/FilePathRuleTest.php
diff --git a/tests/Unit/libraries/src/Form/Rule/FolderPathExistsRuleTest.php b/tests/Unit/Libraries/Cms/Form/Rule/FolderPathExistsRuleTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Form/Rule/FolderPathExistsRuleTest.php
rename to tests/Unit/Libraries/Cms/Form/Rule/FolderPathExistsRuleTest.php
diff --git a/tests/Unit/libraries/src/Html/JHtmlDateTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Html/JHtmlDateTest.php
rename to tests/Unit/Libraries/Cms/Html/JHtmlDateTest.php
diff --git a/tests/Unit/libraries/src/Html/JHtmlNumberTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Html/JHtmlNumberTest.php
rename to tests/Unit/Libraries/Cms/Html/JHtmlNumberTest.php
diff --git a/tests/Unit/libraries/src/Html/JHtmlStringTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Html/JHtmlStringTest.php
rename to tests/Unit/Libraries/Cms/Html/JHtmlStringTest.php
diff --git a/tests/Unit/libraries/src/Html/JHtmlTelTest.php b/tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Html/JHtmlTelTest.php
rename to tests/Unit/Libraries/Cms/Html/JHtmlTelTest.php
diff --git a/tests/Unit/libraries/src/Image/ImageFilterTest.php b/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/ImageFilterTest.php
rename to tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
diff --git a/tests/Unit/libraries/src/Image/ImageTest.php b/tests/Unit/Libraries/Cms/Image/ImageTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/ImageTest.php
rename to tests/Unit/Libraries/Cms/Image/ImageTest.php
diff --git a/tests/Unit/libraries/src/Image/filter/FilterBackgroundfillTest.php b/tests/Unit/Libraries/Cms/Image/filter/FilterBackgroundfillTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/filter/FilterBackgroundfillTest.php
rename to tests/Unit/Libraries/Cms/Image/filter/FilterBackgroundfillTest.php
diff --git a/tests/Unit/libraries/src/Image/filter/FilterBrightnessTest.php b/tests/Unit/Libraries/Cms/Image/filter/FilterBrightnessTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/filter/FilterBrightnessTest.php
rename to tests/Unit/Libraries/Cms/Image/filter/FilterBrightnessTest.php
diff --git a/tests/Unit/libraries/src/Image/filter/FilterContrastTest.php b/tests/Unit/Libraries/Cms/Image/filter/FilterContrastTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/filter/FilterContrastTest.php
rename to tests/Unit/Libraries/Cms/Image/filter/FilterContrastTest.php
diff --git a/tests/Unit/libraries/src/Image/filter/FilterEdgedetectTest.php b/tests/Unit/Libraries/Cms/Image/filter/FilterEdgedetectTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Image/filter/FilterEdgedetectTest.php
rename to tests/Unit/Libraries/Cms/Image/filter/FilterEdgedetectTest.php
diff --git a/tests/Unit/libraries/src/Image/stubs/koala.bmp b/tests/Unit/Libraries/Cms/Image/stubs/koala.bmp
similarity index 100%
rename from tests/Unit/libraries/src/Image/stubs/koala.bmp
rename to tests/Unit/Libraries/Cms/Image/stubs/koala.bmp
diff --git a/tests/Unit/libraries/src/Image/stubs/koala.gif b/tests/Unit/Libraries/Cms/Image/stubs/koala.gif
similarity index 100%
rename from tests/Unit/libraries/src/Image/stubs/koala.gif
rename to tests/Unit/Libraries/Cms/Image/stubs/koala.gif
diff --git a/tests/Unit/libraries/src/Image/stubs/koala.jpg b/tests/Unit/Libraries/Cms/Image/stubs/koala.jpg
similarity index 100%
rename from tests/Unit/libraries/src/Image/stubs/koala.jpg
rename to tests/Unit/Libraries/Cms/Image/stubs/koala.jpg
diff --git a/tests/Unit/libraries/src/Image/stubs/koala.png b/tests/Unit/Libraries/Cms/Image/stubs/koala.png
similarity index 100%
rename from tests/Unit/libraries/src/Image/stubs/koala.png
rename to tests/Unit/Libraries/Cms/Image/stubs/koala.png
diff --git a/tests/Unit/libraries/src/Image/stubs/koala.webp b/tests/Unit/Libraries/Cms/Image/stubs/koala.webp
similarity index 100%
rename from tests/Unit/libraries/src/Image/stubs/koala.webp
rename to tests/Unit/Libraries/Cms/Image/stubs/koala.webp
diff --git a/tests/Unit/libraries/src/Image/tmp/.gitkeep b/tests/Unit/Libraries/Cms/Image/tmp/.gitkeep
similarity index 100%
rename from tests/Unit/libraries/src/Image/tmp/.gitkeep
rename to tests/Unit/Libraries/Cms/Image/tmp/.gitkeep
diff --git a/tests/Unit/libraries/src/Installer/Adapter/ModuleAdapterTest.php b/tests/Unit/Libraries/Cms/Installer/Adapter/ModuleAdapterTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Installer/Adapter/ModuleAdapterTest.php
rename to tests/Unit/Libraries/Cms/Installer/Adapter/ModuleAdapterTest.php
diff --git a/tests/Unit/libraries/src/Layout/BaseLayoutTest.php b/tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Layout/BaseLayoutTest.php
rename to tests/Unit/Libraries/Cms/Layout/BaseLayoutTest.php
diff --git a/tests/Unit/libraries/src/Mail/MailHelperTest.php b/tests/Unit/Libraries/Cms/Mail/MailHelperTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Mail/MailHelperTest.php
rename to tests/Unit/Libraries/Cms/Mail/MailHelperTest.php
diff --git a/tests/Unit/libraries/src/Mail/MailTest.php b/tests/Unit/Libraries/Cms/Mail/MailTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Mail/MailTest.php
rename to tests/Unit/Libraries/Cms/Mail/MailTest.php
diff --git a/tests/Unit/libraries/src/Microdata/MicrodataTest.php b/tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Microdata/MicrodataTest.php
rename to tests/Unit/Libraries/Cms/Microdata/MicrodataTest.php
diff --git a/tests/Unit/libraries/src/Object/CMSObjectTest.php b/tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Object/CMSObjectTest.php
rename to tests/Unit/Libraries/Cms/Object/CMSObjectTest.php
diff --git a/tests/Unit/libraries/src/Session/SessionManagerTest.php b/tests/Unit/Libraries/Cms/Session/SessionManagerTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Session/SessionManagerTest.php
rename to tests/Unit/Libraries/Cms/Session/SessionManagerTest.php
diff --git a/tests/Unit/libraries/src/Toolbar/Button/CustomButtonTest.php b/tests/Unit/Libraries/Cms/Toolbar/Button/CustomButtonTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Toolbar/Button/CustomButtonTest.php
rename to tests/Unit/Libraries/Cms/Toolbar/Button/CustomButtonTest.php
diff --git a/tests/Unit/libraries/src/Toolbar/ToolbarTest.php b/tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
similarity index 100%
rename from tests/Unit/libraries/src/Toolbar/ToolbarTest.php
rename to tests/Unit/Libraries/Cms/Toolbar/ToolbarTest.php
diff --git a/tests/Unit/libraries/src/VersionTest.php b/tests/Unit/Libraries/Cms/VersionTest.php
similarity index 100%
rename from tests/Unit/libraries/src/VersionTest.php
rename to tests/Unit/Libraries/Cms/VersionTest.php