Renamed folders "Cake" to "src" and "Test" to "tests".

cakephp · Jan 9, 2014 · fb72c03 · fb72c03
1 parent 4a3a6a6
commit fb72c03
Show file tree

Hide file tree

Showing 978 changed files with 34 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -27,11 +27,11 @@
     },
     "autoload": {
         "psr-4": {
-            "Cake\\": "Cake",
-            "Cake\\Test\\": "Test"
+            "Cake\\": "src",
+            "Cake\\Test\\": "tests"
         }
     },
     "bin": [
-        "Cake/Console/cake"
+        "src/Cake/Console/cake"
     ]
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,7 @@
 	processIsolation="false"
 	stopOnFailure="false"
 	syntaxCheck="false"
-	bootstrap="./Test/init.php"
+	bootstrap="./tests/init.php"
 	>
 	<php>
 		<ini name="memory_limit" value="-1"/>
@@ -14,14 +14,14 @@
 
 	<testsuites>
 		<testsuite name="CakePHP Test Suite">
-			<directory>./Test/TestCase/</directory>
+			<directory>./tests/TestCase/</directory>
 		</testsuite>
 		<testsuite name="Database Test Suite">
-			<file>./Test/TestCase/DatabaseSuite.php</file>
+			<file>./tests/TestCase/DatabaseSuite.php</file>
 		</testsuite>
 	</testsuites>
 	<listeners>
-		<listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./Cake/TestSuite/Fixture/FixtureInjector.php">
+		<listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./src/TestSuite/Fixture/FixtureInjector.php">
 			<arguments>
 				<object class="\Cake\TestSuite\Fixture\FixtureManager" />
 			</arguments>

diff --git a/Cake/Cache/Cache.php → src/Cache/Cache.php b/Cake/Cache/Cache.php → src/Cache/Cache.php
diff --git a/Cake/Cache/CacheEngine.php → src/Cache/CacheEngine.php b/Cake/Cache/CacheEngine.php → src/Cache/CacheEngine.php
diff --git a/Cake/Cache/CacheRegistry.php → src/Cache/CacheRegistry.php b/Cake/Cache/CacheRegistry.php → src/Cache/CacheRegistry.php
diff --git a/Cake/Cache/Engine/ApcEngine.php → src/Cache/Engine/ApcEngine.php b/Cake/Cache/Engine/ApcEngine.php → src/Cache/Engine/ApcEngine.php
diff --git a/Cake/Cache/Engine/FileEngine.php → src/Cache/Engine/FileEngine.php b/Cake/Cache/Engine/FileEngine.php → src/Cache/Engine/FileEngine.php
diff --git a/Cake/Cache/Engine/MemcachedEngine.php → src/Cache/Engine/MemcachedEngine.php b/Cake/Cache/Engine/MemcachedEngine.php → src/Cache/Engine/MemcachedEngine.php
diff --git a/Cake/Cache/Engine/RedisEngine.php → src/Cache/Engine/RedisEngine.php b/Cake/Cache/Engine/RedisEngine.php → src/Cache/Engine/RedisEngine.php
diff --git a/Cake/Cache/Engine/WincacheEngine.php → src/Cache/Engine/WincacheEngine.php b/Cake/Cache/Engine/WincacheEngine.php → src/Cache/Engine/WincacheEngine.php
diff --git a/Cake/Cache/Engine/XcacheEngine.php → src/Cache/Engine/XcacheEngine.php b/Cake/Cache/Engine/XcacheEngine.php → src/Cache/Engine/XcacheEngine.php
diff --git a/Cake/Collection/Collection.php → src/Collection/Collection.php b/Cake/Collection/Collection.php → src/Collection/Collection.php
diff --git a/Cake/Collection/CollectionTrait.php → src/Collection/CollectionTrait.php b/Cake/Collection/CollectionTrait.php → src/Collection/CollectionTrait.php
diff --git a/Cake/Collection/ExtractTrait.php → src/Collection/ExtractTrait.php b/Cake/Collection/ExtractTrait.php → src/Collection/ExtractTrait.php
diff --git a/Cake/Collection/Iterator/ExtractIterator.php → src/Collection/Iterator/ExtractIterator.php b/Cake/Collection/Iterator/ExtractIterator.php → src/Collection/Iterator/ExtractIterator.php
diff --git a/Cake/Collection/Iterator/FilterIterator.php → src/Collection/Iterator/FilterIterator.php b/Cake/Collection/Iterator/FilterIterator.php → src/Collection/Iterator/FilterIterator.php
diff --git a/Cake/Collection/Iterator/MapReduce.php → src/Collection/Iterator/MapReduce.php b/Cake/Collection/Iterator/MapReduce.php → src/Collection/Iterator/MapReduce.php
diff --git a/Cake/Collection/Iterator/ReplaceIterator.php → src/Collection/Iterator/ReplaceIterator.php b/Cake/Collection/Iterator/ReplaceIterator.php → src/Collection/Iterator/ReplaceIterator.php
diff --git a/Cake/Collection/Iterator/SortIterator.php → src/Collection/Iterator/SortIterator.php b/Cake/Collection/Iterator/SortIterator.php → src/Collection/Iterator/SortIterator.php
diff --git a/Cake/Config/cacert.pem → src/Config/cacert.pem b/Cake/Config/cacert.pem → src/Config/cacert.pem
diff --git a/Cake/Config/config.php → src/Config/config.php b/Cake/Config/config.php → src/Config/config.php
diff --git a/Cake/Config/routes.php → src/Config/routes.php b/Cake/Config/routes.php → src/Config/routes.php
diff --git a/Cake/Configure/ConfigEngineInterface.php → src/Configure/ConfigEngineInterface.php b/Cake/Configure/ConfigEngineInterface.php → src/Configure/ConfigEngineInterface.php
diff --git a/Cake/Configure/Engine/IniConfig.php → src/Configure/Engine/IniConfig.php b/Cake/Configure/Engine/IniConfig.php → src/Configure/Engine/IniConfig.php
diff --git a/Cake/Configure/Engine/PhpConfig.php → src/Configure/Engine/PhpConfig.php b/Cake/Configure/Engine/PhpConfig.php → src/Configure/Engine/PhpConfig.php
diff --git a/Cake/Console/Command/BakeShell.php → src/Console/Command/BakeShell.php b/Cake/Console/Command/BakeShell.php → src/Console/Command/BakeShell.php
diff --git a/Cake/Console/Command/CommandListShell.php → src/Console/Command/CommandListShell.php b/Cake/Console/Command/CommandListShell.php → src/Console/Command/CommandListShell.php
diff --git a/Cake/Console/Command/CompletionShell.php → src/Console/Command/CompletionShell.php b/Cake/Console/Command/CompletionShell.php → src/Console/Command/CompletionShell.php
diff --git a/Cake/Console/Command/I18nShell.php → src/Console/Command/I18nShell.php b/Cake/Console/Command/I18nShell.php → src/Console/Command/I18nShell.php
diff --git a/Cake/Console/Command/ServerShell.php → src/Console/Command/ServerShell.php b/Cake/Console/Command/ServerShell.php → src/Console/Command/ServerShell.php
diff --git a/Cake/Console/Command/Task/BakeTask.php → src/Console/Command/Task/BakeTask.php b/Cake/Console/Command/Task/BakeTask.php → src/Console/Command/Task/BakeTask.php
diff --git a/Cake/Console/Command/Task/CommandTask.php → src/Console/Command/Task/CommandTask.php b/Cake/Console/Command/Task/CommandTask.php → src/Console/Command/Task/CommandTask.php
diff --git a/Cake/Console/Command/Task/ControllerTask.php → src/Console/Command/Task/ControllerTask.php b/Cake/Console/Command/Task/ControllerTask.php → src/Console/Command/Task/ControllerTask.php
diff --git a/Cake/Console/Command/Task/DbConfigTask.php → src/Console/Command/Task/DbConfigTask.php b/Cake/Console/Command/Task/DbConfigTask.php → src/Console/Command/Task/DbConfigTask.php
diff --git a/Cake/Console/Command/Task/ExtractTask.php → src/Console/Command/Task/ExtractTask.php b/Cake/Console/Command/Task/ExtractTask.php → src/Console/Command/Task/ExtractTask.php
diff --git a/Cake/Console/Command/Task/FixtureTask.php → src/Console/Command/Task/FixtureTask.php b/Cake/Console/Command/Task/FixtureTask.php → src/Console/Command/Task/FixtureTask.php
diff --git a/Cake/Console/Command/Task/ModelTask.php → src/Console/Command/Task/ModelTask.php b/Cake/Console/Command/Task/ModelTask.php → src/Console/Command/Task/ModelTask.php
diff --git a/Cake/Console/Command/Task/PluginTask.php → src/Console/Command/Task/PluginTask.php b/Cake/Console/Command/Task/PluginTask.php → src/Console/Command/Task/PluginTask.php
diff --git a/Cake/Console/Command/Task/ProjectTask.php → src/Console/Command/Task/ProjectTask.php b/Cake/Console/Command/Task/ProjectTask.php → src/Console/Command/Task/ProjectTask.php
diff --git a/Cake/Console/Command/Task/TemplateTask.php → src/Console/Command/Task/TemplateTask.php b/Cake/Console/Command/Task/TemplateTask.php → src/Console/Command/Task/TemplateTask.php
diff --git a/Cake/Console/Command/Task/TestTask.php → src/Console/Command/Task/TestTask.php b/Cake/Console/Command/Task/TestTask.php → src/Console/Command/Task/TestTask.php
diff --git a/Cake/Console/Command/Task/ViewTask.php → src/Console/Command/Task/ViewTask.php b/Cake/Console/Command/Task/ViewTask.php → src/Console/Command/Task/ViewTask.php
diff --git a/Cake/Console/Command/TestShell.php → src/Console/Command/TestShell.php b/Cake/Console/Command/TestShell.php → src/Console/Command/TestShell.php
@@ -379,7 +379,7 @@ protected function _mapFileToCase($file, $category, $throwOnMissingFile = true)
 			$testCase = str_replace(DS, '/', $file);
 			$testCase = preg_replace('@.*lib/Cake/@', '', $file);
 			$testCase[0] = strtoupper($testCase[0]);
