diff --git a/libraries/legacy/controller/admin.php b/libraries/cms/controller/admin.php
similarity index 100%
rename from libraries/legacy/controller/admin.php
rename to libraries/cms/controller/admin.php
diff --git a/libraries/legacy/controller/form.php b/libraries/cms/controller/form.php
similarity index 100%
rename from libraries/legacy/controller/form.php
rename to libraries/cms/controller/form.php
diff --git a/libraries/legacy/controller/legacy.php b/libraries/cms/controller/legacy.php
similarity index 100%
rename from libraries/legacy/controller/legacy.php
rename to libraries/cms/controller/legacy.php
diff --git a/libraries/legacy/model/admin.php b/libraries/cms/model/admin.php
similarity index 100%
rename from libraries/legacy/model/admin.php
rename to libraries/cms/model/admin.php
diff --git a/libraries/legacy/model/form.php b/libraries/cms/model/form.php
similarity index 100%
rename from libraries/legacy/model/form.php
rename to libraries/cms/model/form.php
diff --git a/libraries/legacy/model/item.php b/libraries/cms/model/item.php
similarity index 100%
rename from libraries/legacy/model/item.php
rename to libraries/cms/model/item.php
diff --git a/libraries/legacy/model/legacy.php b/libraries/cms/model/legacy.php
similarity index 100%
rename from libraries/legacy/model/legacy.php
rename to libraries/cms/model/legacy.php
diff --git a/libraries/legacy/model/list.php b/libraries/cms/model/list.php
similarity index 100%
rename from libraries/legacy/model/list.php
rename to libraries/cms/model/list.php
diff --git a/tests/unit/suites/libraries/legacy/controller/JControllerFormTest.php b/tests/unit/suites/libraries/cms/controller/JControllerFormTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/JControllerFormTest.php
rename to tests/unit/suites/libraries/cms/controller/JControllerFormTest.php
diff --git a/tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php b/tests/unit/suites/libraries/cms/controller/JControllerLegacyTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/JControllerLegacyTest.php
rename to tests/unit/suites/libraries/cms/controller/JControllerLegacyTest.php
diff --git a/tests/unit/suites/libraries/legacy/controller/stubs/component1/controller.json.php b/tests/unit/suites/libraries/cms/controller/stubs/component1/controller.json.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/stubs/component1/controller.json.php
rename to tests/unit/suites/libraries/cms/controller/stubs/component1/controller.json.php
diff --git a/tests/unit/suites/libraries/legacy/controller/stubs/component2/controller.php b/tests/unit/suites/libraries/cms/controller/stubs/component2/controller.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/stubs/component2/controller.php
rename to tests/unit/suites/libraries/cms/controller/stubs/component2/controller.php
diff --git a/tests/unit/suites/libraries/legacy/controller/stubs/controller.php b/tests/unit/suites/libraries/cms/controller/stubs/controller.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/stubs/controller.php
rename to tests/unit/suites/libraries/cms/controller/stubs/controller.php
diff --git a/tests/unit/suites/libraries/legacy/controller/stubs/controllerform.php b/tests/unit/suites/libraries/cms/controller/stubs/controllerform.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/controller/stubs/controllerform.php
rename to tests/unit/suites/libraries/cms/controller/stubs/controllerform.php
diff --git a/tests/unit/suites/libraries/legacy/model/JModelAdminTest.php b/tests/unit/suites/libraries/cms/model/JModelAdminTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/JModelAdminTest.php
rename to tests/unit/suites/libraries/cms/model/JModelAdminTest.php
diff --git a/tests/unit/suites/libraries/legacy/model/JModelFormTest.php b/tests/unit/suites/libraries/cms/model/JModelFormTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/JModelFormTest.php
rename to tests/unit/suites/libraries/cms/model/JModelFormTest.php
diff --git a/tests/unit/suites/libraries/legacy/model/JModelItemTest.php b/tests/unit/suites/libraries/cms/model/JModelItemTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/JModelItemTest.php
rename to tests/unit/suites/libraries/cms/model/JModelItemTest.php
diff --git a/tests/unit/suites/libraries/legacy/model/JModelLegacyTest.php b/tests/unit/suites/libraries/cms/model/JModelLegacyTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/JModelLegacyTest.php
rename to tests/unit/suites/libraries/cms/model/JModelLegacyTest.php
diff --git a/tests/unit/suites/libraries/legacy/model/JModelListTest.php b/tests/unit/suites/libraries/cms/model/JModelListTest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/JModelListTest.php
rename to tests/unit/suites/libraries/cms/model/JModelListTest.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/constructorexceptiontest.php b/tests/unit/suites/libraries/cms/model/stubs/constructorexceptiontest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/constructorexceptiontest.php
rename to tests/unit/suites/libraries/cms/model/stubs/constructorexceptiontest.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/foobar.php b/tests/unit/suites/libraries/cms/model/stubs/foobar.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/foobar.php
rename to tests/unit/suites/libraries/cms/model/stubs/foobar.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/lead.php b/tests/unit/suites/libraries/cms/model/stubs/lead.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/lead.php
rename to tests/unit/suites/libraries/cms/model/stubs/lead.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/listmodelexceptiontest.php b/tests/unit/suites/libraries/cms/model/stubs/listmodelexceptiontest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/listmodelexceptiontest.php
rename to tests/unit/suites/libraries/cms/model/stubs/listmodelexceptiontest.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/listmodeltest.php b/tests/unit/suites/libraries/cms/model/stubs/listmodeltest.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/listmodeltest.php
rename to tests/unit/suites/libraries/cms/model/stubs/listmodeltest.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/name.php b/tests/unit/suites/libraries/cms/model/stubs/name.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/name.php
rename to tests/unit/suites/libraries/cms/model/stubs/name.php
diff --git a/tests/unit/suites/libraries/legacy/model/stubs/room.php b/tests/unit/suites/libraries/cms/model/stubs/room.php
similarity index 100%
rename from tests/unit/suites/libraries/legacy/model/stubs/room.php
rename to tests/unit/suites/libraries/cms/model/stubs/room.php