diff --git a/cli-script.php b/cli-script.php
index 6bbe64d92..74dd97b46 100755
--- a/cli-script.php
+++ b/cli-script.php
@@ -67,7 +67,7 @@ global $databaseConfig;
 $_SESSION = null;
 
 // Connect to database
-require_once("core/model/DB.php");
+require_once("model/DB.php");
 DB::connect($databaseConfig);
 
 // Get the request URL from the querystring arguments
diff --git a/core/control/ContentNegotiator.php b/control/ContentNegotiator.php
similarity index 100%
rename from core/control/ContentNegotiator.php
rename to control/ContentNegotiator.php
diff --git a/core/control/Controller.php b/control/Controller.php
similarity index 100%
rename from core/control/Controller.php
rename to control/Controller.php
diff --git a/core/Cookie.php b/control/Cookie.php
similarity index 100%
rename from core/Cookie.php
rename to control/Cookie.php
diff --git a/core/control/Director.php b/control/Director.php
similarity index 100%
rename from core/control/Director.php
rename to control/Director.php
diff --git a/core/control/FormResponse.php b/control/FormResponse.php
similarity index 100%
rename from core/control/FormResponse.php
rename to control/FormResponse.php
diff --git a/core/HTTP.php b/control/HTTP.php
similarity index 100%
rename from core/HTTP.php
rename to control/HTTP.php
diff --git a/core/control/HTTPRequest.php b/control/HTTPRequest.php
similarity index 100%
rename from core/control/HTTPRequest.php
rename to control/HTTPRequest.php
diff --git a/core/control/HTTPResponse.php b/control/HTTPResponse.php
similarity index 100%
rename from core/control/HTTPResponse.php
rename to control/HTTPResponse.php
diff --git a/core/control/NullHTTPRequest.php b/control/NullHTTPRequest.php
similarity index 100%
rename from core/control/NullHTTPRequest.php
rename to control/NullHTTPRequest.php
diff --git a/core/control/RequestHandler.php b/control/RequestHandler.php
similarity index 100%
rename from core/control/RequestHandler.php
rename to control/RequestHandler.php
diff --git a/core/Session.php b/control/Session.php
similarity index 100%
rename from core/Session.php
rename to control/Session.php
diff --git a/core/Core.php b/core/Core.php
index f9934b011..34d868fb9 100644
--- a/core/Core.php
+++ b/core/Core.php
@@ -208,15 +208,15 @@ set_include_path(BASE_PATH . '/sapphire' . PATH_SEPARATOR
 require_once 'cache/Cache.php';
 require_once 'core/Object.php';
 require_once 'core/ClassInfo.php';
-require_once 'core/control/Director.php';
+require_once 'control/Director.php';
 require_once 'dev/Debug.php';
 require_once 'filesystem/FileFinder.php';
-require_once 'manifest/ClassLoader.php';
-require_once 'manifest/ClassManifest.php';
-require_once 'manifest/ManifestFileFinder.php';
-require_once 'manifest/TemplateLoader.php';
-require_once 'manifest/TemplateManifest.php';
-require_once 'manifest/TokenisedRegularExpression.php';
+require_once 'core/manifest/ClassLoader.php';
+require_once 'core/manifest/ClassManifest.php';
+require_once 'core/manifest/ManifestFileFinder.php';
+require_once 'core/manifest/TemplateLoader.php';
+require_once 'core/manifest/TemplateManifest.php';
+require_once 'core/manifest/TokenisedRegularExpression.php';
 
 ///////////////////////////////////////////////////////////////////////////////
 // MANIFEST
diff --git a/manifest/ClassLoader.php b/core/manifest/ClassLoader.php
similarity index 100%
rename from manifest/ClassLoader.php
rename to core/manifest/ClassLoader.php
diff --git a/manifest/ClassManifest.php b/core/manifest/ClassManifest.php
similarity index 100%
rename from manifest/ClassManifest.php
rename to core/manifest/ClassManifest.php
diff --git a/manifest/ManifestFileFinder.php b/core/manifest/ManifestFileFinder.php
similarity index 100%
rename from manifest/ManifestFileFinder.php
rename to core/manifest/ManifestFileFinder.php
diff --git a/manifest/TemplateLoader.php b/core/manifest/TemplateLoader.php
similarity index 100%
rename from manifest/TemplateLoader.php
rename to core/manifest/TemplateLoader.php
diff --git a/manifest/TemplateManifest.php b/core/manifest/TemplateManifest.php
similarity index 100%
rename from manifest/TemplateManifest.php
rename to core/manifest/TemplateManifest.php
diff --git a/manifest/TokenisedRegularExpression.php b/core/manifest/TokenisedRegularExpression.php
similarity index 100%
rename from manifest/TokenisedRegularExpression.php
rename to core/manifest/TokenisedRegularExpression.php
diff --git a/profiler/Profiler.php b/dev/Profiler.php
similarity index 100%
rename from profiler/Profiler.php
rename to dev/Profiler.php
diff --git a/core/i18n.php b/i18n/i18n.php
similarity index 100%
rename from core/i18n.php
rename to i18n/i18n.php
diff --git a/core/i18nEntityProvider.php b/i18n/i18nEntityProvider.php
similarity index 100%
rename from core/i18nEntityProvider.php
rename to i18n/i18nEntityProvider.php
diff --git a/core/i18nTextCollector.php b/i18n/i18nTextCollector.php
similarity index 100%
rename from core/i18nTextCollector.php
rename to i18n/i18nTextCollector.php
diff --git a/main.php b/main.php
index 85de63abe..ac6f9809f 100644
--- a/main.php
+++ b/main.php
@@ -102,7 +102,7 @@ if (isset($_GET['debug_profile'])) {
 }
 
 // Connect to database
-require_once("core/model/DB.php");
+require_once("model/DB.php");
 
 // Redirect to the installer if no database is selected
 if(!isset($databaseConfig) || !isset($databaseConfig['database']) || !$databaseConfig['database']) {
diff --git a/core/model/Aggregate.php b/model/Aggregate.php
similarity index 100%
rename from core/model/Aggregate.php
rename to model/Aggregate.php
diff --git a/core/model/ComponentSet.php b/model/ComponentSet.php
similarity index 100%
rename from core/model/ComponentSet.php
rename to model/ComponentSet.php
diff --git a/core/model/DB.php b/model/DB.php
similarity index 100%
rename from core/model/DB.php
rename to model/DB.php
diff --git a/core/model/DataDifferencer.php b/model/DataDifferencer.php
similarity index 100%
rename from core/model/DataDifferencer.php
rename to model/DataDifferencer.php
diff --git a/core/model/DataObject.php b/model/DataObject.php
similarity index 100%
rename from core/model/DataObject.php
rename to model/DataObject.php
diff --git a/core/model/DataObjectDecorator.php b/model/DataObjectDecorator.php
similarity index 100%
rename from core/model/DataObjectDecorator.php
rename to model/DataObjectDecorator.php
diff --git a/core/model/DataObjectInterface.php b/model/DataObjectInterface.php
similarity index 100%
rename from core/model/DataObjectInterface.php
rename to model/DataObjectInterface.php
diff --git a/core/model/DataObjectLog.php b/model/DataObjectLog.php
similarity index 100%
rename from core/model/DataObjectLog.php
rename to model/DataObjectLog.php
diff --git a/core/model/DataObjectSet.php b/model/DataObjectSet.php
similarity index 100%
rename from core/model/DataObjectSet.php
rename to model/DataObjectSet.php
diff --git a/core/model/Database.php b/model/Database.php
similarity index 100%
rename from core/model/Database.php
rename to model/Database.php
diff --git a/core/model/DatabaseAdmin.php b/model/DatabaseAdmin.php
similarity index 99%
rename from core/model/DatabaseAdmin.php
rename to model/DatabaseAdmin.php
index 53f47da66..406358d19 100644
--- a/core/model/DatabaseAdmin.php
+++ b/model/DatabaseAdmin.php
@@ -1,6 +1,6 @@
 <?php
 // Include the DB class
-require_once("core/model/DB.php");
+require_once("model/DB.php");
 
 /**
  * DatabaseAdmin class
diff --git a/integration/HTMLValue.php b/model/HTMLValue.php
similarity index 100%
rename from integration/HTMLValue.php
rename to model/HTMLValue.php
diff --git a/core/model/HiddenClass.php b/model/HiddenClass.php
similarity index 100%
rename from core/model/HiddenClass.php
rename to model/HiddenClass.php
diff --git a/core/model/Hierarchy.php b/model/Hierarchy.php
similarity index 100%
rename from core/model/Hierarchy.php
rename to model/Hierarchy.php
diff --git a/core/model/Image.php b/model/Image.php
similarity index 100%
rename from core/model/Image.php
rename to model/Image.php
diff --git a/core/model/MySQLDatabase.php b/model/MySQLDatabase.php
similarity index 100%
rename from core/model/MySQLDatabase.php
rename to model/MySQLDatabase.php
diff --git a/core/model/SQLMap.php b/model/SQLMap.php
similarity index 100%
rename from core/model/SQLMap.php
rename to model/SQLMap.php
diff --git a/core/model/SQLQuery.php b/model/SQLQuery.php
similarity index 100%
rename from core/model/SQLQuery.php
rename to model/SQLQuery.php
diff --git a/core/model/Transliterator.php b/model/Transliterator.php
similarity index 100%
rename from core/model/Transliterator.php
rename to model/Transliterator.php
diff --git a/core/ValidationException.php b/model/ValidationException.php
similarity index 100%
rename from core/ValidationException.php
rename to model/ValidationException.php
diff --git a/core/ValidationResult.php b/model/ValidationResult.php
similarity index 100%
rename from core/ValidationResult.php
rename to model/ValidationResult.php
diff --git a/core/model/Versioned.php b/model/Versioned.php
similarity index 100%
rename from core/model/Versioned.php
rename to model/Versioned.php
diff --git a/core/model/fieldtypes/Boolean.php b/model/fieldtypes/Boolean.php
similarity index 100%
rename from core/model/fieldtypes/Boolean.php
rename to model/fieldtypes/Boolean.php
diff --git a/core/model/fieldtypes/CompositeDBField.php b/model/fieldtypes/CompositeDBField.php
similarity index 100%
rename from core/model/fieldtypes/CompositeDBField.php
rename to model/fieldtypes/CompositeDBField.php
diff --git a/core/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php
similarity index 100%
rename from core/model/fieldtypes/Currency.php
rename to model/fieldtypes/Currency.php
diff --git a/core/model/fieldtypes/DBField.php b/model/fieldtypes/DBField.php
similarity index 100%
rename from core/model/fieldtypes/DBField.php
rename to model/fieldtypes/DBField.php
diff --git a/core/model/fieldtypes/DBLocale.php b/model/fieldtypes/DBLocale.php
similarity index 100%
rename from core/model/fieldtypes/DBLocale.php
rename to model/fieldtypes/DBLocale.php
diff --git a/core/model/fieldtypes/Date.php b/model/fieldtypes/Date.php
similarity index 100%
rename from core/model/fieldtypes/Date.php
rename to model/fieldtypes/Date.php
diff --git a/core/model/fieldtypes/Datetime.php b/model/fieldtypes/Datetime.php
similarity index 100%
rename from core/model/fieldtypes/Datetime.php
rename to model/fieldtypes/Datetime.php
diff --git a/core/model/fieldtypes/Decimal.php b/model/fieldtypes/Decimal.php
similarity index 100%
rename from core/model/fieldtypes/Decimal.php
rename to model/fieldtypes/Decimal.php
diff --git a/core/model/fieldtypes/Double.php b/model/fieldtypes/Double.php
similarity index 100%
rename from core/model/fieldtypes/Double.php
rename to model/fieldtypes/Double.php
diff --git a/core/model/fieldtypes/Enum.php b/model/fieldtypes/Enum.php
similarity index 100%
rename from core/model/fieldtypes/Enum.php
rename to model/fieldtypes/Enum.php
diff --git a/core/model/fieldtypes/Float.php b/model/fieldtypes/Float.php
similarity index 100%
rename from core/model/fieldtypes/Float.php
rename to model/fieldtypes/Float.php
diff --git a/core/model/fieldtypes/ForeignKey.php b/model/fieldtypes/ForeignKey.php
similarity index 100%
rename from core/model/fieldtypes/ForeignKey.php
rename to model/fieldtypes/ForeignKey.php
diff --git a/core/model/fieldtypes/HTMLText.php b/model/fieldtypes/HTMLText.php
similarity index 100%
rename from core/model/fieldtypes/HTMLText.php
rename to model/fieldtypes/HTMLText.php
diff --git a/core/model/fieldtypes/HTMLVarchar.php b/model/fieldtypes/HTMLVarchar.php
similarity index 100%
rename from core/model/fieldtypes/HTMLVarchar.php
rename to model/fieldtypes/HTMLVarchar.php
diff --git a/core/model/fieldtypes/Int.php b/model/fieldtypes/Int.php
similarity index 100%
rename from core/model/fieldtypes/Int.php
rename to model/fieldtypes/Int.php
diff --git a/core/model/fieldtypes/Money.php b/model/fieldtypes/Money.php
similarity index 100%
rename from core/model/fieldtypes/Money.php
rename to model/fieldtypes/Money.php
diff --git a/core/model/fieldtypes/MultiEnum.php b/model/fieldtypes/MultiEnum.php
similarity index 100%
rename from core/model/fieldtypes/MultiEnum.php
rename to model/fieldtypes/MultiEnum.php
diff --git a/core/model/fieldtypes/Percentage.php b/model/fieldtypes/Percentage.php
similarity index 100%
rename from core/model/fieldtypes/Percentage.php
rename to model/fieldtypes/Percentage.php
diff --git a/core/model/fieldtypes/PrimaryKey.php b/model/fieldtypes/PrimaryKey.php
similarity index 100%
rename from core/model/fieldtypes/PrimaryKey.php
rename to model/fieldtypes/PrimaryKey.php
diff --git a/core/model/fieldtypes/StringField.php b/model/fieldtypes/StringField.php
similarity index 100%
rename from core/model/fieldtypes/StringField.php
rename to model/fieldtypes/StringField.php
diff --git a/core/model/fieldtypes/Text.php b/model/fieldtypes/Text.php
similarity index 100%
rename from core/model/fieldtypes/Text.php
rename to model/fieldtypes/Text.php
diff --git a/core/model/fieldtypes/Time.php b/model/fieldtypes/Time.php
similarity index 100%
rename from core/model/fieldtypes/Time.php
rename to model/fieldtypes/Time.php
diff --git a/core/model/fieldtypes/Varchar.php b/model/fieldtypes/Varchar.php
similarity index 100%
rename from core/model/fieldtypes/Varchar.php
rename to model/fieldtypes/Varchar.php
diff --git a/core/model/fieldtypes/Year.php b/model/fieldtypes/Year.php
similarity index 100%
rename from core/model/fieldtypes/Year.php
rename to model/fieldtypes/Year.php
diff --git a/filesystem/FlushGeneratedImagesTask.php b/tasks/FlushGeneratedImagesTask.php
similarity index 100%
rename from filesystem/FlushGeneratedImagesTask.php
rename to tasks/FlushGeneratedImagesTask.php
diff --git a/core/i18nTextCollectorTask.php b/tasks/i18nTextCollectorTask.php
similarity index 100%
rename from core/i18nTextCollectorTask.php
rename to tasks/i18nTextCollectorTask.php
diff --git a/tests/SoapModelAccessTest.php b/tests/api/SoapModelAccessTest.php
similarity index 100%
rename from tests/SoapModelAccessTest.php
rename to tests/api/SoapModelAccessTest.php
diff --git a/tests/SoapModelAccessTest.yml b/tests/api/SoapModelAccessTest.yml
similarity index 100%
rename from tests/SoapModelAccessTest.yml
rename to tests/api/SoapModelAccessTest.yml
diff --git a/tests/CacheTest.php b/tests/cache/CacheTest.php
similarity index 100%
rename from tests/CacheTest.php
rename to tests/cache/CacheTest.php
diff --git a/tests/ControllerTest.php b/tests/control/ControllerTest.php
similarity index 100%
rename from tests/ControllerTest.php
rename to tests/control/ControllerTest.php
diff --git a/tests/ControllerTest.yml b/tests/control/ControllerTest.yml
similarity index 100%
rename from tests/ControllerTest.yml
rename to tests/control/ControllerTest.yml
diff --git a/tests/HTTPRequestTest.php b/tests/control/HTTPRequestTest.php
similarity index 100%
rename from tests/HTTPRequestTest.php
rename to tests/control/HTTPRequestTest.php
diff --git a/tests/HTTPTest.php b/tests/control/HTTPTest.php
similarity index 100%
rename from tests/HTTPTest.php
rename to tests/control/HTTPTest.php
diff --git a/tests/RequestHandlingTest.php b/tests/control/RequestHandlingTest.php
similarity index 100%
rename from tests/RequestHandlingTest.php
rename to tests/control/RequestHandlingTest.php
diff --git a/tests/SessionTest.php b/tests/control/SessionTest.php
similarity index 100%
rename from tests/SessionTest.php
rename to tests/control/SessionTest.php
diff --git a/tests/ArrayDataTest.php b/tests/core/ArrayDataTest.php
similarity index 100%
rename from tests/ArrayDataTest.php
rename to tests/core/ArrayDataTest.php
diff --git a/tests/ArrayLibTest.php b/tests/core/ArrayLibTest.php
similarity index 100%
rename from tests/ArrayLibTest.php
rename to tests/core/ArrayLibTest.php
diff --git a/tests/ClassInfoTest.php b/tests/core/ClassInfoTest.php
similarity index 100%
rename from tests/ClassInfoTest.php
rename to tests/core/ClassInfoTest.php
diff --git a/tests/ConvertTest.php b/tests/core/ConvertTest.php
similarity index 100%
rename from tests/ConvertTest.php
rename to tests/core/ConvertTest.php
diff --git a/tests/CoreTest.php b/tests/core/CoreTest.php
similarity index 100%
rename from tests/CoreTest.php
rename to tests/core/CoreTest.php
diff --git a/tests/ObjectStaticTest.php b/tests/core/ObjectStaticTest.php
similarity index 100%
rename from tests/ObjectStaticTest.php
rename to tests/core/ObjectStaticTest.php
diff --git a/tests/ObjectTest.php b/tests/core/ObjectTest.php
similarity index 100%
rename from tests/ObjectTest.php
rename to tests/core/ObjectTest.php
diff --git a/tests/manifest/ClassManifestTest.php b/tests/core/manifest/ClassManifestTest.php
similarity index 100%
rename from tests/manifest/ClassManifestTest.php
rename to tests/core/manifest/ClassManifestTest.php
diff --git a/tests/manifest/ManifestFileFinderTest.php b/tests/core/manifest/ManifestFileFinderTest.php
similarity index 100%
rename from tests/manifest/ManifestFileFinderTest.php
rename to tests/core/manifest/ManifestFileFinderTest.php
diff --git a/tests/manifest/TemplateLoaderTest.php b/tests/core/manifest/TemplateLoaderTest.php
similarity index 100%
rename from tests/manifest/TemplateLoaderTest.php
rename to tests/core/manifest/TemplateLoaderTest.php
diff --git a/tests/manifest/TemplateManifestTest.php b/tests/core/manifest/TemplateManifestTest.php
similarity index 100%
rename from tests/manifest/TemplateManifestTest.php
rename to tests/core/manifest/TemplateManifestTest.php
diff --git a/tests/TokenisedRegularExpressionTest.php b/tests/core/manifest/TokenisedRegularExpressionTest.php
similarity index 100%
rename from tests/TokenisedRegularExpressionTest.php
rename to tests/core/manifest/TokenisedRegularExpressionTest.php
diff --git a/tests/manifest/fixtures/_manifest_exclude b/tests/core/manifest/fixtures/_manifest_exclude
similarity index 100%
rename from tests/manifest/fixtures/_manifest_exclude
rename to tests/core/manifest/fixtures/_manifest_exclude
diff --git a/tests/manifest/fixtures/classmanifest/module/_config.php b/tests/core/manifest/fixtures/classmanifest/module/_config.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/_config.php
rename to tests/core/manifest/fixtures/classmanifest/module/_config.php
diff --git a/tests/manifest/fixtures/classmanifest/module/classes/ClassA.php b/tests/core/manifest/fixtures/classmanifest/module/classes/ClassA.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/classes/ClassA.php
rename to tests/core/manifest/fixtures/classmanifest/module/classes/ClassA.php
diff --git a/tests/manifest/fixtures/classmanifest/module/classes/ClassB.php b/tests/core/manifest/fixtures/classmanifest/module/classes/ClassB.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/classes/ClassB.php
rename to tests/core/manifest/fixtures/classmanifest/module/classes/ClassB.php
diff --git a/tests/manifest/fixtures/classmanifest/module/classes/ClassC.php b/tests/core/manifest/fixtures/classmanifest/module/classes/ClassC.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/classes/ClassC.php
rename to tests/core/manifest/fixtures/classmanifest/module/classes/ClassC.php
diff --git a/tests/manifest/fixtures/classmanifest/module/classes/ClassD.php b/tests/core/manifest/fixtures/classmanifest/module/classes/ClassD.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/classes/ClassD.php
rename to tests/core/manifest/fixtures/classmanifest/module/classes/ClassD.php
diff --git a/tests/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php b/tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
rename to tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceA.php
diff --git a/tests/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php b/tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
rename to tests/core/manifest/fixtures/classmanifest/module/interfaces/InterfaceB.php
diff --git a/tests/manifest/fixtures/classmanifest/module/tests/TestClassA.php b/tests/core/manifest/fixtures/classmanifest/module/tests/TestClassA.php
similarity index 100%
rename from tests/manifest/fixtures/classmanifest/module/tests/TestClassA.php
rename to tests/core/manifest/fixtures/classmanifest/module/tests/TestClassA.php
diff --git a/tests/manifest/fixtures/manifestfilefinder/assets/_config.php b/tests/core/manifest/fixtures/manifestfilefinder/assets/_config.php
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/assets/_config.php
rename to tests/core/manifest/fixtures/manifestfilefinder/assets/_config.php
diff --git a/tests/manifest/fixtures/manifestfilefinder/assets/assets.txt b/tests/core/manifest/fixtures/manifestfilefinder/assets/assets.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/assets/assets.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/assets/assets.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt b/tests/core/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/lackingconfig/lackingconfig.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/module/_config.php b/tests/core/manifest/fixtures/manifestfilefinder/module/_config.php
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/module/_config.php
rename to tests/core/manifest/fixtures/manifestfilefinder/module/_config.php
diff --git a/tests/manifest/fixtures/manifestfilefinder/module/lang/lang.txt b/tests/core/manifest/fixtures/manifestfilefinder/module/lang/lang.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/module/lang/lang.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/module/lang/lang.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/module/module.txt b/tests/core/manifest/fixtures/manifestfilefinder/module/module.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/module/module.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/module/module.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/module/tests/tests.txt b/tests/core/manifest/fixtures/manifestfilefinder/module/tests/tests.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/module/tests/tests.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/module/tests/tests.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/root.txt b/tests/core/manifest/fixtures/manifestfilefinder/root.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/root.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/root.txt
diff --git a/tests/manifest/fixtures/manifestfilefinder/themes/themes.txt b/tests/core/manifest/fixtures/manifestfilefinder/themes/themes.txt
similarity index 100%
rename from tests/manifest/fixtures/manifestfilefinder/themes/themes.txt
rename to tests/core/manifest/fixtures/manifestfilefinder/themes/themes.txt
diff --git a/tests/manifest/fixtures/templatemanifest/module/Root.ss b/tests/core/manifest/fixtures/templatemanifest/module/Root.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/Root.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/Root.ss
diff --git a/tests/manifest/fixtures/templatemanifest/module/_config.php b/tests/core/manifest/fixtures/templatemanifest/module/_config.php
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/_config.php
rename to tests/core/manifest/fixtures/templatemanifest/module/_config.php
diff --git a/tests/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss b/tests/core/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/subfolder/templates/Subfolder.ss
diff --git a/tests/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss b/tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/CustomPage.ss
diff --git a/tests/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss b/tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/templates/Layout/Page.ss
diff --git a/tests/manifest/fixtures/templatemanifest/module/templates/Page.ss b/tests/core/manifest/fixtures/templatemanifest/module/templates/Page.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/templates/Page.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/templates/Page.ss
diff --git a/tests/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss b/tests/core/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
rename to tests/core/manifest/fixtures/templatemanifest/module/tests/templates/Test.ss
diff --git a/tests/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss b/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
rename to tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Includes/Include.ss
diff --git a/tests/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss b/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
rename to tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Layout/Page.ss
diff --git a/tests/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss b/tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
similarity index 100%
rename from tests/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
rename to tests/core/manifest/fixtures/templatemanifest/themes/theme/templates/Page.ss
diff --git a/tests/HtmlEditorConfigTest.php b/tests/forms/HtmlEditorConfigTest.php
similarity index 100%
rename from tests/HtmlEditorConfigTest.php
rename to tests/forms/HtmlEditorConfigTest.php
diff --git a/tests/GeoipTest.php b/tests/integration/GeoipTest.php
similarity index 100%
rename from tests/GeoipTest.php
rename to tests/integration/GeoipTest.php
diff --git a/tests/fieldtypes/CurrencyTest.php b/tests/model/CurrencyTest.php
similarity index 100%
rename from tests/fieldtypes/CurrencyTest.php
rename to tests/model/CurrencyTest.php
diff --git a/tests/fieldtypes/DBFieldTest.php b/tests/model/DBFieldTest.php
similarity index 100%
rename from tests/fieldtypes/DBFieldTest.php
rename to tests/model/DBFieldTest.php
diff --git a/tests/DataObjectDecoratorTest.php b/tests/model/DataObjectDecoratorTest.php
similarity index 100%
rename from tests/DataObjectDecoratorTest.php
rename to tests/model/DataObjectDecoratorTest.php
diff --git a/tests/DataObjectDecoratorTest.yml b/tests/model/DataObjectDecoratorTest.yml
similarity index 100%
rename from tests/DataObjectDecoratorTest.yml
rename to tests/model/DataObjectDecoratorTest.yml
diff --git a/tests/DataObjectSetTest.php b/tests/model/DataObjectSetTest.php
similarity index 100%
rename from tests/DataObjectSetTest.php
rename to tests/model/DataObjectSetTest.php
diff --git a/tests/DataObjectSetTest.yml b/tests/model/DataObjectSetTest.yml
similarity index 100%
rename from tests/DataObjectSetTest.yml
rename to tests/model/DataObjectSetTest.yml
diff --git a/tests/DataObjectTest.php b/tests/model/DataObjectTest.php
similarity index 100%
rename from tests/DataObjectTest.php
rename to tests/model/DataObjectTest.php
diff --git a/tests/DataObjectTest.yml b/tests/model/DataObjectTest.yml
similarity index 100%
rename from tests/DataObjectTest.yml
rename to tests/model/DataObjectTest.yml
diff --git a/tests/fieldtypes/DateTest.php b/tests/model/DateTest.php
similarity index 100%
rename from tests/fieldtypes/DateTest.php
rename to tests/model/DateTest.php
diff --git a/tests/fieldtypes/DecimalTest.php b/tests/model/DecimalTest.php
similarity index 100%
rename from tests/fieldtypes/DecimalTest.php
rename to tests/model/DecimalTest.php
diff --git a/tests/fieldtypes/DecimalTest.yml b/tests/model/DecimalTest.yml
similarity index 100%
rename from tests/fieldtypes/DecimalTest.yml
rename to tests/model/DecimalTest.yml
diff --git a/tests/fieldtypes/HTMLTextTest.php b/tests/model/HTMLTextTest.php
similarity index 100%
rename from tests/fieldtypes/HTMLTextTest.php
rename to tests/model/HTMLTextTest.php
diff --git a/tests/fieldtypes/LabelFieldTest.php b/tests/model/LabelFieldTest.php
similarity index 100%
rename from tests/fieldtypes/LabelFieldTest.php
rename to tests/model/LabelFieldTest.php
diff --git a/tests/fieldtypes/PercentageTest.php b/tests/model/PercentageTest.php
similarity index 100%
rename from tests/fieldtypes/PercentageTest.php
rename to tests/model/PercentageTest.php
diff --git a/tests/SQLQueryTest.php b/tests/model/SQLQueryTest.php
similarity index 100%
rename from tests/SQLQueryTest.php
rename to tests/model/SQLQueryTest.php
diff --git a/tests/fieldtypes/TextTest.php b/tests/model/TextTest.php
similarity index 100%
rename from tests/fieldtypes/TextTest.php
rename to tests/model/TextTest.php
diff --git a/tests/TransactionTest.php b/tests/model/TransactionTest.php
similarity index 100%
rename from tests/TransactionTest.php
rename to tests/model/TransactionTest.php
diff --git a/tests/SQLFormatterTest.php b/tests/parsers/SQLFormatterTest.php
similarity index 100%
rename from tests/SQLFormatterTest.php
rename to tests/parsers/SQLFormatterTest.php
diff --git a/tests/ShortcodeParserTest.php b/tests/parsers/ShortcodeParserTest.php
similarity index 100%
rename from tests/ShortcodeParserTest.php
rename to tests/parsers/ShortcodeParserTest.php
diff --git a/tests/SearchContextTest.php b/tests/search/SearchContextTest.php
similarity index 100%
rename from tests/SearchContextTest.php
rename to tests/search/SearchContextTest.php
diff --git a/tests/SearchContextTest.yml b/tests/search/SearchContextTest.yml
similarity index 100%
rename from tests/SearchContextTest.yml
rename to tests/search/SearchContextTest.yml
diff --git a/tests/SSViewerCacheBlockTest.php b/tests/view/SSViewerCacheBlockTest.php
similarity index 100%
rename from tests/SSViewerCacheBlockTest.php
rename to tests/view/SSViewerCacheBlockTest.php
diff --git a/tests/SSViewerTest.php b/tests/view/SSViewerTest.php
similarity index 100%
rename from tests/SSViewerTest.php
rename to tests/view/SSViewerTest.php
diff --git a/tests/ViewableDataTest.php b/tests/view/ViewableDataTest.php
similarity index 100%
rename from tests/ViewableDataTest.php
rename to tests/view/ViewableDataTest.php
diff --git a/core/ArrayData.php b/view/ArrayData.php
similarity index 100%
rename from core/ArrayData.php
rename to view/ArrayData.php
diff --git a/core/Requirements.php b/view/Requirements.php
similarity index 100%
rename from core/Requirements.php
rename to view/Requirements.php
diff --git a/core/SSTemplateParser.php b/view/SSTemplateParser.php
similarity index 100%
rename from core/SSTemplateParser.php
rename to view/SSTemplateParser.php
diff --git a/core/SSTemplateParser.php.inc b/view/SSTemplateParser.php.inc
similarity index 100%
rename from core/SSTemplateParser.php.inc
rename to view/SSTemplateParser.php.inc
diff --git a/core/SSViewer.php b/view/SSViewer.php
similarity index 100%
rename from core/SSViewer.php
rename to view/SSViewer.php
diff --git a/core/ViewableData.php b/view/ViewableData.php
similarity index 100%
rename from core/ViewableData.php
rename to view/ViewableData.php