API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure

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

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 'core/manifest/ClassLoader.php';
-require_once 'manifest/ClassManifest.php';
+require_once 'core/manifest/ClassManifest.php';
-require_once 'manifest/ManifestFileFinder.php';
+require_once 'core/manifest/ManifestFileFinder.php';
-require_once 'manifest/TemplateLoader.php';
+require_once 'core/manifest/TemplateLoader.php';
-require_once 'manifest/TemplateManifest.php';
+require_once 'core/manifest/TemplateManifest.php';
-require_once 'manifest/TokenisedRegularExpression.php';
+require_once 'core/manifest/TokenisedRegularExpression.php';
 
 ///////////////////////////////////////////////////////////////////////////////
 // MANIFEST

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']) {

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