-			$testFile = ROOT . '/Test/TestCase/' . $testCase . 'Test.php';
+			$testFile = ROOT . '/tests/TestCase/' . $testCase . 'Test.php';
 
 			if (!file_exists($testFile) && $throwOnMissingFile) {
 				throw new \Exception(sprintf('Test case %s not found', $testFile));
@@ -389,11 +389,11 @@ protected function _mapFileToCase($file, $category, $throwOnMissingFile = true)
 		}
 
 		if ($category === 'app') {
-			$testFile = str_replace(APP, APP . 'Test/TestCase/', $file) . 'Test.php';
+			$testFile = str_replace(APP, APP . 'tests/TestCase/', $file) . 'Test.php';
 		} else {
 			$testFile = preg_replace(
 				"@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
-				'\1Test/TestCase/\2Test.php',
+				'\1tests/TestCase/\2Test.php',
 				$file
 			);
 		}
@@ -404,7 +404,7 @@ protected function _mapFileToCase($file, $category, $throwOnMissingFile = true)
 
 		$testCase = substr($testFile, 0, -8);
 		$testCase = str_replace(DS, '/', $testCase);
-		$testCase = preg_replace('@.*Test/TestCase/@', '', $testCase);
+		$testCase = preg_replace('@.*tests/TestCase/@', '', $testCase);
 
 		return $testCase;
 	}
