diff --git a/lib/Cake/tests/cases/libs/Cache/CacheTest.php b/lib/Cake/tests/cases/Cache/CacheTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Cache/CacheTest.php
rename to lib/Cake/tests/cases/Cache/CacheTest.php
diff --git a/lib/Cake/tests/cases/libs/Cache/Engine/ApcEngineTest.php b/lib/Cake/tests/cases/Cache/Engine/ApcEngineTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Cache/Engine/ApcEngineTest.php
rename to lib/Cake/tests/cases/Cache/Engine/ApcEngineTest.php
diff --git a/lib/Cake/tests/cases/libs/Cache/Engine/FileEngineTest.php b/lib/Cake/tests/cases/Cache/Engine/FileEngineTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Cache/Engine/FileEngineTest.php
rename to lib/Cake/tests/cases/Cache/Engine/FileEngineTest.php
diff --git a/lib/Cake/tests/cases/libs/Cache/Engine/MemcacheTest.php b/lib/Cake/tests/cases/Cache/Engine/MemcacheTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Cache/Engine/MemcacheTest.php
rename to lib/Cake/tests/cases/Cache/Engine/MemcacheTest.php
diff --git a/lib/Cake/tests/cases/libs/Cache/Engine/XcacheTest.php b/lib/Cake/tests/cases/Cache/Engine/XcacheTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Cache/Engine/XcacheTest.php
rename to lib/Cake/tests/cases/Cache/Engine/XcacheTest.php
diff --git a/lib/Cake/tests/cases/libs/Configure/IniReaderTest.php b/lib/Cake/tests/cases/Configure/IniReaderTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Configure/IniReaderTest.php
rename to lib/Cake/tests/cases/Configure/IniReaderTest.php
diff --git a/lib/Cake/tests/cases/libs/Configure/PhpReaderTest.php b/lib/Cake/tests/cases/Configure/PhpReaderTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Configure/PhpReaderTest.php
rename to lib/Cake/tests/cases/Configure/PhpReaderTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/AclComponentTest.php b/lib/Cake/tests/cases/Controller/Component/AclComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/AclComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/AclComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/tests/cases/Controller/Component/Auth/ActionsAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/ActionsAuthorizeTest.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/ActionsAuthorizeTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/tests/cases/Controller/Component/Auth/BasicAuthenticateTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/BasicAuthenticateTest.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/BasicAuthenticateTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/tests/cases/Controller/Component/Auth/ControllerAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/ControllerAuthorizeTest.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/ControllerAuthorizeTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/tests/cases/Controller/Component/Auth/CrudAuthorizeTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/CrudAuthorizeTest.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/CrudAuthorizeTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/tests/cases/Controller/Component/Auth/DigestAuthenticateTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/DigestAuthenticateTest.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/DigestAuthenticateTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/tests/cases/Controller/Component/Auth/FormAuthenticate.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/Auth/FormAuthenticate.php
rename to lib/Cake/tests/cases/Controller/Component/Auth/FormAuthenticate.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/AuthComponentTest.php b/lib/Cake/tests/cases/Controller/Component/AuthComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/AuthComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/AuthComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/CookieComponentTest.php b/lib/Cake/tests/cases/Controller/Component/CookieComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/CookieComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/CookieComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/EmailComponentTest.php b/lib/Cake/tests/cases/Controller/Component/EmailComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/EmailComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/EmailComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/PaginatorComponentTest.php b/lib/Cake/tests/cases/Controller/Component/PaginatorComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/PaginatorComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/PaginatorComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/tests/cases/Controller/Component/RequestHandlerComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/RequestHandlerComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/RequestHandlerComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/SecurityComponentTest.php b/lib/Cake/tests/cases/Controller/Component/SecurityComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/SecurityComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/SecurityComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/Component/SessionComponentTest.php b/lib/Cake/tests/cases/Controller/Component/SessionComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/Component/SessionComponentTest.php
rename to lib/Cake/tests/cases/Controller/Component/SessionComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/ComponentCollectionTest.php b/lib/Cake/tests/cases/Controller/ComponentCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/ComponentCollectionTest.php
rename to lib/Cake/tests/cases/Controller/ComponentCollectionTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/ComponentTest.php b/lib/Cake/tests/cases/Controller/ComponentTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/ComponentTest.php
rename to lib/Cake/tests/cases/Controller/ComponentTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/ControllerMergeVarsTest.php b/lib/Cake/tests/cases/Controller/ControllerMergeVarsTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/ControllerMergeVarsTest.php
rename to lib/Cake/tests/cases/Controller/ControllerMergeVarsTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/ControllerTest.php b/lib/Cake/tests/cases/Controller/ControllerTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/ControllerTest.php
rename to lib/Cake/tests/cases/Controller/ControllerTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/PagesControllerTest.php b/lib/Cake/tests/cases/Controller/PagesControllerTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/PagesControllerTest.php
rename to lib/Cake/tests/cases/Controller/PagesControllerTest.php
diff --git a/lib/Cake/tests/cases/libs/Controller/ScaffoldTest.php b/lib/Cake/tests/cases/Controller/ScaffoldTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Controller/ScaffoldTest.php
rename to lib/Cake/tests/cases/Controller/ScaffoldTest.php
diff --git a/lib/Cake/tests/cases/libs/Core/AppTest.php b/lib/Cake/tests/cases/Core/AppTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Core/AppTest.php
rename to lib/Cake/tests/cases/Core/AppTest.php
diff --git a/lib/Cake/tests/cases/libs/Core/ConfigureTest.php b/lib/Cake/tests/cases/Core/ConfigureTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Core/ConfigureTest.php
rename to lib/Cake/tests/cases/Core/ConfigureTest.php
diff --git a/lib/Cake/tests/cases/libs/Core/ObjectTest.php b/lib/Cake/tests/cases/Core/ObjectTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Core/ObjectTest.php
rename to lib/Cake/tests/cases/Core/ObjectTest.php
diff --git a/lib/Cake/tests/cases/libs/Error/ErrorHanlderTest.php b/lib/Cake/tests/cases/Error/ErrorHanlderTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Error/ErrorHanlderTest.php
rename to lib/Cake/tests/cases/Error/ErrorHanlderTest.php
diff --git a/lib/Cake/tests/cases/libs/Error/ExceptionRendererTest.php b/lib/Cake/tests/cases/Error/ExceptionRendererTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Error/ExceptionRendererTest.php
rename to lib/Cake/tests/cases/Error/ExceptionRendererTest.php
diff --git a/lib/Cake/tests/cases/libs/I18n/I18nTest.php b/lib/Cake/tests/cases/I18n/I18nTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/I18n/I18nTest.php
rename to lib/Cake/tests/cases/I18n/I18nTest.php
diff --git a/lib/Cake/tests/cases/libs/I18n/L10nTest.php b/lib/Cake/tests/cases/I18n/L10nTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/I18n/L10nTest.php
rename to lib/Cake/tests/cases/I18n/L10nTest.php
diff --git a/lib/Cake/tests/cases/libs/I18n/MultibyteTest.php b/lib/Cake/tests/cases/I18n/MultibyteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/I18n/MultibyteTest.php
rename to lib/Cake/tests/cases/I18n/MultibyteTest.php
diff --git a/lib/Cake/tests/cases/libs/Log/CakeLogTest.php b/lib/Cake/tests/cases/Log/CakeLogTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Log/CakeLogTest.php
rename to lib/Cake/tests/cases/Log/CakeLogTest.php
diff --git a/lib/Cake/tests/cases/libs/Log/Engine/FileLog.php b/lib/Cake/tests/cases/Log/Engine/FileLog.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Log/Engine/FileLog.php
rename to lib/Cake/tests/cases/Log/Engine/FileLog.php
diff --git a/lib/Cake/tests/cases/libs/Model/Behavior/AclBehaviorTest.php b/lib/Cake/tests/cases/Model/Behavior/AclBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Behavior/AclBehaviorTest.php
rename to lib/Cake/tests/cases/Model/Behavior/AclBehaviorTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/tests/cases/Model/Behavior/ContainableBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Behavior/ContainableBehaviorTest.php
rename to lib/Cake/tests/cases/Model/Behavior/ContainableBehaviorTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/tests/cases/Model/Behavior/TranslateBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Behavior/TranslateBehaviorTest.php
rename to lib/Cake/tests/cases/Model/Behavior/TranslateBehaviorTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Behavior/TreeBehaviorTest.php b/lib/Cake/tests/cases/Model/Behavior/TreeBehaviorTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Behavior/TreeBehaviorTest.php
rename to lib/Cake/tests/cases/Model/Behavior/TreeBehaviorTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/BehaviorCollectionTest.php b/lib/Cake/tests/cases/Model/BehaviorCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/BehaviorCollectionTest.php
rename to lib/Cake/tests/cases/Model/BehaviorCollectionTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/CakeSchemaTest.php b/lib/Cake/tests/cases/Model/CakeSchemaTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/CakeSchemaTest.php
rename to lib/Cake/tests/cases/Model/CakeSchemaTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ConnectionManagerTest.php b/lib/Cake/tests/cases/Model/ConnectionManagerTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ConnectionManagerTest.php
rename to lib/Cake/tests/cases/Model/ConnectionManagerTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/CakeSessionTest.php b/lib/Cake/tests/cases/Model/Datasource/CakeSessionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/CakeSessionTest.php
rename to lib/Cake/tests/cases/Model/Datasource/CakeSessionTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Database/MssqlTest.php b/lib/Cake/tests/cases/Model/Datasource/Database/MssqlTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Database/MssqlTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Database/MssqlTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Database/MysqlTest.php b/lib/Cake/tests/cases/Model/Datasource/Database/MysqlTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Database/MysqlTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Database/MysqlTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Database/OrcaleTest.php b/lib/Cake/tests/cases/Model/Datasource/Database/OrcaleTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Database/OrcaleTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Database/OrcaleTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Database/PostgresTest.php b/lib/Cake/tests/cases/Model/Datasource/Database/PostgresTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Database/PostgresTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Database/PostgresTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Database/SqliteTest.php b/lib/Cake/tests/cases/Model/Datasource/Database/SqliteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Database/SqliteTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Database/SqliteTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/DboSourceTest.php b/lib/Cake/tests/cases/Model/Datasource/DboSourceTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/DboSourceTest.php
rename to lib/Cake/tests/cases/Model/Datasource/DboSourceTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/tests/cases/Model/Datasource/Session/CacheSessionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Session/CacheSessionTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Session/CacheSessionTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/tests/cases/Model/Datasource/Session/DatabaseSessionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/Datasource/Session/DatabaseSessionTest.php
rename to lib/Cake/tests/cases/Model/Datasource/Session/DatabaseSessionTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/DbAclTest.php b/lib/Cake/tests/cases/Model/DbAclTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/DbAclTest.php
rename to lib/Cake/tests/cases/Model/DbAclTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelDeleteTest.php b/lib/Cake/tests/cases/Model/ModelDeleteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelDeleteTest.php
rename to lib/Cake/tests/cases/Model/ModelDeleteTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelIntegrationTest.php b/lib/Cake/tests/cases/Model/ModelIntegrationTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelIntegrationTest.php
rename to lib/Cake/tests/cases/Model/ModelIntegrationTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelReadTest.php b/lib/Cake/tests/cases/Model/ModelReadTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelReadTest.php
rename to lib/Cake/tests/cases/Model/ModelReadTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelTestBase.php b/lib/Cake/tests/cases/Model/ModelTestBase.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelTestBase.php
rename to lib/Cake/tests/cases/Model/ModelTestBase.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelValidationTest.php b/lib/Cake/tests/cases/Model/ModelValidationTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelValidationTest.php
rename to lib/Cake/tests/cases/Model/ModelValidationTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/ModelWriteTest.php b/lib/Cake/tests/cases/Model/ModelWriteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/ModelWriteTest.php
rename to lib/Cake/tests/cases/Model/ModelWriteTest.php
diff --git a/lib/Cake/tests/cases/libs/Model/models.php b/lib/Cake/tests/cases/Model/models.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Model/models.php
rename to lib/Cake/tests/cases/Model/models.php
diff --git a/lib/Cake/tests/cases/libs/Network/CakeRequestTest.php b/lib/Cake/tests/cases/Network/CakeRequestTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/CakeRequestTest.php
rename to lib/Cake/tests/cases/Network/CakeRequestTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/CakeResponseTest.php b/lib/Cake/tests/cases/Network/CakeResponseTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/CakeResponseTest.php
rename to lib/Cake/tests/cases/Network/CakeResponseTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/CakeSocketTest.php b/lib/Cake/tests/cases/Network/CakeSocketTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/CakeSocketTest.php
rename to lib/Cake/tests/cases/Network/CakeSocketTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/Http/BasicAuthenticationTest.php b/lib/Cake/tests/cases/Network/Http/BasicAuthenticationTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/Http/BasicAuthenticationTest.php
rename to lib/Cake/tests/cases/Network/Http/BasicAuthenticationTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/Http/DigestAuthenticationTest.php b/lib/Cake/tests/cases/Network/Http/DigestAuthenticationTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/Http/DigestAuthenticationTest.php
rename to lib/Cake/tests/cases/Network/Http/DigestAuthenticationTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/Http/HttpResponseTest.php b/lib/Cake/tests/cases/Network/Http/HttpResponseTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/Http/HttpResponseTest.php
rename to lib/Cake/tests/cases/Network/Http/HttpResponseTest.php
diff --git a/lib/Cake/tests/cases/libs/Network/Http/HttpSocketTest.php b/lib/Cake/tests/cases/Network/Http/HttpSocketTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Network/Http/HttpSocketTest.php
rename to lib/Cake/tests/cases/Network/Http/HttpSocketTest.php
diff --git a/lib/Cake/tests/cases/libs/Routing/DispatcherTest.php b/lib/Cake/tests/cases/Routing/DispatcherTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Routing/DispatcherTest.php
rename to lib/Cake/tests/cases/Routing/DispatcherTest.php
diff --git a/lib/Cake/tests/cases/libs/Routing/Route/CakeRouteTest.php b/lib/Cake/tests/cases/Routing/Route/CakeRouteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Routing/Route/CakeRouteTest.php
rename to lib/Cake/tests/cases/Routing/Route/CakeRouteTest.php
diff --git a/lib/Cake/tests/cases/libs/Routing/Route/PluginShortRouteTest.php b/lib/Cake/tests/cases/Routing/Route/PluginShortRouteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Routing/Route/PluginShortRouteTest.php
rename to lib/Cake/tests/cases/Routing/Route/PluginShortRouteTest.php
diff --git a/lib/Cake/tests/cases/libs/Routing/Route/RedirectRouteTest.php b/lib/Cake/tests/cases/Routing/Route/RedirectRouteTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Routing/Route/RedirectRouteTest.php
rename to lib/Cake/tests/cases/Routing/Route/RedirectRouteTest.php
diff --git a/lib/Cake/tests/cases/libs/Routing/RouterTest.php b/lib/Cake/tests/cases/Routing/RouterTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Routing/RouterTest.php
rename to lib/Cake/tests/cases/Routing/RouterTest.php
diff --git a/lib/Cake/tests/cases/libs/TestSuite/CakeTestCaseTest.php b/lib/Cake/tests/cases/TestSuite/CakeTestCaseTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/TestSuite/CakeTestCaseTest.php
rename to lib/Cake/tests/cases/TestSuite/CakeTestCaseTest.php
diff --git a/lib/Cake/tests/cases/libs/TestSuite/CakeTestFixtureTest.php b/lib/Cake/tests/cases/TestSuite/CakeTestFixtureTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/TestSuite/CakeTestFixtureTest.php
rename to lib/Cake/tests/cases/TestSuite/CakeTestFixtureTest.php
diff --git a/lib/Cake/tests/cases/libs/TestSuite/ControllerTestCaseTest.php b/lib/Cake/tests/cases/TestSuite/ControllerTestCaseTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/TestSuite/ControllerTestCaseTest.php
rename to lib/Cake/tests/cases/TestSuite/ControllerTestCaseTest.php
diff --git a/lib/Cake/tests/cases/libs/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/tests/cases/TestSuite/HtmlCoverageReportTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/TestSuite/HtmlCoverageReportTest.php
rename to lib/Cake/tests/cases/TestSuite/HtmlCoverageReportTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/ClassRegistryTest.php b/lib/Cake/tests/cases/Utility/ClassRegistryTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/ClassRegistryTest.php
rename to lib/Cake/tests/cases/Utility/ClassRegistryTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/DebuggerTest.php b/lib/Cake/tests/cases/Utility/DebuggerTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/DebuggerTest.php
rename to lib/Cake/tests/cases/Utility/DebuggerTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/FileTest.php b/lib/Cake/tests/cases/Utility/FileTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/FileTest.php
rename to lib/Cake/tests/cases/Utility/FileTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/FolderTest.php b/lib/Cake/tests/cases/Utility/FolderTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/FolderTest.php
rename to lib/Cake/tests/cases/Utility/FolderTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/InflectorTest.php b/lib/Cake/tests/cases/Utility/InflectorTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/InflectorTest.php
rename to lib/Cake/tests/cases/Utility/InflectorTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/ObjectCollectionTest.php b/lib/Cake/tests/cases/Utility/ObjectCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/ObjectCollectionTest.php
rename to lib/Cake/tests/cases/Utility/ObjectCollectionTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/SanitizeTest.php b/lib/Cake/tests/cases/Utility/SanitizeTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/SanitizeTest.php
rename to lib/Cake/tests/cases/Utility/SanitizeTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/SecurityTest.php b/lib/Cake/tests/cases/Utility/SecurityTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/SecurityTest.php
rename to lib/Cake/tests/cases/Utility/SecurityTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/SetTest.php b/lib/Cake/tests/cases/Utility/SetTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/SetTest.php
rename to lib/Cake/tests/cases/Utility/SetTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/StringTest.php b/lib/Cake/tests/cases/Utility/StringTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/StringTest.php
rename to lib/Cake/tests/cases/Utility/StringTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/ValidationTest.php b/lib/Cake/tests/cases/Utility/ValidationTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/ValidationTest.php
rename to lib/Cake/tests/cases/Utility/ValidationTest.php
diff --git a/lib/Cake/tests/cases/libs/Utility/XmlTest.php b/lib/Cake/tests/cases/Utility/XmlTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/Utility/XmlTest.php
rename to lib/Cake/tests/cases/Utility/XmlTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/CacheHelperTest.php b/lib/Cake/tests/cases/View/Helper/CacheHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/CacheHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/CacheHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/FormHelperTest.php b/lib/Cake/tests/cases/View/Helper/FormHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/FormHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/FormHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/HtmlHelperTest.php b/lib/Cake/tests/cases/View/Helper/HtmlHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/HtmlHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/HtmlHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/tests/cases/View/Helper/JqueryEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/JqueryEngineHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/JqueryEngineHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/JsHelperTest.php b/lib/Cake/tests/cases/View/Helper/JsHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/JsHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/JsHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/tests/cases/View/Helper/MootoolsEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/MootoolsEngineHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/MootoolsEngineHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/NumberHelperTest.php b/lib/Cake/tests/cases/View/Helper/NumberHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/NumberHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/NumberHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/PaginatorHelperTest.php b/lib/Cake/tests/cases/View/Helper/PaginatorHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/PaginatorHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/PaginatorHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/tests/cases/View/Helper/PrototypeEngineHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/PrototypeEngineHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/PrototypeEngineHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/RssHelperTest.php b/lib/Cake/tests/cases/View/Helper/RssHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/RssHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/RssHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/SessionHelperTest.php b/lib/Cake/tests/cases/View/Helper/SessionHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/SessionHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/SessionHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/TextHelperTest.php b/lib/Cake/tests/cases/View/Helper/TextHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/TextHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/TextHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/Helper/TimeHelperTest.php b/lib/Cake/tests/cases/View/Helper/TimeHelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/Helper/TimeHelperTest.php
rename to lib/Cake/tests/cases/View/Helper/TimeHelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/HelperCollectionTest.php b/lib/Cake/tests/cases/View/HelperCollectionTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/HelperCollectionTest.php
rename to lib/Cake/tests/cases/View/HelperCollectionTest.php
diff --git a/lib/Cake/tests/cases/libs/View/HelperTest.php b/lib/Cake/tests/cases/View/HelperTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/HelperTest.php
rename to lib/Cake/tests/cases/View/HelperTest.php
diff --git a/lib/Cake/tests/cases/libs/View/MediaViewTest.php b/lib/Cake/tests/cases/View/MediaViewTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/MediaViewTest.php
rename to lib/Cake/tests/cases/View/MediaViewTest.php
diff --git a/lib/Cake/tests/cases/libs/View/ThemeViewTest.php b/lib/Cake/tests/cases/View/ThemeViewTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/ThemeViewTest.php
rename to lib/Cake/tests/cases/View/ThemeViewTest.php
diff --git a/lib/Cake/tests/cases/libs/View/ViewTest.php b/lib/Cake/tests/cases/View/ViewTest.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/View/ViewTest.php
rename to lib/Cake/tests/cases/View/ViewTest.php
diff --git a/lib/Cake/tests/cases/libs/all_behaviors.test.php b/lib/Cake/tests/cases/all_behaviors.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_behaviors.test.php
rename to lib/Cake/tests/cases/all_behaviors.test.php
diff --git a/lib/Cake/tests/cases/libs/all_cache_engines.test.php b/lib/Cake/tests/cases/all_cache_engines.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_cache_engines.test.php
rename to lib/Cake/tests/cases/all_cache_engines.test.php
diff --git a/lib/Cake/tests/cases/libs/all_components.test.php b/lib/Cake/tests/cases/all_components.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_components.test.php
rename to lib/Cake/tests/cases/all_components.test.php
diff --git a/lib/Cake/tests/cases/libs/all_configure.test.php b/lib/Cake/tests/cases/all_configure.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_configure.test.php
rename to lib/Cake/tests/cases/all_configure.test.php
diff --git a/lib/Cake/tests/cases/libs/all_controllers.test.php b/lib/Cake/tests/cases/all_controllers.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_controllers.test.php
rename to lib/Cake/tests/cases/all_controllers.test.php
diff --git a/lib/Cake/tests/cases/libs/all_database.test.php b/lib/Cake/tests/cases/all_database.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_database.test.php
rename to lib/Cake/tests/cases/all_database.test.php
diff --git a/lib/Cake/tests/cases/libs/all_error.test.php b/lib/Cake/tests/cases/all_error.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_error.test.php
rename to lib/Cake/tests/cases/all_error.test.php
diff --git a/lib/Cake/tests/cases/libs/all_helpers.test.php b/lib/Cake/tests/cases/all_helpers.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_helpers.test.php
rename to lib/Cake/tests/cases/all_helpers.test.php
diff --git a/lib/Cake/tests/cases/libs/all_js_helpers.test.php b/lib/Cake/tests/cases/all_js_helpers.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_js_helpers.test.php
rename to lib/Cake/tests/cases/all_js_helpers.test.php
diff --git a/lib/Cake/tests/cases/libs/all_libs.test.php b/lib/Cake/tests/cases/all_libs.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_libs.test.php
rename to lib/Cake/tests/cases/all_libs.test.php
diff --git a/lib/Cake/tests/cases/libs/all_localization.test.php b/lib/Cake/tests/cases/all_localization.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_localization.test.php
rename to lib/Cake/tests/cases/all_localization.test.php
diff --git a/lib/Cake/tests/cases/libs/all_model.test.php b/lib/Cake/tests/cases/all_model.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_model.test.php
rename to lib/Cake/tests/cases/all_model.test.php
diff --git a/lib/Cake/tests/cases/libs/all_routing.test.php b/lib/Cake/tests/cases/all_routing.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_routing.test.php
rename to lib/Cake/tests/cases/all_routing.test.php
diff --git a/lib/Cake/tests/cases/libs/all_socket.test.php b/lib/Cake/tests/cases/all_socket.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_socket.test.php
rename to lib/Cake/tests/cases/all_socket.test.php
diff --git a/lib/Cake/tests/cases/libs/all_test_suite.test.php b/lib/Cake/tests/cases/all_test_suite.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_test_suite.test.php
rename to lib/Cake/tests/cases/all_test_suite.test.php
diff --git a/lib/Cake/tests/cases/libs/all_tests.test.php b/lib/Cake/tests/cases/all_tests.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_tests.test.php
rename to lib/Cake/tests/cases/all_tests.test.php
diff --git a/lib/Cake/tests/cases/libs/all_views.test.php b/lib/Cake/tests/cases/all_views.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_views.test.php
rename to lib/Cake/tests/cases/all_views.test.php
diff --git a/lib/Cake/tests/cases/libs/all_xml.test.php b/lib/Cake/tests/cases/all_xml.test.php
similarity index 100%
rename from lib/Cake/tests/cases/libs/all_xml.test.php
rename to lib/Cake/tests/cases/all_xml.test.php