diff --git a/tests/control/CMSProfileControllerTest.php b/admin/tests/CMSProfileControllerTest.php
similarity index 100%
rename from tests/control/CMSProfileControllerTest.php
rename to admin/tests/CMSProfileControllerTest.php
diff --git a/tests/control/CMSProfileControllerTest.yml b/admin/tests/CMSProfileControllerTest.yml
similarity index 100%
rename from tests/control/CMSProfileControllerTest.yml
rename to admin/tests/CMSProfileControllerTest.yml
diff --git a/tests/assets/LeftAndMainTest.css b/admin/tests/assets/LeftAndMainTest.css
similarity index 100%
rename from tests/assets/LeftAndMainTest.css
rename to admin/tests/assets/LeftAndMainTest.css
diff --git a/tests/assets/LeftAndMainTest.js b/admin/tests/assets/LeftAndMainTest.js
similarity index 100%
rename from tests/assets/LeftAndMainTest.js
rename to admin/tests/assets/LeftAndMainTest.js
diff --git a/tests/forms/RequirementsTest_a.css b/tests/forms/RequirementsTest_a.css
deleted file mode 100644
index d54285f0c..000000000
--- a/tests/forms/RequirementsTest_a.css
+++ /dev/null
@@ -1 +0,0 @@
-.a {color: #f00;}
diff --git a/tests/forms/RequirementsTest_b.css b/tests/forms/RequirementsTest_b.css
deleted file mode 100644
index 3747a0e8f..000000000
--- a/tests/forms/RequirementsTest_b.css
+++ /dev/null
@@ -1 +0,0 @@
-.b {color: #0ff;}
diff --git a/tests/forms/RequirementsTest_c.css b/tests/forms/RequirementsTest_c.css
deleted file mode 100644
index 098858dbc..000000000
--- a/tests/forms/RequirementsTest_c.css
+++ /dev/null
@@ -1 +0,0 @@
-.c {color: #0ff;}
diff --git a/tests/javascript/forms/RequirementsTest_a.js b/tests/javascript/forms/RequirementsTest_a.js
deleted file mode 100644
index 99fa3922d..000000000
--- a/tests/javascript/forms/RequirementsTest_a.js
+++ /dev/null
@@ -1 +0,0 @@
-alert('a');
diff --git a/tests/javascript/forms/RequirementsTest_b.js b/tests/javascript/forms/RequirementsTest_b.js
deleted file mode 100644
index 5d1ba2586..000000000
--- a/tests/javascript/forms/RequirementsTest_b.js
+++ /dev/null
@@ -1 +0,0 @@
-alert('b');
diff --git a/tests/javascript/forms/RequirementsTest_c.js b/tests/javascript/forms/RequirementsTest_c.js
deleted file mode 100644
index 8b226d8ec..000000000
--- a/tests/javascript/forms/RequirementsTest_c.js
+++ /dev/null
@@ -1 +0,0 @@
-alert('c');
diff --git a/tests/filesystem/AssetControlExtensionTest.php b/tests/php/Assets/AssetControlExtensionTest.php
similarity index 100%
rename from tests/filesystem/AssetControlExtensionTest.php
rename to tests/php/Assets/AssetControlExtensionTest.php
diff --git a/tests/filesystem/AssetManipulationListTest.php b/tests/php/Assets/AssetManipulationListTest.php
similarity index 100%
rename from tests/filesystem/AssetManipulationListTest.php
rename to tests/php/Assets/AssetManipulationListTest.php
diff --git a/tests/filesystem/FileFinderTest.php b/tests/php/Assets/FileFinderTest.php
similarity index 100%
rename from tests/filesystem/FileFinderTest.php
rename to tests/php/Assets/FileFinderTest.php
diff --git a/tests/filesystem/fixtures/filefinder/dir1/dir1file1.txt b/tests/php/Assets/FileFinderTest/dir1/dir1file1.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/dir1/dir1file1.txt
rename to tests/php/Assets/FileFinderTest/dir1/dir1file1.txt
diff --git a/tests/filesystem/fixtures/filefinder/dir1/dir1file2.txt b/tests/php/Assets/FileFinderTest/dir1/dir1file2.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/dir1/dir1file2.txt
rename to tests/php/Assets/FileFinderTest/dir1/dir1file2.txt
diff --git a/tests/filesystem/fixtures/filefinder/dir1/dir2/dir2file1.txt b/tests/php/Assets/FileFinderTest/dir1/dir2/dir2file1.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/dir1/dir2/dir2file1.txt
rename to tests/php/Assets/FileFinderTest/dir1/dir2/dir2file1.txt
diff --git a/tests/filesystem/fixtures/filefinder/dir1/dir2/dir3/dir3file1.txt b/tests/php/Assets/FileFinderTest/dir1/dir2/dir3/dir3file1.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/dir1/dir2/dir3/dir3file1.txt
rename to tests/php/Assets/FileFinderTest/dir1/dir2/dir3/dir3file1.txt
diff --git a/tests/filesystem/fixtures/filefinder/file1.txt b/tests/php/Assets/FileFinderTest/file1.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/file1.txt
rename to tests/php/Assets/FileFinderTest/file1.txt
diff --git a/tests/filesystem/fixtures/filefinder/file2.txt b/tests/php/Assets/FileFinderTest/file2.txt
similarity index 100%
rename from tests/filesystem/fixtures/filefinder/file2.txt
rename to tests/php/Assets/FileFinderTest/file2.txt
diff --git a/tests/filesystem/FileMigrationHelperTest.php b/tests/php/Assets/FileMigrationHelperTest.php
similarity index 100%
rename from tests/filesystem/FileMigrationHelperTest.php
rename to tests/php/Assets/FileMigrationHelperTest.php
diff --git a/tests/filesystem/FileMigrationHelperTest.yml b/tests/php/Assets/FileMigrationHelperTest.yml
similarity index 100%
rename from tests/filesystem/FileMigrationHelperTest.yml
rename to tests/php/Assets/FileMigrationHelperTest.yml
diff --git a/tests/filesystem/FileNameFilterTest.php b/tests/php/Assets/FileNameFilterTest.php
similarity index 100%
rename from tests/filesystem/FileNameFilterTest.php
rename to tests/php/Assets/FileNameFilterTest.php
diff --git a/tests/filesystem/FileTest.php b/tests/php/Assets/FileTest.php
similarity index 100%
rename from tests/filesystem/FileTest.php
rename to tests/php/Assets/FileTest.php
diff --git a/tests/filesystem/FileTest.yml b/tests/php/Assets/FileTest.yml
similarity index 100%
rename from tests/filesystem/FileTest.yml
rename to tests/php/Assets/FileTest.yml
diff --git a/tests/filesystem/AssetAdapterTest.php b/tests/php/Assets/Flysystem/AssetAdapterTest.php
similarity index 100%
rename from tests/filesystem/AssetAdapterTest.php
rename to tests/php/Assets/Flysystem/AssetAdapterTest.php
diff --git a/tests/filesystem/FolderTest.php b/tests/php/Assets/FolderTest.php
similarity index 100%
rename from tests/filesystem/FolderTest.php
rename to tests/php/Assets/FolderTest.php
diff --git a/tests/filesystem/GDTest.php b/tests/php/Assets/GDTest.php
similarity index 100%
rename from tests/filesystem/GDTest.php
rename to tests/php/Assets/GDTest.php
diff --git a/tests/filesystem/gdtest/nonimagedata.jpg b/tests/php/Assets/GDTest/nonimagedata.jpg
similarity index 100%
rename from tests/filesystem/gdtest/nonimagedata.jpg
rename to tests/php/Assets/GDTest/nonimagedata.jpg
diff --git a/tests/filesystem/gdtest/test_gif.gif b/tests/php/Assets/GDTest/test_gif.gif
similarity index 100%
rename from tests/filesystem/gdtest/test_gif.gif
rename to tests/php/Assets/GDTest/test_gif.gif
diff --git a/tests/filesystem/gdtest/test_jpg.jpg b/tests/php/Assets/GDTest/test_jpg.jpg
similarity index 100%
rename from tests/filesystem/gdtest/test_jpg.jpg
rename to tests/php/Assets/GDTest/test_jpg.jpg
diff --git a/tests/filesystem/gdtest/test_png32.png b/tests/php/Assets/GDTest/test_png32.png
similarity index 100%
rename from tests/filesystem/gdtest/test_png32.png
rename to tests/php/Assets/GDTest/test_png32.png
diff --git a/tests/filesystem/gdtest/test_png8.png b/tests/php/Assets/GDTest/test_png8.png
similarity index 100%
rename from tests/filesystem/gdtest/test_png8.png
rename to tests/php/Assets/GDTest/test_png8.png
diff --git a/tests/filesystem/ProtectedFileControllerTest.php b/tests/php/Assets/ProtectedFileControllerTest.php
similarity index 100%
rename from tests/filesystem/ProtectedFileControllerTest.php
rename to tests/php/Assets/ProtectedFileControllerTest.php
diff --git a/tests/filesystem/AssetStoreTest.php b/tests/php/Assets/Storage/AssetStoreTest.php
similarity index 100%
rename from tests/filesystem/AssetStoreTest.php
rename to tests/php/Assets/Storage/AssetStoreTest.php
diff --git a/tests/filesystem/DefaultAssetNameGeneratorTest.php b/tests/php/Assets/Storage/DefaultAssetNameGeneratorTest.php
similarity index 100%
rename from tests/filesystem/DefaultAssetNameGeneratorTest.php
rename to tests/php/Assets/Storage/DefaultAssetNameGeneratorTest.php
diff --git a/tests/filesystem/UploadTest.php b/tests/php/Assets/UploadTest.php
similarity index 100%
rename from tests/filesystem/UploadTest.php
rename to tests/php/Assets/UploadTest.php
diff --git a/tests/control/ControllerTest.php b/tests/php/Control/ControllerTest.php
similarity index 100%
rename from tests/control/ControllerTest.php
rename to tests/php/Control/ControllerTest.php
diff --git a/tests/control/ControllerTest.yml b/tests/php/Control/ControllerTest.yml
similarity index 100%
rename from tests/control/ControllerTest.yml
rename to tests/php/Control/ControllerTest.yml
diff --git a/tests/control/CookieJarTest.php b/tests/php/Control/CookieJarTest.php
similarity index 100%
rename from tests/control/CookieJarTest.php
rename to tests/php/Control/CookieJarTest.php
diff --git a/tests/control/CookieTest.php b/tests/php/Control/CookieTest.php
similarity index 100%
rename from tests/control/CookieTest.php
rename to tests/php/Control/CookieTest.php
diff --git a/tests/control/DirectorTest.php b/tests/php/Control/DirectorTest.php
similarity index 100%
rename from tests/control/DirectorTest.php
rename to tests/php/Control/DirectorTest.php
diff --git a/tests/email/EmailTest.php b/tests/php/Control/Email/EmailTest.php
similarity index 100%
rename from tests/email/EmailTest.php
rename to tests/php/Control/Email/EmailTest.php
diff --git a/tests/email/MailerTest.php b/tests/php/Control/Email/MailerTest.php
similarity index 100%
rename from tests/email/MailerTest.php
rename to tests/php/Control/Email/MailerTest.php
diff --git a/tests/email/fixtures/attachment.txt b/tests/php/Control/Email/fixtures/attachment.txt
similarity index 100%
rename from tests/email/fixtures/attachment.txt
rename to tests/php/Control/Email/fixtures/attachment.txt
diff --git a/tests/FakeController.php b/tests/php/Control/FakeController.php
similarity index 100%
rename from tests/FakeController.php
rename to tests/php/Control/FakeController.php
diff --git a/tests/control/FlushRequestFilterTest.php b/tests/php/Control/FlushRequestFilterTest.php
similarity index 100%
rename from tests/control/FlushRequestFilterTest.php
rename to tests/php/Control/FlushRequestFilterTest.php
diff --git a/tests/control/HTTPRequestTest.php b/tests/php/Control/HTTPRequestTest.php
similarity index 100%
rename from tests/control/HTTPRequestTest.php
rename to tests/php/Control/HTTPRequestTest.php
diff --git a/tests/control/HTTPResponseTest.php b/tests/php/Control/HTTPResponseTest.php
similarity index 100%
rename from tests/control/HTTPResponseTest.php
rename to tests/php/Control/HTTPResponseTest.php
diff --git a/tests/control/HTTPTest.php b/tests/php/Control/HTTPTest.php
similarity index 100%
rename from tests/control/HTTPTest.php
rename to tests/php/Control/HTTPTest.php
diff --git a/tests/control/files/file.csv b/tests/php/Control/HTTPTest/file.csv
similarity index 100%
rename from tests/control/files/file.csv
rename to tests/php/Control/HTTPTest/file.csv
diff --git a/tests/control/files/file.gif b/tests/php/Control/HTTPTest/file.gif
similarity index 100%
rename from tests/control/files/file.gif
rename to tests/php/Control/HTTPTest/file.gif
diff --git a/tests/control/files/file.html b/tests/php/Control/HTTPTest/file.html
similarity index 100%
rename from tests/control/files/file.html
rename to tests/php/Control/HTTPTest/file.html
diff --git a/tests/control/files/file.jpg b/tests/php/Control/HTTPTest/file.jpg
similarity index 100%
rename from tests/control/files/file.jpg
rename to tests/php/Control/HTTPTest/file.jpg
diff --git a/tests/control/files/file.png b/tests/php/Control/HTTPTest/file.png
similarity index 100%
rename from tests/control/files/file.png
rename to tests/php/Control/HTTPTest/file.png
diff --git a/tests/control/files/file.psd b/tests/php/Control/HTTPTest/file.psd
similarity index 100%
rename from tests/control/files/file.psd
rename to tests/php/Control/HTTPTest/file.psd
diff --git a/tests/control/files/file.wav b/tests/php/Control/HTTPTest/file.wav
similarity index 100%
rename from tests/control/files/file.wav
rename to tests/php/Control/HTTPTest/file.wav
diff --git a/tests/control/files/file.xls b/tests/php/Control/HTTPTest/file.xls
similarity index 100%
rename from tests/control/files/file.xls
rename to tests/php/Control/HTTPTest/file.xls
diff --git a/tests/control/IPUtilsTest.php b/tests/php/Control/IPUtilsTest.php
similarity index 100%
rename from tests/control/IPUtilsTest.php
rename to tests/php/Control/IPUtilsTest.php
diff --git a/tests/control/NullHTTPRequestTest.php b/tests/php/Control/NullHTTPRequestTest.php
similarity index 100%
rename from tests/control/NullHTTPRequestTest.php
rename to tests/php/Control/NullHTTPRequestTest.php
diff --git a/tests/control/PjaxResponseNegotiatorTest.php b/tests/php/Control/PjaxResponseNegotiatorTest.php
similarity index 100%
rename from tests/control/PjaxResponseNegotiatorTest.php
rename to tests/php/Control/PjaxResponseNegotiatorTest.php
diff --git a/tests/api/RSSFeedTest.php b/tests/php/Control/RSS/RSSFeedTest.php
similarity index 100%
rename from tests/api/RSSFeedTest.php
rename to tests/php/Control/RSS/RSSFeedTest.php
diff --git a/tests/control/RequestHandlingTest.php b/tests/php/Control/RequestHandlingTest.php
similarity index 100%
rename from tests/control/RequestHandlingTest.php
rename to tests/php/Control/RequestHandlingTest.php
diff --git a/tests/control/SessionTest.php b/tests/php/Control/SessionTest.php
similarity index 100%
rename from tests/control/SessionTest.php
rename to tests/php/Control/SessionTest.php
diff --git a/tests/cache/CacheTest.php b/tests/php/Core/CacheTest.php
similarity index 100%
rename from tests/cache/CacheTest.php
rename to tests/php/Core/CacheTest.php
diff --git a/tests/core/ClassInfoTest.php b/tests/php/Core/ClassInfoTest.php
similarity index 100%
rename from tests/core/ClassInfoTest.php
rename to tests/php/Core/ClassInfoTest.php
diff --git a/tests/core/ConfigTest.php b/tests/php/Core/Config/ConfigTest.php
similarity index 100%
rename from tests/core/ConfigTest.php
rename to tests/php/Core/Config/ConfigTest.php
diff --git a/tests/core/ConvertTest.php b/tests/php/Core/ConvertTest.php
similarity index 100%
rename from tests/core/ConvertTest.php
rename to tests/php/Core/ConvertTest.php
diff --git a/tests/core/CoreTest.php b/tests/php/Core/CoreTest.php
similarity index 100%
rename from tests/core/CoreTest.php
rename to tests/php/Core/CoreTest.php
diff --git a/tests/core/HTMLCleanerTest.php b/tests/php/Core/HTMLCleanerTest.php
similarity index 100%
rename from tests/core/HTMLCleanerTest.php
rename to tests/php/Core/HTMLCleanerTest.php
diff --git a/tests/injector/AopProxyTest.php b/tests/php/Core/Injector/AopProxyServiceTest.php
similarity index 100%
rename from tests/injector/AopProxyTest.php
rename to tests/php/Core/Injector/AopProxyServiceTest.php
diff --git a/tests/injector/testservices/AnotherService.php b/tests/php/Core/Injector/AopProxyServiceTest/AnotherService.php
similarity index 100%
rename from tests/injector/testservices/AnotherService.php
rename to tests/php/Core/Injector/AopProxyServiceTest/AnotherService.php
diff --git a/tests/injector/testservices/SampleService.php b/tests/php/Core/Injector/AopProxyServiceTest/SampleService.php
similarity index 100%
rename from tests/injector/testservices/SampleService.php
rename to tests/php/Core/Injector/AopProxyServiceTest/SampleService.php
diff --git a/tests/injector/InjectorTest.php b/tests/php/Core/Injector/InjectorTest.php
similarity index 100%
rename from tests/injector/InjectorTest.php
rename to tests/php/Core/Injector/InjectorTest.php
diff --git a/tests/core/manifest/ClassLoaderTest.php b/tests/php/Core/Manifest/ClassLoaderTest.php
similarity index 100%
rename from tests/core/manifest/ClassLoaderTest.php
rename to tests/php/Core/Manifest/ClassLoaderTest.php
diff --git a/tests/core/manifest/ClassManifestTest.php b/tests/php/Core/Manifest/ClassManifestTest.php
similarity index 100%
rename from tests/core/manifest/ClassManifestTest.php
rename to tests/php/Core/Manifest/ClassManifestTest.php
diff --git a/tests/core/manifest/ConfigManifestTest.php b/tests/php/Core/Manifest/ConfigManifestTest.php
similarity index 100%
rename from tests/core/manifest/ConfigManifestTest.php
rename to tests/php/Core/Manifest/ConfigManifestTest.php
diff --git a/tests/core/manifest/ConfigStaticManifestTest.php b/tests/php/Core/Manifest/ConfigStaticManifestTest.php
similarity index 100%
rename from tests/core/manifest/ConfigStaticManifestTest.php
rename to tests/php/Core/Manifest/ConfigStaticManifestTest.php
diff --git a/tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestClassKeyword.php b/tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestClassKeyword.php
similarity index 100%
rename from tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestClassKeyword.php
rename to tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestClassKeyword.php
diff --git a/tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestMyObject.php b/tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestMyObject.php
similarity index 100%
rename from tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestMyObject.php
rename to tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestMyObject.php
diff --git a/tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestNamespace.php b/tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestNamespace.php
similarity index 100%
rename from tests/core/manifest/ConfigStaticManifestTest/ConfigStaticManifestTestNamespace.php
rename to tests/php/Core/Manifest/ConfigStaticManifestTest/ConfigStaticManifestTestNamespace.php
diff --git a/tests/core/manifest/ConfigStaticManifestTest/_manifest_exclude b/tests/php/Core/Manifest/ConfigStaticManifestTest/_manifest_exclude
similarity index 100%
rename from tests/core/manifest/ConfigStaticManifestTest/_manifest_exclude
rename to tests/php/Core/Manifest/ConfigStaticManifestTest/_manifest_exclude
diff --git a/tests/core/manifest/ManifestFileFinderTest.php b/tests/php/Core/Manifest/ManifestFileFinderTest.php
similarity index 100%
rename from tests/core/manifest/ManifestFileFinderTest.php
rename to tests/php/Core/Manifest/ManifestFileFinderTest.php
diff --git a/tests/core/manifest/NamespacedClassManifestTest.php b/tests/php/Core/Manifest/NamespacedClassManifestTest.php
similarity index 100%
rename from tests/core/manifest/NamespacedClassManifestTest.php
rename to tests/php/Core/Manifest/NamespacedClassManifestTest.php
diff --git a/tests/core/manifest/ThemeResourceLoaderTest.php b/tests/php/Core/Manifest/ThemeResourceLoaderTest.php
similarity index 100%
rename from tests/core/manifest/ThemeResourceLoaderTest.php
rename to tests/php/Core/Manifest/ThemeResourceLoaderTest.php
diff --git a/tests/core/manifest/TokenisedRegularExpressionTest.php b/tests/php/Core/Manifest/TokenisedRegularExpressionTest.php
similarity index 100%
rename from tests/core/manifest/TokenisedRegularExpressionTest.php
rename to tests/php/Core/Manifest/TokenisedRegularExpressionTest.php
diff --git a/tests/core/manifest/fixtures/_manifest_exclude b/tests/php/Core/Manifest/fixtures/_manifest_exclude
similarity index 100%
rename from tests/core/manifest/fixtures/_manifest_exclude
rename to tests/php/Core/Manifest/fixtures/_manifest_exclude
diff --git a/tests/core/manifest/fixtures/classmanifest/module/_config.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/_config.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/_config.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/classes/ClassA.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/classes/ClassA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassA.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/classes/ClassB.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassB.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/classes/ClassB.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassB.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/classes/ClassC.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassC.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/classes/ClassC.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassC.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/classes/ClassD.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassD.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/classes/ClassD.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/classes/ClassD.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/classes/_Ignore.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/classes/_Ignore.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/classes/_Ignore.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/classes/_Ignore.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/tests/TestClassA.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/tests/TestClassA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/tests/TestClassA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/tests/TestClassA.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/traits/TestTraitA.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/traits/TestTraitA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/traits/TestTraitA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/traits/TestTraitA.php
diff --git a/tests/core/manifest/fixtures/classmanifest/module/traits/TestTraitB.php b/tests/php/Core/Manifest/fixtures/classmanifest/module/traits/TestTraitB.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/module/traits/TestTraitB.php
rename to tests/php/Core/Manifest/fixtures/classmanifest/module/traits/TestTraitB.php
diff --git a/tests/core/manifest/fixtures/classmanifest/moduleb/_config/moduleb.txt b/tests/php/Core/Manifest/fixtures/classmanifest/moduleb/_config/moduleb.txt
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest/moduleb/_config/moduleb.txt
rename to tests/php/Core/Manifest/fixtures/classmanifest/moduleb/_config/moduleb.txt
diff --git a/tests/core/manifest/fixtures/classmanifest_duplicates/module/_config.php b/tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest_duplicates/module/_config.php
rename to tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/_config.php
diff --git a/tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassA.php b/tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/classes/TestClassA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/classes/TestClassA.php
diff --git a/tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassB.php b/tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/classes/TestClassB.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest_duplicates/module/classes/TestClassB.php
rename to tests/php/Core/Manifest/fixtures/classmanifest_duplicates/module/classes/TestClassB.php
diff --git a/tests/core/manifest/fixtures/classmanifest_other/module/_config.php b/tests/php/Core/Manifest/fixtures/classmanifest_other/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest_other/module/_config.php
rename to tests/php/Core/Manifest/fixtures/classmanifest_other/module/_config.php
diff --git a/tests/core/manifest/fixtures/classmanifest_other/module/classes/OtherClassA.php b/tests/php/Core/Manifest/fixtures/classmanifest_other/module/classes/OtherClassA.php
similarity index 100%
rename from tests/core/manifest/fixtures/classmanifest_other/module/classes/OtherClassA.php
rename to tests/php/Core/Manifest/fixtures/classmanifest_other/module/classes/OtherClassA.php
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/addyamlconfigfile.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/addyamlconfigfile.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/addyamlconfigfile.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/addyamlconfigfile.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/classrules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/classrules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/classrules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/classrules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/constantdefinedrules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/constantdefinedrules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/constantdefinedrules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/constantdefinedrules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/empty.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/empty.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/envrules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/envrules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/envrules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/envrules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/envvarsetrules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/envvarsetrules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/envvarsetrules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/envvarsetrules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/modulerules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/modulerules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/modulerules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/modulerules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/namedempty.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/namedempty.yml
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/variablerules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/variablerules.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest/mysite/_config/variablerules.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/variablerules.yml
diff --git a/tests/core/manifest/fixtures/configmanifest_dynamicenv/mysite/_config.php b/tests/php/Core/Manifest/fixtures/configmanifest_dynamicenv/mysite/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest_dynamicenv/mysite/_config.php
rename to tests/php/Core/Manifest/fixtures/configmanifest_dynamicenv/mysite/_config.php
diff --git a/tests/core/manifest/fixtures/configmanifest_dynamicenv/mysite/_config/environment.yml b/tests/php/Core/Manifest/fixtures/configmanifest_dynamicenv/mysite/_config/environment.yml
similarity index 100%
rename from tests/core/manifest/fixtures/configmanifest_dynamicenv/mysite/_config/environment.yml
rename to tests/php/Core/Manifest/fixtures/configmanifest_dynamicenv/mysite/_config/environment.yml
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/assets/_config.php b/tests/php/Core/Manifest/fixtures/manifestfilefinder/assets/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/assets/_config.php
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/assets/_config.php
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/assets/assets.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/assets/assets.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/assets/assets.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/assets/assets.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/module/_config.php b/tests/php/Core/Manifest/fixtures/manifestfilefinder/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/module/_config.php
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/module/_config.php
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/module/code/tests/tests2.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/module/code/tests/tests2.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/module/code/tests/tests2.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/module/code/tests/tests2.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/module/lang/lang.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/module/lang/lang.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/module/lang/lang.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/module/lang/lang.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/module/module.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/module/module.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/module/module.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/module/module.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/module/tests/tests.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/module/tests/tests.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/module/tests/tests.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/module/tests/tests.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/root.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/root.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/root.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/root.txt
diff --git a/tests/core/manifest/fixtures/manifestfilefinder/themes/themes.txt b/tests/php/Core/Manifest/fixtures/manifestfilefinder/themes/themes.txt
similarity index 100%
rename from tests/core/manifest/fixtures/manifestfilefinder/themes/themes.txt
rename to tests/php/Core/Manifest/fixtures/manifestfilefinder/themes/themes.txt
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/_config.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/_config.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/_config.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassI.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassI.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassI.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/classes/ClassI.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/moduleb/_config/moduleb.txt b/tests/php/Core/Manifest/fixtures/namespaced_classmanifest/moduleb/_config/moduleb.txt
similarity index 100%
rename from tests/core/manifest/fixtures/namespaced_classmanifest/moduleb/_config/moduleb.txt
rename to tests/php/Core/Manifest/fixtures/namespaced_classmanifest/moduleb/_config/moduleb.txt
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/Root.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/Root.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/Root.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/Root.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/_config.php b/tests/php/Core/Manifest/fixtures/templatemanifest/module/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/_config.php
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/_config.php
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/css/content.css b/tests/php/Core/Manifest/fixtures/templatemanifest/module/css/content.css
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/css/content.css
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/css/content.css
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/css/project.css b/tests/php/Core/Manifest/fixtures/templatemanifest/module/css/project.css
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/css/project.css
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/css/project.css
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/javascript/content.js b/tests/php/Core/Manifest/fixtures/templatemanifest/module/javascript/content.js
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/javascript/content.js
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/javascript/content.js
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/javascript/project.js b/tests/php/Core/Manifest/fixtures/templatemanifest/module/javascript/project.js
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/javascript/project.js
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/javascript/project.js
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/CustomTemplate.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/CustomTemplate.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/CustomTemplate.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/CustomTemplate.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomThemePage.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/CustomThemePage.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomThemePage.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/CustomThemePage.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/Layout/MyClass.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/Layout/MyClass.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/Layout/MyClass.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/Layout/MyClass.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/MyClass.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/MyClass.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/MyClass.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/MyClass.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/MySubnamespace/MySubclass.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/MySubnamespace/MySubclass.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/MyNamespace/MySubnamespace/MySubclass.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/MyNamespace/MySubnamespace/MySubclass.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/templates/Page.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Page.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/templates/Page.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/templates/Page.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/module/themes/subtheme/templates/NestedThemePage.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/module/themes/subtheme/templates/NestedThemePage.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/module/themes/subtheme/templates/NestedThemePage.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/module/themes/subtheme/templates/NestedThemePage.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/myproject/_config.php b/tests/php/Core/Manifest/fixtures/templatemanifest/myproject/_config.php
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/myproject/_config.php
rename to tests/php/Core/Manifest/fixtures/templatemanifest/myproject/_config.php
diff --git a/tests/core/manifest/fixtures/templatemanifest/myproject/css/project.css b/tests/php/Core/Manifest/fixtures/templatemanifest/myproject/css/project.css
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/myproject/css/project.css
rename to tests/php/Core/Manifest/fixtures/templatemanifest/myproject/css/project.css
diff --git a/tests/core/manifest/fixtures/templatemanifest/myproject/javascript/project.js b/tests/php/Core/Manifest/fixtures/templatemanifest/myproject/javascript/project.js
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/myproject/javascript/project.js
rename to tests/php/Core/Manifest/fixtures/templatemanifest/myproject/javascript/project.js
diff --git a/tests/core/manifest/fixtures/templatemanifest/myproject/templates/CustomTemplate.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/myproject/templates/CustomTemplate.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/myproject/templates/CustomTemplate.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/myproject/templates/CustomTemplate.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/myproject/templates/Layout/.gitignore b/tests/php/Core/Manifest/fixtures/templatemanifest/myproject/templates/Layout/.gitignore
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/myproject/templates/Layout/.gitignore
rename to tests/php/Core/Manifest/fixtures/templatemanifest/myproject/templates/Layout/.gitignore
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/css/content.css b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/css/content.css
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/css/content.css
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/css/content.css
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/css/project.css b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/css/project.css
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/css/project.css
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/css/project.css
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/javascript/content.js b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/javascript/content.js
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/javascript/content.js
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/javascript/content.js
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/javascript/project.js b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/javascript/project.js
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/javascript/project.js
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/javascript/project.js
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/CustomThemePage.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/CustomThemePage.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/CustomThemePage.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/CustomThemePage.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/MyNamespace/MyClass.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/MyNamespace/MyClass.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/MyNamespace/MyClass.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/MyNamespace/MyClass.ss
diff --git a/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss b/tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
similarity index 100%
rename from tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
rename to tests/php/Core/Manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
diff --git a/tests/MemoryLimitTest.php b/tests/php/Core/MemoryLimitTest.php
similarity index 100%
rename from tests/MemoryLimitTest.php
rename to tests/php/Core/MemoryLimitTest.php
diff --git a/tests/core/ObjectTest.php b/tests/php/Core/ObjectTest.php
similarity index 100%
rename from tests/core/ObjectTest.php
rename to tests/php/Core/ObjectTest.php
diff --git a/tests/PhpSyntaxTest.php b/tests/php/Core/PhpSyntaxTest.php
similarity index 93%
rename from tests/PhpSyntaxTest.php
rename to tests/php/Core/PhpSyntaxTest.php
index 3e8929e3b..21c08bb2d 100644
--- a/tests/PhpSyntaxTest.php
+++ b/tests/php/Core/PhpSyntaxTest.php
@@ -21,7 +21,10 @@ class PhpSyntaxTest extends SapphireTest {
 		$returnCode = 0;
 		$output = array();
 		exec("which find && which grep && which php", $output, $returnCode);
-		if($returnCode != 0) return;
+		if($returnCode != 0) {
+			$this->markTestSkipped("Only works on *nix based systems");
+			return;
+		}
 
 		$settingTests = array('short_open_tag=Off','short_open_tag=On -d asp_tags=On');
 
diff --git a/tests/core/startup/ErrorControlChainTest.php b/tests/php/Core/Startup/ErrorControlChainTest.php
similarity index 100%
rename from tests/core/startup/ErrorControlChainTest.php
rename to tests/php/Core/Startup/ErrorControlChainTest.php
diff --git a/tests/core/startup/ParameterConfirmationTokenTest.php b/tests/php/Core/Startup/ParameterConfirmationTokenTest.php
similarity index 100%
rename from tests/core/startup/ParameterConfirmationTokenTest.php
rename to tests/php/Core/Startup/ParameterConfirmationTokenTest.php
diff --git a/tests/dev/BacktraceTest.php b/tests/php/Dev/BacktraceTest.php
similarity index 100%
rename from tests/dev/BacktraceTest.php
rename to tests/php/Dev/BacktraceTest.php
diff --git a/tests/dev/BulkLoaderResultTest.php b/tests/php/Dev/BulkLoaderResultTest.php
similarity index 100%
rename from tests/dev/BulkLoaderResultTest.php
rename to tests/php/Dev/BulkLoaderResultTest.php
diff --git a/tests/testing/CSSContentParserTest.php b/tests/php/Dev/CSSContentParserTest.php
similarity index 100%
rename from tests/testing/CSSContentParserTest.php
rename to tests/php/Dev/CSSContentParserTest.php
diff --git a/tests/dev/CSVParserTest.php b/tests/php/Dev/CSVParserTest.php
similarity index 100%
rename from tests/dev/CSVParserTest.php
rename to tests/php/Dev/CSVParserTest.php
diff --git a/tests/dev/CsvBulkLoaderTest.php b/tests/php/Dev/CsvBulkLoaderTest.php
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest.php
rename to tests/php/Dev/CsvBulkLoaderTest.php
diff --git a/tests/dev/CsvBulkLoaderTest.yml b/tests/php/Dev/CsvBulkLoaderTest.yml
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest.yml
rename to tests/php/Dev/CsvBulkLoaderTest.yml
diff --git a/tests/dev/CsvBulkLoaderTest_LargeListOfPlayers.csv b/tests/php/Dev/CsvBulkLoaderTest_LargeListOfPlayers.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_LargeListOfPlayers.csv
rename to tests/php/Dev/CsvBulkLoaderTest_LargeListOfPlayers.csv
diff --git a/tests/dev/CsvBulkLoaderTest_Players.csv b/tests/php/Dev/CsvBulkLoaderTest_Players.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_Players.csv
rename to tests/php/Dev/CsvBulkLoaderTest_Players.csv
diff --git a/tests/dev/CsvBulkLoaderTest_PlayersWithCustomHeaderAndRelation.csv b/tests/php/Dev/CsvBulkLoaderTest_PlayersWithCustomHeaderAndRelation.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_PlayersWithCustomHeaderAndRelation.csv
rename to tests/php/Dev/CsvBulkLoaderTest_PlayersWithCustomHeaderAndRelation.csv
diff --git a/tests/dev/CsvBulkLoaderTest_PlayersWithHeader.csv b/tests/php/Dev/CsvBulkLoaderTest_PlayersWithHeader.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_PlayersWithHeader.csv
rename to tests/php/Dev/CsvBulkLoaderTest_PlayersWithHeader.csv
diff --git a/tests/dev/CsvBulkLoaderTest_PlayersWithId.csv b/tests/php/Dev/CsvBulkLoaderTest_PlayersWithId.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_PlayersWithId.csv
rename to tests/php/Dev/CsvBulkLoaderTest_PlayersWithId.csv
diff --git a/tests/dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv b/tests/php/Dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv
similarity index 100%
rename from tests/dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv
rename to tests/php/Dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv
diff --git a/tests/dev/DeprecationTest.php b/tests/php/Dev/DeprecationTest.php
similarity index 100%
rename from tests/dev/DeprecationTest.php
rename to tests/php/Dev/DeprecationTest.php
diff --git a/tests/dev/DevAdminControllerTest.php b/tests/php/Dev/DevAdminControllerTest.php
similarity index 100%
rename from tests/dev/DevAdminControllerTest.php
rename to tests/php/Dev/DevAdminControllerTest.php
diff --git a/tests/dev/FixtureBlueprintTest.php b/tests/php/Dev/FixtureBlueprintTest.php
similarity index 100%
rename from tests/dev/FixtureBlueprintTest.php
rename to tests/php/Dev/FixtureBlueprintTest.php
diff --git a/tests/dev/FixtureFactoryTest.php b/tests/php/Dev/FixtureFactoryTest.php
similarity index 100%
rename from tests/dev/FixtureFactoryTest.php
rename to tests/php/Dev/FixtureFactoryTest.php
diff --git a/tests/dev/MySQLDatabaseConfigurationHelperTest.php b/tests/php/Dev/MySQLDatabaseConfigurationHelperTest.php
similarity index 100%
rename from tests/dev/MySQLDatabaseConfigurationHelperTest.php
rename to tests/php/Dev/MySQLDatabaseConfigurationHelperTest.php
diff --git a/tests/dev/SapphireTestTest.php b/tests/php/Dev/SapphireTestTest.php
similarity index 100%
rename from tests/dev/SapphireTestTest.php
rename to tests/php/Dev/SapphireTestTest.php
diff --git a/tests/dev/TaskRunnerTest.php b/tests/php/Dev/TaskRunnerTest.php
similarity index 100%
rename from tests/dev/TaskRunnerTest.php
rename to tests/php/Dev/TaskRunnerTest.php
diff --git a/tests/testing/YamlFixtureTest.php b/tests/php/Dev/YamlFixtureTest.php
similarity index 100%
rename from tests/testing/YamlFixtureTest.php
rename to tests/php/Dev/YamlFixtureTest.php
diff --git a/tests/testing/YamlFixtureTest.yml b/tests/php/Dev/YamlFixtureTest.yml
similarity index 100%
rename from tests/testing/YamlFixtureTest.yml
rename to tests/php/Dev/YamlFixtureTest.yml
diff --git a/tests/forms/uploadfield/AssetFieldTest.php b/tests/php/Forms/AssetFieldTest.php
similarity index 100%
rename from tests/forms/uploadfield/AssetFieldTest.php
rename to tests/php/Forms/AssetFieldTest.php
diff --git a/tests/forms/uploadfield/AssetFieldTest.yml b/tests/php/Forms/AssetFieldTest.yml
similarity index 100%
rename from tests/forms/uploadfield/AssetFieldTest.yml
rename to tests/php/Forms/AssetFieldTest.yml
diff --git a/tests/forms/CheckboxFieldTest.php b/tests/php/Forms/CheckboxFieldTest.php
similarity index 100%
rename from tests/forms/CheckboxFieldTest.php
rename to tests/php/Forms/CheckboxFieldTest.php
diff --git a/tests/forms/CheckboxSetFieldTest.php b/tests/php/Forms/CheckboxSetFieldTest.php
similarity index 100%
rename from tests/forms/CheckboxSetFieldTest.php
rename to tests/php/Forms/CheckboxSetFieldTest.php
diff --git a/tests/forms/CheckboxSetFieldTest.yml b/tests/php/Forms/CheckboxSetFieldTest.yml
similarity index 100%
rename from tests/forms/CheckboxSetFieldTest.yml
rename to tests/php/Forms/CheckboxSetFieldTest.yml
diff --git a/tests/forms/CompositeFieldTest.php b/tests/php/Forms/CompositeFieldTest.php
similarity index 100%
rename from tests/forms/CompositeFieldTest.php
rename to tests/php/Forms/CompositeFieldTest.php
diff --git a/tests/forms/ConfirmedPasswordFieldTest.php b/tests/php/Forms/ConfirmedPasswordFieldTest.php
similarity index 100%
rename from tests/forms/ConfirmedPasswordFieldTest.php
rename to tests/php/Forms/ConfirmedPasswordFieldTest.php
diff --git a/tests/forms/CurrencyFieldTest.php b/tests/php/Forms/CurrencyFieldTest.php
similarity index 100%
rename from tests/forms/CurrencyFieldTest.php
rename to tests/php/Forms/CurrencyFieldTest.php
diff --git a/tests/forms/DBFileTest.php b/tests/php/Forms/DBFileTest.php
similarity index 100%
rename from tests/forms/DBFileTest.php
rename to tests/php/Forms/DBFileTest.php
diff --git a/tests/forms/DateFieldTest.php b/tests/php/Forms/DateFieldTest.php
similarity index 100%
rename from tests/forms/DateFieldTest.php
rename to tests/php/Forms/DateFieldTest.php
diff --git a/tests/forms/DatefieldViewJQueryTest.php b/tests/php/Forms/DatefieldViewJQueryTest.php
similarity index 100%
rename from tests/forms/DatefieldViewJQueryTest.php
rename to tests/php/Forms/DatefieldViewJQueryTest.php
diff --git a/tests/forms/DatetimeFieldTest.php b/tests/php/Forms/DatetimeFieldTest.php
similarity index 100%
rename from tests/forms/DatetimeFieldTest.php
rename to tests/php/Forms/DatetimeFieldTest.php
diff --git a/tests/forms/DropdownFieldTest.php b/tests/php/Forms/DropdownFieldTest.php
similarity index 100%
rename from tests/forms/DropdownFieldTest.php
rename to tests/php/Forms/DropdownFieldTest.php
diff --git a/tests/forms/EmailFieldTest.php b/tests/php/Forms/EmailFieldTest.php
similarity index 100%
rename from tests/forms/EmailFieldTest.php
rename to tests/php/Forms/EmailFieldTest.php
diff --git a/tests/forms/EmbedShortcodeProviderTest.php b/tests/php/Forms/EmbedShortcodeProviderTest.php
similarity index 100%
rename from tests/forms/EmbedShortcodeProviderTest.php
rename to tests/php/Forms/EmbedShortcodeProviderTest.php
diff --git a/tests/forms/EnumFieldTest.php b/tests/php/Forms/EnumFieldTest.php
similarity index 100%
rename from tests/forms/EnumFieldTest.php
rename to tests/php/Forms/EnumFieldTest.php
diff --git a/tests/forms/FieldGroupTest.php b/tests/php/Forms/FieldGroupTest.php
similarity index 100%
rename from tests/forms/FieldGroupTest.php
rename to tests/php/Forms/FieldGroupTest.php
diff --git a/tests/forms/FieldListTest.php b/tests/php/Forms/FieldListTest.php
similarity index 100%
rename from tests/forms/FieldListTest.php
rename to tests/php/Forms/FieldListTest.php
diff --git a/tests/forms/FileFieldTest.php b/tests/php/Forms/FileFieldTest.php
similarity index 100%
rename from tests/forms/FileFieldTest.php
rename to tests/php/Forms/FileFieldTest.php
diff --git a/tests/forms/FormActionTest.php b/tests/php/Forms/FormActionTest.php
similarity index 100%
rename from tests/forms/FormActionTest.php
rename to tests/php/Forms/FormActionTest.php
diff --git a/tests/forms/FormFieldTest.php b/tests/php/Forms/FormFieldTest.php
similarity index 100%
rename from tests/forms/FormFieldTest.php
rename to tests/php/Forms/FormFieldTest.php
diff --git a/tests/forms/FormScaffolderTest.php b/tests/php/Forms/FormScaffolderTest.php
similarity index 100%
rename from tests/forms/FormScaffolderTest.php
rename to tests/php/Forms/FormScaffolderTest.php
diff --git a/tests/forms/FormScaffolderTest.yml b/tests/php/Forms/FormScaffolderTest.yml
similarity index 100%
rename from tests/forms/FormScaffolderTest.yml
rename to tests/php/Forms/FormScaffolderTest.yml
diff --git a/tests/forms/FormSchemaTest.php b/tests/php/Forms/FormSchemaTest.php
similarity index 100%
rename from tests/forms/FormSchemaTest.php
rename to tests/php/Forms/FormSchemaTest.php
diff --git a/tests/forms/FormTest.php b/tests/php/Forms/FormTest.php
similarity index 100%
rename from tests/forms/FormTest.php
rename to tests/php/Forms/FormTest.php
diff --git a/tests/forms/FormTest.yml b/tests/php/Forms/FormTest.yml
similarity index 100%
rename from tests/forms/FormTest.yml
rename to tests/php/Forms/FormTest.yml
diff --git a/tests/forms/gridfield/GridFieldActionTest.yml b/tests/php/Forms/GridField/GridFieldActionTest.yml
similarity index 100%
rename from tests/forms/gridfield/GridFieldActionTest.yml
rename to tests/php/Forms/GridField/GridFieldActionTest.yml
diff --git a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php b/tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
rename to tests/php/Forms/GridField/GridFieldAddExistingAutocompleterTest.php
diff --git a/tests/forms/gridfield/GridFieldConfigTest.php b/tests/php/Forms/GridField/GridFieldConfigTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldConfigTest.php
rename to tests/php/Forms/GridField/GridFieldConfigTest.php
diff --git a/tests/forms/gridfield/GridFieldDataColumnsTest.php b/tests/php/Forms/GridField/GridFieldDataColumnsTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldDataColumnsTest.php
rename to tests/php/Forms/GridField/GridFieldDataColumnsTest.php
diff --git a/tests/forms/gridfield/GridFieldDeleteActionTest.php b/tests/php/Forms/GridField/GridFieldDeleteActionTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldDeleteActionTest.php
rename to tests/php/Forms/GridField/GridFieldDeleteActionTest.php
diff --git a/tests/forms/gridfield/GridFieldDetailFormTest.php b/tests/php/Forms/GridField/GridFieldDetailFormTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldDetailFormTest.php
rename to tests/php/Forms/GridField/GridFieldDetailFormTest.php
diff --git a/tests/forms/gridfield/GridFieldDetailFormTest.yml b/tests/php/Forms/GridField/GridFieldDetailFormTest.yml
similarity index 100%
rename from tests/forms/gridfield/GridFieldDetailFormTest.yml
rename to tests/php/Forms/GridField/GridFieldDetailFormTest.yml
diff --git a/tests/forms/gridfield/GridFieldEditButtonTest.php b/tests/php/Forms/GridField/GridFieldEditButtonTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldEditButtonTest.php
rename to tests/php/Forms/GridField/GridFieldEditButtonTest.php
diff --git a/tests/forms/gridfield/GridFieldExportButtonTest.php b/tests/php/Forms/GridField/GridFieldExportButtonTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldExportButtonTest.php
rename to tests/php/Forms/GridField/GridFieldExportButtonTest.php
diff --git a/tests/forms/gridfield/GridFieldExportButtonTest.yml b/tests/php/Forms/GridField/GridFieldExportButtonTest.yml
similarity index 100%
rename from tests/forms/gridfield/GridFieldExportButtonTest.yml
rename to tests/php/Forms/GridField/GridFieldExportButtonTest.yml
diff --git a/tests/forms/gridfield/GridFieldPaginatorTest.php b/tests/php/Forms/GridField/GridFieldPaginatorTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldPaginatorTest.php
rename to tests/php/Forms/GridField/GridFieldPaginatorTest.php
diff --git a/tests/forms/gridfield/GridFieldPrintButtonTest.php b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldPrintButtonTest.php
rename to tests/php/Forms/GridField/GridFieldPrintButtonTest.php
diff --git a/tests/forms/gridfield/GridFieldSortableHeaderTest.php b/tests/php/Forms/GridField/GridFieldSortableHeaderTest.php
similarity index 100%
rename from tests/forms/gridfield/GridFieldSortableHeaderTest.php
rename to tests/php/Forms/GridField/GridFieldSortableHeaderTest.php
diff --git a/tests/forms/gridfield/GridFieldSortableHeaderTest.yml b/tests/php/Forms/GridField/GridFieldSortableHeaderTest.yml
similarity index 100%
rename from tests/forms/gridfield/GridFieldSortableHeaderTest.yml
rename to tests/php/Forms/GridField/GridFieldSortableHeaderTest.yml
diff --git a/tests/forms/gridfield/GridFieldTest.yml b/tests/php/Forms/GridField/GridFieldTest.yml
similarity index 100%
rename from tests/forms/gridfield/GridFieldTest.yml
rename to tests/php/Forms/GridField/GridFieldTest.yml
diff --git a/tests/forms/gridfield/GridField_URLHandlerTest.php b/tests/php/Forms/GridField/GridField_URLHandlerTest.php
similarity index 100%
rename from tests/forms/gridfield/GridField_URLHandlerTest.php
rename to tests/php/Forms/GridField/GridField_URLHandlerTest.php
diff --git a/tests/forms/GridFieldTest.php b/tests/php/Forms/GridFieldTest.php
similarity index 100%
rename from tests/forms/GridFieldTest.php
rename to tests/php/Forms/GridFieldTest.php
diff --git a/tests/forms/GroupedDropdownFieldTest.php b/tests/php/Forms/GroupedDropdownFieldTest.php
similarity index 100%
rename from tests/forms/GroupedDropdownFieldTest.php
rename to tests/php/Forms/GroupedDropdownFieldTest.php
diff --git a/tests/forms/HTMLEditorConfigTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorConfigTest.php
similarity index 100%
rename from tests/forms/HTMLEditorConfigTest.php
rename to tests/php/Forms/HTMLEditor/HTMLEditorConfigTest.php
diff --git a/tests/forms/HTMLEditorFieldTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
similarity index 100%
rename from tests/forms/HTMLEditorFieldTest.php
rename to tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
diff --git a/tests/forms/HTMLEditorFieldTest.yml b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.yml
similarity index 100%
rename from tests/forms/HTMLEditorFieldTest.yml
rename to tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.yml
diff --git a/tests/forms/images/HTMLEditorFieldTest-example.jpg b/tests/php/Forms/HTMLEditor/HTMLEditorFieldTest/example.jpg
similarity index 100%
rename from tests/forms/images/HTMLEditorFieldTest-example.jpg
rename to tests/php/Forms/HTMLEditor/HTMLEditorFieldTest/example.jpg
diff --git a/tests/forms/HTMLEditorFieldToolbarTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorFieldToolbarTest.php
similarity index 100%
rename from tests/forms/HTMLEditorFieldToolbarTest.php
rename to tests/php/Forms/HTMLEditor/HTMLEditorFieldToolbarTest.php
diff --git a/tests/forms/HTMLEditorFieldToolbarTest.yml b/tests/php/Forms/HTMLEditor/HTMLEditorFieldToolbarTest.yml
similarity index 100%
rename from tests/forms/HTMLEditorFieldToolbarTest.yml
rename to tests/php/Forms/HTMLEditor/HTMLEditorFieldToolbarTest.yml
diff --git a/tests/forms/HTMLEditorSanitiserTest.php b/tests/php/Forms/HTMLEditor/HTMLEditorSanitiserTest.php
similarity index 100%
rename from tests/forms/HTMLEditorSanitiserTest.php
rename to tests/php/Forms/HTMLEditor/HTMLEditorSanitiserTest.php
diff --git a/tests/forms/InlineFormActionTest.php b/tests/php/Forms/InlineFormActionTest.php
similarity index 100%
rename from tests/forms/InlineFormActionTest.php
rename to tests/php/Forms/InlineFormActionTest.php
diff --git a/tests/forms/ListboxFieldTest.php b/tests/php/Forms/ListboxFieldTest.php
similarity index 100%
rename from tests/forms/ListboxFieldTest.php
rename to tests/php/Forms/ListboxFieldTest.php
diff --git a/tests/forms/ListboxFieldTest.yml b/tests/php/Forms/ListboxFieldTest.yml
similarity index 100%
rename from tests/forms/ListboxFieldTest.yml
rename to tests/php/Forms/ListboxFieldTest.yml
diff --git a/tests/forms/LookupFieldTest.php b/tests/php/Forms/LookupFieldTest.php
similarity index 100%
rename from tests/forms/LookupFieldTest.php
rename to tests/php/Forms/LookupFieldTest.php
diff --git a/tests/forms/LookupFieldTest.yml b/tests/php/Forms/LookupFieldTest.yml
similarity index 100%
rename from tests/forms/LookupFieldTest.yml
rename to tests/php/Forms/LookupFieldTest.yml
diff --git a/tests/forms/MemberDatetimeOptionsetFieldTest.php b/tests/php/Forms/MemberDatetimeOptionsetFieldTest.php
similarity index 100%
rename from tests/forms/MemberDatetimeOptionsetFieldTest.php
rename to tests/php/Forms/MemberDatetimeOptionsetFieldTest.php
diff --git a/tests/forms/MemberDatetimeOptionsetFieldTest.yml b/tests/php/Forms/MemberDatetimeOptionsetFieldTest.yml
similarity index 100%
rename from tests/forms/MemberDatetimeOptionsetFieldTest.yml
rename to tests/php/Forms/MemberDatetimeOptionsetFieldTest.yml
diff --git a/tests/forms/MoneyFieldTest.php b/tests/php/Forms/MoneyFieldTest.php
similarity index 100%
rename from tests/forms/MoneyFieldTest.php
rename to tests/php/Forms/MoneyFieldTest.php
diff --git a/tests/forms/NullableFieldTests.php b/tests/php/Forms/NullableFieldTests.php
similarity index 100%
rename from tests/forms/NullableFieldTests.php
rename to tests/php/Forms/NullableFieldTests.php
diff --git a/tests/forms/NumericFieldTest.php b/tests/php/Forms/NumericFieldTest.php
similarity index 100%
rename from tests/forms/NumericFieldTest.php
rename to tests/php/Forms/NumericFieldTest.php
diff --git a/tests/forms/OptionsetFieldTest.php b/tests/php/Forms/OptionsetFieldTest.php
similarity index 100%
rename from tests/forms/OptionsetFieldTest.php
rename to tests/php/Forms/OptionsetFieldTest.php
diff --git a/tests/forms/PopoverFieldTest.php b/tests/php/Forms/PopoverFieldTest.php
similarity index 100%
rename from tests/forms/PopoverFieldTest.php
rename to tests/php/Forms/PopoverFieldTest.php
diff --git a/tests/forms/RequiredFieldsTest.php b/tests/php/Forms/RequiredFieldsTest.php
similarity index 100%
rename from tests/forms/RequiredFieldsTest.php
rename to tests/php/Forms/RequiredFieldsTest.php
diff --git a/tests/forms/SelectionGroupTest.php b/tests/php/Forms/SelectionGroupTest.php
similarity index 100%
rename from tests/forms/SelectionGroupTest.php
rename to tests/php/Forms/SelectionGroupTest.php
diff --git a/tests/forms/TextFieldTest.php b/tests/php/Forms/TextFieldTest.php
similarity index 100%
rename from tests/forms/TextFieldTest.php
rename to tests/php/Forms/TextFieldTest.php
diff --git a/tests/forms/TextareaFieldTest.php b/tests/php/Forms/TextareaFieldTest.php
similarity index 100%
rename from tests/forms/TextareaFieldTest.php
rename to tests/php/Forms/TextareaFieldTest.php
diff --git a/tests/forms/TimeFieldTest.php b/tests/php/Forms/TimeFieldTest.php
similarity index 100%
rename from tests/forms/TimeFieldTest.php
rename to tests/php/Forms/TimeFieldTest.php
diff --git a/tests/forms/TreeDropdownFieldTest.php b/tests/php/Forms/TreeDropdownFieldTest.php
similarity index 100%
rename from tests/forms/TreeDropdownFieldTest.php
rename to tests/php/Forms/TreeDropdownFieldTest.php
diff --git a/tests/forms/TreeDropdownFieldTest.yml b/tests/php/Forms/TreeDropdownFieldTest.yml
similarity index 100%
rename from tests/forms/TreeDropdownFieldTest.yml
rename to tests/php/Forms/TreeDropdownFieldTest.yml
diff --git a/tests/forms/uploadfield/UploadFieldTest.php b/tests/php/Forms/UploadFieldTest.php
similarity index 100%
rename from tests/forms/uploadfield/UploadFieldTest.php
rename to tests/php/Forms/UploadFieldTest.php
diff --git a/tests/forms/uploadfield/UploadFieldTest.yml b/tests/php/Forms/UploadFieldTest.yml
similarity index 100%
rename from tests/forms/uploadfield/UploadFieldTest.yml
rename to tests/php/Forms/UploadFieldTest.yml
diff --git a/tests/core/ArrayLibTest.php b/tests/php/ORM/ArrayLibTest.php
similarity index 100%
rename from tests/core/ArrayLibTest.php
rename to tests/php/ORM/ArrayLibTest.php
diff --git a/tests/model/ArrayListTest.php b/tests/php/ORM/ArrayListTest.php
similarity index 100%
rename from tests/model/ArrayListTest.php
rename to tests/php/ORM/ArrayListTest.php
diff --git a/tests/model/ChangeSetItemTest.php b/tests/php/ORM/ChangeSetItemTest.php
similarity index 100%
rename from tests/model/ChangeSetItemTest.php
rename to tests/php/ORM/ChangeSetItemTest.php
diff --git a/tests/model/ChangeSetTest.php b/tests/php/ORM/ChangeSetTest.php
similarity index 100%
rename from tests/model/ChangeSetTest.php
rename to tests/php/ORM/ChangeSetTest.php
diff --git a/tests/model/ChangeSetTest.yml b/tests/php/ORM/ChangeSetTest.yml
similarity index 100%
rename from tests/model/ChangeSetTest.yml
rename to tests/php/ORM/ChangeSetTest.yml
diff --git a/tests/model/ComponentSetTest.php b/tests/php/ORM/ComponentSetTest.php
similarity index 100%
rename from tests/model/ComponentSetTest.php
rename to tests/php/ORM/ComponentSetTest.php
diff --git a/tests/model/ComponentSetTest.yml b/tests/php/ORM/ComponentSetTest.yml
similarity index 100%
rename from tests/model/ComponentSetTest.yml
rename to tests/php/ORM/ComponentSetTest.yml
diff --git a/tests/model/DBClassNameTest.php b/tests/php/ORM/DBClassNameTest.php
similarity index 100%
rename from tests/model/DBClassNameTest.php
rename to tests/php/ORM/DBClassNameTest.php
diff --git a/tests/model/DBCompositeTest.php b/tests/php/ORM/DBCompositeTest.php
similarity index 100%
rename from tests/model/DBCompositeTest.php
rename to tests/php/ORM/DBCompositeTest.php
diff --git a/tests/model/DBCurrencyTest.php b/tests/php/ORM/DBCurrencyTest.php
similarity index 100%
rename from tests/model/DBCurrencyTest.php
rename to tests/php/ORM/DBCurrencyTest.php
diff --git a/tests/model/DBDateTest.php b/tests/php/ORM/DBDateTest.php
similarity index 100%
rename from tests/model/DBDateTest.php
rename to tests/php/ORM/DBDateTest.php
diff --git a/tests/model/DBFieldTest.php b/tests/php/ORM/DBFieldTest.php
similarity index 100%
rename from tests/model/DBFieldTest.php
rename to tests/php/ORM/DBFieldTest.php
diff --git a/tests/model/DBHTMLTextTest.php b/tests/php/ORM/DBHTMLTextTest.php
similarity index 100%
rename from tests/model/DBHTMLTextTest.php
rename to tests/php/ORM/DBHTMLTextTest.php
diff --git a/tests/model/DBLocaleTest.php b/tests/php/ORM/DBLocaleTest.php
similarity index 100%
rename from tests/model/DBLocaleTest.php
rename to tests/php/ORM/DBLocaleTest.php
diff --git a/tests/model/DBMoneyTest.php b/tests/php/ORM/DBMoneyTest.php
similarity index 100%
rename from tests/model/DBMoneyTest.php
rename to tests/php/ORM/DBMoneyTest.php
diff --git a/tests/model/DBPercentageTest.php b/tests/php/ORM/DBPercentageTest.php
similarity index 100%
rename from tests/model/DBPercentageTest.php
rename to tests/php/ORM/DBPercentageTest.php
diff --git a/tests/model/DBStringTest.php b/tests/php/ORM/DBStringTest.php
similarity index 100%
rename from tests/model/DBStringTest.php
rename to tests/php/ORM/DBStringTest.php
diff --git a/tests/model/DBTest.php b/tests/php/ORM/DBTest.php
similarity index 100%
rename from tests/model/DBTest.php
rename to tests/php/ORM/DBTest.php
diff --git a/tests/model/DBTextTest.php b/tests/php/ORM/DBTextTest.php
similarity index 100%
rename from tests/model/DBTextTest.php
rename to tests/php/ORM/DBTextTest.php
diff --git a/tests/model/DBYearTest.php b/tests/php/ORM/DBYearTest.php
similarity index 100%
rename from tests/model/DBYearTest.php
rename to tests/php/ORM/DBYearTest.php
diff --git a/tests/model/DataDifferencerTest.php b/tests/php/ORM/DataDifferencerTest.php
similarity index 100%
rename from tests/model/DataDifferencerTest.php
rename to tests/php/ORM/DataDifferencerTest.php
diff --git a/tests/model/DataDifferencerTest.yml b/tests/php/ORM/DataDifferencerTest.yml
similarity index 100%
rename from tests/model/DataDifferencerTest.yml
rename to tests/php/ORM/DataDifferencerTest.yml
diff --git a/tests/model/DataExtensionTest.php b/tests/php/ORM/DataExtensionTest.php
similarity index 100%
rename from tests/model/DataExtensionTest.php
rename to tests/php/ORM/DataExtensionTest.php
diff --git a/tests/model/DataExtensionTest.yml b/tests/php/ORM/DataExtensionTest.yml
similarity index 100%
rename from tests/model/DataExtensionTest.yml
rename to tests/php/ORM/DataExtensionTest.yml
diff --git a/tests/model/DataListTest.php b/tests/php/ORM/DataListTest.php
similarity index 100%
rename from tests/model/DataListTest.php
rename to tests/php/ORM/DataListTest.php
diff --git a/tests/model/DataObjectDuplicationTest.php b/tests/php/ORM/DataObjectDuplicationTest.php
similarity index 100%
rename from tests/model/DataObjectDuplicationTest.php
rename to tests/php/ORM/DataObjectDuplicationTest.php
diff --git a/tests/model/DataObjectLazyLoadingTest.php b/tests/php/ORM/DataObjectLazyLoadingTest.php
similarity index 100%
rename from tests/model/DataObjectLazyLoadingTest.php
rename to tests/php/ORM/DataObjectLazyLoadingTest.php
diff --git a/tests/model/DataObjectSchemaGenerationTest.php b/tests/php/ORM/DataObjectSchemaGenerationTest.php
similarity index 100%
rename from tests/model/DataObjectSchemaGenerationTest.php
rename to tests/php/ORM/DataObjectSchemaGenerationTest.php
diff --git a/tests/model/DataObjectSchemaTest.php b/tests/php/ORM/DataObjectSchemaTest.php
similarity index 100%
rename from tests/model/DataObjectSchemaTest.php
rename to tests/php/ORM/DataObjectSchemaTest.php
diff --git a/tests/model/DataObjectSchemaTest.yml b/tests/php/ORM/DataObjectSchemaTest.yml
similarity index 100%
rename from tests/model/DataObjectSchemaTest.yml
rename to tests/php/ORM/DataObjectSchemaTest.yml
diff --git a/tests/model/DataObjectSchemaTest_Namespaced.php b/tests/php/ORM/DataObjectSchemaTest_Namespaced.php
similarity index 100%
rename from tests/model/DataObjectSchemaTest_Namespaced.php
rename to tests/php/ORM/DataObjectSchemaTest_Namespaced.php
diff --git a/tests/model/DataObjectTest.php b/tests/php/ORM/DataObjectTest.php
similarity index 100%
rename from tests/model/DataObjectTest.php
rename to tests/php/ORM/DataObjectTest.php
diff --git a/tests/model/DataObjectTest.yml b/tests/php/ORM/DataObjectTest.yml
similarity index 100%
rename from tests/model/DataObjectTest.yml
rename to tests/php/ORM/DataObjectTest.yml
diff --git a/tests/model/DataObjectTest_Namespaced.php b/tests/php/ORM/DataObjectTest_Namespaced.php
similarity index 100%
rename from tests/model/DataObjectTest_Namespaced.php
rename to tests/php/ORM/DataObjectTest_Namespaced.php
diff --git a/tests/model/DataQueryTest.php b/tests/php/ORM/DataQueryTest.php
similarity index 100%
rename from tests/model/DataQueryTest.php
rename to tests/php/ORM/DataQueryTest.php
diff --git a/tests/model/DataQueryTest.yml b/tests/php/ORM/DataQueryTest.yml
similarity index 100%
rename from tests/model/DataQueryTest.yml
rename to tests/php/ORM/DataQueryTest.yml
diff --git a/tests/model/DatabaseTest.php b/tests/php/ORM/DatabaseTest.php
similarity index 100%
rename from tests/model/DatabaseTest.php
rename to tests/php/ORM/DatabaseTest.php
diff --git a/tests/model/DbDatetimeTest.php b/tests/php/ORM/DbDatetimeTest.php
similarity index 100%
rename from tests/model/DbDatetimeTest.php
rename to tests/php/ORM/DbDatetimeTest.php
diff --git a/tests/model/DbDatetimeTest.yml b/tests/php/ORM/DbDatetimeTest.yml
similarity index 100%
rename from tests/model/DbDatetimeTest.yml
rename to tests/php/ORM/DbDatetimeTest.yml
diff --git a/tests/model/DecimalTest.php b/tests/php/ORM/DecimalTest.php
similarity index 100%
rename from tests/model/DecimalTest.php
rename to tests/php/ORM/DecimalTest.php
diff --git a/tests/model/DecimalTest.yml b/tests/php/ORM/DecimalTest.yml
similarity index 100%
rename from tests/model/DecimalTest.yml
rename to tests/php/ORM/DecimalTest.yml
diff --git a/tests/search/FulltextFilterTest.php b/tests/php/ORM/Filters/FulltextFilterTest.php
similarity index 100%
rename from tests/search/FulltextFilterTest.php
rename to tests/php/ORM/Filters/FulltextFilterTest.php
diff --git a/tests/search/FulltextFilterTest.yml b/tests/php/ORM/Filters/FulltextFilterTest.yml
similarity index 100%
rename from tests/search/FulltextFilterTest.yml
rename to tests/php/ORM/Filters/FulltextFilterTest.yml
diff --git a/tests/search/SearchFilterApplyRelationTest.php b/tests/php/ORM/Filters/SearchFilterApplyRelationTest.php
similarity index 100%
rename from tests/search/SearchFilterApplyRelationTest.php
rename to tests/php/ORM/Filters/SearchFilterApplyRelationTest.php
diff --git a/tests/search/SearchFilterApplyRelationTest.yml b/tests/php/ORM/Filters/SearchFilterApplyRelationTest.yml
similarity index 100%
rename from tests/search/SearchFilterApplyRelationTest.yml
rename to tests/php/ORM/Filters/SearchFilterApplyRelationTest.yml
diff --git a/tests/model/GDImageTest.php b/tests/php/ORM/GDImageTest.php
similarity index 100%
rename from tests/model/GDImageTest.php
rename to tests/php/ORM/GDImageTest.php
diff --git a/tests/model/GroupedListTest.php b/tests/php/ORM/GroupedListTest.php
similarity index 100%
rename from tests/model/GroupedListTest.php
rename to tests/php/ORM/GroupedListTest.php
diff --git a/tests/model/HasManyListTest.php b/tests/php/ORM/HasManyListTest.php
similarity index 100%
rename from tests/model/HasManyListTest.php
rename to tests/php/ORM/HasManyListTest.php
diff --git a/tests/model/HierarchyTest.php b/tests/php/ORM/HierarchyTest.php
similarity index 100%
rename from tests/model/HierarchyTest.php
rename to tests/php/ORM/HierarchyTest.php
diff --git a/tests/model/HierarchyTest.yml b/tests/php/ORM/HierarchyTest.yml
similarity index 100%
rename from tests/model/HierarchyTest.yml
rename to tests/php/ORM/HierarchyTest.yml
diff --git a/tests/model/ImageTest.php b/tests/php/ORM/ImageTest.php
similarity index 100%
rename from tests/model/ImageTest.php
rename to tests/php/ORM/ImageTest.php
diff --git a/tests/model/ImageTest.yml b/tests/php/ORM/ImageTest.yml
similarity index 100%
rename from tests/model/ImageTest.yml
rename to tests/php/ORM/ImageTest.yml
diff --git a/tests/model/ImagickImageTest.php b/tests/php/ORM/ImagickImageTest.php
similarity index 100%
rename from tests/model/ImagickImageTest.php
rename to tests/php/ORM/ImagickImageTest.php
diff --git a/tests/model/LabelFieldTest.php b/tests/php/ORM/LabelFieldTest.php
similarity index 100%
rename from tests/model/LabelFieldTest.php
rename to tests/php/ORM/LabelFieldTest.php
diff --git a/tests/model/ManyManyListExtensionTest.php b/tests/php/ORM/ManyManyListExtensionTest.php
similarity index 100%
rename from tests/model/ManyManyListExtensionTest.php
rename to tests/php/ORM/ManyManyListExtensionTest.php
diff --git a/tests/model/ManyManyListExtensionTest.yml b/tests/php/ORM/ManyManyListExtensionTest.yml
similarity index 100%
rename from tests/model/ManyManyListExtensionTest.yml
rename to tests/php/ORM/ManyManyListExtensionTest.yml
diff --git a/tests/model/ManyManyListTest.php b/tests/php/ORM/ManyManyListTest.php
similarity index 100%
rename from tests/model/ManyManyListTest.php
rename to tests/php/ORM/ManyManyListTest.php
diff --git a/tests/model/ManyManyThroughListTest.php b/tests/php/ORM/ManyManyThroughListTest.php
similarity index 100%
rename from tests/model/ManyManyThroughListTest.php
rename to tests/php/ORM/ManyManyThroughListTest.php
diff --git a/tests/model/ManyManyThroughListTest.yml b/tests/php/ORM/ManyManyThroughListTest.yml
similarity index 100%
rename from tests/model/ManyManyThroughListTest.yml
rename to tests/php/ORM/ManyManyThroughListTest.yml
diff --git a/tests/model/MapTest.php b/tests/php/ORM/MapTest.php
similarity index 100%
rename from tests/model/MapTest.php
rename to tests/php/ORM/MapTest.php
diff --git a/tests/model/MoneyTest.yml b/tests/php/ORM/MoneyTest.yml
similarity index 100%
rename from tests/model/MoneyTest.yml
rename to tests/php/ORM/MoneyTest.yml
diff --git a/tests/model/MySQLDatabaseTest.php b/tests/php/ORM/MySQLDatabaseTest.php
similarity index 100%
rename from tests/model/MySQLDatabaseTest.php
rename to tests/php/ORM/MySQLDatabaseTest.php
diff --git a/tests/model/MySQLDatabaseTest.yml b/tests/php/ORM/MySQLDatabaseTest.yml
similarity index 100%
rename from tests/model/MySQLDatabaseTest.yml
rename to tests/php/ORM/MySQLDatabaseTest.yml
diff --git a/tests/model/PDODatabaseTest.php b/tests/php/ORM/PDODatabaseTest.php
similarity index 100%
rename from tests/model/PDODatabaseTest.php
rename to tests/php/ORM/PDODatabaseTest.php
diff --git a/tests/model/PaginatedListTest.php b/tests/php/ORM/PaginatedListTest.php
similarity index 100%
rename from tests/model/PaginatedListTest.php
rename to tests/php/ORM/PaginatedListTest.php
diff --git a/tests/model/PolymorphicHasManyListTest.php b/tests/php/ORM/PolymorphicHasManyListTest.php
similarity index 100%
rename from tests/model/PolymorphicHasManyListTest.php
rename to tests/php/ORM/PolymorphicHasManyListTest.php
diff --git a/tests/model/SQLInsertTest.php b/tests/php/ORM/SQLInsertTest.php
similarity index 100%
rename from tests/model/SQLInsertTest.php
rename to tests/php/ORM/SQLInsertTest.php
diff --git a/tests/model/SQLSelectTest.php b/tests/php/ORM/SQLSelectTest.php
similarity index 100%
rename from tests/model/SQLSelectTest.php
rename to tests/php/ORM/SQLSelectTest.php
diff --git a/tests/model/SQLSelectTest.yml b/tests/php/ORM/SQLSelectTest.yml
similarity index 100%
rename from tests/model/SQLSelectTest.yml
rename to tests/php/ORM/SQLSelectTest.yml
diff --git a/tests/model/SQLUpdateTest.php b/tests/php/ORM/SQLUpdateTest.php
similarity index 100%
rename from tests/model/SQLUpdateTest.php
rename to tests/php/ORM/SQLUpdateTest.php
diff --git a/tests/model/SQLUpdateTest.yml b/tests/php/ORM/SQLUpdateTest.yml
similarity index 100%
rename from tests/model/SQLUpdateTest.yml
rename to tests/php/ORM/SQLUpdateTest.yml
diff --git a/tests/search/FulltextSearchableTest.php b/tests/php/ORM/Search/FulltextSearchableTest.php
similarity index 100%
rename from tests/search/FulltextSearchableTest.php
rename to tests/php/ORM/Search/FulltextSearchableTest.php
diff --git a/tests/search/SearchContextTest.php b/tests/php/ORM/Search/SearchContextTest.php
similarity index 100%
rename from tests/search/SearchContextTest.php
rename to tests/php/ORM/Search/SearchContextTest.php
diff --git a/tests/search/SearchContextTest.yml b/tests/php/ORM/Search/SearchContextTest.yml
similarity index 100%
rename from tests/search/SearchContextTest.yml
rename to tests/php/ORM/Search/SearchContextTest.yml
diff --git a/tests/model/TimeTest.php b/tests/php/ORM/TimeTest.php
similarity index 100%
rename from tests/model/TimeTest.php
rename to tests/php/ORM/TimeTest.php
diff --git a/tests/model/TransactionTest.php b/tests/php/ORM/TransactionTest.php
similarity index 100%
rename from tests/model/TransactionTest.php
rename to tests/php/ORM/TransactionTest.php
diff --git a/tests/model/URLSegmentFilterTest.php b/tests/php/ORM/URLSegmentFilterTest.php
similarity index 100%
rename from tests/model/URLSegmentFilterTest.php
rename to tests/php/ORM/URLSegmentFilterTest.php
diff --git a/tests/model/UnsavedRelationListTest.php b/tests/php/ORM/UnsavedRelationListTest.php
similarity index 100%
rename from tests/model/UnsavedRelationListTest.php
rename to tests/php/ORM/UnsavedRelationListTest.php
diff --git a/tests/model/UnsavedRelationListTest.yml b/tests/php/ORM/UnsavedRelationListTest.yml
similarity index 100%
rename from tests/model/UnsavedRelationListTest.yml
rename to tests/php/ORM/UnsavedRelationListTest.yml
diff --git a/tests/model/ValidationExceptionTest.php b/tests/php/ORM/ValidationExceptionTest.php
similarity index 100%
rename from tests/model/ValidationExceptionTest.php
rename to tests/php/ORM/ValidationExceptionTest.php
diff --git a/tests/model/VersionableExtensionsFixtures.yml b/tests/php/ORM/VersionableExtensionsFixtures.yml
similarity index 100%
rename from tests/model/VersionableExtensionsFixtures.yml
rename to tests/php/ORM/VersionableExtensionsFixtures.yml
diff --git a/tests/model/VersionableExtensionsTest.php b/tests/php/ORM/VersionableExtensionsTest.php
similarity index 100%
rename from tests/model/VersionableExtensionsTest.php
rename to tests/php/ORM/VersionableExtensionsTest.php
diff --git a/tests/model/VersionedOwnershipTest.php b/tests/php/ORM/VersionedOwnershipTest.php
similarity index 100%
rename from tests/model/VersionedOwnershipTest.php
rename to tests/php/ORM/VersionedOwnershipTest.php
diff --git a/tests/model/VersionedOwnershipTest.yml b/tests/php/ORM/VersionedOwnershipTest.yml
similarity index 100%
rename from tests/model/VersionedOwnershipTest.yml
rename to tests/php/ORM/VersionedOwnershipTest.yml
diff --git a/tests/model/VersionedTest.php b/tests/php/ORM/VersionedTest.php
similarity index 100%
rename from tests/model/VersionedTest.php
rename to tests/php/ORM/VersionedTest.php
diff --git a/tests/model/VersionedTest.yml b/tests/php/ORM/VersionedTest.yml
similarity index 100%
rename from tests/model/VersionedTest.yml
rename to tests/php/ORM/VersionedTest.yml
diff --git a/tests/model/testimages/test-image-high-quality.jpg b/tests/php/ORM/testimages/test-image-high-quality.jpg
similarity index 100%
rename from tests/model/testimages/test-image-high-quality.jpg
rename to tests/php/ORM/testimages/test-image-high-quality.jpg
diff --git a/tests/model/testimages/test-image-low-quality.jpg b/tests/php/ORM/testimages/test-image-low-quality.jpg
similarity index 100%
rename from tests/model/testimages/test-image-low-quality.jpg
rename to tests/php/ORM/testimages/test-image-low-quality.jpg
diff --git a/tests/model/testimages/test-image.png b/tests/php/ORM/testimages/test-image.png
similarity index 100%
rename from tests/model/testimages/test-image.png
rename to tests/php/ORM/testimages/test-image.png
diff --git a/tests/model/testimages/test.image.with.dots.png b/tests/php/ORM/testimages/test.image.with.dots.png
similarity index 100%
rename from tests/model/testimages/test.image.with.dots.png
rename to tests/php/ORM/testimages/test.image.with.dots.png
diff --git a/tests/security/BasicAuthTest.php b/tests/php/Security/BasicAuthTest.php
similarity index 100%
rename from tests/security/BasicAuthTest.php
rename to tests/php/Security/BasicAuthTest.php
diff --git a/tests/security/BasicAuthTest.yml b/tests/php/Security/BasicAuthTest.yml
similarity index 100%
rename from tests/security/BasicAuthTest.yml
rename to tests/php/Security/BasicAuthTest.yml
diff --git a/tests/security/GroupCsvBulkLoaderTest.csv b/tests/php/Security/GroupCsvBulkLoaderTest.csv
similarity index 100%
rename from tests/security/GroupCsvBulkLoaderTest.csv
rename to tests/php/Security/GroupCsvBulkLoaderTest.csv
diff --git a/tests/security/GroupCsvBulkLoaderTest.php b/tests/php/Security/GroupCsvBulkLoaderTest.php
similarity index 100%
rename from tests/security/GroupCsvBulkLoaderTest.php
rename to tests/php/Security/GroupCsvBulkLoaderTest.php
diff --git a/tests/security/GroupCsvBulkLoaderTest.yml b/tests/php/Security/GroupCsvBulkLoaderTest.yml
similarity index 100%
rename from tests/security/GroupCsvBulkLoaderTest.yml
rename to tests/php/Security/GroupCsvBulkLoaderTest.yml
diff --git a/tests/security/GroupCsvBulkLoaderTest_withExisting.csv b/tests/php/Security/GroupCsvBulkLoaderTest_withExisting.csv
similarity index 100%
rename from tests/security/GroupCsvBulkLoaderTest_withExisting.csv
rename to tests/php/Security/GroupCsvBulkLoaderTest_withExisting.csv
diff --git a/tests/security/GroupTest.php b/tests/php/Security/GroupTest.php
similarity index 100%
rename from tests/security/GroupTest.php
rename to tests/php/Security/GroupTest.php
diff --git a/tests/security/GroupTest.yml b/tests/php/Security/GroupTest.yml
similarity index 100%
rename from tests/security/GroupTest.yml
rename to tests/php/Security/GroupTest.yml
diff --git a/tests/security/MemberAuthenticatorTest.php b/tests/php/Security/MemberAuthenticatorTest.php
similarity index 100%
rename from tests/security/MemberAuthenticatorTest.php
rename to tests/php/Security/MemberAuthenticatorTest.php
diff --git a/tests/security/MemberCsvBulkLoaderTest.csv b/tests/php/Security/MemberCsvBulkLoaderTest.csv
similarity index 100%
rename from tests/security/MemberCsvBulkLoaderTest.csv
rename to tests/php/Security/MemberCsvBulkLoaderTest.csv
diff --git a/tests/security/MemberCsvBulkLoaderTest.php b/tests/php/Security/MemberCsvBulkLoaderTest.php
similarity index 100%
rename from tests/security/MemberCsvBulkLoaderTest.php
rename to tests/php/Security/MemberCsvBulkLoaderTest.php
diff --git a/tests/security/MemberCsvBulkLoaderTest.yml b/tests/php/Security/MemberCsvBulkLoaderTest.yml
similarity index 100%
rename from tests/security/MemberCsvBulkLoaderTest.yml
rename to tests/php/Security/MemberCsvBulkLoaderTest.yml
diff --git a/tests/security/MemberCsvBulkLoaderTest_cleartextpws.csv b/tests/php/Security/MemberCsvBulkLoaderTest_cleartextpws.csv
similarity index 100%
rename from tests/security/MemberCsvBulkLoaderTest_cleartextpws.csv
rename to tests/php/Security/MemberCsvBulkLoaderTest_cleartextpws.csv
diff --git a/tests/security/MemberCsvBulkLoaderTest_withGroups.csv b/tests/php/Security/MemberCsvBulkLoaderTest_withGroups.csv
similarity index 100%
rename from tests/security/MemberCsvBulkLoaderTest_withGroups.csv
rename to tests/php/Security/MemberCsvBulkLoaderTest_withGroups.csv
diff --git a/tests/security/MemberTest.php b/tests/php/Security/MemberTest.php
similarity index 100%
rename from tests/security/MemberTest.php
rename to tests/php/Security/MemberTest.php
diff --git a/tests/security/MemberTest.yml b/tests/php/Security/MemberTest.yml
similarity index 100%
rename from tests/security/MemberTest.yml
rename to tests/php/Security/MemberTest.yml
diff --git a/tests/security/PasswordEncryptorTest.php b/tests/php/Security/PasswordEncryptorTest.php
similarity index 100%
rename from tests/security/PasswordEncryptorTest.php
rename to tests/php/Security/PasswordEncryptorTest.php
diff --git a/tests/security/PasswordValidatorTest.php b/tests/php/Security/PasswordValidatorTest.php
similarity index 100%
rename from tests/security/PasswordValidatorTest.php
rename to tests/php/Security/PasswordValidatorTest.php
diff --git a/tests/security/PermissionCheckboxSetFieldTest.php b/tests/php/Security/PermissionCheckboxSetFieldTest.php
similarity index 100%
rename from tests/security/PermissionCheckboxSetFieldTest.php
rename to tests/php/Security/PermissionCheckboxSetFieldTest.php
diff --git a/tests/security/PermissionCheckboxSetFieldTest.yml b/tests/php/Security/PermissionCheckboxSetFieldTest.yml
similarity index 100%
rename from tests/security/PermissionCheckboxSetFieldTest.yml
rename to tests/php/Security/PermissionCheckboxSetFieldTest.yml
diff --git a/tests/security/PermissionRoleTest.php b/tests/php/Security/PermissionRoleTest.php
similarity index 100%
rename from tests/security/PermissionRoleTest.php
rename to tests/php/Security/PermissionRoleTest.php
diff --git a/tests/security/PermissionRoleTest.yml b/tests/php/Security/PermissionRoleTest.yml
similarity index 100%
rename from tests/security/PermissionRoleTest.yml
rename to tests/php/Security/PermissionRoleTest.yml
diff --git a/tests/security/PermissionTest.php b/tests/php/Security/PermissionTest.php
similarity index 100%
rename from tests/security/PermissionTest.php
rename to tests/php/Security/PermissionTest.php
diff --git a/tests/security/PermissionTest.yml b/tests/php/Security/PermissionTest.yml
similarity index 100%
rename from tests/security/PermissionTest.yml
rename to tests/php/Security/PermissionTest.yml
diff --git a/tests/security/RandomGeneratorTest.php b/tests/php/Security/RandomGeneratorTest.php
similarity index 100%
rename from tests/security/RandomGeneratorTest.php
rename to tests/php/Security/RandomGeneratorTest.php
diff --git a/tests/security/SecurityDefaultAdminTest.php b/tests/php/Security/SecurityDefaultAdminTest.php
similarity index 100%
rename from tests/security/SecurityDefaultAdminTest.php
rename to tests/php/Security/SecurityDefaultAdminTest.php
diff --git a/tests/security/SecurityTest.php b/tests/php/Security/SecurityTest.php
similarity index 100%
rename from tests/security/SecurityTest.php
rename to tests/php/Security/SecurityTest.php
diff --git a/tests/security/SecurityTokenTest.php b/tests/php/Security/SecurityTokenTest.php
similarity index 100%
rename from tests/security/SecurityTokenTest.php
rename to tests/php/Security/SecurityTokenTest.php
diff --git a/tests/core/ArrayDataTest.php b/tests/php/View/ArrayDataTest.php
similarity index 100%
rename from tests/core/ArrayDataTest.php
rename to tests/php/View/ArrayDataTest.php
diff --git a/tests/view/ContentNegotiatorTest.php b/tests/php/View/ContentNegotiatorTest.php
similarity index 100%
rename from tests/view/ContentNegotiatorTest.php
rename to tests/php/View/ContentNegotiatorTest.php
diff --git a/tests/core/DiffTest.php b/tests/php/View/Parsers/DiffTest.php
similarity index 100%
rename from tests/core/DiffTest.php
rename to tests/php/View/Parsers/DiffTest.php
diff --git a/tests/integration/HTML4ValueTest.php b/tests/php/View/Parsers/HTML4ValueTest.php
similarity index 100%
rename from tests/integration/HTML4ValueTest.php
rename to tests/php/View/Parsers/HTML4ValueTest.php
diff --git a/tests/parsers/SQLFormatterTest.php b/tests/php/View/Parsers/SQLFormatterTest.php
similarity index 100%
rename from tests/parsers/SQLFormatterTest.php
rename to tests/php/View/Parsers/SQLFormatterTest.php
diff --git a/tests/parsers/ShortcodeParserTest.php b/tests/php/View/Parsers/ShortcodeParserTest.php
similarity index 100%
rename from tests/parsers/ShortcodeParserTest.php
rename to tests/php/View/Parsers/ShortcodeParserTest.php
diff --git a/tests/forms/RequirementsTest.php b/tests/php/View/RequirementsTest.php
similarity index 100%
rename from tests/forms/RequirementsTest.php
rename to tests/php/View/RequirementsTest.php
diff --git a/tests/css/forms/RequirementsTest_a.css b/tests/php/View/RequirementsTest/RequirementsTest_a.css
similarity index 100%
rename from tests/css/forms/RequirementsTest_a.css
rename to tests/php/View/RequirementsTest/RequirementsTest_a.css
diff --git a/tests/forms/RequirementsTest_a.js b/tests/php/View/RequirementsTest/RequirementsTest_a.js
similarity index 100%
rename from tests/forms/RequirementsTest_a.js
rename to tests/php/View/RequirementsTest/RequirementsTest_a.js
diff --git a/tests/css/forms/RequirementsTest_b.css b/tests/php/View/RequirementsTest/RequirementsTest_b.css
similarity index 100%
rename from tests/css/forms/RequirementsTest_b.css
rename to tests/php/View/RequirementsTest/RequirementsTest_b.css
diff --git a/tests/forms/RequirementsTest_b.js b/tests/php/View/RequirementsTest/RequirementsTest_b.js
similarity index 100%
rename from tests/forms/RequirementsTest_b.js
rename to tests/php/View/RequirementsTest/RequirementsTest_b.js
diff --git a/tests/css/forms/RequirementsTest_c.css b/tests/php/View/RequirementsTest/RequirementsTest_c.css
similarity index 100%
rename from tests/css/forms/RequirementsTest_c.css
rename to tests/php/View/RequirementsTest/RequirementsTest_c.css
diff --git a/tests/forms/RequirementsTest_c.js b/tests/php/View/RequirementsTest/RequirementsTest_c.js
similarity index 100%
rename from tests/forms/RequirementsTest_c.js
rename to tests/php/View/RequirementsTest/RequirementsTest_c.js
diff --git a/tests/forms/RequirementsTest_print_a.css b/tests/php/View/RequirementsTest/RequirementsTest_print_a.css
similarity index 100%
rename from tests/forms/RequirementsTest_print_a.css
rename to tests/php/View/RequirementsTest/RequirementsTest_print_a.css
diff --git a/tests/forms/RequirementsTest_print_b.css b/tests/php/View/RequirementsTest/RequirementsTest_print_b.css
similarity index 100%
rename from tests/forms/RequirementsTest_print_b.css
rename to tests/php/View/RequirementsTest/RequirementsTest_print_b.css
diff --git a/tests/view/SSViewerCacheBlockTest.php b/tests/php/View/SSViewerCacheBlockTest.php
similarity index 100%
rename from tests/view/SSViewerCacheBlockTest.php
rename to tests/php/View/SSViewerCacheBlockTest.php
diff --git a/tests/view/SSViewerTest.php b/tests/php/View/SSViewerTest.php
similarity index 100%
rename from tests/view/SSViewerTest.php
rename to tests/php/View/SSViewerTest.php
diff --git a/tests/php/View/SSViewerTest/Model.php b/tests/php/View/SSViewerTest/Model.php
new file mode 100644
index 000000000..7d049043e
--- /dev/null
+++ b/tests/php/View/SSViewerTest/Model.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace TestNamespace;
+
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Control\Controller;
+
+class SSViewerTestModel extends DataObject implements TestOnly {
+
+}
+
+class SSViewerTestModel_Controller extends Controller implements TestOnly {
+
+}
diff --git a/tests/templates/ControllerTest.ss b/tests/php/View/SSViewerTest/templates/ControllerTest.ss
similarity index 100%
rename from tests/templates/ControllerTest.ss
rename to tests/php/View/SSViewerTest/templates/ControllerTest.ss
diff --git a/tests/templates/ControllerTest_templateaction.ss b/tests/php/View/SSViewerTest/templates/ControllerTest_templateaction.ss
similarity index 100%
rename from tests/templates/ControllerTest_templateaction.ss
rename to tests/php/View/SSViewerTest/templates/ControllerTest_templateaction.ss
diff --git a/tests/templates/Includes/SSViewerTestCommentsInclude.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestCommentsInclude.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestCommentsInclude.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestCommentsInclude.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeObjectArguments.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeObjectArguments.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeObjectArguments.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeObjectArguments.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeScopeInheritanceInclude.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceInclude.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeScopeInheritanceInclude.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceInclude.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInLoop.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInLoop.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInLoop.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInLoop.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInNestedWith.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInNestedWith.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInNestedWith.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInNestedWith.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInWith.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInWith.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInWith.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithArgsInWith.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithUpAndTop.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithUpAndTop.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeScopeInheritanceWithUpAndTop.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeScopeInheritanceWithUpAndTop.ss
diff --git a/tests/templates/Includes/SSViewerTestIncludeWithArguments.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeWithArguments.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestIncludeWithArguments.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestIncludeWithArguments.ss
diff --git a/tests/templates/Includes/SSViewerTestProcessHead.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestProcessHead.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestProcessHead.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestProcessHead.ss
diff --git a/tests/templates/Includes/SSViewerTestRecursiveInclude.ss b/tests/php/View/SSViewerTest/templates/Includes/SSViewerTestRecursiveInclude.ss
similarity index 100%
rename from tests/templates/Includes/SSViewerTestRecursiveInclude.ss
rename to tests/php/View/SSViewerTest/templates/Includes/SSViewerTestRecursiveInclude.ss
diff --git a/tests/templates/Namespace/Includes/NamespaceInclude.ss b/tests/php/View/SSViewerTest/templates/Namespace/Includes/NamespaceInclude.ss
similarity index 100%
rename from tests/templates/Namespace/Includes/NamespaceInclude.ss
rename to tests/php/View/SSViewerTest/templates/Namespace/Includes/NamespaceInclude.ss
diff --git a/tests/templates/RSSFeedTest.ss b/tests/php/View/SSViewerTest/templates/RSSFeedTest.ss
similarity index 100%
rename from tests/templates/RSSFeedTest.ss
rename to tests/php/View/SSViewerTest/templates/RSSFeedTest.ss
diff --git a/tests/templates/RequirementsTest_Conditionals.ss b/tests/php/View/SSViewerTest/templates/RequirementsTest_Conditionals.ss
similarity index 100%
rename from tests/templates/RequirementsTest_Conditionals.ss
rename to tests/php/View/SSViewerTest/templates/RequirementsTest_Conditionals.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSource.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSource.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSource.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSource.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceHTML4Doctype.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceHTML4Doctype.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceHTML4Doctype.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceHTML4Doctype.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIE.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIE.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIE.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIE.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIENoDoctype.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIENoDoctype.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIENoDoctype.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceIfIENoDoctype.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceNoDoctype.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceNoDoctype.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceNoDoctype.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsFullSourceNoDoctype.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsPartialSource.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsPartialSource.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsPartialSource.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsPartialSource.ss
diff --git a/tests/templates/SSViewerTestComments/SSViewerTestCommentsWithInclude.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsWithInclude.ss
similarity index 100%
rename from tests/templates/SSViewerTestComments/SSViewerTestCommentsWithInclude.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestComments/SSViewerTestCommentsWithInclude.ss
diff --git a/tests/templates/SSViewerTestIncludeScopeInheritance.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestIncludeScopeInheritance.ss
similarity index 100%
rename from tests/templates/SSViewerTestIncludeScopeInheritance.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestIncludeScopeInheritance.ss
diff --git a/tests/templates/SSViewerTestIncludeScopeInheritanceWithArgs.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestIncludeScopeInheritanceWithArgs.ss
similarity index 100%
rename from tests/templates/SSViewerTestIncludeScopeInheritanceWithArgs.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestIncludeScopeInheritanceWithArgs.ss
diff --git a/tests/templates/SSViewerTestPartialTemplate.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestPartialTemplate.ss
similarity index 100%
rename from tests/templates/SSViewerTestPartialTemplate.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestPartialTemplate.ss
diff --git a/tests/templates/SSViewerTestProcess.ss b/tests/php/View/SSViewerTest/templates/SSViewerTestProcess.ss
similarity index 100%
rename from tests/templates/SSViewerTestProcess.ss
rename to tests/php/View/SSViewerTest/templates/SSViewerTestProcess.ss
diff --git a/tests/view/themes/javascript/bad.js b/tests/php/View/SSViewerTest/themes/javascript/bad.js
similarity index 100%
rename from tests/view/themes/javascript/bad.js
rename to tests/php/View/SSViewerTest/themes/javascript/bad.js
diff --git a/tests/view/themes/layouttest/templates/Controller.ss b/tests/php/View/SSViewerTest/themes/layouttest/templates/Controller.ss
similarity index 100%
rename from tests/view/themes/layouttest/templates/Controller.ss
rename to tests/php/View/SSViewerTest/themes/layouttest/templates/Controller.ss
diff --git a/tests/view/themes/layouttest/templates/Layout/Page.ss b/tests/php/View/SSViewerTest/themes/layouttest/templates/Layout/Page.ss
similarity index 100%
rename from tests/view/themes/layouttest/templates/Layout/Page.ss
rename to tests/php/View/SSViewerTest/themes/layouttest/templates/Layout/Page.ss
diff --git a/tests/view/themes/layouttest/templates/Layout/Shortcodes.ss b/tests/php/View/SSViewerTest/themes/layouttest/templates/Layout/Shortcodes.ss
similarity index 100%
rename from tests/view/themes/layouttest/templates/Layout/Shortcodes.ss
rename to tests/php/View/SSViewerTest/themes/layouttest/templates/Layout/Shortcodes.ss
diff --git a/tests/view/themes/layouttest/templates/Page.ss b/tests/php/View/SSViewerTest/themes/layouttest/templates/Page.ss
similarity index 100%
rename from tests/view/themes/layouttest/templates/Page.ss
rename to tests/php/View/SSViewerTest/themes/layouttest/templates/Page.ss
diff --git a/tests/view/themes/layouttest/templates/TestNamespace/SSViewerTestModel_Controller.ss b/tests/php/View/SSViewerTest/themes/layouttest/templates/TestNamespace/SSViewerTestModel_Controller.ss
similarity index 100%
rename from tests/view/themes/layouttest/templates/TestNamespace/SSViewerTestModel_Controller.ss
rename to tests/php/View/SSViewerTest/themes/layouttest/templates/TestNamespace/SSViewerTestModel_Controller.ss
diff --git a/tests/view/ViewableDataTest.php b/tests/php/View/ViewableDataTest.php
similarity index 100%
rename from tests/view/ViewableDataTest.php
rename to tests/php/View/ViewableDataTest.php
diff --git a/tests/bootstrap.php b/tests/php/bootstrap.php
similarity index 100%
rename from tests/bootstrap.php
rename to tests/php/bootstrap.php
diff --git a/tests/i18n/i18nTest.php b/tests/php/i18n/i18nTest.php
similarity index 100%
rename from tests/i18n/i18nTest.php
rename to tests/php/i18n/i18nTest.php
diff --git a/tests/i18n/i18nTextCollectorTestMyObject.php b/tests/php/i18n/i18nTest/MyObject.php
similarity index 100%
rename from tests/i18n/i18nTextCollectorTestMyObject.php
rename to tests/php/i18n/i18nTest/MyObject.php
diff --git a/tests/i18n/i18nTextCollectorTestMySubObject.php b/tests/php/i18n/i18nTest/MySubObject.php
similarity index 100%
rename from tests/i18n/i18nTextCollectorTestMySubObject.php
rename to tests/php/i18n/i18nTest/MySubObject.php
diff --git a/tests/i18n/_fakewebroot/_manifest_exclude b/tests/php/i18n/i18nTest/_fakewebroot/_manifest_exclude
similarity index 100%
rename from tests/i18n/_fakewebroot/_manifest_exclude
rename to tests/php/i18n/i18nTest/_fakewebroot/_manifest_exclude
diff --git a/tests/i18n/_fakewebroot/assets/blank b/tests/php/i18n/i18nTest/_fakewebroot/assets/blank
similarity index 100%
rename from tests/i18n/_fakewebroot/assets/blank
rename to tests/php/i18n/i18nTest/_fakewebroot/assets/blank
diff --git a/tests/i18n/_fakewebroot/i18nnonstandardmodule/_config.php b/tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/_config.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nnonstandardmodule/_config.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/_config.php
diff --git a/tests/i18n/_fakewebroot/i18nnonstandardmodule/phpfile.php b/tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/phpfile.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nnonstandardmodule/phpfile.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/phpfile.php
diff --git a/tests/i18n/_fakewebroot/i18nnonstandardmodule/template.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/template.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nnonstandardmodule/template.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/template.ss
diff --git a/tests/i18n/_fakewebroot/i18nnonstandardmodule/tests/NothingInHere.php b/tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/tests/NothingInHere.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nnonstandardmodule/tests/NothingInHere.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nnonstandardmodule/tests/NothingInHere.php
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/_config/blank.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/_config/blank.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/_config/blank.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/_config/blank.yml
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/lang/de.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/lang/de.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/lang/de.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/lang/de.yml
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/lang/en.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/lang/en.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/lang/en.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/lang/en.yml
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/wrongplace/i18nNotIncluded.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/wrongplace/i18nNotIncluded.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18nothermodule/wrongplace/i18nNotIncluded.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18nothermodule/wrongplace/i18nNotIncluded.ss
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/_config.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/_config.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/_config.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/_config.php
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/i18nTestModule.php
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/_config.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/_config.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/_config.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/_config.php
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestNamespacedClass.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestNamespacedClass.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestNamespacedClass.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestNamespacedClass.php
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/lang/de.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/de.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/lang/de.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/de.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/lang/en.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/en.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/lang/en.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/en.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/lang/de.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/lang/de.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/lang/de_AT.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de_AT.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/lang/de_AT.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/de_AT.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/lang/en.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/lang/en.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/en.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/lang/fr.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/fr.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/lang/fr.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/fr.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/lang/mi_NZ.yml b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/mi_NZ.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/lang/mi_NZ.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/lang/mi_NZ.yml
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/tests/DontLook.php b/tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/tests/DontLook.php
similarity index 100%
rename from tests/i18n/_fakewebroot/i18ntestmodule/tests/DontLook.php
rename to tests/php/i18n/i18nTest/_fakewebroot/i18ntestmodule/tests/DontLook.php
diff --git a/tests/i18n/_fakewebroot/notmodule/noop.php b/tests/php/i18n/i18nTest/_fakewebroot/notmodule/noop.php
similarity index 100%
rename from tests/i18n/_fakewebroot/notmodule/noop.php
rename to tests/php/i18n/i18nTest/_fakewebroot/notmodule/noop.php
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/lang/de.yml b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/lang/de.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de.yml
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/lang/de_DE.php b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de_DE.php
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/lang/de_DE.php
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/de_DE.php
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/lang/en.yml b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/lang/en.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en.yml
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/lang/en_US.php b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en_US.php
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/lang/en_US.php
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/lang/en_US.php
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Includes/i18nTestTheme1Include.ss
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/Layout/i18nTestTheme1.ss
diff --git a/tests/i18n/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme1/templates/i18nTestTheme1Main.ss
diff --git a/tests/i18n/_fakewebroot/themes/testtheme2/lang/de.yml b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/lang/de.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme2/lang/de.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/lang/de.yml
diff --git a/tests/i18n/_fakewebroot/themes/testtheme2/lang/en.yml b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/lang/en.yml
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme2/lang/en.yml
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/lang/en.yml
diff --git a/tests/i18n/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss b/tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss
similarity index 100%
rename from tests/i18n/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss
rename to tests/php/i18n/i18nTest/_fakewebroot/themes/testtheme2/templates/i18nTestTheme2.ss
diff --git a/tests/i18n/i18nTextCollectorTest.php b/tests/php/i18n/i18nTextCollectorTest.php
similarity index 100%
rename from tests/i18n/i18nTextCollectorTest.php
rename to tests/php/i18n/i18nTextCollectorTest.php
diff --git a/tests/view/TestNamespace/SSViewerTest_Controller.php b/tests/view/TestNamespace/SSViewerTest_Controller.php
deleted file mode 100644
index 0b1492fa5..000000000
--- a/tests/view/TestNamespace/SSViewerTest_Controller.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace TestNamespace;
-
-use SilverStripe\ORM\DataObject;
-use SilverStripe\Control\Controller;
-
-
-class SSViewerTestModel extends DataObject {
-
-}
-
-class SSViewerTestModel_Controller extends Controller {
-
-}