diff --git a/app/config/schema/db_acl.php b/app/Config/Schema/db_acl.php
similarity index 100%
rename from app/config/schema/db_acl.php
rename to app/Config/Schema/db_acl.php
diff --git a/app/config/schema/i18n.php b/app/Config/Schema/i18n.php
similarity index 100%
rename from app/config/schema/i18n.php
rename to app/Config/Schema/i18n.php
diff --git a/app/config/schema/sessions.php b/app/Config/Schema/sessions.php
similarity index 100%
rename from app/config/schema/sessions.php
rename to app/Config/Schema/sessions.php
diff --git a/app/config/acl.ini.php b/app/Config/acl.ini.php
similarity index 100%
rename from app/config/acl.ini.php
rename to app/Config/acl.ini.php
diff --git a/app/config/bootstrap.php b/app/Config/bootstrap.php
similarity index 100%
rename from app/config/bootstrap.php
rename to app/Config/bootstrap.php
diff --git a/app/config/core.php b/app/Config/core.php
similarity index 100%
rename from app/config/core.php
rename to app/Config/core.php
diff --git a/app/config/database.php.default b/app/Config/database.php.default
similarity index 100%
rename from app/config/database.php.default
rename to app/Config/database.php.default
diff --git a/app/config/email.php.default b/app/Config/email.php.default
similarity index 100%
rename from app/config/email.php.default
rename to app/Config/email.php.default
diff --git a/app/config/routes.php b/app/Config/routes.php
similarity index 100%
rename from app/config/routes.php
rename to app/Config/routes.php
diff --git a/app/View/pages/empty b/app/Locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from app/View/pages/empty
rename to app/Locale/eng/LC_MESSAGES/empty
diff --git a/app/locale/eng/LC_MESSAGES/empty b/app/Plugin/empty
similarity index 100%
rename from app/locale/eng/LC_MESSAGES/empty
rename to app/Plugin/empty
diff --git a/app/plugins/empty b/app/Test/Case/Controller/Component/empty
similarity index 100%
rename from app/plugins/empty
rename to app/Test/Case/Controller/Component/empty
diff --git a/app/tests/Case/Controller/Component/empty b/app/Test/Case/Controller/empty
similarity index 100%
rename from app/tests/Case/Controller/Component/empty
rename to app/Test/Case/Controller/empty
diff --git a/app/tests/Case/Controller/empty b/app/Test/Case/Model/Behavior/empty
similarity index 100%
rename from app/tests/Case/Controller/empty
rename to app/Test/Case/Model/Behavior/empty
diff --git a/app/tests/Case/Model/Behavior/empty b/app/Test/Case/Model/empty
similarity index 100%
rename from app/tests/Case/Model/Behavior/empty
rename to app/Test/Case/Model/empty
diff --git a/app/tests/Case/Model/empty b/app/Test/Case/View/Helper/empty
similarity index 100%
rename from app/tests/Case/Model/empty
rename to app/Test/Case/View/Helper/empty
diff --git a/app/tests/Case/View/Helper/empty b/app/Test/Fixture/empty
similarity index 100%
rename from app/tests/Case/View/Helper/empty
rename to app/Test/Fixture/empty
diff --git a/app/tests/Fixture/empty b/app/Vendor/shells/tasks/empty
similarity index 100%
rename from app/tests/Fixture/empty
rename to app/Vendor/shells/tasks/empty
diff --git a/app/vendors/shells/tasks/empty b/app/Vendor/shells/templates/empty
similarity index 100%
rename from app/vendors/shells/tasks/empty
rename to app/Vendor/shells/templates/empty
diff --git a/app/vendors/shells/templates/empty b/app/View/Pages/empty
similarity index 100%
rename from app/vendors/shells/templates/empty
rename to app/View/Pages/empty
diff --git a/lib/Cake/config/config.php b/lib/Cake/Config/config.php
similarity index 100%
rename from lib/Cake/config/config.php
rename to lib/Cake/Config/config.php
diff --git a/lib/Cake/config/unicode/casefolding/0080_00ff.php b/lib/Cake/Config/unicode/casefolding/0080_00ff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0080_00ff.php
rename to lib/Cake/Config/unicode/casefolding/0080_00ff.php
diff --git a/lib/Cake/config/unicode/casefolding/0100_017f.php b/lib/Cake/Config/unicode/casefolding/0100_017f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0100_017f.php
rename to lib/Cake/Config/unicode/casefolding/0100_017f.php
diff --git a/lib/Cake/config/unicode/casefolding/0180_024F.php b/lib/Cake/Config/unicode/casefolding/0180_024F.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0180_024F.php
rename to lib/Cake/Config/unicode/casefolding/0180_024F.php
diff --git a/lib/Cake/config/unicode/casefolding/0250_02af.php b/lib/Cake/Config/unicode/casefolding/0250_02af.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0250_02af.php
rename to lib/Cake/Config/unicode/casefolding/0250_02af.php
diff --git a/lib/Cake/config/unicode/casefolding/0370_03ff.php b/lib/Cake/Config/unicode/casefolding/0370_03ff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0370_03ff.php
rename to lib/Cake/Config/unicode/casefolding/0370_03ff.php
diff --git a/lib/Cake/config/unicode/casefolding/0400_04ff.php b/lib/Cake/Config/unicode/casefolding/0400_04ff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0400_04ff.php
rename to lib/Cake/Config/unicode/casefolding/0400_04ff.php
diff --git a/lib/Cake/config/unicode/casefolding/0500_052f.php b/lib/Cake/Config/unicode/casefolding/0500_052f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0500_052f.php
rename to lib/Cake/Config/unicode/casefolding/0500_052f.php
diff --git a/lib/Cake/config/unicode/casefolding/0530_058f.php b/lib/Cake/Config/unicode/casefolding/0530_058f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/0530_058f.php
rename to lib/Cake/Config/unicode/casefolding/0530_058f.php
diff --git a/lib/Cake/config/unicode/casefolding/1e00_1eff.php b/lib/Cake/Config/unicode/casefolding/1e00_1eff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/1e00_1eff.php
rename to lib/Cake/Config/unicode/casefolding/1e00_1eff.php
diff --git a/lib/Cake/config/unicode/casefolding/1f00_1fff.php b/lib/Cake/Config/unicode/casefolding/1f00_1fff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/1f00_1fff.php
rename to lib/Cake/Config/unicode/casefolding/1f00_1fff.php
diff --git a/lib/Cake/config/unicode/casefolding/2100_214f.php b/lib/Cake/Config/unicode/casefolding/2100_214f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2100_214f.php
rename to lib/Cake/Config/unicode/casefolding/2100_214f.php
diff --git a/lib/Cake/config/unicode/casefolding/2150_218f.php b/lib/Cake/Config/unicode/casefolding/2150_218f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2150_218f.php
rename to lib/Cake/Config/unicode/casefolding/2150_218f.php
diff --git a/lib/Cake/config/unicode/casefolding/2460_24ff.php b/lib/Cake/Config/unicode/casefolding/2460_24ff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2460_24ff.php
rename to lib/Cake/Config/unicode/casefolding/2460_24ff.php
diff --git a/lib/Cake/config/unicode/casefolding/2c00_2c5f.php b/lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2c00_2c5f.php
rename to lib/Cake/Config/unicode/casefolding/2c00_2c5f.php
diff --git a/lib/Cake/config/unicode/casefolding/2c60_2c7f.php b/lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2c60_2c7f.php
rename to lib/Cake/Config/unicode/casefolding/2c60_2c7f.php
diff --git a/lib/Cake/config/unicode/casefolding/2c80_2cff.php b/lib/Cake/Config/unicode/casefolding/2c80_2cff.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/2c80_2cff.php
rename to lib/Cake/Config/unicode/casefolding/2c80_2cff.php
diff --git a/lib/Cake/config/unicode/casefolding/ff00_ffef.php b/lib/Cake/Config/unicode/casefolding/ff00_ffef.php
similarity index 100%
rename from lib/Cake/config/unicode/casefolding/ff00_ffef.php
rename to lib/Cake/Config/unicode/casefolding/ff00_ffef.php
diff --git a/lib/Cake/tests/Case/AllBehaviorsTest.php b/lib/Cake/Test/Case/AllBehaviorsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllBehaviorsTest.php
rename to lib/Cake/Test/Case/AllBehaviorsTest.php
diff --git a/lib/Cake/tests/Case/AllCacheTest.php b/lib/Cake/Test/Case/AllCacheTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllCacheTest.php
rename to lib/Cake/Test/Case/AllCacheTest.php
diff --git a/lib/Cake/tests/Case/AllComponentsTest.php b/lib/Cake/Test/Case/AllComponentsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllComponentsTest.php
rename to lib/Cake/Test/Case/AllComponentsTest.php
diff --git a/lib/Cake/tests/Case/AllConfigureTest.php b/lib/Cake/Test/Case/AllConfigureTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllConfigureTest.php
rename to lib/Cake/Test/Case/AllConfigureTest.php
diff --git a/lib/Cake/tests/Case/AllConsoleTest.php b/lib/Cake/Test/Case/AllConsoleTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllConsoleTest.php
rename to lib/Cake/Test/Case/AllConsoleTest.php
diff --git a/lib/Cake/tests/Case/AllControllerTest.php b/lib/Cake/Test/Case/AllControllerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllControllerTest.php
rename to lib/Cake/Test/Case/AllControllerTest.php
diff --git a/lib/Cake/tests/Case/AllCoreTest.php b/lib/Cake/Test/Case/AllCoreTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllCoreTest.php
rename to lib/Cake/Test/Case/AllCoreTest.php
diff --git a/lib/Cake/tests/Case/AllDatabaseTest.php b/lib/Cake/Test/Case/AllDatabaseTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllDatabaseTest.php
rename to lib/Cake/Test/Case/AllDatabaseTest.php
diff --git a/lib/Cake/tests/Case/AllErrorTest.php b/lib/Cake/Test/Case/AllErrorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllErrorTest.php
rename to lib/Cake/Test/Case/AllErrorTest.php
diff --git a/lib/Cake/tests/Case/AllHelpersTest.php b/lib/Cake/Test/Case/AllHelpersTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllHelpersTest.php
rename to lib/Cake/Test/Case/AllHelpersTest.php
diff --git a/lib/Cake/tests/Case/AllI18nTest.php b/lib/Cake/Test/Case/AllI18nTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllI18nTest.php
rename to lib/Cake/Test/Case/AllI18nTest.php
diff --git a/lib/Cake/tests/Case/AllLogTest.php b/lib/Cake/Test/Case/AllLogTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllLogTest.php
rename to lib/Cake/Test/Case/AllLogTest.php
diff --git a/lib/Cake/tests/Case/AllModelTest.php b/lib/Cake/Test/Case/AllModelTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllModelTest.php
rename to lib/Cake/Test/Case/AllModelTest.php
diff --git a/lib/Cake/tests/Case/AllNetworkTest.php b/lib/Cake/Test/Case/AllNetworkTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllNetworkTest.php
rename to lib/Cake/Test/Case/AllNetworkTest.php
diff --git a/lib/Cake/tests/Case/AllRoutingTest.php b/lib/Cake/Test/Case/AllRoutingTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllRoutingTest.php
rename to lib/Cake/Test/Case/AllRoutingTest.php
diff --git a/lib/Cake/tests/Case/AllTestSuiteTest.php b/lib/Cake/Test/Case/AllTestSuiteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllTestSuiteTest.php
rename to lib/Cake/Test/Case/AllTestSuiteTest.php
diff --git a/lib/Cake/tests/Case/AllTestsTest.php b/lib/Cake/Test/Case/AllTestsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllTestsTest.php
rename to lib/Cake/Test/Case/AllTestsTest.php
diff --git a/lib/Cake/tests/Case/AllUtilityTest.php b/lib/Cake/Test/Case/AllUtilityTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllUtilityTest.php
rename to lib/Cake/Test/Case/AllUtilityTest.php
diff --git a/lib/Cake/tests/Case/AllViewTest.php b/lib/Cake/Test/Case/AllViewTest.php
similarity index 100%
rename from lib/Cake/tests/Case/AllViewTest.php
rename to lib/Cake/Test/Case/AllViewTest.php
diff --git a/lib/Cake/tests/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/BasicsTest.php
rename to lib/Cake/Test/Case/BasicsTest.php
diff --git a/lib/Cake/tests/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Cache/CacheTest.php
rename to lib/Cake/Test/Case/Cache/CacheTest.php
diff --git a/lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php
rename to lib/Cake/Test/Case/Cache/Engine/ApcEngineTest.php
diff --git a/lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php
rename to lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php
diff --git a/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php
rename to lib/Cake/Test/Case/Cache/Engine/MemcacheTest.php
diff --git a/lib/Cake/tests/Case/Cache/Engine/XcacheTest.php b/lib/Cake/Test/Case/Cache/Engine/XcacheTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Cache/Engine/XcacheTest.php
rename to lib/Cake/Test/Case/Cache/Engine/XcacheTest.php
diff --git a/lib/Cake/tests/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Configure/IniReaderTest.php
rename to lib/Cake/Test/Case/Configure/IniReaderTest.php
diff --git a/lib/Cake/tests/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Configure/PhpReaderTest.php
rename to lib/Cake/Test/Case/Configure/PhpReaderTest.php
diff --git a/lib/Cake/tests/Case/Console/AllConsoleLibsTest.php b/lib/Cake/Test/Case/Console/AllConsoleLibsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/AllConsoleLibsTest.php
rename to lib/Cake/Test/Case/Console/AllConsoleLibsTest.php
diff --git a/lib/Cake/tests/Case/Console/AllConsoleTest.php b/lib/Cake/Test/Case/Console/AllConsoleTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/AllConsoleTest.php
rename to lib/Cake/Test/Case/Console/AllConsoleTest.php
diff --git a/lib/Cake/tests/Case/Console/AllShellsTest.php b/lib/Cake/Test/Case/Console/AllShellsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/AllShellsTest.php
rename to lib/Cake/Test/Case/Console/AllShellsTest.php
diff --git a/lib/Cake/tests/Case/Console/AllTasksTest.php b/lib/Cake/Test/Case/Console/AllTasksTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/AllTasksTest.php
rename to lib/Cake/Test/Case/Console/AllTasksTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/AclShellTest.php b/lib/Cake/Test/Case/Console/Command/AclShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/AclShellTest.php
rename to lib/Cake/Test/Case/Console/Command/AclShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/ApiShellTest.php b/lib/Cake/Test/Case/Console/Command/ApiShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/ApiShellTest.php
rename to lib/Cake/Test/Case/Console/Command/ApiShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/BakeShellTest.php b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/BakeShellTest.php
rename to lib/Cake/Test/Case/Console/Command/BakeShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
rename to lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
rename to lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/ShellTest.php b/lib/Cake/Test/Case/Console/Command/ShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/ShellTest.php
rename to lib/Cake/Test/Case/Console/Command/ShellTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
rename to lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
diff --git a/lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php b/lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php
rename to lib/Cake/Test/Case/Console/Command/TestsuiteShellTest.php
diff --git a/lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php b/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php
rename to lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php
diff --git a/lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php
rename to lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
diff --git a/lib/Cake/tests/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/ConsoleOutputTest.php
rename to lib/Cake/Test/Case/Console/ConsoleOutputTest.php
diff --git a/lib/Cake/tests/Case/Console/HelpFormatterTest.php b/lib/Cake/Test/Case/Console/HelpFormatterTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/HelpFormatterTest.php
rename to lib/Cake/Test/Case/Console/HelpFormatterTest.php
diff --git a/lib/Cake/tests/Case/Console/ShellDispatcherTest.php b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/ShellDispatcherTest.php
rename to lib/Cake/Test/Case/Console/ShellDispatcherTest.php
diff --git a/lib/Cake/tests/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Console/TaskCollectionTest.php
rename to lib/Cake/Test/Case/Console/TaskCollectionTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/AclComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/AclComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
rename to lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
diff --git a/lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php b/lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php
rename to lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
rename to lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
diff --git a/lib/Cake/tests/Case/Controller/ComponentTest.php b/lib/Cake/Test/Case/Controller/ComponentTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/ComponentTest.php
rename to lib/Cake/Test/Case/Controller/ComponentTest.php
diff --git a/lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php
rename to lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
diff --git a/lib/Cake/tests/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/ControllerTest.php
rename to lib/Cake/Test/Case/Controller/ControllerTest.php
diff --git a/lib/Cake/tests/Case/Controller/PagesControllerTest.php b/lib/Cake/Test/Case/Controller/PagesControllerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/PagesControllerTest.php
rename to lib/Cake/Test/Case/Controller/PagesControllerTest.php
diff --git a/lib/Cake/tests/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Controller/ScaffoldTest.php
rename to lib/Cake/Test/Case/Controller/ScaffoldTest.php
diff --git a/lib/Cake/tests/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Core/AppTest.php
rename to lib/Cake/Test/Case/Core/AppTest.php
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Core/CakePluginTest.php
rename to lib/Cake/Test/Case/Core/CakePluginTest.php
diff --git a/lib/Cake/tests/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Core/ConfigureTest.php
rename to lib/Cake/Test/Case/Core/ConfigureTest.php
diff --git a/lib/Cake/tests/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Core/ObjectTest.php
rename to lib/Cake/Test/Case/Core/ObjectTest.php
diff --git a/lib/Cake/tests/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Error/ErrorHandlerTest.php
rename to lib/Cake/Test/Case/Error/ErrorHandlerTest.php
diff --git a/lib/Cake/tests/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Error/ExceptionRendererTest.php
rename to lib/Cake/Test/Case/Error/ExceptionRendererTest.php
diff --git a/lib/Cake/tests/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php
similarity index 100%
rename from lib/Cake/tests/Case/I18n/I18nTest.php
rename to lib/Cake/Test/Case/I18n/I18nTest.php
diff --git a/lib/Cake/tests/Case/I18n/L10nTest.php b/lib/Cake/Test/Case/I18n/L10nTest.php
similarity index 100%
rename from lib/Cake/tests/Case/I18n/L10nTest.php
rename to lib/Cake/Test/Case/I18n/L10nTest.php
diff --git a/lib/Cake/tests/Case/I18n/MultibyteTest.php b/lib/Cake/Test/Case/I18n/MultibyteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/I18n/MultibyteTest.php
rename to lib/Cake/Test/Case/I18n/MultibyteTest.php
diff --git a/lib/Cake/tests/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Log/CakeLogTest.php
rename to lib/Cake/Test/Case/Log/CakeLogTest.php
diff --git a/lib/Cake/tests/Case/Log/Engine/FileLog.php b/lib/Cake/Test/Case/Log/Engine/FileLog.php
similarity index 100%
rename from lib/Cake/tests/Case/Log/Engine/FileLog.php
rename to lib/Cake/Test/Case/Log/Engine/FileLog.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php
rename to lib/Cake/Test/Case/Model/Behavior/AclBehaviorTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php
rename to lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php
diff --git a/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
rename to lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
diff --git a/lib/Cake/tests/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/CakeSchemaTest.php
rename to lib/Cake/Test/Case/Model/CakeSchemaTest.php
diff --git a/lib/Cake/tests/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ConnectionManagerTest.php
rename to lib/Cake/Test/Case/Model/ConnectionManagerTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php
rename to lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MssqlTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Database/MssqlTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/OrcaleTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Database/OrcaleTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php b/lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Database/SqliteTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php
rename to lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
diff --git a/lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php
rename to lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
diff --git a/lib/Cake/tests/Case/Model/DbAclTest.php b/lib/Cake/Test/Case/Model/DbAclTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/DbAclTest.php
rename to lib/Cake/Test/Case/Model/DbAclTest.php
diff --git a/lib/Cake/tests/Case/Model/ModelDeleteTest.php b/lib/Cake/Test/Case/Model/ModelDeleteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelDeleteTest.php
rename to lib/Cake/Test/Case/Model/ModelDeleteTest.php
diff --git a/lib/Cake/tests/Case/Model/ModelIntegrationTest.php b/lib/Cake/Test/Case/Model/ModelIntegrationTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelIntegrationTest.php
rename to lib/Cake/Test/Case/Model/ModelIntegrationTest.php
diff --git a/lib/Cake/tests/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelReadTest.php
rename to lib/Cake/Test/Case/Model/ModelReadTest.php
diff --git a/lib/Cake/tests/Case/Model/ModelTestBase.php b/lib/Cake/Test/Case/Model/ModelTestBase.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelTestBase.php
rename to lib/Cake/Test/Case/Model/ModelTestBase.php
diff --git a/lib/Cake/tests/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelValidationTest.php
rename to lib/Cake/Test/Case/Model/ModelValidationTest.php
diff --git a/lib/Cake/tests/Case/Model/ModelWriteTest.php b/lib/Cake/Test/Case/Model/ModelWriteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/ModelWriteTest.php
rename to lib/Cake/Test/Case/Model/ModelWriteTest.php
diff --git a/lib/Cake/tests/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/models.php
rename to lib/Cake/Test/Case/Model/models.php
diff --git a/lib/Cake/tests/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/CakeRequestTest.php
rename to lib/Cake/Test/Case/Network/CakeRequestTest.php
diff --git a/lib/Cake/tests/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/CakeResponseTest.php
rename to lib/Cake/Test/Case/Network/CakeResponseTest.php
diff --git a/lib/Cake/tests/Case/Network/CakeSocketTest.php b/lib/Cake/Test/Case/Network/CakeSocketTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/CakeSocketTest.php
rename to lib/Cake/Test/Case/Network/CakeSocketTest.php
diff --git a/lib/Cake/tests/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Email/CakeEmailTest.php
rename to lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
diff --git a/lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php b/lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php
rename to lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
diff --git a/lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php
rename to lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
diff --git a/lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php
rename to lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
diff --git a/lib/Cake/tests/Case/Network/Http/HttpResponseTest.php b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Http/HttpResponseTest.php
rename to lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
diff --git a/lib/Cake/tests/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Network/Http/HttpSocketTest.php
rename to lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
diff --git a/lib/Cake/tests/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Routing/DispatcherTest.php
rename to lib/Cake/Test/Case/Routing/DispatcherTest.php
diff --git a/lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php b/lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php
rename to lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
diff --git a/lib/Cake/tests/Case/Routing/Route/PluginShortRouteTest.php b/lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Routing/Route/PluginShortRouteTest.php
rename to lib/Cake/Test/Case/Routing/Route/PluginShortRouteTest.php
diff --git a/lib/Cake/tests/Case/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Routing/Route/RedirectRouteTest.php
rename to lib/Cake/Test/Case/Routing/Route/RedirectRouteTest.php
diff --git a/lib/Cake/tests/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Routing/RouterTest.php
rename to lib/Cake/Test/Case/Routing/RouterTest.php
diff --git a/lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
similarity index 100%
rename from lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php
rename to lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
diff --git a/lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
similarity index 100%
rename from lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
rename to lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
diff --git a/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
similarity index 100%
rename from lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
rename to lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
diff --git a/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
similarity index 100%
rename from lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
rename to lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
diff --git a/lib/Cake/tests/Case/Utility/ClassRegistryTest.php b/lib/Cake/Test/Case/Utility/ClassRegistryTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/ClassRegistryTest.php
rename to lib/Cake/Test/Case/Utility/ClassRegistryTest.php
diff --git a/lib/Cake/tests/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/DebuggerTest.php
rename to lib/Cake/Test/Case/Utility/DebuggerTest.php
diff --git a/lib/Cake/tests/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/FileTest.php
rename to lib/Cake/Test/Case/Utility/FileTest.php
diff --git a/lib/Cake/tests/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/FolderTest.php
rename to lib/Cake/Test/Case/Utility/FolderTest.php
diff --git a/lib/Cake/tests/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/InflectorTest.php
rename to lib/Cake/Test/Case/Utility/InflectorTest.php
diff --git a/lib/Cake/tests/Case/Utility/ObjectCollectionTest.php b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/ObjectCollectionTest.php
rename to lib/Cake/Test/Case/Utility/ObjectCollectionTest.php
diff --git a/lib/Cake/tests/Case/Utility/SanitizeTest.php b/lib/Cake/Test/Case/Utility/SanitizeTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/SanitizeTest.php
rename to lib/Cake/Test/Case/Utility/SanitizeTest.php
diff --git a/lib/Cake/tests/Case/Utility/SecurityTest.php b/lib/Cake/Test/Case/Utility/SecurityTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/SecurityTest.php
rename to lib/Cake/Test/Case/Utility/SecurityTest.php
diff --git a/lib/Cake/tests/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/SetTest.php
rename to lib/Cake/Test/Case/Utility/SetTest.php
diff --git a/lib/Cake/tests/Case/Utility/StringTest.php b/lib/Cake/Test/Case/Utility/StringTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/StringTest.php
rename to lib/Cake/Test/Case/Utility/StringTest.php
diff --git a/lib/Cake/tests/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/ValidationTest.php
rename to lib/Cake/Test/Case/Utility/ValidationTest.php
diff --git a/lib/Cake/tests/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Utility/XmlTest.php
rename to lib/Cake/Test/Case/Utility/XmlTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/FormHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/FormHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/JqueryEngineHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/JsHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/JsHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/MootoolsEngineHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/NumberHelperTest.php b/lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/NumberHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php b/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/PrototypeEngineHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/RssHelperTest.php b/lib/Cake/Test/Case/View/Helper/RssHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/RssHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/RssHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/SessionHelperTest.php b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/SessionHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/TextHelperTest.php b/lib/Cake/Test/Case/View/Helper/TextHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/TextHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/TextHelperTest.php
diff --git a/lib/Cake/tests/Case/View/Helper/TimeHelperTest.php b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/Helper/TimeHelperTest.php
rename to lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
diff --git a/lib/Cake/tests/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/HelperCollectionTest.php
rename to lib/Cake/Test/Case/View/HelperCollectionTest.php
diff --git a/lib/Cake/tests/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/HelperTest.php
rename to lib/Cake/Test/Case/View/HelperTest.php
diff --git a/lib/Cake/tests/Case/View/MediaViewTest.php b/lib/Cake/Test/Case/View/MediaViewTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/MediaViewTest.php
rename to lib/Cake/Test/Case/View/MediaViewTest.php
diff --git a/lib/Cake/tests/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/ThemeViewTest.php
rename to lib/Cake/Test/Case/View/ThemeViewTest.php
diff --git a/lib/Cake/tests/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
similarity index 100%
rename from lib/Cake/tests/Case/View/ViewTest.php
rename to lib/Cake/Test/Case/View/ViewTest.php
diff --git a/lib/Cake/tests/Fixture/AccountFixture.php b/lib/Cake/Test/Fixture/AccountFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AccountFixture.php
rename to lib/Cake/Test/Fixture/AccountFixture.php
diff --git a/lib/Cake/tests/Fixture/AcoActionFixture.php b/lib/Cake/Test/Fixture/AcoActionFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AcoActionFixture.php
rename to lib/Cake/Test/Fixture/AcoActionFixture.php
diff --git a/lib/Cake/tests/Fixture/AcoFixture.php b/lib/Cake/Test/Fixture/AcoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AcoFixture.php
rename to lib/Cake/Test/Fixture/AcoFixture.php
diff --git a/lib/Cake/tests/Fixture/AcoTwoFixture.php b/lib/Cake/Test/Fixture/AcoTwoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AcoTwoFixture.php
rename to lib/Cake/Test/Fixture/AcoTwoFixture.php
diff --git a/lib/Cake/tests/Fixture/AdFixture.php b/lib/Cake/Test/Fixture/AdFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AdFixture.php
rename to lib/Cake/Test/Fixture/AdFixture.php
diff --git a/lib/Cake/tests/Fixture/AdvertisementFixture.php b/lib/Cake/Test/Fixture/AdvertisementFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AdvertisementFixture.php
rename to lib/Cake/Test/Fixture/AdvertisementFixture.php
diff --git a/lib/Cake/tests/Fixture/AfterTreeFixture.php b/lib/Cake/Test/Fixture/AfterTreeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AfterTreeFixture.php
rename to lib/Cake/Test/Fixture/AfterTreeFixture.php
diff --git a/lib/Cake/tests/Fixture/AnotherArticleFixture.php b/lib/Cake/Test/Fixture/AnotherArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AnotherArticleFixture.php
rename to lib/Cake/Test/Fixture/AnotherArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/AppleFixture.php b/lib/Cake/Test/Fixture/AppleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AppleFixture.php
rename to lib/Cake/Test/Fixture/AppleFixture.php
diff --git a/lib/Cake/tests/Fixture/AroFixture.php b/lib/Cake/Test/Fixture/AroFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AroFixture.php
rename to lib/Cake/Test/Fixture/AroFixture.php
diff --git a/lib/Cake/tests/Fixture/AroTwoFixture.php b/lib/Cake/Test/Fixture/AroTwoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AroTwoFixture.php
rename to lib/Cake/Test/Fixture/AroTwoFixture.php
diff --git a/lib/Cake/tests/Fixture/ArosAcoFixture.php b/lib/Cake/Test/Fixture/ArosAcoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArosAcoFixture.php
rename to lib/Cake/Test/Fixture/ArosAcoFixture.php
diff --git a/lib/Cake/tests/Fixture/ArosAcoTwoFixture.php b/lib/Cake/Test/Fixture/ArosAcoTwoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArosAcoTwoFixture.php
rename to lib/Cake/Test/Fixture/ArosAcoTwoFixture.php
diff --git a/lib/Cake/tests/Fixture/ArticleFeaturedFixture.php b/lib/Cake/Test/Fixture/ArticleFeaturedFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArticleFeaturedFixture.php
rename to lib/Cake/Test/Fixture/ArticleFeaturedFixture.php
diff --git a/lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php b/lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php
rename to lib/Cake/Test/Fixture/ArticleFeaturedsTagsFixture.php
diff --git a/lib/Cake/tests/Fixture/ArticleFixture.php b/lib/Cake/Test/Fixture/ArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArticleFixture.php
rename to lib/Cake/Test/Fixture/ArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/ArticlesTagFixture.php b/lib/Cake/Test/Fixture/ArticlesTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ArticlesTagFixture.php
rename to lib/Cake/Test/Fixture/ArticlesTagFixture.php
diff --git a/lib/Cake/tests/Fixture/AssertTagsTestCase.php b/lib/Cake/Test/Fixture/AssertTagsTestCase.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AssertTagsTestCase.php
rename to lib/Cake/Test/Fixture/AssertTagsTestCase.php
diff --git a/lib/Cake/tests/Fixture/AttachmentFixture.php b/lib/Cake/Test/Fixture/AttachmentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AttachmentFixture.php
rename to lib/Cake/Test/Fixture/AttachmentFixture.php
diff --git a/lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php b/lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php
rename to lib/Cake/Test/Fixture/AuthUserCustomFieldFixture.php
diff --git a/lib/Cake/tests/Fixture/AuthUserFixture.php b/lib/Cake/Test/Fixture/AuthUserFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AuthUserFixture.php
rename to lib/Cake/Test/Fixture/AuthUserFixture.php
diff --git a/lib/Cake/tests/Fixture/AuthorFixture.php b/lib/Cake/Test/Fixture/AuthorFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/AuthorFixture.php
rename to lib/Cake/Test/Fixture/AuthorFixture.php
diff --git a/lib/Cake/tests/Fixture/BakeArticleFixture.php b/lib/Cake/Test/Fixture/BakeArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BakeArticleFixture.php
rename to lib/Cake/Test/Fixture/BakeArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php b/lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php
rename to lib/Cake/Test/Fixture/BakeArticlesBakeTagFixture.php
diff --git a/lib/Cake/tests/Fixture/BakeCommentFixture.php b/lib/Cake/Test/Fixture/BakeCommentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BakeCommentFixture.php
rename to lib/Cake/Test/Fixture/BakeCommentFixture.php
diff --git a/lib/Cake/tests/Fixture/BakeTagFixture.php b/lib/Cake/Test/Fixture/BakeTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BakeTagFixture.php
rename to lib/Cake/Test/Fixture/BakeTagFixture.php
diff --git a/lib/Cake/tests/Fixture/BasketFixture.php b/lib/Cake/Test/Fixture/BasketFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BasketFixture.php
rename to lib/Cake/Test/Fixture/BasketFixture.php
diff --git a/lib/Cake/tests/Fixture/BidFixture.php b/lib/Cake/Test/Fixture/BidFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BidFixture.php
rename to lib/Cake/Test/Fixture/BidFixture.php
diff --git a/lib/Cake/tests/Fixture/BinaryTestFixture.php b/lib/Cake/Test/Fixture/BinaryTestFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BinaryTestFixture.php
rename to lib/Cake/Test/Fixture/BinaryTestFixture.php
diff --git a/lib/Cake/tests/Fixture/BookFixture.php b/lib/Cake/Test/Fixture/BookFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/BookFixture.php
rename to lib/Cake/Test/Fixture/BookFixture.php
diff --git a/lib/Cake/tests/Fixture/CacheTestModelFixture.php b/lib/Cake/Test/Fixture/CacheTestModelFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CacheTestModelFixture.php
rename to lib/Cake/Test/Fixture/CacheTestModelFixture.php
diff --git a/lib/Cake/tests/Fixture/CallbackFixture.php b/lib/Cake/Test/Fixture/CallbackFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CallbackFixture.php
rename to lib/Cake/Test/Fixture/CallbackFixture.php
diff --git a/lib/Cake/tests/Fixture/CampaignFixture.php b/lib/Cake/Test/Fixture/CampaignFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CampaignFixture.php
rename to lib/Cake/Test/Fixture/CampaignFixture.php
diff --git a/lib/Cake/tests/Fixture/CategoryFixture.php b/lib/Cake/Test/Fixture/CategoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CategoryFixture.php
rename to lib/Cake/Test/Fixture/CategoryFixture.php
diff --git a/lib/Cake/tests/Fixture/CategoryThreadFixture.php b/lib/Cake/Test/Fixture/CategoryThreadFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CategoryThreadFixture.php
rename to lib/Cake/Test/Fixture/CategoryThreadFixture.php
diff --git a/lib/Cake/tests/Fixture/CdFixture.php b/lib/Cake/Test/Fixture/CdFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CdFixture.php
rename to lib/Cake/Test/Fixture/CdFixture.php
diff --git a/lib/Cake/tests/Fixture/CommentFixture.php b/lib/Cake/Test/Fixture/CommentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CommentFixture.php
rename to lib/Cake/Test/Fixture/CommentFixture.php
diff --git a/lib/Cake/tests/Fixture/ContentAccountFixture.php b/lib/Cake/Test/Fixture/ContentAccountFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ContentAccountFixture.php
rename to lib/Cake/Test/Fixture/ContentAccountFixture.php
diff --git a/lib/Cake/tests/Fixture/ContentFixture.php b/lib/Cake/Test/Fixture/ContentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ContentFixture.php
rename to lib/Cake/Test/Fixture/ContentFixture.php
diff --git a/lib/Cake/tests/Fixture/CounterCachePostFixture.php b/lib/Cake/Test/Fixture/CounterCachePostFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CounterCachePostFixture.php
rename to lib/Cake/Test/Fixture/CounterCachePostFixture.php
diff --git a/lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php b/lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
rename to lib/Cake/Test/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
diff --git a/lib/Cake/tests/Fixture/CounterCacheUserFixture.php b/lib/Cake/Test/Fixture/CounterCacheUserFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CounterCacheUserFixture.php
rename to lib/Cake/Test/Fixture/CounterCacheUserFixture.php
diff --git a/lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php b/lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
rename to lib/Cake/Test/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
diff --git a/lib/Cake/tests/Fixture/DataTestFixture.php b/lib/Cake/Test/Fixture/DataTestFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DataTestFixture.php
rename to lib/Cake/Test/Fixture/DataTestFixture.php
diff --git a/lib/Cake/tests/Fixture/DatatypeFixture.php b/lib/Cake/Test/Fixture/DatatypeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DatatypeFixture.php
rename to lib/Cake/Test/Fixture/DatatypeFixture.php
diff --git a/lib/Cake/tests/Fixture/DependencyFixture.php b/lib/Cake/Test/Fixture/DependencyFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DependencyFixture.php
rename to lib/Cake/Test/Fixture/DependencyFixture.php
diff --git a/lib/Cake/tests/Fixture/DeviceFixture.php b/lib/Cake/Test/Fixture/DeviceFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DeviceFixture.php
rename to lib/Cake/Test/Fixture/DeviceFixture.php
diff --git a/lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php b/lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php
rename to lib/Cake/Test/Fixture/DeviceTypeCategoryFixture.php
diff --git a/lib/Cake/tests/Fixture/DeviceTypeFixture.php b/lib/Cake/Test/Fixture/DeviceTypeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DeviceTypeFixture.php
rename to lib/Cake/Test/Fixture/DeviceTypeFixture.php
diff --git a/lib/Cake/tests/Fixture/DocumentDirectoryFixture.php b/lib/Cake/Test/Fixture/DocumentDirectoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DocumentDirectoryFixture.php
rename to lib/Cake/Test/Fixture/DocumentDirectoryFixture.php
diff --git a/lib/Cake/tests/Fixture/DocumentFixture.php b/lib/Cake/Test/Fixture/DocumentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/DocumentFixture.php
rename to lib/Cake/Test/Fixture/DocumentFixture.php
diff --git a/lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php b/lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php
rename to lib/Cake/Test/Fixture/ExteriorTypeCategoryFixture.php
diff --git a/lib/Cake/tests/Fixture/FeatureSetFixture.php b/lib/Cake/Test/Fixture/FeatureSetFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FeatureSetFixture.php
rename to lib/Cake/Test/Fixture/FeatureSetFixture.php
diff --git a/lib/Cake/tests/Fixture/FeaturedFixture.php b/lib/Cake/Test/Fixture/FeaturedFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FeaturedFixture.php
rename to lib/Cake/Test/Fixture/FeaturedFixture.php
diff --git a/lib/Cake/tests/Fixture/FilmFileFixture.php b/lib/Cake/Test/Fixture/FilmFileFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FilmFileFixture.php
rename to lib/Cake/Test/Fixture/FilmFileFixture.php
diff --git a/lib/Cake/tests/Fixture/FixturizedTestCase.php b/lib/Cake/Test/Fixture/FixturizedTestCase.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FixturizedTestCase.php
rename to lib/Cake/Test/Fixture/FixturizedTestCase.php
diff --git a/lib/Cake/tests/Fixture/FlagTreeFixture.php b/lib/Cake/Test/Fixture/FlagTreeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FlagTreeFixture.php
rename to lib/Cake/Test/Fixture/FlagTreeFixture.php
diff --git a/lib/Cake/tests/Fixture/FruitFixture.php b/lib/Cake/Test/Fixture/FruitFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FruitFixture.php
rename to lib/Cake/Test/Fixture/FruitFixture.php
diff --git a/lib/Cake/tests/Fixture/FruitsUuidTagFixture.php b/lib/Cake/Test/Fixture/FruitsUuidTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/FruitsUuidTagFixture.php
rename to lib/Cake/Test/Fixture/FruitsUuidTagFixture.php
diff --git a/lib/Cake/tests/Fixture/GroupUpdateAllFixture.php b/lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/GroupUpdateAllFixture.php
rename to lib/Cake/Test/Fixture/GroupUpdateAllFixture.php
diff --git a/lib/Cake/tests/Fixture/HomeFixture.php b/lib/Cake/Test/Fixture/HomeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/HomeFixture.php
rename to lib/Cake/Test/Fixture/HomeFixture.php
diff --git a/lib/Cake/tests/Fixture/ImageFixture.php b/lib/Cake/Test/Fixture/ImageFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ImageFixture.php
rename to lib/Cake/Test/Fixture/ImageFixture.php
diff --git a/lib/Cake/tests/Fixture/ItemFixture.php b/lib/Cake/Test/Fixture/ItemFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ItemFixture.php
rename to lib/Cake/Test/Fixture/ItemFixture.php
diff --git a/lib/Cake/tests/Fixture/ItemsPortfolioFixture.php b/lib/Cake/Test/Fixture/ItemsPortfolioFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ItemsPortfolioFixture.php
rename to lib/Cake/Test/Fixture/ItemsPortfolioFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinABFixture.php b/lib/Cake/Test/Fixture/JoinABFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinABFixture.php
rename to lib/Cake/Test/Fixture/JoinABFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinACFixture.php b/lib/Cake/Test/Fixture/JoinACFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinACFixture.php
rename to lib/Cake/Test/Fixture/JoinACFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinAFixture.php b/lib/Cake/Test/Fixture/JoinAFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinAFixture.php
rename to lib/Cake/Test/Fixture/JoinAFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinBFixture.php b/lib/Cake/Test/Fixture/JoinBFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinBFixture.php
rename to lib/Cake/Test/Fixture/JoinBFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinCFixture.php b/lib/Cake/Test/Fixture/JoinCFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinCFixture.php
rename to lib/Cake/Test/Fixture/JoinCFixture.php
diff --git a/lib/Cake/tests/Fixture/JoinThingFixture.php b/lib/Cake/Test/Fixture/JoinThingFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/JoinThingFixture.php
rename to lib/Cake/Test/Fixture/JoinThingFixture.php
diff --git a/lib/Cake/tests/Fixture/MessageFixture.php b/lib/Cake/Test/Fixture/MessageFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MessageFixture.php
rename to lib/Cake/Test/Fixture/MessageFixture.php
diff --git a/lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php
rename to lib/Cake/Test/Fixture/MyCategoriesMyProductsFixture.php
diff --git a/lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php b/lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php
rename to lib/Cake/Test/Fixture/MyCategoriesMyUsersFixture.php
diff --git a/lib/Cake/tests/Fixture/MyCategoryFixture.php b/lib/Cake/Test/Fixture/MyCategoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MyCategoryFixture.php
rename to lib/Cake/Test/Fixture/MyCategoryFixture.php
diff --git a/lib/Cake/tests/Fixture/MyProductFixture.php b/lib/Cake/Test/Fixture/MyProductFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MyProductFixture.php
rename to lib/Cake/Test/Fixture/MyProductFixture.php
diff --git a/lib/Cake/tests/Fixture/MyUserFixture.php b/lib/Cake/Test/Fixture/MyUserFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/MyUserFixture.php
rename to lib/Cake/Test/Fixture/MyUserFixture.php
diff --git a/lib/Cake/tests/Fixture/NodeFixture.php b/lib/Cake/Test/Fixture/NodeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/NodeFixture.php
rename to lib/Cake/Test/Fixture/NodeFixture.php
diff --git a/lib/Cake/tests/Fixture/NumberTreeFixture.php b/lib/Cake/Test/Fixture/NumberTreeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/NumberTreeFixture.php
rename to lib/Cake/Test/Fixture/NumberTreeFixture.php
diff --git a/lib/Cake/tests/Fixture/NumberTreeTwoFixture.php b/lib/Cake/Test/Fixture/NumberTreeTwoFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/NumberTreeTwoFixture.php
rename to lib/Cake/Test/Fixture/NumberTreeTwoFixture.php
diff --git a/lib/Cake/tests/Fixture/NumericArticleFixture.php b/lib/Cake/Test/Fixture/NumericArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/NumericArticleFixture.php
rename to lib/Cake/Test/Fixture/NumericArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/OverallFavoriteFixture.php b/lib/Cake/Test/Fixture/OverallFavoriteFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/OverallFavoriteFixture.php
rename to lib/Cake/Test/Fixture/OverallFavoriteFixture.php
diff --git a/lib/Cake/tests/Fixture/PersonFixture.php b/lib/Cake/Test/Fixture/PersonFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/PersonFixture.php
rename to lib/Cake/Test/Fixture/PersonFixture.php
diff --git a/lib/Cake/tests/Fixture/PortfolioFixture.php b/lib/Cake/Test/Fixture/PortfolioFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/PortfolioFixture.php
rename to lib/Cake/Test/Fixture/PortfolioFixture.php
diff --git a/lib/Cake/tests/Fixture/PostFixture.php b/lib/Cake/Test/Fixture/PostFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/PostFixture.php
rename to lib/Cake/Test/Fixture/PostFixture.php
diff --git a/lib/Cake/tests/Fixture/PostsTagFixture.php b/lib/Cake/Test/Fixture/PostsTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/PostsTagFixture.php
rename to lib/Cake/Test/Fixture/PostsTagFixture.php
diff --git a/lib/Cake/tests/Fixture/PrimaryModelFixture.php b/lib/Cake/Test/Fixture/PrimaryModelFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/PrimaryModelFixture.php
rename to lib/Cake/Test/Fixture/PrimaryModelFixture.php
diff --git a/lib/Cake/tests/Fixture/ProductFixture.php b/lib/Cake/Test/Fixture/ProductFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ProductFixture.php
rename to lib/Cake/Test/Fixture/ProductFixture.php
diff --git a/lib/Cake/tests/Fixture/ProductUpdateAllFixture.php b/lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ProductUpdateAllFixture.php
rename to lib/Cake/Test/Fixture/ProductUpdateAllFixture.php
diff --git a/lib/Cake/tests/Fixture/ProjectFixture.php b/lib/Cake/Test/Fixture/ProjectFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ProjectFixture.php
rename to lib/Cake/Test/Fixture/ProjectFixture.php
diff --git a/lib/Cake/tests/Fixture/SampleFixture.php b/lib/Cake/Test/Fixture/SampleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SampleFixture.php
rename to lib/Cake/Test/Fixture/SampleFixture.php
diff --git a/lib/Cake/tests/Fixture/SecondaryModelFixture.php b/lib/Cake/Test/Fixture/SecondaryModelFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SecondaryModelFixture.php
rename to lib/Cake/Test/Fixture/SecondaryModelFixture.php
diff --git a/lib/Cake/tests/Fixture/SessionFixture.php b/lib/Cake/Test/Fixture/SessionFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SessionFixture.php
rename to lib/Cake/Test/Fixture/SessionFixture.php
diff --git a/lib/Cake/tests/Fixture/SomethingElseFixture.php b/lib/Cake/Test/Fixture/SomethingElseFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SomethingElseFixture.php
rename to lib/Cake/Test/Fixture/SomethingElseFixture.php
diff --git a/lib/Cake/tests/Fixture/SomethingFixture.php b/lib/Cake/Test/Fixture/SomethingFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SomethingFixture.php
rename to lib/Cake/Test/Fixture/SomethingFixture.php
diff --git a/lib/Cake/tests/Fixture/StoriesTagFixture.php b/lib/Cake/Test/Fixture/StoriesTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/StoriesTagFixture.php
rename to lib/Cake/Test/Fixture/StoriesTagFixture.php
diff --git a/lib/Cake/tests/Fixture/StoryFixture.php b/lib/Cake/Test/Fixture/StoryFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/StoryFixture.php
rename to lib/Cake/Test/Fixture/StoryFixture.php
diff --git a/lib/Cake/tests/Fixture/SyfileFixture.php b/lib/Cake/Test/Fixture/SyfileFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/SyfileFixture.php
rename to lib/Cake/Test/Fixture/SyfileFixture.php
diff --git a/lib/Cake/tests/Fixture/TagFixture.php b/lib/Cake/Test/Fixture/TagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TagFixture.php
rename to lib/Cake/Test/Fixture/TagFixture.php
diff --git a/lib/Cake/tests/Fixture/TestPluginArticleFixture.php b/lib/Cake/Test/Fixture/TestPluginArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TestPluginArticleFixture.php
rename to lib/Cake/Test/Fixture/TestPluginArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/TestPluginCommentFixture.php b/lib/Cake/Test/Fixture/TestPluginCommentFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TestPluginCommentFixture.php
rename to lib/Cake/Test/Fixture/TestPluginCommentFixture.php
diff --git a/lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php b/lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php
rename to lib/Cake/Test/Fixture/ThePaperMonkiesFixture.php
diff --git a/lib/Cake/tests/Fixture/ThreadFixture.php b/lib/Cake/Test/Fixture/ThreadFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/ThreadFixture.php
rename to lib/Cake/Test/Fixture/ThreadFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslateArticleFixture.php b/lib/Cake/Test/Fixture/TranslateArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslateArticleFixture.php
rename to lib/Cake/Test/Fixture/TranslateArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslateFixture.php b/lib/Cake/Test/Fixture/TranslateFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslateFixture.php
rename to lib/Cake/Test/Fixture/TranslateFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslateTableFixture.php b/lib/Cake/Test/Fixture/TranslateTableFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslateTableFixture.php
rename to lib/Cake/Test/Fixture/TranslateTableFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php b/lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php
rename to lib/Cake/Test/Fixture/TranslateWithPrefixFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslatedArticleFixture.php b/lib/Cake/Test/Fixture/TranslatedArticleFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslatedArticleFixture.php
rename to lib/Cake/Test/Fixture/TranslatedArticleFixture.php
diff --git a/lib/Cake/tests/Fixture/TranslatedItemFixture.php b/lib/Cake/Test/Fixture/TranslatedItemFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/TranslatedItemFixture.php
rename to lib/Cake/Test/Fixture/TranslatedItemFixture.php
diff --git a/lib/Cake/tests/Fixture/UnconventionalTreeFixture.php b/lib/Cake/Test/Fixture/UnconventionalTreeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UnconventionalTreeFixture.php
rename to lib/Cake/Test/Fixture/UnconventionalTreeFixture.php
diff --git a/lib/Cake/tests/Fixture/UnderscoreFieldFixture.php b/lib/Cake/Test/Fixture/UnderscoreFieldFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UnderscoreFieldFixture.php
rename to lib/Cake/Test/Fixture/UnderscoreFieldFixture.php
diff --git a/lib/Cake/tests/Fixture/UserFixture.php b/lib/Cake/Test/Fixture/UserFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UserFixture.php
rename to lib/Cake/Test/Fixture/UserFixture.php
diff --git a/lib/Cake/tests/Fixture/UuidFixture.php b/lib/Cake/Test/Fixture/UuidFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuidFixture.php
rename to lib/Cake/Test/Fixture/UuidFixture.php
diff --git a/lib/Cake/tests/Fixture/UuidTagFixture.php b/lib/Cake/Test/Fixture/UuidTagFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuidTagFixture.php
rename to lib/Cake/Test/Fixture/UuidTagFixture.php
diff --git a/lib/Cake/tests/Fixture/UuidTreeFixture.php b/lib/Cake/Test/Fixture/UuidTreeFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuidTreeFixture.php
rename to lib/Cake/Test/Fixture/UuidTreeFixture.php
diff --git a/lib/Cake/tests/Fixture/UuiditemFixture.php b/lib/Cake/Test/Fixture/UuiditemFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuiditemFixture.php
rename to lib/Cake/Test/Fixture/UuiditemFixture.php
diff --git a/lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php
rename to lib/Cake/Test/Fixture/UuiditemsUuidportfolioFixture.php
diff --git a/lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php b/lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php
rename to lib/Cake/Test/Fixture/UuiditemsUuidportfolioNumericidFixture.php
diff --git a/lib/Cake/tests/Fixture/UuidportfolioFixture.php b/lib/Cake/Test/Fixture/UuidportfolioFixture.php
similarity index 100%
rename from lib/Cake/tests/Fixture/UuidportfolioFixture.php
rename to lib/Cake/Test/Fixture/UuidportfolioFixture.php
diff --git a/lib/Cake/tests/Fixture/rss.xml b/lib/Cake/Test/Fixture/rss.xml
similarity index 100%
rename from lib/Cake/tests/Fixture/rss.xml
rename to lib/Cake/Test/Fixture/rss.xml
diff --git a/lib/Cake/tests/Fixture/sample.xml b/lib/Cake/Test/Fixture/sample.xml
similarity index 100%
rename from lib/Cake/tests/Fixture/sample.xml
rename to lib/Cake/Test/Fixture/sample.xml
diff --git a/lib/Cake/tests/Fixture/soap_request.xml b/lib/Cake/Test/Fixture/soap_request.xml
similarity index 100%
rename from lib/Cake/tests/Fixture/soap_request.xml
rename to lib/Cake/Test/Fixture/soap_request.xml
diff --git a/lib/Cake/tests/Fixture/soap_response.xml b/lib/Cake/Test/Fixture/soap_response.xml
similarity index 100%
rename from lib/Cake/tests/Fixture/soap_response.xml
rename to lib/Cake/Test/Fixture/soap_response.xml
diff --git a/lib/Cake/tests/test_app/Console/Command/SampleShell.php b/lib/Cake/Test/test_app/Console/Command/SampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/Console/Command/SampleShell.php
rename to lib/Cake/Test/test_app/Console/Command/SampleShell.php
diff --git a/lib/Cake/tests/test_app/Console/Command/Task/empty b/lib/Cake/Test/test_app/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/Console/templates/test/classes/test_object.ctp b/lib/Cake/Test/test_app/Console/templates/test/classes/test_object.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/Console/templates/test/classes/test_object.ctp
rename to lib/Cake/Test/test_app/Console/templates/test/classes/test_object.ctp
diff --git a/lib/Cake/tests/test_app/Controller/Component/empty b/lib/Cake/Test/test_app/Controller/Component/empty
similarity index 100%
rename from lib/Cake/tests/test_app/Controller/Component/empty
rename to lib/Cake/Test/test_app/Controller/Component/empty
diff --git a/lib/Cake/tests/test_app/Controller/TestsAppsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsController.php
similarity index 100%
rename from lib/Cake/tests/test_app/Controller/TestsAppsController.php
rename to lib/Cake/Test/test_app/Controller/TestsAppsController.php
diff --git a/lib/Cake/tests/test_app/Controller/TestsAppsPostsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
similarity index 100%
rename from lib/Cake/tests/test_app/Controller/TestsAppsPostsController.php
rename to lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
diff --git a/lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php b/lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
rename to lib/Cake/Test/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
diff --git a/lib/Cake/tests/test_app/Lib/Library.php b/lib/Cake/Test/test_app/Lib/Library.php
similarity index 100%
rename from lib/Cake/tests/test_app/Lib/Library.php
rename to lib/Cake/Test/test_app/Lib/Library.php
diff --git a/lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php b/lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
rename to lib/Cake/Test/test_app/Lib/Log/Engine/TestAppLog.php
diff --git a/lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php b/lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php
rename to lib/Cake/Test/test_app/Lib/Utility/TestUtilityClass.php
diff --git a/lib/Cake/tests/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php b/lib/Cake/Test/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php
rename to lib/Cake/Test/test_app/Model/Behavior/PersisterOneBehaviorBehavior.php
diff --git a/lib/Cake/tests/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php b/lib/Cake/Test/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
rename to lib/Cake/Test/test_app/Model/Behavior/PersisterTwoBehaviorBehavior.php
diff --git a/lib/Cake/tests/test_app/Model/Behavior/empty b/lib/Cake/Test/test_app/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Behavior/empty
rename to lib/Cake/Test/test_app/Model/Behavior/empty
diff --git a/lib/Cake/tests/test_app/Model/Comment.php b/lib/Cake/Test/test_app/Model/Comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Comment.php
rename to lib/Cake/Test/test_app/Model/Comment.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php b/lib/Cake/Test/test_app/Model/Datasource/Database/TestLocalDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php
rename to lib/Cake/Test/test_app/Model/Datasource/Database/TestLocalDriver.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/Session/TestAppLibSession.php b/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/Session/TestAppLibSession.php
rename to lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/Test2OtherSource.php b/lib/Cake/Test/test_app/Model/Datasource/Test2OtherSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/Test2OtherSource.php
rename to lib/Cake/Test/test_app/Model/Datasource/Test2OtherSource.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/Test2Source.php b/lib/Cake/Test/test_app/Model/Datasource/Test2Source.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Datasource/Test2Source.php
rename to lib/Cake/Test/test_app/Model/Datasource/Test2Source.php
diff --git a/lib/Cake/tests/test_app/Model/PersisterOne.php b/lib/Cake/Test/test_app/Model/PersisterOne.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/PersisterOne.php
rename to lib/Cake/Test/test_app/Model/PersisterOne.php
diff --git a/lib/Cake/tests/test_app/Model/PersisterTwo.php b/lib/Cake/Test/test_app/Model/PersisterTwo.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/PersisterTwo.php
rename to lib/Cake/Test/test_app/Model/PersisterTwo.php
diff --git a/lib/Cake/tests/test_app/Model/Post.php b/lib/Cake/Test/test_app/Model/Post.php
similarity index 100%
rename from lib/Cake/tests/test_app/Model/Post.php
rename to lib/Cake/Test/test_app/Model/Post.php
diff --git a/lib/Cake/tests/test_app/View/Helper/BananaHelper.php b/lib/Cake/Test/test_app/View/Helper/BananaHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/View/Helper/BananaHelper.php
rename to lib/Cake/Test/test_app/View/Helper/BananaHelper.php
diff --git a/lib/Cake/tests/test_app/View/Helper/empty b/lib/Cake/Test/test_app/View/Helper/empty
similarity index 100%
rename from lib/Cake/tests/test_app/View/Helper/empty
rename to lib/Cake/Test/test_app/View/Helper/empty
diff --git a/lib/Cake/tests/test_app/View/elements/empty b/lib/Cake/Test/test_app/View/elements/empty
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/empty
rename to lib/Cake/Test/test_app/View/elements/empty
diff --git a/lib/Cake/tests/test_app/View/elements/html_call.ctp b/lib/Cake/Test/test_app/View/elements/html_call.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/html_call.ctp
rename to lib/Cake/Test/test_app/View/elements/html_call.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/nocache/contains_nocache.ctp b/lib/Cake/Test/test_app/View/elements/nocache/contains_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/nocache/contains_nocache.ctp
rename to lib/Cake/Test/test_app/View/elements/nocache/contains_nocache.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/nocache/plain.ctp b/lib/Cake/Test/test_app/View/elements/nocache/plain.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/nocache/plain.ctp
rename to lib/Cake/Test/test_app/View/elements/nocache/plain.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/nocache/sub1.ctp b/lib/Cake/Test/test_app/View/elements/nocache/sub1.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/nocache/sub1.ctp
rename to lib/Cake/Test/test_app/View/elements/nocache/sub1.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/nocache/sub2.ctp b/lib/Cake/Test/test_app/View/elements/nocache/sub2.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/nocache/sub2.ctp
rename to lib/Cake/Test/test_app/View/elements/nocache/sub2.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/session_helper.ctp b/lib/Cake/Test/test_app/View/elements/session_helper.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/session_helper.ctp
rename to lib/Cake/Test/test_app/View/elements/session_helper.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/test_element.ctp b/lib/Cake/Test/test_app/View/elements/test_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/elements/test_element.ctp
diff --git a/lib/Cake/tests/test_app/View/elements/type_check.ctp b/lib/Cake/Test/test_app/View/elements/type_check.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/elements/type_check.ctp
rename to lib/Cake/Test/test_app/View/elements/type_check.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/html/custom.ctp b/lib/Cake/Test/test_app/View/emails/html/custom.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/html/custom.ctp
rename to lib/Cake/Test/test_app/View/emails/html/custom.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/html/default.ctp b/lib/Cake/Test/test_app/View/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/html/default.ctp
rename to lib/Cake/Test/test_app/View/emails/html/default.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/html/nested_element.ctp b/lib/Cake/Test/test_app/View/emails/html/nested_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/html/nested_element.ctp
rename to lib/Cake/Test/test_app/View/emails/html/nested_element.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/text/custom.ctp b/lib/Cake/Test/test_app/View/emails/text/custom.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/text/custom.ctp
rename to lib/Cake/Test/test_app/View/emails/text/custom.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/text/default.ctp b/lib/Cake/Test/test_app/View/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/text/default.ctp
rename to lib/Cake/Test/test_app/View/emails/text/default.ctp
diff --git a/lib/Cake/tests/test_app/View/emails/text/wide.ctp b/lib/Cake/Test/test_app/View/emails/text/wide.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/emails/text/wide.ctp
rename to lib/Cake/Test/test_app/View/emails/text/wide.ctp
diff --git a/lib/Cake/tests/test_app/View/errors/empty b/lib/Cake/Test/test_app/View/errors/empty
similarity index 100%
rename from lib/Cake/tests/test_app/View/errors/empty
rename to lib/Cake/Test/test_app/View/errors/empty
diff --git a/lib/Cake/tests/test_app/View/layouts/ajax.ctp b/lib/Cake/Test/test_app/View/layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/ajax.ctp
rename to lib/Cake/Test/test_app/View/layouts/ajax.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/ajax2.ctp b/lib/Cake/Test/test_app/View/layouts/ajax2.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/ajax2.ctp
rename to lib/Cake/Test/test_app/View/layouts/ajax2.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/cache_empty_sections.ctp b/lib/Cake/Test/test_app/View/layouts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/cache_empty_sections.ctp
rename to lib/Cake/Test/test_app/View/layouts/cache_empty_sections.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/cache_layout.ctp b/lib/Cake/Test/test_app/View/layouts/cache_layout.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/cache_layout.ctp
rename to lib/Cake/Test/test_app/View/layouts/cache_layout.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/default.ctp b/lib/Cake/Test/test_app/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/emails/html/default.ctp b/lib/Cake/Test/test_app/View/layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/emails/html/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/emails/html/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/emails/html/thin.ctp b/lib/Cake/Test/test_app/View/layouts/emails/html/thin.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/emails/html/thin.ctp
rename to lib/Cake/Test/test_app/View/layouts/emails/html/thin.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/emails/text/default.ctp b/lib/Cake/Test/test_app/View/layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/emails/text/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/emails/text/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/flash.ctp b/lib/Cake/Test/test_app/View/layouts/flash.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/flash.ctp
rename to lib/Cake/Test/test_app/View/layouts/flash.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/js/default.ctp b/lib/Cake/Test/test_app/View/layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/js/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/js/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/json/default.ctp b/lib/Cake/Test/test_app/View/layouts/json/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/json/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/json/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/multi_cache.ctp b/lib/Cake/Test/test_app/View/layouts/multi_cache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/multi_cache.ctp
rename to lib/Cake/Test/test_app/View/layouts/multi_cache.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/rss/default.ctp b/lib/Cake/Test/test_app/View/layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/rss/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/rss/default.ctp
diff --git a/lib/Cake/tests/test_app/View/layouts/xml/default.ctp b/lib/Cake/Test/test_app/View/layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/layouts/xml/default.ctp
rename to lib/Cake/Test/test_app/View/layouts/xml/default.ctp
diff --git a/lib/Cake/tests/test_app/View/pages/empty b/lib/Cake/Test/test_app/View/pages/empty
similarity index 100%
rename from lib/Cake/tests/test_app/View/pages/empty
rename to lib/Cake/Test/test_app/View/pages/empty
diff --git a/lib/Cake/tests/test_app/View/pages/extract.ctp b/lib/Cake/Test/test_app/View/pages/extract.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/pages/extract.ctp
rename to lib/Cake/Test/test_app/View/pages/extract.ctp
diff --git a/lib/Cake/tests/test_app/View/pages/home.ctp b/lib/Cake/Test/test_app/View/pages/home.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/pages/home.ctp
rename to lib/Cake/Test/test_app/View/pages/home.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/alt_ext.alt b/lib/Cake/Test/test_app/View/posts/alt_ext.alt
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/alt_ext.alt
rename to lib/Cake/Test/test_app/View/posts/alt_ext.alt
diff --git a/lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp b/lib/Cake/Test/test_app/View/posts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp
rename to lib/Cake/Test/test_app/View/posts/cache_empty_sections.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/cache_form.ctp b/lib/Cake/Test/test_app/View/posts/cache_form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/cache_form.ctp
rename to lib/Cake/Test/test_app/View/posts/cache_form.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp b/lib/Cake/Test/test_app/View/posts/helper_overwrite.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp
rename to lib/Cake/Test/test_app/View/posts/helper_overwrite.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/index.ctp b/lib/Cake/Test/test_app/View/posts/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/index.ctp
rename to lib/Cake/Test/test_app/View/posts/index.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp b/lib/Cake/Test/test_app/View/posts/multiple_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp
rename to lib/Cake/Test/test_app/View/posts/multiple_nocache.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp b/lib/Cake/Test/test_app/View/posts/nocache_multiple_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp
rename to lib/Cake/Test/test_app/View/posts/nocache_multiple_element.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/scaffold.form.ctp b/lib/Cake/Test/test_app/View/posts/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/scaffold.form.ctp
rename to lib/Cake/Test/test_app/View/posts/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp b/lib/Cake/Test/test_app/View/posts/sequencial_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp
rename to lib/Cake/Test/test_app/View/posts/sequencial_nocache.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp b/lib/Cake/Test/test_app/View/posts/test_nocache_tags.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
rename to lib/Cake/Test/test_app/View/posts/test_nocache_tags.ctp
diff --git a/lib/Cake/tests/test_app/View/scaffolds/empty b/lib/Cake/Test/test_app/View/scaffolds/empty
similarity index 100%
rename from lib/Cake/tests/test_app/View/scaffolds/empty
rename to lib/Cake/Test/test_app/View/scaffolds/empty
diff --git a/lib/Cake/tests/test_app/View/tests_apps/index.ctp b/lib/Cake/Test/test_app/View/tests_apps/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/tests_apps/index.ctp
rename to lib/Cake/Test/test_app/View/tests_apps/index.ctp
diff --git a/lib/Cake/tests/test_app/View/tests_apps/json/index.ctp b/lib/Cake/Test/test_app/View/tests_apps/json/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/tests_apps/json/index.ctp
rename to lib/Cake/Test/test_app/View/tests_apps/json/index.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/elements/test_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/elements/test_element.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/posts/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/posts/index.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp b/lib/Cake/Test/test_app/View/themed/test_theme/posts/scaffold.index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp
rename to lib/Cake/Test/test_app/View/themed/test_theme/posts/scaffold.index.ctp
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/cake.power.gif
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/cake.power.gif
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/theme.js
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/js/theme.js
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf b/lib/Cake/Test/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
rename to lib/Cake/Test/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
diff --git a/lib/Cake/tests/test_app/config/acl.ini.php b/lib/Cake/Test/test_app/config/acl.ini.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/acl.ini.php
rename to lib/Cake/Test/test_app/config/acl.ini.php
diff --git a/lib/Cake/tests/test_app/config/empty.php b/lib/Cake/Test/test_app/config/empty.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/empty.php
rename to lib/Cake/Test/test_app/config/empty.php
diff --git a/lib/Cake/tests/test_app/config/htmlhelper_minimized.ini b/lib/Cake/Test/test_app/config/htmlhelper_minimized.ini
similarity index 100%
rename from lib/Cake/tests/test_app/config/htmlhelper_minimized.ini
rename to lib/Cake/Test/test_app/config/htmlhelper_minimized.ini
diff --git a/lib/Cake/tests/test_app/config/htmlhelper_tags.php b/lib/Cake/Test/test_app/config/htmlhelper_tags.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/htmlhelper_tags.php
rename to lib/Cake/Test/test_app/config/htmlhelper_tags.php
diff --git a/lib/Cake/tests/test_app/config/nested.ini b/lib/Cake/Test/test_app/config/nested.ini
similarity index 100%
rename from lib/Cake/tests/test_app/config/nested.ini
rename to lib/Cake/Test/test_app/config/nested.ini
diff --git a/lib/Cake/tests/test_app/config/no_section.ini b/lib/Cake/Test/test_app/config/no_section.ini
similarity index 100%
rename from lib/Cake/tests/test_app/config/no_section.ini
rename to lib/Cake/Test/test_app/config/no_section.ini
diff --git a/lib/Cake/tests/test_app/config/routes.php b/lib/Cake/Test/test_app/config/routes.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/routes.php
rename to lib/Cake/Test/test_app/config/routes.php
diff --git a/lib/Cake/tests/test_app/config/var_test.php b/lib/Cake/Test/test_app/config/var_test.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/var_test.php
rename to lib/Cake/Test/test_app/config/var_test.php
diff --git a/lib/Cake/tests/test_app/config/var_test2.php b/lib/Cake/Test/test_app/config/var_test2.php
similarity index 100%
rename from lib/Cake/tests/test_app/config/var_test2.php
rename to lib/Cake/Test/test_app/config/var_test2.php
diff --git a/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
rename to lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
diff --git a/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
rename to lib/Cake/Test/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
diff --git a/lib/Cake/tests/test_app/locale/ja_jp/LC_TIME b/lib/Cake/Test/test_app/locale/ja_jp/LC_TIME
similarity index 100%
rename from lib/Cake/tests/test_app/locale/ja_jp/LC_TIME
rename to lib/Cake/Test/test_app/locale/ja_jp/LC_TIME
diff --git a/lib/Cake/tests/test_app/locale/po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/po/LC_MONETARY/default.po b/lib/Cake/Test/test_app/locale/po/LC_MONETARY/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/po/LC_MONETARY/default.po
rename to lib/Cake/Test/test_app/locale/po/LC_MONETARY/default.po
diff --git a/lib/Cake/tests/test_app/locale/po/LC_TIME b/lib/Cake/Test/test_app/locale/po/LC_TIME
similarity index 100%
rename from lib/Cake/tests/test_app/locale/po/LC_TIME
rename to lib/Cake/Test/test_app/locale/po/LC_TIME
diff --git a/lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_0_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_10_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_11_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_12_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_13_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_14_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_1_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_2_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_3_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_4_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_5_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_6_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_7_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_8_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
rename to lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
rename to lib/Cake/Test/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
diff --git a/lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/core.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
rename to lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/core.po
diff --git a/lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/default.po
similarity index 100%
rename from lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
rename to lib/Cake/Test/test_app/locale/rule_9_po/LC_MESSAGES/default.po
diff --git a/lib/Cake/tests/test_app/locale/time_test/LC_TIME b/lib/Cake/Test/test_app/locale/time_test/LC_TIME
similarity index 100%
rename from lib/Cake/tests/test_app/locale/time_test/LC_TIME
rename to lib/Cake/Test/test_app/locale/time_test/LC_TIME
diff --git a/lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php b/lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php
rename to lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php
diff --git a/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js b/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
rename to lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
diff --git a/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js b/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js
rename to lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty b/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty b/lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginController.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginController.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestsController.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestsController.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/TestPluginPost.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/TestPluginPost.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php b/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php b/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php b/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php b/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp b/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp b/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp b/lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp b/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp b/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
rename to lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php b/lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po b/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
rename to lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po b/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
rename to lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php b/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php b/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php
rename to lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js b/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js
rename to lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty b/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php b/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
rename to lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty b/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty
rename to lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php b/lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php
rename to lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php
diff --git a/lib/Cake/tests/test_app/tmp/dir_map b/lib/Cake/Test/test_app/tmp/dir_map
similarity index 100%
rename from lib/Cake/tests/test_app/tmp/dir_map
rename to lib/Cake/Test/test_app/tmp/dir_map
diff --git a/lib/Cake/tests/test_app/vendors/Test/MyTest.php b/lib/Cake/Test/test_app/vendors/Test/MyTest.php
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/Test/MyTest.php
rename to lib/Cake/Test/test_app/vendors/Test/MyTest.php
diff --git a/lib/Cake/tests/test_app/vendors/Test/hello.php b/lib/Cake/Test/test_app/vendors/Test/hello.php
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/Test/hello.php
rename to lib/Cake/Test/test_app/vendors/Test/hello.php
diff --git a/lib/Cake/tests/test_app/vendors/css/test_asset.css b/lib/Cake/Test/test_app/vendors/css/test_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/css/test_asset.css
rename to lib/Cake/Test/test_app/vendors/css/test_asset.css
diff --git a/lib/Cake/tests/test_app/vendors/img/test.jpg b/lib/Cake/Test/test_app/vendors/img/test.jpg
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/img/test.jpg
rename to lib/Cake/Test/test_app/vendors/img/test.jpg
diff --git a/lib/Cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
rename to lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php
diff --git a/lib/Cake/tests/test_app/vendors/somename/some.name.php b/lib/Cake/Test/test_app/vendors/somename/some.name.php
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/somename/some.name.php
rename to lib/Cake/Test/test_app/vendors/somename/some.name.php
diff --git a/lib/Cake/tests/test_app/vendors/welcome.php b/lib/Cake/Test/test_app/vendors/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/vendors/welcome.php
rename to lib/Cake/Test/test_app/vendors/welcome.php
diff --git a/lib/Cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css b/lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css
similarity index 100%
rename from lib/Cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
rename to lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css
diff --git a/lib/Cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css b/lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css
similarity index 100%
rename from lib/Cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
rename to lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css
diff --git a/lib/Cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif b/lib/Cake/Test/test_app/webroot/theme/test_theme/img/cake.power.gif
similarity index 100%
rename from lib/Cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
rename to lib/Cake/Test/test_app/webroot/theme/test_theme/img/cake.power.gif
diff --git a/lib/Cake/tests/test_app/webroot/theme/test_theme/img/test.jpg b/lib/Cake/Test/test_app/webroot/theme/test_theme/img/test.jpg
similarity index 100%
rename from lib/Cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
rename to lib/Cake/Test/test_app/webroot/theme/test_theme/img/test.jpg
diff --git a/lib/Cake/TestSuite/CakeTestLoader.php b/lib/Cake/TestSuite/CakeTestLoader.php
index 158a0acdd91..e02eaf564e9 100644
--- a/lib/Cake/TestSuite/CakeTestLoader.php
+++ b/lib/Cake/TestSuite/CakeTestLoader.php
@@ -56,7 +56,7 @@ protected static function _basePath($params) {
 			$result = APP_TEST_CASES;
 		} else if (!empty($params['plugin']) && CakePlugin::loaded($params['plugin'])) {
 			$pluginPath = CakePLugin::path($params['plugin']);
-			$result = $pluginPath . 'tests' . DS . 'Case';
+			$result = $pluginPath . 'Test' . DS . 'Case';
 		}
 		return $result;
 	}
diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
index 2fef2498798..0949468b11b 100644
--- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
+++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-define('CORE_TEST_CASES', LIBS . 'tests' . DS . 'Case');
+define('CORE_TEST_CASES', LIBS . 'Test' . DS . 'Case');
 define('APP_TEST_CASES', TESTS . 'Case');
 
 App::uses('CakeTestSuiteCommand', 'TestSuite');
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 6d4acee64ba..2c296fb6d20 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -131,7 +131,7 @@
  * Path to the tests directory.
  */
 if (!defined('TESTS')) {
-	define('TESTS', APP.'tests'.DS);
+	define('TESTS', APP.'Test'.DS);
 }
 
 /**