@@ -428,6 +428,11 @@ protected function _mapFileToCategory($file) {
 		if (strpos($file, APP) !== false) {
 			return 'app';
 		}
+		$file = preg_replace(
+			['#^Cake/#', '#^Test/#'],
+			['src/', 'tests/'],
+			$file
+		);
 		if (file_exists(ROOT . DS . $file) || strpos($file, ROOT . DS) !== false) {
 			return 'core';
 		}

diff --git a/Cake/Console/Command/UpgradeShell.php → src/Console/Command/UpgradeShell.php b/Cake/Console/Command/UpgradeShell.php → src/Console/Command/UpgradeShell.php
diff --git a/Cake/Console/ConsoleErrorHandler.php → src/Console/ConsoleErrorHandler.php b/Cake/Console/ConsoleErrorHandler.php → src/Console/ConsoleErrorHandler.php
diff --git a/Cake/Console/ConsoleInput.php → src/Console/ConsoleInput.php b/Cake/Console/ConsoleInput.php → src/Console/ConsoleInput.php
diff --git a/Cake/Console/ConsoleInputArgument.php → src/Console/ConsoleInputArgument.php b/Cake/Console/ConsoleInputArgument.php → src/Console/ConsoleInputArgument.php
diff --git a/Cake/Console/ConsoleInputOption.php → src/Console/ConsoleInputOption.php b/Cake/Console/ConsoleInputOption.php → src/Console/ConsoleInputOption.php
diff --git a/Cake/Console/ConsoleInputSubcommand.php → src/Console/ConsoleInputSubcommand.php b/Cake/Console/ConsoleInputSubcommand.php → src/Console/ConsoleInputSubcommand.php
diff --git a/Cake/Console/ConsoleOptionParser.php → src/Console/ConsoleOptionParser.php b/Cake/Console/ConsoleOptionParser.php → src/Console/ConsoleOptionParser.php
diff --git a/Cake/Console/ConsoleOutput.php → src/Console/ConsoleOutput.php b/Cake/Console/ConsoleOutput.php → src/Console/ConsoleOutput.php
diff --git a/Cake/Console/HelpFormatter.php → src/Console/HelpFormatter.php b/Cake/Console/HelpFormatter.php → src/Console/HelpFormatter.php
diff --git a/Cake/Console/Shell.php → src/Console/Shell.php b/Cake/Console/Shell.php → src/Console/Shell.php
diff --git a/Cake/Console/ShellDispatcher.php → src/Console/ShellDispatcher.php b/Cake/Console/ShellDispatcher.php → src/Console/ShellDispatcher.php
diff --git a/Cake/Console/TaskRegistry.php → src/Console/TaskRegistry.php b/Cake/Console/TaskRegistry.php → src/Console/TaskRegistry.php
diff --git a/...es/default/actions/controller_actions.ctp → ...es/default/actions/controller_actions.ctp b/...es/default/actions/controller_actions.ctp → ...es/default/actions/controller_actions.ctp
diff --git a/.../Templates/default/classes/controller.ctp → .../Templates/default/classes/controller.ctp b/.../Templates/default/classes/controller.ctp → .../Templates/default/classes/controller.ctp
diff --git a/...ole/Templates/default/classes/fixture.ctp → ...ole/Templates/default/classes/fixture.ctp b/...ole/Templates/default/classes/fixture.ctp → ...ole/Templates/default/classes/fixture.ctp
diff --git a/...nsole/Templates/default/classes/model.ctp → ...nsole/Templates/default/classes/model.ctp b/...nsole/Templates/default/classes/model.ctp → ...nsole/Templates/default/classes/model.ctp
diff --git a/...onsole/Templates/default/classes/test.ctp → ...onsole/Templates/default/classes/test.ctp b/...onsole/Templates/default/classes/test.ctp → ...onsole/Templates/default/classes/test.ctp
diff --git a/.../Console/Templates/default/views/form.ctp → src/Console/Templates/default/views/form.ctp b/.../Console/Templates/default/views/form.ctp → src/Console/Templates/default/views/form.ctp
diff --git a/...Console/Templates/default/views/index.ctp → ...Console/Templates/default/views/index.ctp b/...Console/Templates/default/views/index.ctp → ...Console/Templates/default/views/index.ctp
diff --git a/.../Console/Templates/default/views/view.ctp → src/Console/Templates/default/views/view.ctp b/.../Console/Templates/default/views/view.ctp → src/Console/Templates/default/views/view.ctp
diff --git a/Cake/Console/cake → src/Console/cake b/Cake/Console/cake → src/Console/cake
diff --git a/Cake/Console/cake.bat → src/Console/cake.bat b/Cake/Console/cake.bat → src/Console/cake.bat
diff --git a/Cake/Console/cake.php → src/Console/cake.php b/Cake/Console/cake.php → src/Console/cake.php
diff --git a/Cake/Controller/Component.php → src/Controller/Component.php b/Cake/Controller/Component.php → src/Controller/Component.php
diff --git a/...Controller/Component/Acl/AclInterface.php → ...Controller/Component/Acl/AclInterface.php b/...Controller/Component/Acl/AclInterface.php → ...Controller/Component/Acl/AclInterface.php
diff --git a/Cake/Controller/Component/Acl/IniAcl.php → src/Controller/Component/Acl/IniAcl.php b/Cake/Controller/Component/Acl/IniAcl.php → src/Controller/Component/Acl/IniAcl.php
diff --git a/Cake/Controller/Component/Acl/PhpAcl.php → src/Controller/Component/Acl/PhpAcl.php b/Cake/Controller/Component/Acl/PhpAcl.php → src/Controller/Component/Acl/PhpAcl.php
diff --git a/Cake/Controller/Component/AclComponent.php → src/Controller/Component/AclComponent.php b/Cake/Controller/Component/AclComponent.php → src/Controller/Component/AclComponent.php
diff --git a/...Component/Auth/AbstractPasswordHasher.php → ...Component/Auth/AbstractPasswordHasher.php b/...Component/Auth/AbstractPasswordHasher.php → ...Component/Auth/AbstractPasswordHasher.php
diff --git a/...oller/Component/Auth/ActionsAuthorize.php → ...oller/Component/Auth/ActionsAuthorize.php b/...oller/Component/Auth/ActionsAuthorize.php → ...oller/Component/Auth/ActionsAuthorize.php
diff --git a/...oller/Component/Auth/BaseAuthenticate.php → ...oller/Component/Auth/BaseAuthenticate.php b/...oller/Component/Auth/BaseAuthenticate.php → ...oller/Component/Auth/BaseAuthenticate.php
diff --git a/...ntroller/Component/Auth/BaseAuthorize.php → ...ntroller/Component/Auth/BaseAuthorize.php b/...ntroller/Component/Auth/BaseAuthorize.php → ...ntroller/Component/Auth/BaseAuthorize.php
diff --git a/...ller/Component/Auth/BasicAuthenticate.php → ...ller/Component/Auth/BasicAuthenticate.php b/...ller/Component/Auth/BasicAuthenticate.php → ...ller/Component/Auth/BasicAuthenticate.php
diff --git a/...Component/Auth/BlowfishPasswordHasher.php → ...Component/Auth/BlowfishPasswordHasher.php b/...Component/Auth/BlowfishPasswordHasher.php → ...Component/Auth/BlowfishPasswordHasher.php
diff --git a/...er/Component/Auth/ControllerAuthorize.php → ...er/Component/Auth/ControllerAuthorize.php b/...er/Component/Auth/ControllerAuthorize.php → ...er/Component/Auth/ControllerAuthorize.php
diff --git a/...ntroller/Component/Auth/CrudAuthorize.php → ...ntroller/Component/Auth/CrudAuthorize.php b/...ntroller/Component/Auth/CrudAuthorize.php → ...ntroller/Component/Auth/CrudAuthorize.php
diff --git a/...ler/Component/Auth/DigestAuthenticate.php → ...ler/Component/Auth/DigestAuthenticate.php b/...ler/Component/Auth/DigestAuthenticate.php → ...ler/Component/Auth/DigestAuthenticate.php
diff --git a/...oller/Component/Auth/FormAuthenticate.php → ...oller/Component/Auth/FormAuthenticate.php b/...oller/Component/Auth/FormAuthenticate.php → ...oller/Component/Auth/FormAuthenticate.php
diff --git a/...r/Component/Auth/SimplePasswordHasher.php → ...r/Component/Auth/SimplePasswordHasher.php b/...r/Component/Auth/SimplePasswordHasher.php → ...r/Component/Auth/SimplePasswordHasher.php
diff --git a/Cake/Controller/Component/AuthComponent.php → src/Controller/Component/AuthComponent.php b/Cake/Controller/Component/AuthComponent.php → src/Controller/Component/AuthComponent.php
diff --git a/.../Controller/Component/CookieComponent.php → src/Controller/Component/CookieComponent.php b/.../Controller/Component/CookieComponent.php → src/Controller/Component/CookieComponent.php
diff --git a/Cake/Controller/Component/CsrfComponent.php → src/Controller/Component/CsrfComponent.php b/Cake/Controller/Component/CsrfComponent.php → src/Controller/Component/CsrfComponent.php
diff --git a/...ntroller/Component/PaginatorComponent.php → ...ntroller/Component/PaginatorComponent.php b/...ntroller/Component/PaginatorComponent.php → ...ntroller/Component/PaginatorComponent.php
diff --git a/...ler/Component/RequestHandlerComponent.php → ...ler/Component/RequestHandlerComponent.php b/...ler/Component/RequestHandlerComponent.php → ...ler/Component/RequestHandlerComponent.php
diff --git a/...ontroller/Component/SecurityComponent.php → ...ontroller/Component/SecurityComponent.php b/...ontroller/Component/SecurityComponent.php → ...ontroller/Component/SecurityComponent.php
diff --git a/...Controller/Component/SessionComponent.php → ...Controller/Component/SessionComponent.php b/...Controller/Component/SessionComponent.php → ...Controller/Component/SessionComponent.php
diff --git a/Cake/Controller/ComponentRegistry.php → src/Controller/ComponentRegistry.php b/Cake/Controller/ComponentRegistry.php → src/Controller/ComponentRegistry.php
diff --git a/Cake/Controller/Controller.php → src/Controller/Controller.php b/Cake/Controller/Controller.php → src/Controller/Controller.php
diff --git a/Cake/Controller/ErrorController.php → src/Controller/ErrorController.php b/Cake/Controller/ErrorController.php → src/Controller/ErrorController.php
diff --git a/Cake/Core/App.php → src/Core/App.php b/Cake/Core/App.php → src/Core/App.php
diff --git a/Cake/Core/ClassLoader.php → src/Core/ClassLoader.php b/Cake/Core/ClassLoader.php → src/Core/ClassLoader.php
diff --git a/Cake/Core/Configure.php → src/Core/Configure.php b/Cake/Core/Configure.php → src/Core/Configure.php
diff --git a/Cake/Core/Object.php → src/Core/Object.php b/Cake/Core/Object.php → src/Core/Object.php
diff --git a/Cake/Core/Plugin.php → src/Core/Plugin.php b/Cake/Core/Plugin.php → src/Core/Plugin.php
diff --git a/Cake/Core/StaticConfigTrait.php → src/Core/StaticConfigTrait.php b/Cake/Core/StaticConfigTrait.php → src/Core/StaticConfigTrait.php
diff --git a/Cake/Database/Connection.php → src/Database/Connection.php b/Cake/Database/Connection.php → src/Database/Connection.php
diff --git a/Cake/Database/ConnectionManager.php → src/Database/ConnectionManager.php b/Cake/Database/ConnectionManager.php → src/Database/ConnectionManager.php
diff --git a/Cake/Database/ConnectionRegistry.php → src/Database/ConnectionRegistry.php b/Cake/Database/ConnectionRegistry.php → src/Database/ConnectionRegistry.php
diff --git a/Cake/Database/Dialect/MysqlDialectTrait.php → src/Database/Dialect/MysqlDialectTrait.php b/Cake/Database/Dialect/MysqlDialectTrait.php → src/Database/Dialect/MysqlDialectTrait.php
diff --git a/...Database/Dialect/PostgresDialectTrait.php → ...Database/Dialect/PostgresDialectTrait.php b/...Database/Dialect/PostgresDialectTrait.php → ...Database/Dialect/PostgresDialectTrait.php
diff --git a/Cake/Database/Dialect/SqliteDialectTrait.php → src/Database/Dialect/SqliteDialectTrait.php b/Cake/Database/Dialect/SqliteDialectTrait.php → src/Database/Dialect/SqliteDialectTrait.php
diff --git a/Cake/Database/Driver.php → src/Database/Driver.php b/Cake/Database/Driver.php → src/Database/Driver.php
diff --git a/Cake/Database/Driver/Mysql.php → src/Database/Driver/Mysql.php b/Cake/Database/Driver/Mysql.php → src/Database/Driver/Mysql.php
diff --git a/Cake/Database/Driver/PDODriverTrait.php → src/Database/Driver/PDODriverTrait.php b/Cake/Database/Driver/PDODriverTrait.php → src/Database/Driver/PDODriverTrait.php
diff --git a/Cake/Database/Driver/Postgres.php → src/Database/Driver/Postgres.php b/Cake/Database/Driver/Postgres.php → src/Database/Driver/Postgres.php
diff --git a/Cake/Database/Driver/Sqlite.php → src/Database/Driver/Sqlite.php b/Cake/Database/Driver/Sqlite.php → src/Database/Driver/Sqlite.php
diff --git a/Cake/Database/Exception.php → src/Database/Exception.php b/Cake/Database/Exception.php → src/Database/Exception.php
diff --git a/.../Exception/MissingConnectionException.php → .../Exception/MissingConnectionException.php b/.../Exception/MissingConnectionException.php → .../Exception/MissingConnectionException.php
diff --git a/...base/Exception/MissingDriverException.php → ...base/Exception/MissingDriverException.php b/...base/Exception/MissingDriverException.php → ...base/Exception/MissingDriverException.php
diff --git a/...e/Exception/MissingExtensionException.php → ...e/Exception/MissingExtensionException.php b/...e/Exception/MissingExtensionException.php → ...e/Exception/MissingExtensionException.php
diff --git a/Cake/Database/Expression/Comparison.php → src/Database/Expression/Comparison.php b/Cake/Database/Expression/Comparison.php → src/Database/Expression/Comparison.php
diff --git a/...atabase/Expression/FunctionExpression.php → ...atabase/Expression/FunctionExpression.php b/...atabase/Expression/FunctionExpression.php → ...atabase/Expression/FunctionExpression.php
diff --git a/...abase/Expression/IdentifierExpression.php → ...abase/Expression/IdentifierExpression.php b/...abase/Expression/IdentifierExpression.php → ...abase/Expression/IdentifierExpression.php
diff --git a/...Database/Expression/OrderByExpression.php → ...Database/Expression/OrderByExpression.php b/...Database/Expression/OrderByExpression.php → ...Database/Expression/OrderByExpression.php
diff --git a/Cake/Database/Expression/QueryExpression.php → src/Database/Expression/QueryExpression.php b/Cake/Database/Expression/QueryExpression.php → src/Database/Expression/QueryExpression.php
diff --git a/Cake/Database/Expression/UnaryExpression.php → src/Database/Expression/UnaryExpression.php b/Cake/Database/Expression/UnaryExpression.php → src/Database/Expression/UnaryExpression.php
diff --git a/.../Database/Expression/ValuesExpression.php → src/Database/Expression/ValuesExpression.php b/.../Database/Expression/ValuesExpression.php → src/Database/Expression/ValuesExpression.php
diff --git a/Cake/Database/ExpressionInterface.php → src/Database/ExpressionInterface.php b/Cake/Database/ExpressionInterface.php → src/Database/ExpressionInterface.php
diff --git a/Cake/Database/FunctionsBuilder.php → src/Database/FunctionsBuilder.php b/Cake/Database/FunctionsBuilder.php → src/Database/FunctionsBuilder.php
diff --git a/Cake/Database/IdentifierQuoter.php → src/Database/IdentifierQuoter.php b/Cake/Database/IdentifierQuoter.php → src/Database/IdentifierQuoter.php
diff --git a/Cake/Database/Log/LoggedQuery.php → src/Database/Log/LoggedQuery.php b/Cake/Database/Log/LoggedQuery.php → src/Database/Log/LoggedQuery.php
diff --git a/Cake/Database/Log/LoggingStatement.php → src/Database/Log/LoggingStatement.php b/Cake/Database/Log/LoggingStatement.php → src/Database/Log/LoggingStatement.php
diff --git a/Cake/Database/Log/QueryLogger.php → src/Database/Log/QueryLogger.php b/Cake/Database/Log/QueryLogger.php → src/Database/Log/QueryLogger.php
diff --git a/Cake/Database/Query.php → src/Database/Query.php b/Cake/Database/Query.php → src/Database/Query.php
diff --git a/Cake/Database/Schema/BaseSchema.php → src/Database/Schema/BaseSchema.php b/Cake/Database/Schema/BaseSchema.php → src/Database/Schema/BaseSchema.php
diff --git a/Cake/Database/Schema/Collection.php → src/Database/Schema/Collection.php b/Cake/Database/Schema/Collection.php → src/Database/Schema/Collection.php
diff --git a/Cake/Database/Schema/MysqlSchema.php → src/Database/Schema/MysqlSchema.php b/Cake/Database/Schema/MysqlSchema.php → src/Database/Schema/MysqlSchema.php
diff --git a/Cake/Database/Schema/PostgresSchema.php → src/Database/Schema/PostgresSchema.php b/Cake/Database/Schema/PostgresSchema.php → src/Database/Schema/PostgresSchema.php
diff --git a/Cake/Database/Schema/SqliteSchema.php → src/Database/Schema/SqliteSchema.php b/Cake/Database/Schema/SqliteSchema.php → src/Database/Schema/SqliteSchema.php
diff --git a/Cake/Database/Schema/Table.php → src/Database/Schema/Table.php b/Cake/Database/Schema/Table.php → src/Database/Schema/Table.php
diff --git a/Cake/Database/SqlDialectTrait.php → src/Database/SqlDialectTrait.php b/Cake/Database/SqlDialectTrait.php → src/Database/SqlDialectTrait.php
diff --git a/.../Database/Statement/BufferedStatement.php → src/Database/Statement/BufferedStatement.php b/.../Database/Statement/BufferedStatement.php → src/Database/Statement/BufferedStatement.php
diff --git a/.../Database/Statement/CallbackStatement.php → src/Database/Statement/CallbackStatement.php b/.../Database/Statement/CallbackStatement.php → src/Database/Statement/CallbackStatement.php
diff --git a/Cake/Database/Statement/PDOStatement.php → src/Database/Statement/PDOStatement.php b/Cake/Database/Statement/PDOStatement.php → src/Database/Statement/PDOStatement.php
diff --git a/Cake/Database/Statement/SqliteStatement.php → src/Database/Statement/SqliteStatement.php b/Cake/Database/Statement/SqliteStatement.php → src/Database/Statement/SqliteStatement.php
diff --git a/...Database/Statement/StatementDecorator.php → ...Database/Statement/StatementDecorator.php b/...Database/Statement/StatementDecorator.php → ...Database/Statement/StatementDecorator.php
diff --git a/Cake/Database/StatementInterface.php → src/Database/StatementInterface.php b/Cake/Database/StatementInterface.php → src/Database/StatementInterface.php
diff --git a/Cake/Database/Type.php → src/Database/Type.php b/Cake/Database/Type.php → src/Database/Type.php
diff --git a/Cake/Database/Type/BinaryType.php → src/Database/Type/BinaryType.php b/Cake/Database/Type/BinaryType.php → src/Database/Type/BinaryType.php
diff --git a/Cake/Database/Type/DateTimeType.php → src/Database/Type/DateTimeType.php b/Cake/Database/Type/DateTimeType.php → src/Database/Type/DateTimeType.php
diff --git a/Cake/Database/Type/DateType.php → src/Database/Type/DateType.php b/Cake/Database/Type/DateType.php → src/Database/Type/DateType.php
diff --git a/Cake/Database/Type/UuidType.php → src/Database/Type/UuidType.php b/Cake/Database/Type/UuidType.php → src/Database/Type/UuidType.php
diff --git a/Cake/Database/TypeConverterTrait.php → src/Database/TypeConverterTrait.php b/Cake/Database/TypeConverterTrait.php → src/Database/TypeConverterTrait.php
diff --git a/Cake/Database/ValueBinder.php → src/Database/ValueBinder.php b/Cake/Database/ValueBinder.php → src/Database/ValueBinder.php
diff --git a/Cake/Error/AclException.php → src/Error/AclException.php b/Cake/Error/AclException.php → src/Error/AclException.php
diff --git a/Cake/Error/BadRequestException.php → src/Error/BadRequestException.php b/Cake/Error/BadRequestException.php → src/Error/BadRequestException.php
diff --git a/Cake/Error/BaseErrorHandler.php → src/Error/BaseErrorHandler.php b/Cake/Error/BaseErrorHandler.php → src/Error/BaseErrorHandler.php
diff --git a/Cake/Error/BaseException.php → src/Error/BaseException.php b/Cake/Error/BaseException.php → src/Error/BaseException.php
diff --git a/Cake/Error/ConfigureException.php → src/Error/ConfigureException.php b/Cake/Error/ConfigureException.php → src/Error/ConfigureException.php
diff --git a/Cake/Error/ConsoleException.php → src/Error/ConsoleException.php b/Cake/Error/ConsoleException.php → src/Error/ConsoleException.php
diff --git a/Cake/Error/ErrorHandler.php → src/Error/ErrorHandler.php b/Cake/Error/ErrorHandler.php → src/Error/ErrorHandler.php
diff --git a/Cake/Error/Exception.php → src/Error/Exception.php b/Cake/Error/Exception.php → src/Error/Exception.php
diff --git a/Cake/Error/ExceptionRenderer.php → src/Error/ExceptionRenderer.php b/Cake/Error/ExceptionRenderer.php → src/Error/ExceptionRenderer.php
diff --git a/Cake/Error/FatalErrorException.php → src/Error/FatalErrorException.php b/Cake/Error/FatalErrorException.php → src/Error/FatalErrorException.php
diff --git a/Cake/Error/ForbiddenException.php → src/Error/ForbiddenException.php b/Cake/Error/ForbiddenException.php → src/Error/ForbiddenException.php
diff --git a/Cake/Error/HttpException.php → src/Error/HttpException.php b/Cake/Error/HttpException.php → src/Error/HttpException.php
diff --git a/Cake/Error/InternalErrorException.php → src/Error/InternalErrorException.php b/Cake/Error/InternalErrorException.php → src/Error/InternalErrorException.php
diff --git a/Cake/Error/MethodNotAllowedException.php → src/Error/MethodNotAllowedException.php b/Cake/Error/MethodNotAllowedException.php → src/Error/MethodNotAllowedException.php
diff --git a/Cake/Error/MissingActionException.php → src/Error/MissingActionException.php b/Cake/Error/MissingActionException.php → src/Error/MissingActionException.php
diff --git a/Cake/Error/MissingBehaviorException.php → src/Error/MissingBehaviorException.php b/Cake/Error/MissingBehaviorException.php → src/Error/MissingBehaviorException.php
diff --git a/Cake/Error/MissingComponentException.php → src/Error/MissingComponentException.php b/Cake/Error/MissingComponentException.php → src/Error/MissingComponentException.php
diff --git a/Cake/Error/MissingConnectionException.php → src/Error/MissingConnectionException.php b/Cake/Error/MissingConnectionException.php → src/Error/MissingConnectionException.php
diff --git a/Cake/Error/MissingControllerException.php → src/Error/MissingControllerException.php b/Cake/Error/MissingControllerException.php → src/Error/MissingControllerException.php
diff --git a/Cake/Error/MissingDatabaseException.php → src/Error/MissingDatabaseException.php b/Cake/Error/MissingDatabaseException.php → src/Error/MissingDatabaseException.php
diff --git a/...rror/MissingDatasourceConfigException.php → ...rror/MissingDatasourceConfigException.php b/...rror/MissingDatasourceConfigException.php → ...rror/MissingDatasourceConfigException.php
diff --git a/Cake/Error/MissingDatasourceException.php → src/Error/MissingDatasourceException.php b/Cake/Error/MissingDatasourceException.php → src/Error/MissingDatasourceException.php
diff --git a/...rror/MissingDispatcherFilterException.php → ...rror/MissingDispatcherFilterException.php b/...rror/MissingDispatcherFilterException.php → ...rror/MissingDispatcherFilterException.php
diff --git a/Cake/Error/MissingHelperException.php → src/Error/MissingHelperException.php b/Cake/Error/MissingHelperException.php → src/Error/MissingHelperException.php
diff --git a/Cake/Error/MissingLayoutException.php → src/Error/MissingLayoutException.php b/Cake/Error/MissingLayoutException.php → src/Error/MissingLayoutException.php
diff --git a/Cake/Error/MissingPluginException.php → src/Error/MissingPluginException.php b/Cake/Error/MissingPluginException.php → src/Error/MissingPluginException.php
diff --git a/Cake/Error/MissingShellException.php → src/Error/MissingShellException.php b/Cake/Error/MissingShellException.php → src/Error/MissingShellException.php
diff --git a/Cake/Error/MissingShellMethodException.php → src/Error/MissingShellMethodException.php b/Cake/Error/MissingShellMethodException.php → src/Error/MissingShellMethodException.php
diff --git a/Cake/Error/MissingTableException.php → src/Error/MissingTableException.php b/Cake/Error/MissingTableException.php → src/Error/MissingTableException.php
diff --git a/Cake/Error/MissingTaskException.php → src/Error/MissingTaskException.php b/Cake/Error/MissingTaskException.php → src/Error/MissingTaskException.php
diff --git a/Cake/Error/MissingTestLoaderException.php → src/Error/MissingTestLoaderException.php b/Cake/Error/MissingTestLoaderException.php → src/Error/MissingTestLoaderException.php
diff --git a/Cake/Error/MissingViewException.php → src/Error/MissingViewException.php b/Cake/Error/MissingViewException.php → src/Error/MissingViewException.php
diff --git a/Cake/Error/NotFoundException.php → src/Error/NotFoundException.php b/Cake/Error/NotFoundException.php → src/Error/NotFoundException.php
diff --git a/Cake/Error/NotImplementedException.php → src/Error/NotImplementedException.php b/Cake/Error/NotImplementedException.php → src/Error/NotImplementedException.php
diff --git a/Cake/Error/PrivateActionException.php → src/Error/PrivateActionException.php b/Cake/Error/PrivateActionException.php → src/Error/PrivateActionException.php
diff --git a/Cake/Error/SocketException.php → src/Error/SocketException.php b/Cake/Error/SocketException.php → src/Error/SocketException.php
diff --git a/Cake/Error/UnauthorizedException.php → src/Error/UnauthorizedException.php b/Cake/Error/UnauthorizedException.php → src/Error/UnauthorizedException.php
diff --git a/Cake/Error/XmlException.php → src/Error/XmlException.php b/Cake/Error/XmlException.php → src/Error/XmlException.php
diff --git a/Cake/Event/Event.php → src/Event/Event.php b/Cake/Event/Event.php → src/Event/Event.php
diff --git a/Cake/Event/EventListener.php → src/Event/EventListener.php b/Cake/Event/EventListener.php → src/Event/EventListener.php
diff --git a/Cake/Event/EventManager.php → src/Event/EventManager.php b/Cake/Event/EventManager.php → src/Event/EventManager.php
diff --git a/Cake/I18n/I18n.php → src/I18n/I18n.php b/Cake/I18n/I18n.php → src/I18n/I18n.php
diff --git a/Cake/I18n/L10n.php → src/I18n/L10n.php b/Cake/I18n/L10n.php → src/I18n/L10n.php
diff --git a/Cake/Log/Engine/BaseLog.php → src/Log/Engine/BaseLog.php b/Cake/Log/Engine/BaseLog.php → src/Log/Engine/BaseLog.php
diff --git a/Cake/Log/Engine/ConsoleLog.php → src/Log/Engine/ConsoleLog.php b/Cake/Log/Engine/ConsoleLog.php → src/Log/Engine/ConsoleLog.php
diff --git a/Cake/Log/Engine/FileLog.php → src/Log/Engine/FileLog.php b/Cake/Log/Engine/FileLog.php → src/Log/Engine/FileLog.php
diff --git a/Cake/Log/Engine/SyslogLog.php → src/Log/Engine/SyslogLog.php b/Cake/Log/Engine/SyslogLog.php → src/Log/Engine/SyslogLog.php
diff --git a/Cake/Log/Log.php → src/Log/Log.php b/Cake/Log/Log.php → src/Log/Log.php
diff --git a/Cake/Log/LogEngineRegistry.php → src/Log/LogEngineRegistry.php b/Cake/Log/LogEngineRegistry.php → src/Log/LogEngineRegistry.php
diff --git a/Cake/Log/LogInterface.php → src/Log/LogInterface.php b/Cake/Log/LogInterface.php → src/Log/LogInterface.php
diff --git a/Cake/Log/LogTrait.php → src/Log/LogTrait.php b/Cake/Log/LogTrait.php → src/Log/LogTrait.php
diff --git a/Cake/Model/Behavior/CounterCacheBehavior.php → src/Model/Behavior/CounterCacheBehavior.php b/Cake/Model/Behavior/CounterCacheBehavior.php → src/Model/Behavior/CounterCacheBehavior.php
diff --git a/Cake/Model/Behavior/TimestampBehavior.php → src/Model/Behavior/TimestampBehavior.php b/Cake/Model/Behavior/TimestampBehavior.php → src/Model/Behavior/TimestampBehavior.php
diff --git a/Cake/Network/Email/AbstractTransport.php → src/Network/Email/AbstractTransport.php b/Cake/Network/Email/AbstractTransport.php → src/Network/Email/AbstractTransport.php
diff --git a/Cake/Network/Email/DebugTransport.php → src/Network/Email/DebugTransport.php b/Cake/Network/Email/DebugTransport.php → src/Network/Email/DebugTransport.php
diff --git a/Cake/Network/Email/Email.php → src/Network/Email/Email.php b/Cake/Network/Email/Email.php → src/Network/Email/Email.php
diff --git a/Cake/Network/Email/MailTransport.php → src/Network/Email/MailTransport.php b/Cake/Network/Email/MailTransport.php → src/Network/Email/MailTransport.php
diff --git a/Cake/Network/Email/SmtpTransport.php → src/Network/Email/SmtpTransport.php b/Cake/Network/Email/SmtpTransport.php → src/Network/Email/SmtpTransport.php
diff --git a/Cake/Network/Http/Adapter/Stream.php → src/Network/Http/Adapter/Stream.php b/Cake/Network/Http/Adapter/Stream.php → src/Network/Http/Adapter/Stream.php
diff --git a/Cake/Network/Http/Auth/Basic.php → src/Network/Http/Auth/Basic.php b/Cake/Network/Http/Auth/Basic.php → src/Network/Http/Auth/Basic.php
diff --git a/Cake/Network/Http/Auth/Digest.php → src/Network/Http/Auth/Digest.php b/Cake/Network/Http/Auth/Digest.php → src/Network/Http/Auth/Digest.php
diff --git a/Cake/Network/Http/Auth/Oauth.php → src/Network/Http/Auth/Oauth.php b/Cake/Network/Http/Auth/Oauth.php → src/Network/Http/Auth/Oauth.php
diff --git a/Cake/Network/Http/Client.php → src/Network/Http/Client.php b/Cake/Network/Http/Client.php → src/Network/Http/Client.php
diff --git a/Cake/Network/Http/Cookies.php → src/Network/Http/Cookies.php b/Cake/Network/Http/Cookies.php → src/Network/Http/Cookies.php
diff --git a/Cake/Network/Http/FormData.php → src/Network/Http/FormData.php b/Cake/Network/Http/FormData.php → src/Network/Http/FormData.php
diff --git a/Cake/Network/Http/FormData/Part.php → src/Network/Http/FormData/Part.php b/Cake/Network/Http/FormData/Part.php → src/Network/Http/FormData/Part.php
diff --git a/Cake/Network/Http/Message.php → src/Network/Http/Message.php b/Cake/Network/Http/Message.php → src/Network/Http/Message.php
diff --git a/Cake/Network/Http/Request.php → src/Network/Http/Request.php b/Cake/Network/Http/Request.php → src/Network/Http/Request.php
diff --git a/Cake/Network/Http/Response.php → src/Network/Http/Response.php b/Cake/Network/Http/Response.php → src/Network/Http/Response.php
diff --git a/Cake/Network/Request.php → src/Network/Request.php b/Cake/Network/Request.php → src/Network/Request.php
diff --git a/Cake/Network/Response.php → src/Network/Response.php b/Cake/Network/Response.php → src/Network/Response.php
diff --git a/Cake/Network/Session.php → src/Network/Session.php b/Cake/Network/Session.php → src/Network/Session.php
diff --git a/Cake/Network/Session/CacheSession.php → src/Network/Session/CacheSession.php b/Cake/Network/Session/CacheSession.php → src/Network/Session/CacheSession.php
diff --git a/Cake/Network/Session/DatabaseSession.php → src/Network/Session/DatabaseSession.php b/Cake/Network/Session/DatabaseSession.php → src/Network/Session/DatabaseSession.php
diff --git a/Cake/Network/Socket.php → src/Network/Socket.php b/Cake/Network/Socket.php → src/Network/Socket.php
diff --git a/Cake/ORM/Association.php → src/ORM/Association.php b/Cake/ORM/Association.php → src/ORM/Association.php
diff --git a/Cake/ORM/Association/BelongsTo.php → src/ORM/Association/BelongsTo.php b/Cake/ORM/Association/BelongsTo.php → src/ORM/Association/BelongsTo.php
diff --git a/Cake/ORM/Association/BelongsToMany.php → src/ORM/Association/BelongsToMany.php b/Cake/ORM/Association/BelongsToMany.php → src/ORM/Association/BelongsToMany.php
diff --git a/.../ORM/Association/DependentDeleteTrait.php → src/ORM/Association/DependentDeleteTrait.php b/.../ORM/Association/DependentDeleteTrait.php → src/ORM/Association/DependentDeleteTrait.php
diff --git a/.../Association/ExternalAssociationTrait.php → .../Association/ExternalAssociationTrait.php b/.../Association/ExternalAssociationTrait.php → .../Association/ExternalAssociationTrait.php
diff --git a/Cake/ORM/Association/HasMany.php → src/ORM/Association/HasMany.php b/Cake/ORM/Association/HasMany.php → src/ORM/Association/HasMany.php
diff --git a/Cake/ORM/Association/HasOne.php → src/ORM/Association/HasOne.php b/Cake/ORM/Association/HasOne.php → src/ORM/Association/HasOne.php
diff --git a/Cake/ORM/Associations.php → src/ORM/Associations.php b/Cake/ORM/Associations.php → src/ORM/Associations.php
diff --git a/Cake/ORM/Behavior.php → src/ORM/Behavior.php b/Cake/ORM/Behavior.php → src/ORM/Behavior.php
diff --git a/Cake/ORM/BehaviorRegistry.php → src/ORM/BehaviorRegistry.php b/Cake/ORM/BehaviorRegistry.php → src/ORM/BehaviorRegistry.php
diff --git a/Cake/ORM/Entity.php → src/ORM/Entity.php b/Cake/ORM/Entity.php → src/ORM/Entity.php
diff --git a/Cake/ORM/EntityValidator.php → src/ORM/EntityValidator.php b/Cake/ORM/EntityValidator.php → src/ORM/EntityValidator.php
diff --git a/Cake/ORM/Error/MissingEntityException.php → src/ORM/Error/MissingEntityException.php b/Cake/ORM/Error/MissingEntityException.php → src/ORM/Error/MissingEntityException.php
diff --git a/.../ORM/Error/MissingTableClassException.php → src/ORM/Error/MissingTableClassException.php b/.../ORM/Error/MissingTableClassException.php → src/ORM/Error/MissingTableClassException.php
diff --git a/Cake/ORM/Error/RecordNotFoundException.php → src/ORM/Error/RecordNotFoundException.php b/Cake/ORM/Error/RecordNotFoundException.php → src/ORM/Error/RecordNotFoundException.php
diff --git a/Cake/ORM/Marshaller.php → src/ORM/Marshaller.php b/Cake/ORM/Marshaller.php → src/ORM/Marshaller.php
diff --git a/Cake/ORM/Query.php → src/ORM/Query.php b/Cake/ORM/Query.php → src/ORM/Query.php
diff --git a/Cake/ORM/QueryCacher.php → src/ORM/QueryCacher.php b/Cake/ORM/QueryCacher.php → src/ORM/QueryCacher.php
diff --git a/Cake/ORM/ResultSet.php → src/ORM/ResultSet.php b/Cake/ORM/ResultSet.php → src/ORM/ResultSet.php
diff --git a/Cake/ORM/ResultSetDecorator.php → src/ORM/ResultSetDecorator.php b/Cake/ORM/ResultSetDecorator.php → src/ORM/ResultSetDecorator.php
diff --git a/Cake/ORM/Table.php → src/ORM/Table.php b/Cake/ORM/Table.php → src/ORM/Table.php
diff --git a/Cake/ORM/TableRegistry.php → src/ORM/TableRegistry.php b/Cake/ORM/TableRegistry.php → src/ORM/TableRegistry.php
diff --git a/Cake/Routing/Dispatcher.php → src/Routing/Dispatcher.php b/Cake/Routing/Dispatcher.php → src/Routing/Dispatcher.php
diff --git a/Cake/Routing/DispatcherFilter.php → src/Routing/DispatcherFilter.php b/Cake/Routing/DispatcherFilter.php → src/Routing/DispatcherFilter.php
diff --git a/Cake/Routing/Filter/AssetDispatcher.php → src/Routing/Filter/AssetDispatcher.php b/Cake/Routing/Filter/AssetDispatcher.php → src/Routing/Filter/AssetDispatcher.php
diff --git a/Cake/Routing/Filter/CacheDispatcher.php → src/Routing/Filter/CacheDispatcher.php b/Cake/Routing/Filter/CacheDispatcher.php → src/Routing/Filter/CacheDispatcher.php
diff --git a/Cake/Routing/RequestActionTrait.php → src/Routing/RequestActionTrait.php b/Cake/Routing/RequestActionTrait.php → src/Routing/RequestActionTrait.php
diff --git a/Cake/Routing/Route/PluginShortRoute.php → src/Routing/Route/PluginShortRoute.php b/Cake/Routing/Route/PluginShortRoute.php → src/Routing/Route/PluginShortRoute.php
diff --git a/Cake/Routing/Route/RedirectRoute.php → src/Routing/Route/RedirectRoute.php b/Cake/Routing/Route/RedirectRoute.php → src/Routing/Route/RedirectRoute.php
diff --git a/Cake/Routing/Route/Route.php → src/Routing/Route/Route.php b/Cake/Routing/Route/Route.php → src/Routing/Route/Route.php
diff --git a/Cake/Routing/RouteCollection.php → src/Routing/RouteCollection.php b/Cake/Routing/RouteCollection.php → src/Routing/RouteCollection.php
diff --git a/Cake/Routing/Router.php → src/Routing/Router.php b/Cake/Routing/Router.php → src/Routing/Router.php
diff --git a/Cake/TestSuite/ControllerTestCase.php → src/TestSuite/ControllerTestCase.php b/Cake/TestSuite/ControllerTestCase.php → src/TestSuite/ControllerTestCase.php
diff --git a/...TestSuite/Coverage/BaseCoverageReport.php → ...TestSuite/Coverage/BaseCoverageReport.php b/...TestSuite/Coverage/BaseCoverageReport.php → ...TestSuite/Coverage/BaseCoverageReport.php
diff --git a/...TestSuite/Coverage/HtmlCoverageReport.php → ...TestSuite/Coverage/HtmlCoverageReport.php b/...TestSuite/Coverage/HtmlCoverageReport.php → ...TestSuite/Coverage/HtmlCoverageReport.php
diff --git a/...TestSuite/Coverage/TextCoverageReport.php → ...TestSuite/Coverage/TextCoverageReport.php b/...TestSuite/Coverage/TextCoverageReport.php → ...TestSuite/Coverage/TextCoverageReport.php
diff --git a/Cake/TestSuite/Fixture/FixtureInjector.php → src/TestSuite/Fixture/FixtureInjector.php b/Cake/TestSuite/Fixture/FixtureInjector.php → src/TestSuite/Fixture/FixtureInjector.php
diff --git a/Cake/TestSuite/Fixture/FixtureManager.php → src/TestSuite/Fixture/FixtureManager.php b/Cake/TestSuite/Fixture/FixtureManager.php → src/TestSuite/Fixture/FixtureManager.php
diff --git a/Cake/TestSuite/Fixture/TestFixture.php → src/TestSuite/Fixture/TestFixture.php b/Cake/TestSuite/Fixture/TestFixture.php → src/TestSuite/Fixture/TestFixture.php
diff --git a/Cake/TestSuite/Reporter/BaseReporter.php → src/TestSuite/Reporter/BaseReporter.php b/Cake/TestSuite/Reporter/BaseReporter.php → src/TestSuite/Reporter/BaseReporter.php
diff --git a/Cake/TestSuite/Reporter/HtmlReporter.php → src/TestSuite/Reporter/HtmlReporter.php b/Cake/TestSuite/Reporter/HtmlReporter.php → src/TestSuite/Reporter/HtmlReporter.php
diff --git a/Cake/TestSuite/Reporter/TextReporter.php → src/TestSuite/Reporter/TextReporter.php b/Cake/TestSuite/Reporter/TextReporter.php → src/TestSuite/Reporter/TextReporter.php
diff --git a/Cake/TestSuite/TestCase.php → src/TestSuite/TestCase.php b/Cake/TestSuite/TestCase.php → src/TestSuite/TestCase.php
diff --git a/Cake/TestSuite/TestLoader.php → src/TestSuite/TestLoader.php b/Cake/TestSuite/TestLoader.php → src/TestSuite/TestLoader.php
diff --git a/Cake/TestSuite/TestPermutationDecorator.php → src/TestSuite/TestPermutationDecorator.php b/Cake/TestSuite/TestPermutationDecorator.php → src/TestSuite/TestPermutationDecorator.php
diff --git a/Cake/TestSuite/TestRunner.php → src/TestSuite/TestRunner.php b/Cake/TestSuite/TestRunner.php → src/TestSuite/TestRunner.php
diff --git a/Cake/TestSuite/TestSuite.php → src/TestSuite/TestSuite.php b/Cake/TestSuite/TestSuite.php → src/TestSuite/TestSuite.php
diff --git a/Cake/TestSuite/TestSuiteCommand.php → src/TestSuite/TestSuiteCommand.php b/Cake/TestSuite/TestSuiteCommand.php → src/TestSuite/TestSuiteCommand.php
diff --git a/Cake/TestSuite/TestSuiteDispatcher.php → src/TestSuite/TestSuiteDispatcher.php b/Cake/TestSuite/TestSuiteDispatcher.php → src/TestSuite/TestSuiteDispatcher.php
diff --git a/Cake/TestSuite/templates/footer.php → src/TestSuite/templates/footer.php b/Cake/TestSuite/templates/footer.php → src/TestSuite/templates/footer.php
diff --git a/Cake/TestSuite/templates/header.php → src/TestSuite/templates/header.php b/Cake/TestSuite/templates/header.php → src/TestSuite/templates/header.php
diff --git a/Cake/TestSuite/templates/menu.php → src/TestSuite/templates/menu.php b/Cake/TestSuite/templates/menu.php → src/TestSuite/templates/menu.php
diff --git a/...estSuite/templates/missing_connection.php → ...estSuite/templates/missing_connection.php b/...estSuite/templates/missing_connection.php → ...estSuite/templates/missing_connection.php
diff --git a/Cake/TestSuite/templates/phpunit.php → src/TestSuite/templates/phpunit.php b/Cake/TestSuite/templates/phpunit.php → src/TestSuite/templates/phpunit.php
diff --git a/Cake/TestSuite/templates/xdebug.php → src/TestSuite/templates/xdebug.php b/Cake/TestSuite/templates/xdebug.php → src/TestSuite/templates/xdebug.php
diff --git a/Cake/Utility/Debugger.php → src/Utility/Debugger.php b/Cake/Utility/Debugger.php → src/Utility/Debugger.php
diff --git a/Cake/Utility/File.php → src/Utility/File.php b/Cake/Utility/File.php → src/Utility/File.php
diff --git a/Cake/Utility/Folder.php → src/Utility/Folder.php b/Cake/Utility/Folder.php → src/Utility/Folder.php
diff --git a/Cake/Utility/Hash.php → src/Utility/Hash.php b/Cake/Utility/Hash.php → src/Utility/Hash.php
diff --git a/Cake/Utility/Inflector.php → src/Utility/Inflector.php b/Cake/Utility/Inflector.php → src/Utility/Inflector.php
diff --git a/Cake/Utility/MergeVariablesTrait.php → src/Utility/MergeVariablesTrait.php b/Cake/Utility/MergeVariablesTrait.php → src/Utility/MergeVariablesTrait.php
diff --git a/Cake/Utility/Number.php → src/Utility/Number.php b/Cake/Utility/Number.php → src/Utility/Number.php
diff --git a/Cake/Utility/ObjectCollection.php → src/Utility/ObjectCollection.php b/Cake/Utility/ObjectCollection.php → src/Utility/ObjectCollection.php
diff --git a/Cake/Utility/ObjectRegistry.php → src/Utility/ObjectRegistry.php b/Cake/Utility/ObjectRegistry.php → src/Utility/ObjectRegistry.php
diff --git a/Cake/Utility/RepositoryAwareTrait.php → src/Utility/RepositoryAwareTrait.php b/Cake/Utility/RepositoryAwareTrait.php → src/Utility/RepositoryAwareTrait.php
diff --git a/Cake/Utility/Security.php → src/Utility/Security.php b/Cake/Utility/Security.php → src/Utility/Security.php
diff --git a/Cake/Utility/Set.php → src/Utility/Set.php b/Cake/Utility/Set.php → src/Utility/Set.php
diff --git a/Cake/Utility/String.php → src/Utility/String.php b/Cake/Utility/String.php → src/Utility/String.php
diff --git a/Cake/Utility/Time.php → src/Utility/Time.php b/Cake/Utility/Time.php → src/Utility/Time.php
diff --git a/Cake/Utility/ViewVarsTrait.php → src/Utility/ViewVarsTrait.php b/Cake/Utility/ViewVarsTrait.php → src/Utility/ViewVarsTrait.php
diff --git a/Cake/Utility/Xml.php → src/Utility/Xml.php b/Cake/Utility/Xml.php → src/Utility/Xml.php
diff --git a/Cake/Validation/RulesProvider.php → src/Validation/RulesProvider.php b/Cake/Validation/RulesProvider.php → src/Validation/RulesProvider.php
diff --git a/Cake/Validation/Validation.php → src/Validation/Validation.php b/Cake/Validation/Validation.php → src/Validation/Validation.php
diff --git a/Cake/Validation/ValidationRule.php → src/Validation/ValidationRule.php b/Cake/Validation/ValidationRule.php → src/Validation/ValidationRule.php
diff --git a/Cake/Validation/ValidationSet.php → src/Validation/ValidationSet.php b/Cake/Validation/ValidationSet.php → src/Validation/ValidationSet.php
diff --git a/Cake/Validation/Validator.php → src/Validation/Validator.php b/Cake/Validation/Validator.php → src/Validation/Validator.php
diff --git a/Cake/View/Element/exception_stack_trace.ctp → src/View/Element/exception_stack_trace.ctp b/Cake/View/Element/exception_stack_trace.ctp → src/View/Element/exception_stack_trace.ctp
diff --git a/Cake/View/Element/sql_dump.ctp → src/View/Element/sql_dump.ctp b/Cake/View/Element/sql_dump.ctp → src/View/Element/sql_dump.ctp