From c504535980f2998420fe14acfe7e3414153cd2b8 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 17 Apr 2011 01:37:31 -0430
Subject: [PATCH 01/50] Stating to implement a CakePlugin class to allow the
 inclusion of bootraping files for plugins

---
 lib/Cake/Core/App.php         |   9 +-
 lib/Cake/Core/CakePlugin.php  | 161 ++++++++++++++++++++++++++++++++++
 lib/Cake/Error/exceptions.php |   8 ++
 3 files changed, 171 insertions(+), 7 deletions(-)
 create mode 100644 lib/Cake/Core/CakePlugin.php

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 014f812db..f7c49e0f5 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -349,13 +349,7 @@ class App {
  * @return string full path to the plugin.
  */
 	public static function pluginPath($plugin) {
-		$pluginDir = Inflector::underscore($plugin);
-		foreach (self::$__packages['plugins'] as $pluginPath) {
-			if (is_dir($pluginPath . $pluginDir)) {
-				return $pluginPath . $pluginDir . DS ;
-			}
-		}
-		return self::$__packages['plugins'][0] . $pluginDir . DS;
+		return CakePlugin::path($plugin);
 	}
 
 /**
@@ -760,6 +754,7 @@ class App {
 		self::$__map = (array)Cache::read('file_map', '_cake_core_');
 		self::$__objects = (array)Cache::read('object_map', '_cake_core_');
 		register_shutdown_function(array('App', 'shutdown'));
+		self::uses('CakePlugin', 'Core');
 	}
 
 /**
diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
new file mode 100644
index 000000000..f4702ccd8
--- /dev/null
+++ b/lib/Cake/Core/CakePlugin.php
@@ -0,0 +1,161 @@
+<?php
+
+class CakePlugin {
+
+/**
+ * Holds a list of all loaded plugins and their configuration
+ *
+ */
+	private static $_plugins = array();
+
+/**
+ * Loads a plugin and optionally loads bootstrapping, routing files or loads a initialization function
+ *
+ * Examples:
+ *
+ * 	`CakePlugin::load('DebugKit')` will load the DebugKit plugin and will not load any bootstrap nor route files
+ *	`CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))` will load the bootstrap.php and routes.php files
+ * 	`CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))` will load routes.php file but not bootstrap.php
+ * 	`CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))` will load config1.php and config2.php files
+ *	`CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))` will run the aCallableMethod function to initialize it
+ *
+ * Bootstrap initialization functions can be expressed as a PHP callback type, including closures. Callbacks will receive two
+ * parameters (plugin name, plugin configuration)
+ *
+ * It is also possible to load multiple plugins at once. Examples:
+ * 
+ * `CakePlugin::load(array('DebugKit', 'ApiGenerator'))` will load the DebugKit and ApiGenerator plugins
+ * `CakePlugin::load(array('DebugKit', 'ApiGenerator'), array('bootstrap' => true))` will load bootstrap file for both plugins
+ * 
+ * {{{
+ * 	CakePlugin::load(array(
+ * 		'DebugKit' => array('routes' => true),
+ * 		'ApiGenerator'
+ * 		), array('bootstrap' => true))
+ * }}}
+ * 
+ * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit
+ * 
+ * @param mixed $plugin name of the plugin to be loaded in CamelCase format or array or plugins to load
+ * @param array $config configuration options for the plugin
+ * @throws MissingPluginException if the folder for the plugin to be loaded is not found
+ * @return void
+ */
+	public static function load($plugin, $config = array()) {
+		if (is_array($plugin)) {
+			foreach ($plugin as $name => $conf) {
+				list($name, $conf) = (is_numeric($name)) ? array($conf, $config) : array($name, $conf);
+				self::load($name, $config);
+			}
+			return;
+		}
+		$config += array('bootstrap' => false, 'routes' => false);
+		$underscored = Inflector::underscore($plugin);
+		if (empty($config[$path])) {
+			foreach (App::path('plugins') as $path) {
+				if (is_dir($path . $underscored)) {
+					self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
+				}
+			}
+		} else {
+			self::$_plugins[$plugin] = $config;
+		}
+
+		if (empty(self::$_plugins[$plugin]['path'])) {
+			throw new MissingPluginException(array('plugin' => $plugin));
+		}
+		if (!empty(self::$_plugins[$plugin]['bootstrap'])) {
+			self::bootstrap($plugin);
+		}
+		if (!empty(self::$_plugins[$plugin]['routes'])) {
+			self::routes($plugin);
+		}
+	}
+
+
+/**
+ * Returns the filesystem path for a plugin
+ *
+ * @param string $plugin name of the plugin in CamelCase format
+ * @return string path to the plugin folder
+ * @throws MissingPluginException if the folder for plugin was not found or plugin has not been loaded
+ */
+	public static function path($plugin) {
+		if (empty(self::_$plugins[$plugin])) {
+			throw new MissingPluginException(array('plugin' => $plugin));
+		}
+		return self::_$plugins[$plugin]['path'];
+	}
+
+/**
+ * Loads the bootstrapping files for a plugin, or calls the initialization setup in the configuration
+ *
+ * @param string $plugin name of the plugin
+ * @return mixed
+ * @see CakePlugin::load() for examples of bootstrap configuration
+ */
+	public static function bootstrap($plugin) {
+		$config = self::$_plugins[$plugin];
+		if ($config['bootstrap'] === false) {
+			return false;
+		}
+		if (is_callable($config['bootstrap'])) {
+			return call_user_func_array($config['bootstrap'], array($plugin, $config));
+		}
+
+		$path = self::path($plugin);
+		if ($config['bootstrap'] === true && is_file($path . 'config' . DS . 'bootstrap.php')) {
+			return include($path . 'config' . DS . 'bootstrap.php');
+		}
+
+		$bootstrap = (array)$config['bootstrap'];
+		foreach ($bootstrap as $file) {
+			if (is_file($path . 'config' . DS . $file . '.php')) {
+				include $path . 'config' . DS . $file . '.php'
+			}
+		}
+
+		return true;
+	}
+
+/**
+ * Loads the routes file for a plugin
+ *
+ * @param string $plugin name of the plugin
+ * @return boolean
+ */
+	public static function routes($plugin) {
+		$config = self::$_plugins[$plugin];
+		if ($config['routes'] === false) {
+			return false;
+		}
+		$path = include self::path($plugin) . 'config' . DS . 'routes.php';
+		if (is_file($path)) {
+			include $path;
+		}
+		return true;
+	}
+
+/**
+ * Returns a list of all loaded plugins
+ *
+ * @return array list of plugins that have been loaded
+ */
+	public static function list() {
+		return array_keys(self::$_plugins);
+	}
+
+/**
+ * Forgets a loaded plugin or all of them if first parameter is null
+ *
+ * @param string $plugin name of the plugin to forget
+ * @return void
+ */
+	public static function unload($plugin = null) {
+		if (is_null($plugin)) {
+			self::$_plugins = array();
+		} else {
+			unset($_plugins[$plugin]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/lib/Cake/Error/exceptions.php b/lib/Cake/Error/exceptions.php
index d178005b6..1145669fb 100644
--- a/lib/Cake/Error/exceptions.php
+++ b/lib/Cake/Error/exceptions.php
@@ -417,6 +417,14 @@ class MissingTestLoaderException extends CakeException {
 	protected $_messageTemplate = 'Test loader %s could not be found.';
 }
 
+/**
+ * Exception Raised when a test loader could not be found
+ *
+ * @package cake.libs
+ */
+class MissingPluginException extends CakeException {
+	protected $_messageTemplate = 'Test plugin %s could not be found.';
+}
 
 /**
  * Exception class for Cache.  This exception will be thrown from Cache when it

From 8053436b354085afbc0d3a65590876762607cf51 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 25 Apr 2011 22:42:33 -0430
Subject: [PATCH 02/50] Fixing some parse errors

---
 lib/Cake/Core/CakePlugin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index f4702ccd8..442c2b2d6 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -81,10 +81,10 @@ class CakePlugin {
  * @throws MissingPluginException if the folder for plugin was not found or plugin has not been loaded
  */
 	public static function path($plugin) {
-		if (empty(self::_$plugins[$plugin])) {
+		if (empty(self::$_plugins[$plugin])) {
 			throw new MissingPluginException(array('plugin' => $plugin));
 		}
-		return self::_$plugins[$plugin]['path'];
+		return self::$_plugins[$plugin]['path'];
 	}
 
 /**
@@ -111,7 +111,7 @@ class CakePlugin {
 		$bootstrap = (array)$config['bootstrap'];
 		foreach ($bootstrap as $file) {
 			if (is_file($path . 'config' . DS . $file . '.php')) {
-				include $path . 'config' . DS . $file . '.php'
+				include $path . 'config' . DS . $file . '.php';
 			}
 		}
 
@@ -141,7 +141,7 @@ class CakePlugin {
  *
  * @return array list of plugins that have been loaded
  */
-	public static function list() {
+	public static function enabled() {
 		return array_keys(self::$_plugins);
 	}
 

From 4f1a6baf873603cf4d3676822284bf5afae7aea6 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Tue, 26 Apr 2011 00:56:19 -0430
Subject: [PATCH 03/50] Fixing some errors in the new plugin loader and adding
 some tests

---
 lib/Cake/Core/CakePlugin.php                  |  20 +--
 lib/Cake/tests/Case/Core/CakePluginTest.php   | 168 ++++++++++++++++++
 .../plugins/test_plugin/config/bootstrap.php  |   2 +
 .../test_plugin/config/custom_config.php      |   2 +
 .../plugins/test_plugin/config/routes.php     |   2 +
 .../test_plugin_two/config/bootstrap.php      |   2 +
 6 files changed, 183 insertions(+), 13 deletions(-)
 create mode 100644 lib/Cake/tests/Case/Core/CakePluginTest.php
 create mode 100644 lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php
 create mode 100644 lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php
 create mode 100644 lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php
 create mode 100644 lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 442c2b2d6..4e2c5ab81 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -45,13 +45,13 @@ class CakePlugin {
 		if (is_array($plugin)) {
 			foreach ($plugin as $name => $conf) {
 				list($name, $conf) = (is_numeric($name)) ? array($conf, $config) : array($name, $conf);
-				self::load($name, $config);
+				self::load($name, $conf);
 			}
 			return;
 		}
 		$config += array('bootstrap' => false, 'routes' => false);
 		$underscored = Inflector::underscore($plugin);
-		if (empty($config[$path])) {
+		if (empty($config['path'])) {
 			foreach (App::path('plugins') as $path) {
 				if (is_dir($path . $underscored)) {
 					self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
@@ -104,15 +104,13 @@ class CakePlugin {
 		}
 
 		$path = self::path($plugin);
-		if ($config['bootstrap'] === true && is_file($path . 'config' . DS . 'bootstrap.php')) {
+		if ($config['bootstrap'] === true) {
 			return include($path . 'config' . DS . 'bootstrap.php');
 		}
 
 		$bootstrap = (array)$config['bootstrap'];
 		foreach ($bootstrap as $file) {
-			if (is_file($path . 'config' . DS . $file . '.php')) {
-				include $path . 'config' . DS . $file . '.php';
-			}
+			include $path . 'config' . DS . $file . '.php';
 		}
 
 		return true;
@@ -129,11 +127,7 @@ class CakePlugin {
 		if ($config['routes'] === false) {
 			return false;
 		}
-		$path = include self::path($plugin) . 'config' . DS . 'routes.php';
-		if (is_file($path)) {
-			include $path;
-		}
-		return true;
+		return (bool) include self::path($plugin) . 'config' . DS . 'routes.php';
 	}
 
 /**
@@ -141,7 +135,7 @@ class CakePlugin {
  *
  * @return array list of plugins that have been loaded
  */
-	public static function enabled() {
+	public static function loaded() {
 		return array_keys(self::$_plugins);
 	}
 
@@ -155,7 +149,7 @@ class CakePlugin {
 		if (is_null($plugin)) {
 			self::$_plugins = array();
 		} else {
-			unset($_plugins[$plugin]);
+			unset(self::$_plugins[$plugin]);
 		}
 	}
 }
\ No newline at end of file
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
new file mode 100644
index 000000000..db46a2ba2
--- /dev/null
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -0,0 +1,168 @@
+<?php
+
+
+App::uses('CakePlugin', 'Core');
+
+/**
+ * CakePluginTest class
+ *
+ */
+class CakePluginTest extends CakeTestCase {
+
+/**
+ * Sets the plugins folder for this test
+ *
+ * @return void
+ */
+	public function setUp() {
+		App::build(array(
+			'plugins' => array(CAKE_TESTS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+	}
+
+/**
+ * Reverts the changes done to the environment while testing
+ *
+ * @return void
+ */
+	public function tearDown() {
+		App::build();
+		CakePlugin::unload();
+		Configure::delete('CakePluginTest');
+	}
+
+/**
+ * Tests loading a single plugin
+ *
+ * @return void
+ */
+	public function testLoadSingle() {
+		CakePlugin::load('TestPlugin');
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+	}
+
+/**
+ * Tests unloading plugins
+ *
+ * @return void
+ */
+	public function testUnload() {
+		CakePlugin::load('TestPlugin');
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		
+		CakePlugin::unload('TestPlugin');
+		$this->assertEquals(array(), CakePlugin::loaded());
+
+		CakePlugin::load('TestPlugin');
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		
+		CakePlugin::unload('TestFakePlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+	}
+
+/**
+ * Tests loading a plugin and its bootstrap file
+ *
+ * @return void
+ */
+	public function testLoadSingleWithBootstrap() {
+		CakePlugin::load('TestPlugin', array('bootstrap' => true));
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+	}
+
+/**
+ * Tests loading a plugin with bootstrap file and routes file
+ *
+ * @return void
+ */
+	public function testLoadSingleWithBootstrapAndRoutes() {
+		CakePlugin::load('TestPlugin', array('bootstrap' => true, 'routes' => true));
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin routes', Configure::read('CakePluginTest.test_plugin.routes'));
+	}
+
+/**
+ * Tests loading multiple plugins at once
+ *
+ * @return void
+ */
+	public function testLoadMultiple() {
+		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
+		$expected = array('TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+	}
+
+/**
+ * Tests loading multiple plugins and their bootstrap files
+ *
+ * @return void
+ */
+	public function testLoadMultipleWithDefaults() {
+		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'), array('bootstrap' => true, 'routes' => false));
+		$expected = array('TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin two bootstrap', Configure::read('CakePluginTest.test_plugin_two.bootstrap'));
+	}
+
+/**
+ * Tests loading multiple plugins with default loading params and some overrides
+ *
+ * @return void
+ */
+	public function testLoadMultipleWithDefaultsAndOverride() {
+		CakePlugin::load(
+			array('TestPlugin', 'TestPluginTwo' => array('routes' => false)),
+			array('bootstrap' => true, 'routes' => true)
+		);
+		$expected = array('TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+		$this->assertEquals(null, Configure::read('CakePluginTest.test_plugin_two.bootstrap'));
+	}
+
+/**
+ * Tests that it is possible to load multiple bootstrap files at once
+ *
+ * @return void
+ */
+	public function testMultipleBootstrapFiles() {
+		CakePlugin::load('TestPlugin', array('bootstrap' => array('bootstrap', 'custom_config')));
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+	}
+
+	public function testCallbackBootstrap() {
+		CakePlugin::load('TestPlugin', array('bootstrap' => array($this, 'pluginBootstrap')));
+		$expected = array('TestPlugin');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('called plugin bootstrap callback', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+	}
+
+/**
+ * Tests that loading a missing routes file throws a warning
+ *
+ * @return void
+ * @expectedException PHPUNIT_FRAMEWORK_ERROR_WARNING
+ */
+	public function testLoadMultipleWithDefaultsMissingFile() {
+		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'), array('bootstrap' => true, 'routes' => true));
+	}
+
+/**
+ * Auxiliary function to test plugin bootstrap callbacks
+ *
+ * @return void
+ */
+	public function pluginBootstrap() {
+		Configure::write('CakePluginTest.test_plugin.bootstrap', 'called plugin bootstrap callback');
+	}
+}
\ No newline at end of file
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php
new file mode 100644
index 000000000..25b87f140
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+Configure::write('CakePluginTest.test_plugin.bootstrap', 'loaded plugin bootstrap');
\ No newline at end of file
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php
new file mode 100644
index 000000000..86c82c98e
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php
@@ -0,0 +1,2 @@
+<?php
+Configure::write('CakePluginTest.test_plugin.custom', 'loaded plugin custom config');
\ No newline at end of file
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php b/lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php
new file mode 100644
index 000000000..2bd2971c6
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php
@@ -0,0 +1,2 @@
+<?php
+Configure::write('CakePluginTest.test_plugin.routes', 'loaded plugin routes');
\ No newline at end of file
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php
new file mode 100644
index 000000000..0d1b8a4d0
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+Configure::write('CakePluginTest.test_plugin_two.bootstrap', 'loaded plugin two bootstrap');
\ No newline at end of file

From 46d994c3f0b8d3589f129ef6c1559d4b74ff0fe9 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 29 Apr 2011 12:23:11 -0430
Subject: [PATCH 04/50] Improving test coverage for CakePlugin

---
 lib/Cake/tests/Case/Core/CakePluginTest.php | 41 +++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index db46a2ba2..753ac481e 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -140,6 +140,12 @@ class CakePluginTest extends CakeTestCase {
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
 	}
 
+
+/**
+ * Tests that it is possible to load plugin bootstrap by calling a callback function
+ *
+ * @return void
+ */
 	public function testCallbackBootstrap() {
 		CakePlugin::load('TestPlugin', array('bootstrap' => array($this, 'pluginBootstrap')));
 		$expected = array('TestPlugin');
@@ -157,6 +163,41 @@ class CakePluginTest extends CakeTestCase {
 		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'), array('bootstrap' => true, 'routes' => true));
 	}
 
+/**
+ * Tests that CakePlugin::load() throws an exception on unknown plugin
+ *
+ * @return void
+ * @expectedException MissingPluginException
+ */
+	public function testLoadNotFound() {
+		CakePlugin::load('MissingPlugin');
+	}
+
+
+/**
+ * Tests that CakePlugin::path() returns the correct path for the loaded plugins
+ *
+ * @return void
+ */
+	public function testPath() {
+		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEquals(CakePlugin::path('TestPlugin'), $expected);
+
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$this->assertEquals(CakePlugin::path('TestPluginTwo'), $expected);
+	}
+
+/**
+ * Tests that CakePlugin::path() throws an exception on unknown plugin
+ *
+ * @return void
+ * @expectedException MissingPluginException
+ */
+	public function testPathNotFound() {
+		CakePlugin::path('TestPlugin');
+	}
+
 /**
  * Auxiliary function to test plugin bootstrap callbacks
  *

From f6a5df913ac2d2ceeb0185fb202f161c8ea05946 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 29 Apr 2011 12:49:46 -0430
Subject: [PATCH 05/50] Moving test plugins to the new naming convention> Now
 plugin names should be camel cased

---
 lib/Cake/Core/CakePlugin.php                        |   9 ++++++++-
 lib/Cake/tests/Case/Core/CakePluginTest.php         |   4 ++--
 .../webroot/js/one/plugin_one.js                    |   0
 .../{plugin_js => PluginJs}/webroot/js/plugin_js.js |   0
 .../Console/Command/Task/empty                      |   0
 .../Console/Command/Task/other_task.php             |   0
 .../Console/Command/example.php                     |   0
 .../Console/templates/empty                         |   0
 .../Controller/Component/other_component.php        |   0
 .../Controller/Component/plugins_component.php      |   0
 .../Controller/Component/test_plugin_component.php  |   0
 .../Component/test_plugin_other_component.php       |   0
 .../Controller/test_plugin_app_controller.php       |   0
 .../Controller/test_plugin_controller.php           |   0
 .../Controller/tests_controller.php                 |   0
 .../Lib/Cache/Engine/TestPluginCacheEngine.php      |   0
 .../Lib/Custom/Package/CustomLibClass.php           |   0
 .../Lib/Log/Engine/TestPluginLog.php                |   0
 .../Lib/test_plugin_library.php                     |   0
 .../Model/Behavior/test_plugin_persister_one.php    |   0
 .../Model/Behavior/test_plugin_persister_two.php    |   0
 .../Model/Datasource/Database/DboDummy.php          |   0
 .../Model/Datasource/Database/TestDriver.php        |   0
 .../Model/Datasource/Session/TestPluginSession.php  |   0
 .../Model/Datasource/TestSource.php                 |   0
 .../Model/Datasource/test_other_source.php          |   0
 .../Model/test_plugin_app_model.php                 |   0
 .../Model/test_plugin_auth_user.php                 |   0
 .../Model/test_plugin_authors.php                   |   0
 .../Model/test_plugin_comment.php                   |   0
 .../Model/test_plugin_post.php                      |   0
 .../View/Helper/OtherHelperHelper.php               |   0
 .../View/Helper/plugged_helper.php                  |   0
 .../View/Helper/test_plugin_app.php                 |   0
 .../View/elements/plugin_element.ctp                |   0
 .../View/elements/test_plugin_element.ctp           |   0
 .../View/layouts/default.ctp                        |   0
 .../View/tests/index.ctp                            |   0
 .../View/tests/scaffold.form.ctp                    |   0
 .../config/bootstrap.php                            |   0
 .../config/custom_config.php                        |   0
 .../{test_plugin => TestPlugin}/config/load.php     |   0
 .../config/more.load.php                            |   0
 .../{test_plugin => TestPlugin}/config/routes.php   |   0
 .../config/schema/schema.php                        |   0
 .../locale/po/LC_MESSAGES/test_plugin.po            |   0
 .../locale/po/LC_MONETARY/test_plugin.po            |   0
 .../vendors/sample/sample_plugin.php                |   0
 .../{test_plugin => TestPlugin}/vendors/welcome.php |   0
 .../webroot/css/test_plugin_asset.css               |   0
 .../webroot/css/theme_one.htc                       |   0
 .../webroot/css/unknown.extension                   |   0
 .../webroot/flash/plugin_test.swf                   |   0
 .../webroot/img/cake.icon.gif                       | Bin
 .../webroot/js/test_plugin/test.js                  |   0
 .../webroot/pdfs/plugin_test.pdf                    | Bin
 .../{test_plugin => TestPlugin}/webroot/root.js     |   0
 .../Console/Command/Task/empty                      |   0
 .../Console/Command/example.php                     |   0
 .../Console/Command/welcome.php                     |   0
 .../Console/templates/empty                         |   0
 .../config/bootstrap.php                            |   0
 62 files changed, 10 insertions(+), 3 deletions(-)
 rename lib/Cake/tests/test_app/plugins/{plugin_js => PluginJs}/webroot/js/one/plugin_one.js (100%)
 rename lib/Cake/tests/test_app/plugins/{plugin_js => PluginJs}/webroot/js/plugin_js.js (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Console/Command/Task/empty (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Console/Command/Task/other_task.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Console/Command/example.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Console/templates/empty (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/Component/other_component.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/Component/plugins_component.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/Component/test_plugin_component.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/Component/test_plugin_other_component.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/test_plugin_app_controller.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/test_plugin_controller.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Controller/tests_controller.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Lib/Cache/Engine/TestPluginCacheEngine.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Lib/Custom/Package/CustomLibClass.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Lib/Log/Engine/TestPluginLog.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Lib/test_plugin_library.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Behavior/test_plugin_persister_one.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Behavior/test_plugin_persister_two.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Datasource/Database/DboDummy.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Datasource/Database/TestDriver.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Datasource/Session/TestPluginSession.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Datasource/TestSource.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/Datasource/test_other_source.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/test_plugin_app_model.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/test_plugin_auth_user.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/test_plugin_authors.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/test_plugin_comment.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/test_plugin_post.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/Helper/OtherHelperHelper.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/Helper/plugged_helper.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/Helper/test_plugin_app.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/elements/plugin_element.ctp (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/elements/test_plugin_element.ctp (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/layouts/default.ctp (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/tests/index.ctp (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/View/tests/scaffold.form.ctp (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/bootstrap.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/custom_config.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/load.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/more.load.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/routes.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/config/schema/schema.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/locale/po/LC_MESSAGES/test_plugin.po (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/locale/po/LC_MONETARY/test_plugin.po (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/vendors/sample/sample_plugin.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/vendors/welcome.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/css/test_plugin_asset.css (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/css/theme_one.htc (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/css/unknown.extension (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/flash/plugin_test.swf (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/img/cake.icon.gif (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/js/test_plugin/test.js (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/pdfs/plugin_test.pdf (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/webroot/root.js (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin_two => TestPluginTwo}/Console/Command/Task/empty (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin_two => TestPluginTwo}/Console/Command/example.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin_two => TestPluginTwo}/Console/Command/welcome.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin_two => TestPluginTwo}/Console/templates/empty (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin_two => TestPluginTwo}/config/bootstrap.php (100%)

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 4e2c5ab81..22d8161a0 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -50,11 +50,18 @@ class CakePlugin {
 			return;
 		}
 		$config += array('bootstrap' => false, 'routes' => false);
-		$underscored = Inflector::underscore($plugin);
 		if (empty($config['path'])) {
 			foreach (App::path('plugins') as $path) {
+				if (is_dir($path . $plugin)) {
+					self::$_plugins[$plugin] = $config + array('path' => $path . $plugin . DS);
+					break;
+				}
+
+				//Backwards compatibility to make easier to migrate to 2.0
+				$underscored = Inflector::underscore($plugin);
 				if (is_dir($path . $underscored)) {
 					self::$_plugins[$plugin] = $config + array('path' => $path . $underscored . DS);
+					break;
 				}
 			}
 		} else {
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index 753ac481e..779e006a7 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -181,10 +181,10 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testPath() {
 		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
 		$this->assertEquals(CakePlugin::path('TestPlugin'), $expected);
 
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
 		$this->assertEquals(CakePlugin::path('TestPluginTwo'), $expected);
 	}
 
diff --git a/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
rename to lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
diff --git a/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
rename to lib/Cake/tests/test_app/plugins/PluginJs/webroot/js/plugin_js.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/test_plugin_post.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php b/lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp b/lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp
rename to lib/Cake/tests/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/bootstrap.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/bootstrap.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/custom_config.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/custom_config.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/load.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/load.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/load.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/more.load.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/more.load.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/routes.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/routes.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/config/schema/schema.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po b/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
rename to lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po b/lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
rename to lib/Cake/tests/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/vendors/welcome.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/css/unknown.extension
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/webroot/root.js b/lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/webroot/root.js
rename to lib/Cake/tests/test_app/plugins/TestPlugin/webroot/root.js
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/config/bootstrap.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/config/bootstrap.php

From 27a134de4f98dbc9c18bd6647da17b2b2424752c Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 6 May 2011 00:53:30 -0430
Subject: [PATCH 06/50] Implementing CakePlugin::loadAll()

---
 lib/Cake/Core/CakePlugin.php                | 25 +++++++++++++
 lib/Cake/tests/Case/Core/CakePluginTest.php | 41 +++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 22d8161a0..9812959d7 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -79,6 +79,31 @@ class CakePlugin {
 		}
 	}
 
+/**
+ * Will load all the plugins located in the configured plugins folders
+ * If passed an options array, it will be used as a common default for all plugins to be loaded
+ * It is possible to set specific defaults for each plugins in the options array. Examples:
+ *
+ * {{{
+ * 	CakePlugin::loadAll(array(
+ *		array('bootstrap' => true),
+ * 		'DebugKit' => array('routes' => true),
+ * 	))
+ * }}}
+ *
+ * The above example will load the bootstrap file for all plugins, but for DebugKit it will only load the routes file
+ * and will not look for any bootstrap script.
+ *
+ * @param array $options 
+ * @return void
+ */
+	public function loadAll($options = array()) {
+		$plugins = App::objects('plugins');
+		foreach ($plugins as $p) {
+			$opts = isset($options[$p]) ? $options[$p] : $options;
+			self::load($p, $opts);
+		}
+	}
 
 /**
  * Returns the filesystem path for a plugin
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index 779e006a7..c8faa272b 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -198,6 +198,47 @@ class CakePluginTest extends CakeTestCase {
 		CakePlugin::path('TestPlugin');
 	}
 
+/**
+ * Tests that CakePlugin::loadAll() will load all plgins in the configured folder
+ *
+ * @return void
+ */
+	public function testLoadAll() {
+		CakePlugin::loadAll();
+		$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+	}
+
+/**
+ * Tests that CakePlugin::loadAll() will load all plgins in the configured folder with bootstrap loading
+ *
+ * @return void
+ */
+	public function testLoadAllWithDefaults() {
+		CakePlugin::loadAll(array('bootstrap' => true));
+		$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded js plugin bootstrap', Configure::read('CakePluginTest.js_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin two bootstrap', Configure::read('CakePluginTest.test_plugin_two.bootstrap'));
+	}
+
+/**
+ * Tests that CakePlugin::loadAll() will load all plgins in the configured folder wit defaults
+ * and overrides for a plugin
+ *
+ * @return void
+ */
+	public function testLoadAllWithDefaultsAndOverride() {
+		CakePlugin::loadAll(array('bootstrap' => true, 'TestPlugin' => array('routes' => true)));
+		$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertEquals('loaded js plugin bootstrap', Configure::read('CakePluginTest.js_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin routes', Configure::read('CakePluginTest.test_plugin.routes'));
+		$this->assertEquals(null, Configure::read('CakePluginTest.test_plugin.bootstrap'));
+		$this->assertEquals('loaded plugin two bootstrap', Configure::read('CakePluginTest.test_plugin_two.bootstrap'));
+	}
+
 /**
  * Auxiliary function to test plugin bootstrap callbacks
  *

From f18b9aae7b736462de6ef4f6cffa8c98d496a7d8 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 6 May 2011 01:05:33 -0430
Subject: [PATCH 07/50] Unloading all plugins with App::build() and $reset
 parameter is true

---
 lib/Cake/Core/App.php                       |  3 ++
 lib/Cake/tests/Case/Core/CakePluginTest.php |  1 -
 lib/Cake/tests/Case/View/ViewTest.php       | 35 +++++++++++----------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index e5c33a8e0..70b0715b4 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -226,6 +226,8 @@ class App {
  *
  * `App::build(array('View/Helper' => array('/path/to/models/', '/another/path/))); will setup multiple search paths for helpers`
  *
+ * If reset is set to true, all loaded plugins will be forgotten and they will be needed to be loaded again.
+ *
  * @param array $paths associative array with package names as keys and a list of directories for new search paths
  * @param boolean $reset true will set paths, false merges paths [default] false
  * @return void
@@ -303,6 +305,7 @@ class App {
 				}
 				self::$__packages[$type] = (array)$new;
 			}
+			CakePlugin::unload();
 			return $paths;
 		}
 
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index c8faa272b..a974e9bc3 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -27,7 +27,6 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function tearDown() {
 		App::build();
-		CakePlugin::unload();
 		Configure::delete('CakePluginTest');
 	}
 
diff --git a/lib/Cake/tests/Case/View/ViewTest.php b/lib/Cake/tests/Case/View/ViewTest.php
index 07760a003..0e50b86fc 100644
--- a/lib/Cake/tests/Case/View/ViewTest.php
+++ b/lib/Cake/tests/Case/View/ViewTest.php
@@ -200,7 +200,7 @@ class ViewTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
-
+		CakePlugin::loadAll();
 		Configure::write('debug', 2);
 	}
 
@@ -224,18 +224,18 @@ class ViewTest extends CakeTestCase {
  * @return void
  */
 	function testPluginGetTemplate() {
-		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
 		$this->Controller->viewPath = 'tests';
 		$this->Controller->action = 'index';
 
 		$View = new TestView($this->Controller);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
+		$expected = CakePlugin::path('TestPlugin') . 'View' . DS .'tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
+		$expected = CakePlugin::path('TestPlugin') . 'View' . DS . 'layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -246,7 +246,7 @@ class ViewTest extends CakeTestCase {
  * @return void
  */
 	function testPluginPathGeneration() {
-		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
 		$this->Controller->viewPath = 'tests';
 		$this->Controller->action = 'index';
@@ -256,13 +256,13 @@ class ViewTest extends CakeTestCase {
 		$expected = array_merge(App::path('View'), App::core('View'));
 		$this->assertEqual($paths, $expected);
 
-		$paths = $View->paths('test_plugin');
-
+		$paths = $View->paths('TestPlugin');
+		$pluginPath = CakePlugin::path('TestPlugin');
 		$expected = array(
-			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'plugins' . DS . 'test_plugin' . DS,
-			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'View' . DS,
-			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
-			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'Lib' . DS . 'View' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'plugins' . DS . 'TestPlugin' . DS,
+			$pluginPath . 'View' . DS,
+			$pluginPath . 'views' . DS,
+			$pluginPath . 'Lib' . DS . 'View' . DS,
 			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS,
 			LIBS . 'View' . DS
 		);
@@ -286,11 +286,12 @@ class ViewTest extends CakeTestCase {
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
+		$pluginPath = CakePlugin::path('TestPlugin');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'TestPlugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
+		$expected = $pluginPath. 'View' . DS . 'layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -331,8 +332,8 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
-		$View->layoutPath = 'email' . DS . 'html';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$View->layoutPath = 'emails' . DS . 'html';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
 		$result = $View->getLayoutFileName();
 
 		$this->assertEqual($result, $expected);
@@ -427,10 +428,10 @@ class ViewTest extends CakeTestCase {
 		$result = $this->View->element('test_element');
 		$this->assertEqual($result, 'this is the test element');
 
-		$result = $this->View->element('plugin_element', array(), array('plugin' => 'test_plugin'));
+		$result = $this->View->element('plugin_element', array(), array('plugin' => 'TestPlugin'));
 		$this->assertEqual($result, 'this is the plugin element using params[plugin]');
 
-		$this->View->plugin = 'test_plugin';
+		$this->View->plugin = 'TestPlugin';
 		$result = $this->View->element('test_plugin_element');
 		$this->assertEqual($result, 'this is the test set using View::$plugin plugin element');
 

From 0573037f2cf3e8d94d3efd51588bca815053b1ff Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 6 May 2011 01:07:59 -0430
Subject: [PATCH 08/50] Migrating all View tests to the new plugin loader

---
 lib/Cake/Core/App.php                 | 1 -
 lib/Cake/tests/Case/View/ViewTest.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 70b0715b4..fb48d06e5 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -305,7 +305,6 @@ class App {
 				}
 				self::$__packages[$type] = (array)$new;
 			}
-			CakePlugin::unload();
 			return $paths;
 		}
 
diff --git a/lib/Cake/tests/Case/View/ViewTest.php b/lib/Cake/tests/Case/View/ViewTest.php
index 0e50b86fc..14c783d0b 100644
--- a/lib/Cake/tests/Case/View/ViewTest.php
+++ b/lib/Cake/tests/Case/View/ViewTest.php
@@ -212,6 +212,7 @@ class ViewTest extends CakeTestCase {
  */
 	function tearDown() {
 		parent::tearDown();
+		CakePlugin::unload();
 		unset($this->View);
 		unset($this->PostsController);
 		unset($this->Controller);

From a45758cc7dbff3b5eed586b9622678d34e667670 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 6 May 2011 01:23:01 -0430
Subject: [PATCH 09/50] Migrating all View package tests to use the new plugin
 loader

---
 lib/Cake/View/Helper.php                             |  2 +-
 lib/Cake/tests/Case/View/HelperCollectionTest.php    |  3 +++
 lib/Cake/tests/Case/View/HelperTest.php              |  2 ++
 lib/Cake/tests/Case/View/ThemeViewTest.php           | 12 +++++++-----
 .../layouts/plugin_default.ctp                       |  0
 .../{test_plugin => TestPlugin}/tests/index.ctp      |  0
 6 files changed, 13 insertions(+), 6 deletions(-)
 rename lib/Cake/tests/test_app/View/themed/test_theme/plugins/{test_plugin => TestPlugin}/layouts/plugin_default.ctp (100%)
 rename lib/Cake/tests/test_app/View/themed/test_theme/plugins/{test_plugin => TestPlugin}/tests/index.ctp (100%)

diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
index cba5786ad..55e45f852 100644
--- a/lib/Cake/View/Helper.php
+++ b/lib/Cake/View/Helper.php
@@ -253,7 +253,7 @@ class Helper extends Object {
 				$themePath = App::themePath($theme) . 'webroot' . DS . implode(DS, $segments);
 				return $path . '?' . @filemtime($themePath);
 			} else {
-				$plugin = $segments[0];
+				$plugin = Inflector::camelize($segments[0]);
 				unset($segments[0]);
 				$pluginPath = App::pluginPath($plugin) . 'webroot' . DS . implode(DS, $segments);
 				return $path . '?' . @filemtime($pluginPath);
diff --git a/lib/Cake/tests/Case/View/HelperCollectionTest.php b/lib/Cake/tests/Case/View/HelperCollectionTest.php
index a98fa88e2..4586bd8a0 100644
--- a/lib/Cake/tests/Case/View/HelperCollectionTest.php
+++ b/lib/Cake/tests/Case/View/HelperCollectionTest.php
@@ -44,6 +44,7 @@ class HelperCollectionTest extends CakeTestCase {
  * @return void
  */
 	function teardown() {
+		CakePlugin::unload();
 		unset($this->Helpers, $this->View);
 	}
 
@@ -82,6 +83,7 @@ class HelperCollectionTest extends CakeTestCase {
 		$this->assertInstanceOf('HtmlAliasHelper', $result);
 
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		CakePlugin::loadAll();
 		$result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper'));
 		$this->assertInstanceOf('OtherHelperHelper', $result);
 		$this->assertInstanceOf('OtherHelperHelper', $this->Helpers->SomeOther);
@@ -123,6 +125,7 @@ class HelperCollectionTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
+		CakePlugin::loadAll();
 		$result = $this->Helpers->load('TestPlugin.OtherHelper');
 		$this->assertInstanceOf('OtherHelperHelper', $result, 'Helper class is wrong.');
 		$this->assertInstanceOf('OtherHelperHelper', $this->Helpers->OtherHelper, 'Class is wrong');
diff --git a/lib/Cake/tests/Case/View/HelperTest.php b/lib/Cake/tests/Case/View/HelperTest.php
index 641a32828..ab39f83a4 100644
--- a/lib/Cake/tests/Case/View/HelperTest.php
+++ b/lib/Cake/tests/Case/View/HelperTest.php
@@ -216,6 +216,7 @@ class HelperTest extends CakeTestCase {
  * @return void
  */
 	function tearDown() {
+		CakePlugin::unload();
 		unset($this->Helper, $this->View);
 		ClassRegistry::flush();
 	}
@@ -520,6 +521,7 @@ class HelperTest extends CakeTestCase {
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
 		));
+		CakePlugin::loadAll();
 
 		$result = $this->Helper->assetTimestamp('/test_plugin/css/test_plugin_asset.css');
 		$this->assertPattern('#/test_plugin/css/test_plugin_asset.css\?[0-9]+$#', $result, 'Missing timestamp plugin');
diff --git a/lib/Cake/tests/Case/View/ThemeViewTest.php b/lib/Cake/tests/Case/View/ThemeViewTest.php
index 455f9ae86..1c7c99a9c 100644
--- a/lib/Cake/tests/Case/View/ThemeViewTest.php
+++ b/lib/Cake/tests/Case/View/ThemeViewTest.php
@@ -120,6 +120,7 @@ class ThemeViewTest extends CakeTestCase {
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
+		CakePlugin::loadAll();
 	}
 
 /**
@@ -134,6 +135,7 @@ class ThemeViewTest extends CakeTestCase {
 		unset($this->Controller);
 		ClassRegistry::flush();
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**
@@ -143,18 +145,18 @@ class ThemeViewTest extends CakeTestCase {
  * @return void
  */
 	function testPluginThemedGetTemplate() {
-		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
 		$this->Controller->viewPath = 'tests';
 		$this->Controller->action = 'index';
 		$this->Controller->theme = 'test_theme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'tests' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'layouts' . DS .'plugin_default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'layouts' . DS .'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEqual($result, $expected);
 
@@ -195,8 +197,8 @@ class ThemeViewTest extends CakeTestCase {
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
-		$ThemeView->layoutPath = 'email' . DS . 'html';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$ThemeView->layoutPath = 'emails' . DS . 'html';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
diff --git a/lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp b/lib/Cake/tests/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/test_plugin/layouts/plugin_default.ctp
rename to lib/Cake/tests/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/test_plugin/tests/index.ctp b/lib/Cake/tests/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/test_plugin/tests/index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/plugins/TestPlugin/tests/index.ctp

From 8ccbd6faa523bc7d2678e34a653fdb9aa34387ac Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 8 May 2011 22:07:24 -0430
Subject: [PATCH 10/50] Adding missing file from last commit

---
 lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php

diff --git a/lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php b/lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php
new file mode 100644
index 000000000..d4469c900
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/PluginJs/config/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+Configure::write('CakePluginTest.js_plugin.bootstrap', 'loaded js plugin bootstrap');
\ No newline at end of file

From 2093b11296c27d8990ef1d59a8827b78840c7213 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 8 May 2011 22:15:50 -0430
Subject: [PATCH 11/50] Fixing ClassRegistry tests after plugin loader change

---
 lib/Cake/tests/Case/Utility/ClassRegistryTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Utility/ClassRegistryTest.php b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
index 7f6e4d54e..36ba686c6 100644
--- a/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
+++ b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
@@ -265,6 +265,8 @@ class ClassRegistryTest extends CakeTestCase {
 		$TestRegistryPluginModel = ClassRegistry::isKeySet('TestRegistryPluginModel');
 		$this->assertFalse($TestRegistryPluginModel);
 
+		//Faking a plugin
+		CakePlugin::load('RegistryPlugin', array('path' => '/fake/path'));
 		$TestRegistryPluginModel = ClassRegistry::init('RegistryPlugin.TestRegistryPluginModel');
 		$this->assertTrue(is_a($TestRegistryPluginModel, 'TestRegistryPluginModel'));
 

From 2fab0b0e1cc1127b7905c0091ef411c1d6652f18 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 8 May 2011 23:19:00 -0430
Subject: [PATCH 12/50] Improving CakePlugin::loaded() to accept a plugin name
 as first parameter

---
 lib/Cake/Core/CakePlugin.php                | 11 ++++++++---
 lib/Cake/tests/Case/Core/CakePluginTest.php | 12 ++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 9812959d7..3215e5781 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -163,11 +163,16 @@ class CakePlugin {
 	}
 
 /**
- * Returns a list of all loaded plugins
+ * Retruns true if the plugin $plugin is already loaded
+ * If plugin is null, it will return a list of all loaded plugins
  *
- * @return array list of plugins that have been loaded
+ * @return mixed boolean true if $plugin is already loaded.
+ * If $plugin is null, returns a list of plugins that have been loaded
  */
-	public static function loaded() {
+	public static function loaded($plugin = null) {
+		if ($plugin) {
+			return isset(self::$_plugins[$plugin]);
+		}
 		return array_keys(self::$_plugins);
 	}
 
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index a974e9bc3..26c88fb9a 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -69,8 +69,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testLoadSingleWithBootstrap() {
 		CakePlugin::load('TestPlugin', array('bootstrap' => true));
-		$expected = array('TestPlugin');
-		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertTrue(CakePlugin::loaded('TestPlugin'));
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
 	}
 
@@ -81,8 +80,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testLoadSingleWithBootstrapAndRoutes() {
 		CakePlugin::load('TestPlugin', array('bootstrap' => true, 'routes' => true));
-		$expected = array('TestPlugin');
-		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertTrue(CakePlugin::loaded('TestPlugin'));
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
 		$this->assertEquals('loaded plugin routes', Configure::read('CakePluginTest.test_plugin.routes'));
 	}
@@ -134,8 +132,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testMultipleBootstrapFiles() {
 		CakePlugin::load('TestPlugin', array('bootstrap' => array('bootstrap', 'custom_config')));
-		$expected = array('TestPlugin');
-		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertTrue(CakePlugin::loaded('TestPlugin'));
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
 	}
 
@@ -147,8 +144,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testCallbackBootstrap() {
 		CakePlugin::load('TestPlugin', array('bootstrap' => array($this, 'pluginBootstrap')));
-		$expected = array('TestPlugin');
-		$this->assertEquals($expected, CakePlugin::loaded());
+		$this->assertTrue(CakePlugin::loaded('TestPlugin'));
 		$this->assertEquals('called plugin bootstrap callback', Configure::read('CakePluginTest.test_plugin.bootstrap'));
 	}
 

From 2c3132fa855dc1b69a321902fb5d4da01abcbabf Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 8 May 2011 23:25:32 -0430
Subject: [PATCH 13/50] Fixing some TestSuite tests

---
 lib/Cake/Routing/Dispatcher.php                    | 14 ++++++++------
 lib/Cake/TestSuite/templates/menu.php              |  6 ++----
 lib/Cake/tests/Case/Core/CakePluginTest.php        |  1 +
 .../Case/TestSuite/ControllerTestCaseTest.php      |  7 +++++--
 .../Case/TestSuite/HtmlCoverageReportTest.php      |  9 +++++++--
 lib/Cake/tests/Case/Utility/ClassRegistryTest.php  |  1 +
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
index a5d0c10a5..53f24a765 100644
--- a/lib/Cake/Routing/Dispatcher.php
+++ b/lib/Cake/Routing/Dispatcher.php
@@ -313,12 +313,14 @@ class Dispatcher {
 				$assetFile = $path . $fileFragment;
 			}
 		} else {
-			$plugin = $parts[0];
-			unset($parts[0]);
-			$fileFragment = implode(DS, $parts);
-			$pluginWebroot = App::pluginPath($plugin) . 'webroot' . DS;
-			if (file_exists($pluginWebroot . $fileFragment)) {
-				$assetFile = $pluginWebroot . $fileFragment;
+			$plugin = Inflector::camelize($parts[0]);
+			if (CakePlugin::loaded($plugin)) {
+				unset($parts[0]);
+				$fileFragment = implode(DS, $parts);
+				$pluginWebroot = CakePlugin::path($plugin) . 'webroot' . DS;
+				if (file_exists($pluginWebroot . $fileFragment)) {
+					$assetFile = $pluginWebroot . $fileFragment;
+				}
 			}
 		}
 
diff --git a/lib/Cake/TestSuite/templates/menu.php b/lib/Cake/TestSuite/templates/menu.php
index bb81dc7cf..4577908f3 100644
--- a/lib/Cake/TestSuite/templates/menu.php
+++ b/lib/Cake/TestSuite/templates/menu.php
@@ -30,14 +30,12 @@ if (!empty($plugins)):
 ?>
 	<li style="padding-top: 10px">
 		<span style="font-size: 18px">Plugins</span>
-	<?php foreach($plugins as $plugin):
-			$pluginPath = Inflector::underscore($plugin);
-	?>
+	<?php foreach($plugins as $plugin): ?>
 			<ul>
 				<li style="padding-top: 10px">
 					<span  style="font-size: 18px"><?php echo $plugin;?></span>
 					<ul>
-						<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $pluginPath; ?>'>Tests</a></li>
+						<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $plugin; ?>'>Tests</a></li>
 					</ul>
 				</li>
 			</ul>
diff --git a/lib/Cake/tests/Case/Core/CakePluginTest.php b/lib/Cake/tests/Case/Core/CakePluginTest.php
index 26c88fb9a..5ef5a4602 100644
--- a/lib/Cake/tests/Case/Core/CakePluginTest.php
+++ b/lib/Cake/tests/Case/Core/CakePluginTest.php
@@ -27,6 +27,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function tearDown() {
 		App::build();
+		CakePlugin::unload();
 		Configure::delete('CakePluginTest');
 	}
 
diff --git a/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
index 1bf23d8d3..54f6893b6 100644
--- a/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
+++ b/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
@@ -127,6 +127,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS)
 		));
+		CakePlugin::loadAll();
 		$this->Case = new ControllerTestCase();
 		Router::reload();
 	}
@@ -138,6 +139,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  */
 	function tearDown() {
 		parent::tearDown();
+		CakePlugin::unload();
 		$this->Case->controller = null;
 	}
 
@@ -412,8 +414,9 @@ class ControllerTestCaseTest extends CakeTestCase {
 				'blue' => 'mana'
 			)
 		));
-		$this->assertTrue(isset($result['params']['url']['red']));
-		$this->assertTrue(isset($result['params']['url']['blue']));
+		$query = $this->Case->controller->request->query;
+		$this->assertTrue(isset($query['red']));
+		$this->assertTrue(isset($query['blue']));
 	}
 
 /**
diff --git a/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
index a8d6ae7db..9a7f61462 100644
--- a/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
+++ b/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
@@ -26,6 +26,10 @@ class HtmlCoverageReportTest extends CakeTestCase {
  * @return void
  */
 	public function setUp() {
+		App::build(array(
+			'plugins' => array(CAKE . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		CakePlugin::loadAll();
 		$reporter = new CakeBaseReporter();
 		$reporter->params = array('app' => false, 'plugin' => false, 'group' => false);
 		$coverage = array();
@@ -47,9 +51,9 @@ class HtmlCoverageReportTest extends CakeTestCase {
 		$this->assertEquals(ROOT . DS . APP_DIR . DS, $result);
 
 		$this->Coverage->appTest = false;
-		$this->Coverage->pluginTest = 'test_plugin';
+		$this->Coverage->pluginTest = 'TestPlugin';
 		$result = $this->Coverage->getPathFilter();
-		$this->assertEquals(ROOT . DS . APP_DIR . DS . 'plugins' . DS .'test_plugin' . DS, $result);
+		$this->assertEquals(CakePlugin::path('TestPlugin'), $result);
 	}
 
 /**
@@ -170,6 +174,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
  * @return void
  */
 	function tearDown() {
+		CakePlugin::unload();
 		unset($this->Coverage);
 	}
 }
\ No newline at end of file
diff --git a/lib/Cake/tests/Case/Utility/ClassRegistryTest.php b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
index 36ba686c6..374427ab6 100644
--- a/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
+++ b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
@@ -278,5 +278,6 @@ class ClassRegistryTest extends CakeTestCase {
 		$PluginUserCopy = ClassRegistry::getObject('RegistryPluginUser');
 		$this->assertTrue(is_a($PluginUserCopy, 'RegistryPluginAppModel'));
 		$this->assertSame($PluginUser, $PluginUserCopy);
+		CakePlugin::unload();
 	}
 }

From ca99b5b515a8ff6c5a0a8fa146bae31706df8b1c Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 00:01:00 -0430
Subject: [PATCH 14/50] Fixing Router and Dispatcher so they user the plugin
 loader

---
 lib/Cake/Routing/Router.php                   |  2 +-
 .../tests/Case/Routing/DispatcherTest.php     | 26 +++++++++----------
 lib/Cake/tests/Case/Routing/RouterTest.php    | 14 ++++++++--
 ...roller.php => TestPluginAppController.php} |  0
 ...ontroller.php => TestPluginController.php} |  0
 ...sts_controller.php => TestsController.php} |  0
 6 files changed, 25 insertions(+), 17 deletions(-)
 rename lib/Cake/tests/test_app/plugins/TestPlugin/Controller/{test_plugin_app_controller.php => TestPluginAppController.php} (100%)
 rename lib/Cake/tests/test_app/plugins/TestPlugin/Controller/{test_plugin_controller.php => TestPluginController.php} (100%)
 rename lib/Cake/tests/test_app/plugins/TestPlugin/Controller/{tests_controller.php => TestsController.php} (100%)

diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
index 72caf98ab..47dcd9b29 100644
--- a/lib/Cake/Routing/Router.php
+++ b/lib/Cake/Routing/Router.php
@@ -579,7 +579,7 @@ class Router {
  * @access private
  */
 	private static function __connectDefaultRoutes() {
-		if ($plugins = App::objects('plugin')) {
+		if ($plugins = CakePlugin::loaded()) {
 			App::uses('PluginShortRoute', 'Routing/Route');
 			foreach ($plugins as $key => $value) {
 				$plugins[$key] = Inflector::underscore($value);
diff --git a/lib/Cake/tests/Case/Routing/DispatcherTest.php b/lib/Cake/tests/Case/Routing/DispatcherTest.php
index 55e254409..398333036 100644
--- a/lib/Cake/tests/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/tests/Case/Routing/DispatcherTest.php
@@ -553,6 +553,7 @@ class DispatcherTest extends CakeTestCase {
 		$_FILES = $this->_files;
 		$_SERVER = $this->_server;
 		App::build();
+		CakePlugin::unload();
 		Configure::write('App', $this->_app);
 		Configure::write('Cache', $this->_cache);
 		Configure::write('debug', $this->_debug);
@@ -925,7 +926,7 @@ class DispatcherTest extends CakeTestCase {
 		$plugins[] = 'MyPlugin';
 		$plugins[] = 'ArticlesTest';
 
-		App::setObjects('plugin', $plugins);
+		CakePlugin::load('MyPlugin', array('path' => '/fake/path'));
 
 		Router::reload();
 		$Dispatcher = new TestDispatcher();
@@ -982,6 +983,7 @@ class DispatcherTest extends CakeTestCase {
 		$this->assertEqual($controller->passedArgs, $expected);
 
 		Configure::write('Routing.prefixes', array('admin'));
+		CakePLugin::load('ArticlesTest', array('path' => '/fake/path'));
 		Router::reload();
 
 		$Dispatcher = new TestDispatcher();
@@ -1002,7 +1004,7 @@ class DispatcherTest extends CakeTestCase {
 			'return' => 1
 		);
 		foreach ($expected as $key => $value) {
-			$this->assertEqual($controller->request[$key], $expected[$key], 'Value mismatch ' . $key . ' %s');
+			$this->assertEqual($controller->request[$key], $expected[$key], 'Value mismatch ' . $key);
 		}
 	}
 
@@ -1013,12 +1015,7 @@ class DispatcherTest extends CakeTestCase {
  * @return void
  */
 	public function testAutomaticPluginDispatchWithShortAccess() {
-		$_POST = array();
-		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
-		$plugins = App::objects('plugin');
-		$plugins[] = 'MyPlugin';
-
-		App::setObjects('plugin', $plugins);
+		CakePlugin::load('MyPlugin', array('path' => '/fake/path'));
 		Router::reload();
 
 		$Dispatcher = new TestDispatcher();
@@ -1047,7 +1044,7 @@ class DispatcherTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 
 		$Dispatcher = new TestDispatcher();
 		$Dispatcher->base = false;
@@ -1147,7 +1144,7 @@ class DispatcherTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 		Router::reload();
 		Router::parse('/');
 
@@ -1207,6 +1204,7 @@ class DispatcherTest extends CakeTestCase {
 			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
+		CakePlugin::loadAll();
 
 		$Dispatcher = new TestDispatcher();
 		$Dispatcher->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -1264,20 +1262,20 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/root.js');
 		$result = ob_get_clean();
-		$expected = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'root.js');
+		$expected = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'root.js');
 		$this->assertEqual($result, $expected);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/flash/plugin_test.swf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the plugin.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/pdfs/plugin_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
 		$this->assertEqual($file, $result);
 		 $this->assertEqual('this is just a test to load pdf file from the plugin.', $result);
 
@@ -1299,7 +1297,7 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/img/cake.icon.gif');
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
 		$this->assertEqual($file, $result);
 
 		ob_start();
diff --git a/lib/Cake/tests/Case/Routing/RouterTest.php b/lib/Cake/tests/Case/Routing/RouterTest.php
index 67e058080..4bc07851e 100644
--- a/lib/Cake/tests/Case/Routing/RouterTest.php
+++ b/lib/Cake/tests/Case/Routing/RouterTest.php
@@ -42,6 +42,16 @@ class RouterTest extends CakeTestCase {
 		Configure::write('Routing', array('admin' => null, 'prefixes' => array()));
 	}
 
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		CakePlugin::unload();
+	}
+
 /**
  * testFullBaseURL method
  *
@@ -1179,7 +1189,7 @@ class RouterTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 
 		Router::reload();
 		$request = new CakeRequest();
@@ -2204,7 +2214,7 @@ class RouterTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 		Router::reload();
 
 		$result = Router::url(array('plugin' => 'plugin_js', 'controller' => 'js_file', 'action' => 'index'));
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_app_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/test_plugin_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestPluginController.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestsController.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Controller/tests_controller.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Controller/TestsController.php

From c208e4ed3071d63645704555dfc7cee295eea631 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 00:28:01 -0430
Subject: [PATCH 15/50] Fixing a couple of tests in CakeRequest

---
 lib/Cake/tests/Case/Network/CakeRequestTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Network/CakeRequestTest.php b/lib/Cake/tests/Case/Network/CakeRequestTest.php
index ffb1febef..25c9c8ab2 100644
--- a/lib/Cake/tests/Case/Network/CakeRequestTest.php
+++ b/lib/Cake/tests/Case/Network/CakeRequestTest.php
@@ -1039,6 +1039,7 @@ class CakeRequestTestCase extends CakeTestCase {
 						'REQUEST_URI' => '/index.php?/posts/add',
 						'PHP_SELF' => '',
 						'URL' => '/index.php?/posts/add',
+						'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot',
 						'argv' => array('/posts/add'),
 						'argc' => 1
 					),
@@ -1317,6 +1318,7 @@ class CakeRequestTestCase extends CakeTestCase {
  * @return void
  */
 	public function testEnvironmentDetection($name, $env, $expected) {
+		$_GET = array();
 		$this->__loadEnvironment($env);
 
 		$request = new CakeRequest();

From 0ef070757532d56422ce7d81d91aac18bab71fd6 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 00:31:38 -0430
Subject: [PATCH 16/50] Correctly loading plugins for Log tests

---
 lib/Cake/tests/Case/Log/CakeLogTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Log/CakeLogTest.php b/lib/Cake/tests/Case/Log/CakeLogTest.php
index b5abcd119..94c0a6cd9 100644
--- a/lib/Cake/tests/Case/Log/CakeLogTest.php
+++ b/lib/Cake/tests/Case/Log/CakeLogTest.php
@@ -50,6 +50,7 @@ class CakeLogTest extends CakeTestCase {
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
+		CakePlugin::load('TestPlugin');
 
 		$result = CakeLog::config('libtest', array(
 			'engine' => 'TestAppLog'
@@ -64,6 +65,7 @@ class CakeLogTest extends CakeTestCase {
 		$this->assertEqual(CakeLog::configured(), array('libtest', 'plugintest'));
 
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**

From 7171887c7a010474eb8805a01f964c22ba52da08 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 00:36:52 -0430
Subject: [PATCH 17/50] Correctly loading plugins in I18n

---
 lib/Cake/I18n/I18n.php                | 8 ++++----
 lib/Cake/tests/Case/I18n/I18nTest.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/I18n/I18n.php b/lib/Cake/I18n/I18n.php
index e05e1bcdc..c0461f358 100644
--- a/lib/Cake/I18n/I18n.php
+++ b/lib/Cake/I18n/I18n.php
@@ -263,13 +263,13 @@ class I18n {
 		$core = true;
 		$merge = array();
 		$searchPaths = App::path('locales');
-		$plugins = App::objects('plugin');
+		$plugins = CakePlugin::loaded();
 
 		if (!empty($plugins)) {
 			foreach ($plugins as $plugin) {
-				$plugin = Inflector::underscore($plugin);
-				if ($plugin === $domain) {
-					$searchPaths[] = App::pluginPath($plugin) . DS . 'locale' . DS;
+				$pluginDomain = Inflector::underscore($plugin);
+				if ($pluginDomain === $domain) {
+					$searchPaths[] = CakePlugin::path($plugin) . DS . 'locale' . DS;
 					$searchPaths = array_reverse($searchPaths);
 					break;
 				}
diff --git a/lib/Cake/tests/Case/I18n/I18nTest.php b/lib/Cake/tests/Case/I18n/I18nTest.php
index 37dace724..d4b918472 100644
--- a/lib/Cake/tests/Case/I18n/I18nTest.php
+++ b/lib/Cake/tests/Case/I18n/I18nTest.php
@@ -37,7 +37,7 @@ class I18nTest extends CakeTestCase {
 			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 	}
 
 /**
@@ -49,7 +49,7 @@ class I18nTest extends CakeTestCase {
 	function tearDown() {
 		Cache::delete('object_map', '_cake_core_');
 		App::build();
-		App::objects('plugin', null, false);
+		CakePlugin::unload();
 	}
 
 

From bd1479f7320d711c2eb9a10db719a8687e247942 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 23:33:58 -0430
Subject: [PATCH 18/50] Fixing a bunch of tests in the View/Helper package

---
 lib/Cake/View/Helper.php                            | 11 ++++++-----
 lib/Cake/tests/Case/View/Helper/CacheHelperTest.php |  1 +
 lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php  |  8 ++++----
 lib/Cake/tests/Case/View/HelperTest.php             |  1 +
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
index 8f165ab0e..6fa3c37f0 100644
--- a/lib/Cake/View/Helper.php
+++ b/lib/Cake/View/Helper.php
@@ -254,9 +254,11 @@ class Helper extends Object {
 				return $path . '?' . @filemtime($themePath);
 			} else {
 				$plugin = Inflector::camelize($segments[0]);
-				unset($segments[0]);
-				$pluginPath = App::pluginPath($plugin) . 'webroot' . DS . implode(DS, $segments);
-				return $path . '?' . @filemtime($pluginPath);
+				if (CakePlugin::loaded($plugin)) {
+					unset($segments[0]);
+					$pluginPath = CakePlugin::path($plugin) . 'webroot' . DS . implode(DS, $segments);
+					return $path . '?' . @filemtime($pluginPath);
+				}
 			}
 		}
 		return $path;
@@ -264,7 +266,7 @@ class Helper extends Object {
 
 /**
  * Used to remove harmful tags from content.  Removes a number of well known XSS attacks
- * from content.  However, is not guaranteed to remove all possiblities.  Escaping
+ * from content.  However, is not guaranteed to remove all possibilities.  Escaping
  * content is the best way to prevent all possible attacks.
  *
  * @param mixed $output Either an array of strings to clean or a single string to clean.
@@ -287,7 +289,6 @@ class Helper extends Object {
 	}
 
 /**
-<<<<<<< HEAD:lib/Cake/View/Helper.php
  * Returns a space-delimited string with items of the $options array. If a
  * key of $options array happens to be one of:
  *
diff --git a/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php b/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
index cdecdee04..adb8fb315 100644
--- a/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
+++ b/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
@@ -76,6 +76,7 @@ class CacheHelperTest extends CakeTestCase {
  */
 	function setUp() {
 		parent::setUp();
+		$_GET = array();
 		$request = new CakeRequest();
 		$this->Controller = new CacheTestController($request);
 		$View = new View($this->Controller);
diff --git a/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
index d6f0055dd..cbb29fb8b 100644
--- a/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
+++ b/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
@@ -300,18 +300,18 @@ class HtmlHelperTest extends CakeTestCase {
 
 		Configure::write('Asset.timestamp', 'force');
 
- 		$result = $this->Html->link($this->Html->image('test.gif'), '#', array('escape' => false));
+ 		$result = $this->Html->link($this->Html->image('../favicon.ico'), '#', array('escape' => false));
  		$expected = array(
  			'a' => array('href' => '#'),
-			'img' => array('src' => 'preg:/img\/test\.gif\?\d*/', 'alt' => ''),
+			'img' => array('src' => 'preg:/img\/..\/favicon\.ico\?\d*/', 'alt' => ''),
 			'/a'
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Html->image('test.gif', array('url' => '#'));
+		$result = $this->Html->image('../favicon.ico', array('url' => '#'));
 		$expected = array(
 			'a' => array('href' => '#'),
-			'img' => array('src' => 'preg:/img\/test\.gif\?\d*/', 'alt' => ''),
+			'img' => array('src' => 'preg:/img\/..\/favicon\.ico\?\d*/', 'alt' => ''),
 			'/a'
 		);
 		$this->assertTags($result, $expected);
diff --git a/lib/Cake/tests/Case/View/HelperTest.php b/lib/Cake/tests/Case/View/HelperTest.php
index ab39f83a4..2c1f0edfd 100644
--- a/lib/Cake/tests/Case/View/HelperTest.php
+++ b/lib/Cake/tests/Case/View/HelperTest.php
@@ -801,6 +801,7 @@ class HelperTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),	
 		));
+		CakePlugin::loadAll();
 		$Helper = new TestHelper($this->View);
 		$this->assertInstanceOf('OtherHelperHelper', $Helper->OtherHelper);
 		$this->assertInstanceOf('HtmlHelper', $Helper->Html);

From ca776d92bd67eee6965cca4ab0941e14ddfa1bcf Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Mon, 9 May 2011 23:47:29 -0430
Subject: [PATCH 19/50] Making Error package tests

---
 lib/Cake/tests/Case/Error/ErrorHandlerTest.php                  | 2 ++
 .../Lib/Error/TestPluginExceptionRenderer.php                   | 0
 .../{test_plugin => TestPlugin}/Model/TestPluginPost.php        | 0
 3 files changed, 2 insertions(+)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Lib/Error/TestPluginExceptionRenderer.php (100%)
 rename lib/Cake/tests/test_app/plugins/{test_plugin => TestPlugin}/Model/TestPluginPost.php (100%)

diff --git a/lib/Cake/tests/Case/Error/ErrorHandlerTest.php b/lib/Cake/tests/Case/Error/ErrorHandlerTest.php
index 9b119bdfe..89077ab8d 100644
--- a/lib/Cake/tests/Case/Error/ErrorHandlerTest.php
+++ b/lib/Cake/tests/Case/Error/ErrorHandlerTest.php
@@ -233,12 +233,14 @@ class ErrorHandlerTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			)
 		), true);
+		CakePlugin::load('TestPlugin');
 		Configure::write('Exception.renderer', 'TestPlugin.TestPluginExceptionRenderer');
 		$error = new NotFoundException('Kaboom!');
 		ob_start();
 		ErrorHandler::handleException($error);
 		$result = ob_get_clean();
 		$this->assertEquals($result, 'Rendered by test plugin');
+		CakePlugin::unload();
 	}
 
 }
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Lib/Error/TestPluginExceptionRenderer.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Model/TestPluginPost.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/Model/TestPluginPost.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Model/TestPluginPost.php

From a8122a5afe0781e2caa32505043d1b059b5e2c15 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Tue, 10 May 2011 00:10:15 -0430
Subject: [PATCH 20/50] Fixing AllDatabase tests correctly loading plugins

---
 lib/Cake/tests/Case/Model/CakeSchemaTest.php    |  3 +++
 .../tests/Case/Model/ConnectionManagerTest.php  | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/Cake/tests/Case/Model/CakeSchemaTest.php b/lib/Cake/tests/Case/Model/CakeSchemaTest.php
index f2b17f212..5f1a5ab05 100644
--- a/lib/Cake/tests/Case/Model/CakeSchemaTest.php
+++ b/lib/Cake/tests/Case/Model/CakeSchemaTest.php
@@ -528,6 +528,7 @@ class CakeSchemaTest extends CakeTestCase {
 		parent::tearDown();
 		@unlink(TMP . 'tests' . DS .'schema.php');
 		unset($this->Schema);
+		CakePlugin::unload();
 	}
 
 /**
@@ -666,6 +667,7 @@ class CakeSchemaTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 
 		$Schema = new CakeSchema();
 		$Schema->plugin = 'TestPlugin';
@@ -984,6 +986,7 @@ class CakeSchemaTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
 		$this->assertEqual($Other->name, 'TestPluginApp');
 		$this->assertEqual(array_keys($Other->tables), array('test_plugin_acos'));
diff --git a/lib/Cake/tests/Case/Model/ConnectionManagerTest.php b/lib/Cake/tests/Case/Model/ConnectionManagerTest.php
index 5b0291520..4f3e7e63c 100644
--- a/lib/Cake/tests/Case/Model/ConnectionManagerTest.php
+++ b/lib/Cake/tests/Case/Model/ConnectionManagerTest.php
@@ -25,6 +25,15 @@ App::uses('ConnectionManager', 'Model');
  */
 class ConnectionManagerTest extends CakeTestCase {
 
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		CakePlugin::unload();
+	}
 /**
  * testEnumConnectionObjects method
  *
@@ -73,7 +82,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
-
+		CakePlugin::load('TestPlugin');
 		$name = 'test_source';
 		$config = array('datasource' => 'TestPlugin.TestSource');
 		$connection = ConnectionManager::create($name, $config);
@@ -95,7 +104,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
-
+		CakePlugin::load('TestPlugin');
 		$name = 'test_plugin_source_and_driver';
 		$config = array('datasource' => 'TestPlugin.Database/TestDriver');
 
@@ -119,7 +128,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
-
+		CakePlugin::load('TestPlugin');
 		$name = 'test_local_source_and_plugin_driver';
 		$config = array('datasource' => 'TestPlugin.Database/DboDummy');
 
@@ -268,7 +277,7 @@ class ConnectionManagerTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
 			)
 		));
-
+		CakePlugin::loadAll();
 		$expected = array(
 		    'datasource' => 'Test2Source'
 		);

From 54eb934892e810959503dcb259eab6c49f009b50 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Tue, 10 May 2011 00:46:24 -0430
Subject: [PATCH 21/50] Fixing plugin related tests in Core package

---
 lib/Cake/Core/App.php                      | 14 ++++++++++---
 lib/Cake/View/View.php                     |  2 +-
 lib/Cake/tests/Case/Core/AppTest.php       | 23 ++++++++++++++++------
 lib/Cake/tests/Case/Core/ConfigureTest.php |  7 ++++---
 lib/Cake/tests/Case/Core/ObjectTest.php    | 23 +++++++++-------------
 5 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 8a6aba93e..b0104918c 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -92,7 +92,7 @@ class App {
 		'class' => array('extends' => null, 'core' => true),
 		'file' => array('extends' => null, 'core' => true),
 		'model' => array('extends' => 'AppModel', 'core' => false),
-		'behavior' => array('extends' => 'ModelBehavior', 'core' => true),
+		'behavior' => array( 'suffix' => 'Behavior', 'extends' => 'Model/ModelBehavior', 'core' => true),
 		'controller' => array('suffix' => 'Controller', 'extends' => 'AppController', 'core' => true),
 		'component' => array('suffix' => 'Component', 'extends' => null, 'core' => true),
 		'lib' => array('extends' => null, 'core' => true),
@@ -643,6 +643,9 @@ class App {
 		list($plugin, $name) = pluginSplit($name);
 		if (!empty($plugin)) {
 			$plugin = Inflector::camelize($plugin);
+			if (!CakePlugin::loaded($plugin)) {
+				return false;
+			}
 		}
 
 		if (!$specialPackage) {
@@ -679,10 +682,15 @@ class App {
 			$suffix = self::$types[$originalType]['suffix'];
 			$name .= ($suffix == $name) ? '' : $suffix;
 		}
-
 		if ($parent && isset(self::$types[$originalType]['extends'])) {
 			$extends = self::$types[$originalType]['extends'];
-			App::uses($extends, $type);
+			$extendType = $type;
+			if (strpos($extends, '/') !== false) {
+				$parts = explode('/', $extends);
+				$extends = array_pop($parts);
+				$extendType = implode('/', $parts);
+			}
+			App::uses($extends, $extendType);
 			if ($plugin && in_array($originalType, array('controller', 'model'))) {
 				App::uses($plugin . $extends, $plugin . '.' .$type);
 			}
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
index a9831356b..91dd15696 100644
--- a/lib/Cake/View/View.php
+++ b/lib/Cake/View/View.php
@@ -802,8 +802,8 @@ class View extends Object {
 		$paths = array();
 		$viewPaths = App::path('View');
 		$corePaths = array_flip(App::core('View'));
-
 		if (!empty($plugin)) {
+			$plugin = Inflector::camelize($plugin);
 			$count = count($viewPaths);
 			for ($i = 0; $i < $count; $i++) {
 				if (!isset($corePaths[$viewPaths[$i]])) {
diff --git a/lib/Cake/tests/Case/Core/AppTest.php b/lib/Cake/tests/Case/Core/AppTest.php
index 3b40453d8..4f4450b5f 100644
--- a/lib/Cake/tests/Case/Core/AppTest.php
+++ b/lib/Cake/tests/Case/Core/AppTest.php
@@ -7,6 +7,15 @@
  */
 class AppImportTest extends CakeTestCase {
 
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		CakePlugin::unload();
+	}
+
 /**
  * testBuild method
  *
@@ -311,6 +320,7 @@ class AppImportTest extends CakeTestCase {
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::loadAll();
 
 		$result = App::objects('TestPlugin.model');
 		$this->assertTrue(in_array('TestPluginPost', $result));
@@ -361,16 +371,14 @@ class AppImportTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
-		$path = App::pluginPath('test_plugin');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
-		$this->assertEqual($path, $expected);
+		CakePlugin::loadAll();
 
 		$path = App::pluginPath('TestPlugin');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
 		$this->assertEqual($path, $expected);
 
 		$path = App::pluginPath('TestPluginTwo');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
 		$this->assertEqual($path, $expected);
 		App::build();
 	}
@@ -438,7 +446,7 @@ class AppImportTest extends CakeTestCase {
 		$file = App::import('Model', array('NonExistingPlugin.NonExistingModel'), false);
 		$this->assertFalse($file);
 
-		if (!class_exists('AppController')) {
+		if (!class_exists('AppController', false)) {
 			$classes = array_flip(get_declared_classes());
 
 			$this->assertFalse(isset($classes['PagesController']));
@@ -485,6 +493,7 @@ class AppImportTest extends CakeTestCase {
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::loadAll();
 
 		$result = App::import('Controller', 'TestPlugin.Tests');
 		$this->assertTrue($result);
@@ -662,6 +671,7 @@ class AppImportTest extends CakeTestCase {
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
 		), App::RESET);
+		CakePlugin::loadAll();
 
 		ob_start();
 		$result = App::import('Vendor', 'css/TestAsset', array('ext' => 'css'));
@@ -718,6 +728,7 @@ class AppImportTest extends CakeTestCase {
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), App::RESET);
+		CakePlugin::loadAll();
 
 		$this->assertFalse(class_exists('CustomLibClass', false));
 		App::uses('CustomLibClass', 'TestPlugin.Custom/Package');
diff --git a/lib/Cake/tests/Case/Core/ConfigureTest.php b/lib/Cake/tests/Case/Core/ConfigureTest.php
index d4ed6b634..1f51633d5 100644
--- a/lib/Cake/tests/Case/Core/ConfigureTest.php
+++ b/lib/Cake/tests/Case/Core/ConfigureTest.php
@@ -243,18 +243,19 @@ class ConfigureTest extends CakeTestCase {
 	function testLoadPlugin() {
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
 		Configure::config('test', new PhpReader());
-
-		$result = Configure::load('test_plugin.load', 'test');
+		CakePlugin::load('TestPlugin');
+		$result = Configure::load('TestPlugin.load', 'test');
 		$this->assertTrue($result);
 		$expected = '/test_app/plugins/test_plugin/config/load.php';
 		$config = Configure::read('plugin_load');
 		$this->assertEqual($config, $expected);
 
-		$result = Configure::load('test_plugin.more.load', 'test');
+		$result = Configure::load('TestPlugin.more.load', 'test');
 		$this->assertTrue($result);
 		$expected = '/test_app/plugins/test_plugin/config/more.load.php';
 		$config = Configure::read('plugin_more_load');
 		$this->assertEqual($config, $expected);
+		CakePlugin::unload();
 	}
 
 /**
diff --git a/lib/Cake/tests/Case/Core/ObjectTest.php b/lib/Cake/tests/Case/Core/ObjectTest.php
index 8566057df..c21b06855 100644
--- a/lib/Cake/tests/Case/Core/ObjectTest.php
+++ b/lib/Cake/tests/Case/Core/ObjectTest.php
@@ -18,6 +18,7 @@
  */
 
 App::uses('Object', 'Core');
+App::uses('Router', 'Routing');
 App::uses('Controller', 'Controller');
 App::uses('Model', 'Model');
 
@@ -355,17 +356,9 @@ class ObjectTest extends CakeTestCase {
  * @return void
  */
 	function tearDown() {
-		unset($this->object);
-	}
-
-/**
- * endTest
- *
- * @access public
- * @return void
- */
-	function endTest() {
 		App::build();
+		CakePlugin::unload();
+		unset($this->object);
 	}
 
 /**
@@ -725,7 +718,7 @@ class ObjectTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 		Router::reload();
 		
 		$result = $this->object->requestAction('/test_plugin/tests/index', array('return'));
@@ -753,7 +746,7 @@ class ObjectTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 		
 		App::build();
-		App::objects('plugin', null, false);
+		CakePlugin::unload();
 	}
 
 /**
@@ -765,9 +758,11 @@ class ObjectTest extends CakeTestCase {
 		App::build(array(
 			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
 			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
-			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS)
+			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'. DS)
 		));
-	
+		CakePlugin::loadAll();
+
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'test_request_action')
 		);

From 35ebd29ac3a9e99565807324c374432b609a4e5f Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Tue, 10 May 2011 11:43:38 -0430
Subject: [PATCH 22/50] updating controller tests

---
 lib/Cake/tests/Case/Controller/ControllerTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Cake/tests/Case/Controller/ControllerTest.php b/lib/Cake/tests/Case/Controller/ControllerTest.php
index 9af38e2cb..160f4b87b 100644
--- a/lib/Cake/tests/Case/Controller/ControllerTest.php
+++ b/lib/Cake/tests/Case/Controller/ControllerTest.php
@@ -406,6 +406,7 @@ class ControllerTest extends CakeTestCase {
  * @return void
  */
 	function teardown() {
+		CakePlugin::unload();
 		App::build();
 	}
 
@@ -442,6 +443,7 @@ class ControllerTest extends CakeTestCase {
 			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		App::uses('TestPluginAppController', 'TestPlugin.Controller');
 		App::uses('TestPluginController', 'TestPlugin.Controller');
 
@@ -481,6 +483,7 @@ class ControllerTest extends CakeTestCase {
 		unset($Controller);
 
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		CakePlugin::load('TestPlugin');
 
 		$Controller = new Controller($request);
 		$Controller->uses = array('TestPlugin.TestPluginPost');

From 2be486844e3fb0bf6b570d2c2cd72733b0954a37 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Wed, 11 May 2011 23:48:51 -0430
Subject: [PATCH 23/50] Fixing PluginTask tests

---
 lib/Cake/Console/Command/Task/PluginTask.php       |  5 ++---
 lib/Cake/Console/Shell.php                         |  5 ++++-
 .../Case/Console/Command/Task/PluginTaskTest.php   | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index e7d754048..19a91d232 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -76,7 +76,7 @@ class PluginTask extends Shell {
 		}
 
 		if (!$this->bake($plugin)) {
-			$this->error(__d('cake_console', "An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::underscore($pluginPath)));
+			$this->error(__d('cake_console', "An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::camelize($pluginPath)));
 		}
 	}
 
@@ -88,8 +88,7 @@ class PluginTask extends Shell {
  * @return bool
  */
 	public function bake($plugin) {
-		$pluginPath = Inflector::underscore($plugin);
-
+		$pluginPath = Inflector::camelize($plugin);
 		$pathOptions = App::path('plugins');
 		if (count($pathOptions) > 1) {
 			$this->findPath($pathOptions);
diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
index 995ca3198..58af189a9 100644
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/Shell.php
@@ -756,6 +756,9 @@ class Shell extends Object {
  * @return string $path path to the correct plugin.
  */
 	function _pluginPath($pluginName) {
-		return App::pluginPath($pluginName);
+		if (CakePlugin::loaded($pluginName)) {
+			return CakePlugin::path($pluginName);
+		}
+		return current(App::path('plugins')) . $pluginName . DS;
 	}
 }
diff --git a/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
index 97452cc09..18ba45b42 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
@@ -65,7 +65,7 @@ class PluginTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue($this->_testPath));
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue('y'));
 
-		$path = $this->Task->path . 'bake_test_plugin';
+		$path = $this->Task->path . 'BakeTestPlugin';
 
 		$file = $path . DS . 'Controller' . DS  .'BakeTestPluginAppController.php';
 		$this->Task->expects($this->at(2))->method('createFile')
@@ -77,7 +77,7 @@ class PluginTaskTest extends CakeTestCase {
 
 		$this->Task->bake('BakeTestPlugin');
 
-		$path = $this->Task->path . 'bake_test_plugin';
+		$path = $this->Task->path . 'BakeTestPlugin';
 		$this->assertTrue(is_dir($path), 'No plugin dir %s');
 		
 		$directories = array(
@@ -99,7 +99,7 @@ class PluginTaskTest extends CakeTestCase {
 			$this->assertTrue(is_dir($path . DS . $dir), 'Missing directory for ' . $dir);
 		}
 
-		$Folder = new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder = new Folder($this->Task->path . 'BakeTestPlugin');
 		$Folder->delete();
 	}
 
@@ -113,7 +113,7 @@ class PluginTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue('3'));
 		$this->Task->expects($this->at(2))->method('in')->will($this->returnValue('y'));
 
-		$path = $this->Task->path . 'test_plugin';
+		$path = $this->Task->path . 'TestPlugin';
 		$file = $path . DS . 'Controller' . DS . 'TestPluginAppController.php';
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
@@ -140,12 +140,12 @@ class PluginTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(1))->method('in')
 			->will($this->returnValue('y'));
 
-		$path = $this->Task->path . 'bake_test_plugin';
+		$path = $this->Task->path . 'BakeTestPlugin';
 		$file = $path . DS . 'Controller' . DS . 'BakeTestPluginAppController.php';
 		$this->Task->expects($this->at(2))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
-		$path = $this->Task->path . 'bake_test_plugin';
+		$path = $this->Task->path . 'BakeTestPlugin';
 		$file = $path . DS . 'Model' . DS . 'BakeTestPluginAppModel.php';
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
@@ -154,7 +154,7 @@ class PluginTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 
-		$Folder = new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder = new Folder($this->Task->path . 'BakeTestPlugin');
 		$Folder->delete();
 	}
 

From 233c050cea6f404fd50d8eebd33a3faacac44b04 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Wed, 11 May 2011 23:52:09 -0430
Subject: [PATCH 24/50] Updating TestTask tests

---
 .../tests/Case/Console/Command/Task/TestTaskTest.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
index 6810f6e27..de471b01f 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
@@ -258,6 +258,7 @@ class TestTaskTest extends CakeTestCase {
 	public function tearDown() {
 		parent::tearDown();
 		unset($this->Task);
+		CakePlugin::unload();
 	}
 
 /**
@@ -525,11 +526,14 @@ class TestTaskTest extends CakeTestCase {
 	public function testBakeWithPlugin() {
 		$this->Task->plugin = 'TestTest';
 
-		$path = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS  .'FormHelperTest.php';
+		//fake plugin path
+		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS));
+		$path = APP . 'plugins' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS  .'FormHelperTest.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
 		$this->Task->bake('Helper', 'Form');
+		CakePlugin::unload();
 	}
 
 /**
@@ -542,9 +546,10 @@ class TestTaskTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array($testApp)
 		), true);
+		CakePlugin::load('TestPlugin');
 
 		$this->Task->plugin = 'TestPlugin';
-		$path = $testApp . 'test_plugin' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
+		$path = $testApp . 'TestPlugin' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
 		$this->Task->expects($this->any())
 			->method('in')
 			->will($this->onConsecutiveCalls(
@@ -591,9 +596,10 @@ class TestTaskTest extends CakeTestCase {
 		$expected = $this->Task->path . 'Case' . DS . 'Controller' . DS  . 'Component' . DS . 'AuthComponentTest.php';
 		$this->assertEqual($result, $expected);
 
+		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS ));
 		$this->Task->plugin = 'TestTest';
 		$result = $this->Task->testCaseFileName('Model', 'Post');
-		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
+		$expected = APP . 'plugins' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
 		$this->assertEqual($result, $expected);
 	}
 

From e78345035ad3ed13235b5aef5eae15c3919cf406 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Thu, 12 May 2011 00:20:29 -0430
Subject: [PATCH 25/50] Updating CommandListShell to use the new CakePLugin
 class

---
 lib/Cake/Console/Command/CommandListShell.php               | 6 +++---
 .../Console/Command/{example.php => ExampleShell.php}       | 0
 .../Console/Command/{example.php => ExampleShell.php}       | 0
 .../Console/Command/{welcome.php => WelcomeShell.php}       | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/{example.php => ExampleShell.php} (100%)
 rename lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/{example.php => ExampleShell.php} (100%)
 rename lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/{welcome.php => WelcomeShell.php} (100%)

diff --git a/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php
index 56f487299..14981f827 100644
--- a/lib/Cake/Console/Command/CommandListShell.php
+++ b/lib/Cake/Console/Command/CommandListShell.php
@@ -86,7 +86,7 @@ class CommandListShell extends Shell {
 		$appShells = App::objects('Console/Command', null, false);
 		$shellList = $this->_appendShells('app', $appShells, $shellList);
 
-		$plugins = App::objects('plugin');
+		$plugins = CakePlugin::loaded();
 		foreach ($plugins as $plugin) {
 			$pluginShells = App::objects($plugin . '.Console/Command');
 			$shellList = $this->_appendShells($plugin, $pluginShells, $shellList);
@@ -187,13 +187,13 @@ class CommandListShell extends Shell {
  * @return void
  */
 	protected function _asXml($shellList) {
-		$plugins = App::objects('plugin');
+		$plugins = CakePlugin::loaded();
 		$shells = new SimpleXmlElement('<shells></shells>');
 		foreach ($shellList as $name => $location) {
 			$source = current($location);
 			$callable = $name;
 			if (in_array($source, $plugins)) {
-				$callable = Inflector::underscore($source) . '.' . $name;
+				$callable = Inflector::camelize($source) . '.' . $name;
 			}
 			$shell = $shells->addChild('shell');
 			$shell->addAttribute('name', $name);
diff --git a/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/example.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
diff --git a/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php b/lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/welcome.php
rename to lib/Cake/tests/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php

From 685b7f8562331f1cb462f4547fc4e63485ec3b5c Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Thu, 12 May 2011 00:24:45 -0430
Subject: [PATCH 26/50] Updating CommandListShell to use CakePlugin

---
 .../tests/Case/Console/Command/CommandListShellTest.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php b/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
index 57a0cbd90..af5c92002 100644
--- a/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
+++ b/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
@@ -47,7 +47,7 @@ class CommandListTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::loadAll();
 
 		$out = new TestStringOutput();
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
@@ -67,6 +67,7 @@ class CommandListTest extends CakeTestCase {
 	function tearDown() {
 		parent::tearDown();
 		unset($this->Shell);
+		CakePlugin::unload();
 	}
 
 /**
@@ -150,8 +151,8 @@ class CommandListTest extends CakeTestCase {
 
 		$find = '<shell name="bake" call_as="bake" provider="CORE" help="bake -h"/>';
 		$this->assertContains($find, $output);
-		
-		$find = '<shell name="welcome" call_as="test_plugin_two.welcome" provider="TestPluginTwo" help="test_plugin_two.welcome -h"/>';
+
+		$find = '<shell name="welcome" call_as="TestPluginTwo.welcome" provider="TestPluginTwo" help="TestPluginTwo.welcome -h"/>';
 		$this->assertContains($find, $output);
 	}
 }

From e97b330463f459856914ee7cf3060326af55c4e4 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Thu, 12 May 2011 00:25:16 -0430
Subject: [PATCH 27/50] updating SchemaShell tests to use CakePlugin class

---
 .../tests/Case/Console/Command/SchemaShellTest.php  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php b/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
index 8eea33027..20b9c5315 100644
--- a/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
@@ -189,6 +189,7 @@ class SchemaShellTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$this->Shell->args = array('TestPlugin.schema');
 		$this->Shell->startup();
 		$this->Shell->expects($this->exactly(2))->method('_stop');
@@ -201,6 +202,7 @@ class SchemaShellTest extends CakeTestCase {
 		$this->Shell->view();
 
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**
@@ -238,6 +240,7 @@ class SchemaShellTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$this->Shell->args = array('TestPlugin.TestPluginApp');
 		$this->Shell->params = array(
 			'connection' => 'test',
@@ -256,6 +259,7 @@ class SchemaShellTest extends CakeTestCase {
 
 		$this->file->delete();
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**
@@ -334,7 +338,7 @@ class SchemaShellTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::load('TestPlugin');
 
 		$this->db->cacheSources = false;
 		$this->Shell->params = array(
@@ -355,6 +359,7 @@ class SchemaShellTest extends CakeTestCase {
 		$this->assertPattern('/var \$test_plugin_comments/', $contents);
 		$this->assertNoPattern('/var \$users/', $contents);
 		$this->assertNoPattern('/var \$articles/', $contents);
+		CakePlugin::unload();
 	}
 
 /**
@@ -447,13 +452,15 @@ class SchemaShellTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$this->Shell->params = array(
 			'plugin' => 'TestPlugin',
 			'connection' => 'test'
 		);
 		$this->Shell->startup();
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'config' . DS . 'schema';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'config' . DS . 'schema';
 		$this->assertEqual($this->Shell->Schema->path, $expected);
+		CakePlugin::unload();
 	}
 
 /**
@@ -465,6 +472,7 @@ class SchemaShellTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$this->Shell->params = array(
 			'connection' => 'test'
 		);
@@ -479,5 +487,6 @@ class SchemaShellTest extends CakeTestCase {
 
 		$schema = new TestPluginAppSchema();
 		$db->execute($db->dropSchema($schema, 'test_plugin_acos'));
+		CakePlugin::unload();
 	}
 }

From da6e0c0589ac1045a7cf842c0135058b69e8b88f Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Thu, 12 May 2011 00:28:39 -0430
Subject: [PATCH 28/50] Updating the rest of the console tests to use the
 CakePlugin class

---
 lib/Cake/TestSuite/CakeTestLoader.php                |  4 ++--
 .../Case/Console/Command/Task/ControllerTaskTest.php |  9 ++++++---
 .../Case/Console/Command/Task/FixtureTaskTest.php    |  5 ++++-
 .../Case/Console/Command/Task/ModelTaskTest.php      |  6 ++++--
 .../tests/Case/Console/Command/Task/ViewTaskTest.php |  5 ++++-
 lib/Cake/tests/Case/Console/ShellDispatcherTest.php  | 12 +++++++++++-
 lib/Cake/tests/Case/Console/TaskCollectionTest.php   |  2 ++
 7 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/Cake/TestSuite/CakeTestLoader.php b/lib/Cake/TestSuite/CakeTestLoader.php
index 9fb47278a..158a0acdd 100644
--- a/lib/Cake/TestSuite/CakeTestLoader.php
+++ b/lib/Cake/TestSuite/CakeTestLoader.php
@@ -54,8 +54,8 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 			$result = CORE_TEST_CASES;
 		} elseif (!empty($params['app'])) {
 			$result = APP_TEST_CASES;
-		} else if (!empty($params['plugin'])) {
-			$pluginPath = App::pluginPath($params['plugin']);
+		} else if (!empty($params['plugin']) && CakePlugin::loaded($params['plugin'])) {
+			$pluginPath = CakePLugin::path($params['plugin']);
 			$result = $pluginPath . 'tests' . DS . 'Case';
 		}
 		return $result;
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
index 4cfac5688..6cc6f01ff 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
@@ -300,7 +300,9 @@ class ControllerTaskTest extends CakeTestCase {
 		$components = array('Acl', 'Auth');
 		$uses = array('Comment', 'User');
 
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Controller' . DS . 'ArticlesController.php';
+		//fake plugin path
+		CakePlugin::load('ControllerTest', array('path' => APP . 'plugins' . DS . 'ControllerTest' . DS));
+		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
 
 		$this->Task->expects($this->at(1))->method('createFile')->with(
 			$path,
@@ -313,11 +315,12 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
-		$this->Task->plugin = 'controllerTest';
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Controller' . DS . 'ArticlesController.php';
+		$this->Task->plugin = 'ControllerTest';
+		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
 		$this->assertEqual($this->Task->Template->templateVars['plugin'], 'ControllerTest');
+		CakePlugin::unload();
 	}
 
 /**
diff --git a/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
index a22631d99..ee86a3adf 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
@@ -362,12 +362,15 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
 		$this->Task->plugin = 'TestFixture';
-		$filename = APP . 'plugins' . DS . 'test_fixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
+		$filename = APP . 'plugins' . DS . 'TestFixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
 
+		//fake plugin path
+		CakePlugin::load('TestFixture', array('path' => APP . 'plugins' . DS . 'TestFixture' . DS));
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/Article/'));
 
 		$result = $this->Task->generateFixtureFile('Article', array());
+		CakePlugin::unload();
 	}
 
 }
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
index 48ae20ed6..08ae01f6a 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
@@ -743,9 +743,11 @@ STRINGEND;
  * @return void
  */
 	public function testBakeWithPlugin() {
-		$this->Task->plugin = 'controllerTest';
+		$this->Task->plugin = 'ControllerTest';
 
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Model' . DS . 'BakeArticle.php';
+		//fake plugin path
+		CakePlugin::load('ControllerTest', array('path' => APP . 'plugins' . DS . 'ControllerTest' . DS));
+		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Model' . DS . 'BakeArticle.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_PCREMatch('/BakeArticle extends ControllerTestAppModel/'));
 	
diff --git a/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
index a0e92952f..c5577b19f 100644
--- a/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
@@ -395,11 +395,14 @@ class ViewTaskTest extends CakeTestCase {
 		$this->Task->plugin = 'TestTest';
 		$this->Task->name = 'View';
 
-		$path = APP . 'plugins' . DS . 'test_test' . DS . 'View' . DS . 'view_task_comments' . DS  . 'view.ctp';
+		//fake plugin path
+		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS));
+		$path = APP . 'plugins' . DS . 'TestTest' . DS . 'View' . DS . 'view_task_comments' . DS  . 'view.ctp';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
 		$this->Task->bake('view', true);
+		CakePlugin::unload();
 	}
 
 /**
diff --git a/lib/Cake/tests/Case/Console/ShellDispatcherTest.php b/lib/Cake/tests/Case/Console/ShellDispatcherTest.php
index f31af2f5b..e5bbfc78d 100644
--- a/lib/Cake/tests/Case/Console/ShellDispatcherTest.php
+++ b/lib/Cake/tests/Case/Console/ShellDispatcherTest.php
@@ -123,6 +123,16 @@ class ShellDispatcherTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
+		CakePlugin::loadAll();
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		CakePlugin::unload();
 	}
 
 /**
@@ -391,7 +401,7 @@ class ShellDispatcherTest extends CakeTestCase {
 		$this->assertInstanceOf('SampleShell', $result);
 
 		$Dispatcher = new TestShellDispatcher();
-		$result = $Dispatcher->getShell('test_plugin.example');
+		$result = $Dispatcher->getShell('TestPlugin.example');
 		$this->assertInstanceOf('ExampleShell', $result);
 	}
 
diff --git a/lib/Cake/tests/Case/Console/TaskCollectionTest.php b/lib/Cake/tests/Case/Console/TaskCollectionTest.php
index bb961736f..3f5a40511 100644
--- a/lib/Cake/tests/Case/Console/TaskCollectionTest.php
+++ b/lib/Cake/tests/Case/Console/TaskCollectionTest.php
@@ -90,11 +90,13 @@ class TaskCollectionTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
+		CakePlugin::load('TestPlugin');
 		$this->Tasks = new TaskCollection($shell, $dispatcher);
 
 		$result = $this->Tasks->load('TestPlugin.OtherTask');
 		$this->assertInstanceOf('OtherTaskTask', $result, 'Task class is wrong.');
 		$this->assertInstanceOf('OtherTaskTask', $this->Tasks->OtherTask, 'Class is wrong');
+		CakePlugin::unload();
 	}
 
 /**

From 53037d90d62e50dbacf186a3e8056fea49078c7d Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 01:28:17 -0430
Subject: [PATCH 29/50] Updating PhpReader test

---
 lib/Cake/tests/Case/Configure/PhpReaderTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Configure/PhpReaderTest.php b/lib/Cake/tests/Case/Configure/PhpReaderTest.php
index e66fed473..7fdb46a0e 100644
--- a/lib/Cake/tests/Case/Configure/PhpReaderTest.php
+++ b/lib/Cake/tests/Case/Configure/PhpReaderTest.php
@@ -85,11 +85,13 @@ class PhpReaderTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
+		CakePlugin::load('TestPlugin');
 		$reader = new PhpReader($this->path);
 		$result = $reader->read('TestPlugin.load');
 		$this->assertTrue(isset($result['plugin_load']));
 
 		$result = $reader->read('TestPlugin.load.php');
 		$this->assertTrue(isset($result['plugin_load']));
+		CakePlugin::unload();
 	}
 }

From 18b5b36b6fe4a5b3c0c4e9ce7189df9f383e9f44 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 01:33:11 -0430
Subject: [PATCH 30/50] Updating component tests

---
 .../tests/Case/Controller/Component/Auth/FormAuthenticate.php | 3 ++-
 lib/Cake/tests/Case/Controller/ComponentCollectionTest.php    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
index e11150611..9c71f494f 100644
--- a/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
@@ -157,7 +157,7 @@ class FormAuthenticateTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		), true);
-		App::objects('plugin', null, false);
+		CakePlugin::load('TestPlugin');
 
 		$PluginModel = ClassRegistry::init('TestPlugin.TestPluginAuthUser');
 		$user['id'] = 1;
@@ -182,6 +182,7 @@ class FormAuthenticateTest extends CakeTestCase {
 			'updated' => date('Y-m-d H:i:s')
 		);
 		$this->assertEquals($expected, $result);
+		CakePlugin::unload();
 	}
 
 }
\ No newline at end of file
diff --git a/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php b/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
index a6b779073..ec11e4d51 100644
--- a/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
+++ b/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
@@ -85,6 +85,7 @@ class ComponentCollectionTest extends CakeTestCase {
 		$this->assertInstanceOf('CookieAliasComponent', $result);
 
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		CakePlugin::load('TestPlugin');
 		$result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent'));
 		$this->assertInstanceOf('OtherComponentComponent', $result);
 		$this->assertInstanceOf('OtherComponentComponent', $this->Components->SomeOther);
@@ -92,6 +93,7 @@ class ComponentCollectionTest extends CakeTestCase {
 		$result = $this->Components->attached();
 		$this->assertEquals(array('Cookie', 'SomeOther'), $result, 'attached() results are wrong.');
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**
@@ -125,10 +127,12 @@ class ComponentCollectionTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
+		CakePlugin::load('TestPlugin');
 		$result = $this->Components->load('TestPlugin.OtherComponent');
 		$this->assertInstanceOf('OtherComponentComponent', $result, 'Component class is wrong.');
 		$this->assertInstanceOf('OtherComponentComponent', $this->Components->OtherComponent, 'Class is wrong');
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**

From 35dc82571a3b0ce2f71ed1769251912f61fb44ad Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 01:34:59 -0430
Subject: [PATCH 31/50] Updating Cache tests

---
 lib/Cake/tests/Case/Cache/CacheTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Cache/CacheTest.php b/lib/Cake/tests/Case/Cache/CacheTest.php
index 147f519b2..c30e9e644 100644
--- a/lib/Cake/tests/Case/Cache/CacheTest.php
+++ b/lib/Cake/tests/Case/Cache/CacheTest.php
@@ -92,6 +92,7 @@ class CacheTest extends CakeTestCase {
 			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
+		CakePlugin::load('TestPlugin');
 
 		$settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_');
 		$result = Cache::config('libEngine', $settings);
@@ -105,6 +106,7 @@ class CacheTest extends CakeTestCase {
 		Cache::drop('pluginLibEngine');
 
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**

From 5f45dd20d22b325cf12df1a277ed4e3d52f462e1 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 01:43:35 -0430
Subject: [PATCH 32/50] Updating behaviors tests

---
 lib/Cake/tests/Case/Model/BehaviorCollectionTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php b/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
index 907b127c5..749b027f3 100644
--- a/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
+++ b/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
@@ -454,12 +454,14 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working');
 
 		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		CakePlugin::load('TestPlugin');
 		$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
 		$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);
 
 		$result = $Apple->Behaviors->attached();
 		$this->assertEquals(array('Test', 'SomeOther'), $result, 'attached() results are wrong.');
 		App::build();
+		CakePlugin::unload();
 	}
 
 /**

From 900dfef2f7d8328ed04f93af507f33e53ccc436a Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 01:53:49 -0430
Subject: [PATCH 33/50] Starting unification of casing in remaining folders

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

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 158a0acdd..e02eaf564 100644
--- a/lib/Cake/TestSuite/CakeTestLoader.php
+++ b/lib/Cake/TestSuite/CakeTestLoader.php
@@ -56,7 +56,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
 			$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 2fef24987..0949468b1 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 6d4acee64..2c296fb6d 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -131,7 +131,7 @@ if (!defined('CONFIGS')) {
  * Path to the tests directory.
  */
 if (!defined('TESTS')) {
-	define('TESTS', APP.'tests'.DS);
+	define('TESTS', APP.'Test'.DS);
 }
 
 /**

From ded3cb48264618fdc5e0d5b3884907ede44d3687 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 02:31:33 -0430
Subject: [PATCH 34/50] Renaming more folders

---
 app/View/{emails => Emails}/html/empty              |   0
 app/View/{emails => Emails}/text/empty              |   0
 app/View/{errors => Errors}/empty                   |   0
 app/View/{scaffolds => Scaffolds}/empty             |   0
 .../templates/skel/{config => Config}/acl.ini.php   |   0
 .../templates/skel/{config => Config}/bootstrap.php |   0
 .../templates/skel/{config => Config}/core.php      |   0
 .../skel/{config => Config}/database.php.default    |   0
 .../skel/{config => Config}/email.php.default       |   0
 .../templates/skel/{config => Config}/routes.php    |   0
 .../skel/{config => Config}/schema/db_acl.php       |   0
 .../skel/{config => Config}/schema/db_acl.sql       |   0
 .../skel/{config => Config}/schema/i18n.php         |   0
 .../skel/{config => Config}/schema/i18n.sql         |   0
 .../skel/{config => Config}/schema/sessions.php     |   0
 .../skel/{config => Config}/schema/sessions.sql     |   0
 .../{View/errors => Locale/eng/LC_MESSAGES}/empty   |   0
 .../templates/skel/{View/pages => Plugin}/empty     |   0
 .../Case/Controller/Component}/empty                |   0
 .../eng/LC_MESSAGES => Test/Case/Controller}/empty  |   0
 .../{plugins => Test/Case/Model/Behavior}/empty     |   0
 .../Controller/Component => Test/Case/Model}/empty  |   0
 .../Case/Controller => Test/Case/View/Helper}/empty |   0
 .../Case/Model/Behavior => Test/Fixture}/empty      |   0
 .../skel/{tests/Case/Model => Vendor}/empty         |   0
 .../skel/View/{emails => Emails}/html/default.ctp   |   0
 .../skel/View/{emails => Emails}/text/default.ctp   |   0
 .../{tests/Case/View/Helper => View/Errors}/empty   |   0
 .../skel/{tests/Fixture => View/Pages}/empty        |   0
 .../skel/{vendors => View/Scaffolds}/empty          |   0
 lib/Cake/Core/App.php                               |   7 ++++---
 .../Test/test_app/{config => Config}/acl.ini.php    |   0
 lib/Cake/Test/test_app/{config => Config}/empty.php |   0
 .../{config => Config}/htmlhelper_minimized.ini     |   0
 .../test_app/{config => Config}/htmlhelper_tags.php |   0
 .../Test/test_app/{config => Config}/nested.ini     |   0
 .../Test/test_app/{config => Config}/no_section.ini |   0
 .../Test/test_app/{config => Config}/routes.php     |   0
 .../Test/test_app/{config => Config}/var_test.php   |   0
 .../Test/test_app/{config => Config}/var_test2.php  |   0
 .../cache_test_po/LC_MESSAGES/default.po            |   0
 .../cache_test_po/LC_MESSAGES/dom1.po               |   0
 .../cache_test_po/LC_MESSAGES/dom2.po               |   0
 .../Test/test_app/{locale => Locale}/ja_jp/LC_TIME  |   0
 .../{locale => Locale}/po/LC_MESSAGES/default.po    |   0
 .../{locale => Locale}/po/LC_MONETARY/default.po    |   0
 .../Test/test_app/{locale => Locale}/po/LC_TIME     |   0
 .../rule_0_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_0_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_0_po/LC_MESSAGES/core.po                   |   0
 .../rule_0_po/LC_MESSAGES/default.po                |   0
 .../rule_10_mo/LC_MESSAGES/core.mo                  | Bin
 .../rule_10_mo/LC_MESSAGES/default.mo               | Bin
 .../rule_10_po/LC_MESSAGES/core.po                  |   0
 .../rule_10_po/LC_MESSAGES/default.po               |   0
 .../rule_11_mo/LC_MESSAGES/core.mo                  | Bin
 .../rule_11_mo/LC_MESSAGES/default.mo               | Bin
 .../rule_11_po/LC_MESSAGES/core.po                  |   0
 .../rule_11_po/LC_MESSAGES/default.po               |   0
 .../rule_12_mo/LC_MESSAGES/core.mo                  | Bin
 .../rule_12_mo/LC_MESSAGES/default.mo               | Bin
 .../rule_12_po/LC_MESSAGES/core.po                  |   0
 .../rule_12_po/LC_MESSAGES/default.po               |   0
 .../rule_13_mo/LC_MESSAGES/core.mo                  | Bin
 .../rule_13_mo/LC_MESSAGES/default.mo               | Bin
 .../rule_13_po/LC_MESSAGES/core.po                  |   0
 .../rule_13_po/LC_MESSAGES/default.po               |   0
 .../rule_14_mo/LC_MESSAGES/core.mo                  | Bin
 .../rule_14_mo/LC_MESSAGES/default.mo               | Bin
 .../rule_14_po/LC_MESSAGES/core.po                  |   0
 .../rule_14_po/LC_MESSAGES/default.po               |   0
 .../rule_1_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_1_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_1_po/LC_MESSAGES/core.po                   |   0
 .../rule_1_po/LC_MESSAGES/default.po                |   0
 .../rule_2_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_2_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_2_po/LC_MESSAGES/core.po                   |   0
 .../rule_2_po/LC_MESSAGES/default.po                |   0
 .../rule_3_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_3_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_3_po/LC_MESSAGES/core.po                   |   0
 .../rule_3_po/LC_MESSAGES/default.po                |   0
 .../rule_4_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_4_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_4_po/LC_MESSAGES/core.po                   |   0
 .../rule_4_po/LC_MESSAGES/default.po                |   0
 .../rule_5_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_5_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_5_po/LC_MESSAGES/core.po                   |   0
 .../rule_5_po/LC_MESSAGES/default.po                |   0
 .../rule_6_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_6_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_6_po/LC_MESSAGES/core.po                   |   0
 .../rule_6_po/LC_MESSAGES/default.po                |   0
 .../rule_7_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_7_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_7_po/LC_MESSAGES/core.po                   |   0
 .../rule_7_po/LC_MESSAGES/default.po                |   0
 .../rule_8_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_8_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_8_po/LC_MESSAGES/core.po                   |   0
 .../rule_8_po/LC_MESSAGES/default.po                |   0
 .../rule_9_mo/LC_MESSAGES/core.mo                   | Bin
 .../rule_9_mo/LC_MESSAGES/default.mo                | Bin
 .../rule_9_po/LC_MESSAGES/core.po                   |   0
 .../rule_9_po/LC_MESSAGES/default.po                |   0
 .../test_app/{locale => Locale}/time_test/LC_TIME   |   0
 .../config => Plugin/PluginJs/Config}/bootstrap.php |   0
 .../PluginJs/webroot/js/one/plugin_one.js           |   0
 .../PluginJs/webroot/js/plugin_js.js                |   0
 .../TestPlugin/Config/Schema}/schema.php            |   0
 .../TestPlugin/Config}/bootstrap.php                |   0
 .../TestPlugin/Config}/custom_config.php            |   0
 .../config => Plugin/TestPlugin/Config}/load.php    |   0
 .../TestPlugin/Config}/more.load.php                |   0
 .../config => Plugin/TestPlugin/Config}/routes.php  |   0
 .../TestPlugin/Console/Command/ExampleShell.php     |   0
 .../TestPlugin/Console/Command/Task}/empty          |   0
 .../TestPlugin/Console/Command/Task/other_task.php  |   0
 .../TestPlugin/Console/templates}/empty             |   0
 .../Controller/Component/other_component.php        |   0
 .../Controller/Component/plugins_component.php      |   0
 .../Controller/Component/test_plugin_component.php  |   0
 .../Component/test_plugin_other_component.php       |   0
 .../Controller/TestPluginAppController.php          |   0
 .../TestPlugin/Controller/TestPluginController.php  |   0
 .../TestPlugin/Controller/TestsController.php       |   0
 .../Lib/Cache/Engine/TestPluginCacheEngine.php      |   0
 .../Lib/Custom/Package/CustomLibClass.php           |   0
 .../Lib/Error/TestPluginExceptionRenderer.php       |   0
 .../TestPlugin/Lib/Log/Engine/TestPluginLog.php     |   0
 .../TestPlugin/Lib/test_plugin_library.php          |   0
 .../Locale}/po/LC_MESSAGES/test_plugin.po           |   0
 .../Locale}/po/LC_MONETARY/test_plugin.po           |   0
 .../Model/Behavior/test_plugin_persister_one.php    |   0
 .../Model/Behavior/test_plugin_persister_two.php    |   0
 .../Model/Datasource/Database/DboDummy.php          |   0
 .../Model/Datasource/Database/TestDriver.php        |   0
 .../Model/Datasource/Session/TestPluginSession.php  |   0
 .../TestPlugin/Model/Datasource/TestSource.php      |   0
 .../Model/Datasource/test_other_source.php          |   0
 .../TestPlugin/Model/TestPluginPost.php             |   0
 .../TestPlugin/Model/test_plugin_app_model.php      |   0
 .../TestPlugin/Model/test_plugin_auth_user.php      |   0
 .../TestPlugin/Model/test_plugin_authors.php        |   0
 .../TestPlugin/Model/test_plugin_comment.php        |   0
 .../TestPlugin/Vendor}/sample/sample_plugin.php     |   0
 .../TestPlugin/Vendor}/welcome.php                  |   0
 .../TestPlugin/View/Helper/OtherHelperHelper.php    |   0
 .../TestPlugin/View/Helper/plugged_helper.php       |   0
 .../TestPlugin/View/Helper/test_plugin_app.php      |   0
 .../TestPlugin/View/Tests}/index.ctp                |   0
 .../TestPlugin/View/Tests}/scaffold.form.ctp        |   0
 .../TestPlugin/View/elements/plugin_element.ctp     |   0
 .../View/elements/test_plugin_element.ctp           |   0
 .../TestPlugin/View/layouts/default.ctp             |   0
 .../TestPlugin/webroot/css/test_plugin_asset.css    |   0
 .../TestPlugin/webroot/css/theme_one.htc            |   0
 .../TestPlugin/webroot/css/unknown.extension        |   0
 .../TestPlugin/webroot/flash/plugin_test.swf        |   0
 .../TestPlugin/webroot/img/cake.icon.gif            | Bin
 .../TestPlugin/webroot/js/test_plugin/test.js       |   0
 .../TestPlugin/webroot/pdfs/plugin_test.pdf         | Bin
 .../{plugins => Plugin}/TestPlugin/webroot/root.js  |   0
 .../TestPluginTwo/Config}/bootstrap.php             |   0
 .../TestPluginTwo/Console/Command/ExampleShell.php  |   0
 .../TestPluginTwo/Console/Command/Task}/empty       |   0
 .../TestPluginTwo/Console/Command/WelcomeShell.php  |   0
 .../TestPluginTwo/Console/templates}/empty          |   0
 .../test_app/{vendors => Vendor}/Test/MyTest.php    |   0
 .../test_app/{vendors => Vendor}/Test/hello.php     |   0
 .../webroot => Vendor}/css/test_asset.css           |   0
 .../test_theme/webroot => Vendor}/img/test.jpg      | Bin
 .../sample/configure_test_vendor_sample.php         |   0
 .../{vendors => Vendor}/somename/some.name.php      |   0
 .../Test/test_app/{vendors => Vendor}/welcome.php   |   0
 .../View/{emails => Emails}/html/custom.ctp         |   0
 .../View/{emails => Emails}/html/default.ctp        |   0
 .../View/{emails => Emails}/html/nested_element.ctp |   0
 .../View/{emails => Emails}/text/custom.ctp         |   0
 .../View/{emails => Emails}/text/default.ctp        |   0
 .../test_app/View/{emails => Emails}/text/wide.ctp  |   0
 .../Console/templates => View/Errors}/empty         |   0
 .../Console/Command/Task => View/Pages}/empty       |   0
 .../Test/test_app/View/{pages => Pages}/extract.ctp |   0
 .../Test/test_app/View/{pages => Pages}/home.ctp    |   0
 .../Test/test_app/View/{posts => Posts}/alt_ext.alt |   0
 .../View/{posts => Posts}/cache_empty_sections.ctp  |   0
 .../test_app/View/{posts => Posts}/cache_form.ctp   |   0
 .../View/{posts => Posts}/helper_overwrite.ctp      |   0
 .../Test/test_app/View/{posts => Posts}/index.ctp   |   0
 .../View/{posts => Posts}/multiple_nocache.ctp      |   0
 .../{posts => Posts}/nocache_multiple_element.ctp   |   0
 .../View/{posts => Posts}/scaffold.form.ctp         |   0
 .../View/{posts => Posts}/sequencial_nocache.ctp    |   0
 .../View/{posts => Posts}/test_nocache_tags.ctp     |   0
 .../Console/templates => View/Scaffolds}/empty      |   0
 .../View/{tests_apps => TestsApps}/index.ctp        |   0
 .../View/{tests_apps => TestsApps}/json/index.ctp   |   0
 .../posts => Themed/test_theme/Posts}/index.ctp     |   0
 .../test_theme/Posts}/scaffold.index.ctp            |   0
 .../test_theme/elements/test_element.ctp            |   0
 .../test_theme/layouts/default.ctp                  |   0
 .../plugins/TestPlugin/layouts/plugin_default.ctp   |   0
 .../test_theme/plugins/TestPlugin/tests/index.ctp   |   0
 .../Themed/test_theme/webroot}/css/test_asset.css   |   0
 .../test_theme/webroot/css/theme_webroot.css        |   0
 .../test_theme/webroot/flash/theme_test.swf         |   0
 .../test_theme/webroot/img/cake.power.gif           | Bin
 .../Themed/test_theme/webroot}/img/test.jpg         | Bin
 .../test_theme/webroot/js/one/theme_one.js          |   0
 .../test_theme/webroot/js/theme.js                  |   0
 .../test_theme/webroot/pdfs/theme_test.pdf          | Bin
 lib/Cake/View/{emails => Emails}/html/default.ctp   |   0
 lib/Cake/View/{emails => Emails}/text/default.ctp   |   0
 lib/Cake/View/{errors => Errors}/error400.ctp       |   0
 lib/Cake/View/{errors => Errors}/error500.ctp       |   0
 lib/Cake/View/{errors => Errors}/missing_action.ctp |   0
 .../{errors => Errors}/missing_behavior_class.ctp   |   0
 .../{errors => Errors}/missing_behavior_file.ctp    |   0
 .../{errors => Errors}/missing_component_class.ctp  |   0
 .../{errors => Errors}/missing_component_file.ctp   |   0
 .../View/{errors => Errors}/missing_connection.ctp  |   0
 .../View/{errors => Errors}/missing_controller.ctp  |   0
 .../View/{errors => Errors}/missing_database.ctp    |   0
 .../missing_datasource_config.ctp                   |   0
 .../{errors => Errors}/missing_datasource_file.ctp  |   0
 .../{errors => Errors}/missing_helper_class.ctp     |   0
 .../View/{errors => Errors}/missing_helper_file.ctp |   0
 lib/Cake/View/{errors => Errors}/missing_layout.ctp |   0
 lib/Cake/View/{errors => Errors}/missing_table.ctp  |   0
 lib/Cake/View/{errors => Errors}/missing_view.ctp   |   0
 lib/Cake/View/{errors => Errors}/private_action.ctp |   0
 lib/Cake/View/{errors => Errors}/scaffold_error.ctp |   0
 lib/Cake/View/{pages => Pages}/home.ctp             |   0
 lib/Cake/View/{scaffolds => Scaffolds}/form.ctp     |   0
 lib/Cake/View/{scaffolds => Scaffolds}/index.ctp    |   0
 lib/Cake/View/{scaffolds => Scaffolds}/view.ctp     |   0
 239 files changed, 4 insertions(+), 3 deletions(-)
 rename app/View/{emails => Emails}/html/empty (100%)
 rename app/View/{emails => Emails}/text/empty (100%)
 rename app/View/{errors => Errors}/empty (100%)
 rename app/View/{scaffolds => Scaffolds}/empty (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/acl.ini.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/bootstrap.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/core.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/database.php.default (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/email.php.default (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/routes.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/db_acl.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/db_acl.sql (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/i18n.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/i18n.sql (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/sessions.php (100%)
 rename lib/Cake/Console/templates/skel/{config => Config}/schema/sessions.sql (100%)
 rename lib/Cake/Console/templates/skel/{View/errors => Locale/eng/LC_MESSAGES}/empty (100%)
 rename lib/Cake/Console/templates/skel/{View/pages => Plugin}/empty (100%)
 rename lib/Cake/Console/templates/skel/{View/scaffolds => Test/Case/Controller/Component}/empty (100%)
 rename lib/Cake/Console/templates/skel/{locale/eng/LC_MESSAGES => Test/Case/Controller}/empty (100%)
 rename lib/Cake/Console/templates/skel/{plugins => Test/Case/Model/Behavior}/empty (100%)
 rename lib/Cake/Console/templates/skel/{tests/Case/Controller/Component => Test/Case/Model}/empty (100%)
 rename lib/Cake/Console/templates/skel/{tests/Case/Controller => Test/Case/View/Helper}/empty (100%)
 rename lib/Cake/Console/templates/skel/{tests/Case/Model/Behavior => Test/Fixture}/empty (100%)
 rename lib/Cake/Console/templates/skel/{tests/Case/Model => Vendor}/empty (100%)
 rename lib/Cake/Console/templates/skel/View/{emails => Emails}/html/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{emails => Emails}/text/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/{tests/Case/View/Helper => View/Errors}/empty (100%)
 rename lib/Cake/Console/templates/skel/{tests/Fixture => View/Pages}/empty (100%)
 rename lib/Cake/Console/templates/skel/{vendors => View/Scaffolds}/empty (100%)
 rename lib/Cake/Test/test_app/{config => Config}/acl.ini.php (100%)
 rename lib/Cake/Test/test_app/{config => Config}/empty.php (100%)
 rename lib/Cake/Test/test_app/{config => Config}/htmlhelper_minimized.ini (100%)
 rename lib/Cake/Test/test_app/{config => Config}/htmlhelper_tags.php (100%)
 rename lib/Cake/Test/test_app/{config => Config}/nested.ini (100%)
 rename lib/Cake/Test/test_app/{config => Config}/no_section.ini (100%)
 rename lib/Cake/Test/test_app/{config => Config}/routes.php (100%)
 rename lib/Cake/Test/test_app/{config => Config}/var_test.php (100%)
 rename lib/Cake/Test/test_app/{config => Config}/var_test2.php (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/cache_test_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/cache_test_po/LC_MESSAGES/dom1.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/cache_test_po/LC_MESSAGES/dom2.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/ja_jp/LC_TIME (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/po/LC_MONETARY/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/po/LC_TIME (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_0_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_0_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_0_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_0_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_10_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_10_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_10_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_10_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_11_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_11_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_11_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_11_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_12_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_12_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_12_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_12_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_13_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_13_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_13_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_13_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_14_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_14_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_14_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_14_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_1_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_1_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_1_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_1_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_2_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_2_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_2_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_2_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_3_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_3_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_3_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_3_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_4_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_4_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_4_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_4_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_5_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_5_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_5_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_5_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_6_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_6_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_6_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_6_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_7_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_7_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_7_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_7_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_8_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_8_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_8_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_8_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_9_mo/LC_MESSAGES/core.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_9_mo/LC_MESSAGES/default.mo (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_9_po/LC_MESSAGES/core.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/rule_9_po/LC_MESSAGES/default.po (100%)
 rename lib/Cake/Test/test_app/{locale => Locale}/time_test/LC_TIME (100%)
 rename lib/Cake/Test/test_app/{plugins/PluginJs/config => Plugin/PluginJs/Config}/bootstrap.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/PluginJs/webroot/js/one/plugin_one.js (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/PluginJs/webroot/js/plugin_js.js (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config/schema => Plugin/TestPlugin/Config/Schema}/schema.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config => Plugin/TestPlugin/Config}/bootstrap.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config => Plugin/TestPlugin/Config}/custom_config.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config => Plugin/TestPlugin/Config}/load.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config => Plugin/TestPlugin/Config}/more.load.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/config => Plugin/TestPlugin/Config}/routes.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Console/Command/ExampleShell.php (100%)
 rename lib/Cake/Test/test_app/{View/errors => Plugin/TestPlugin/Console/Command/Task}/empty (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Console/Command/Task/other_task.php (100%)
 rename lib/Cake/Test/test_app/{View/pages => Plugin/TestPlugin/Console/templates}/empty (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/Component/other_component.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/Component/plugins_component.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/Component/test_plugin_component.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/Component/test_plugin_other_component.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/TestPluginAppController.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/TestPluginController.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Controller/TestsController.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Lib/Custom/Package/CustomLibClass.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Lib/Log/Engine/TestPluginLog.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Lib/test_plugin_library.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/locale => Plugin/TestPlugin/Locale}/po/LC_MESSAGES/test_plugin.po (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/locale => Plugin/TestPlugin/Locale}/po/LC_MONETARY/test_plugin.po (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Behavior/test_plugin_persister_one.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Behavior/test_plugin_persister_two.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Datasource/Database/DboDummy.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Datasource/Database/TestDriver.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Datasource/Session/TestPluginSession.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Datasource/TestSource.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/Datasource/test_other_source.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/TestPluginPost.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/test_plugin_app_model.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/test_plugin_auth_user.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/test_plugin_authors.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/Model/test_plugin_comment.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/vendors => Plugin/TestPlugin/Vendor}/sample/sample_plugin.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/vendors => Plugin/TestPlugin/Vendor}/welcome.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/Helper/OtherHelperHelper.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/Helper/plugged_helper.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/Helper/test_plugin_app.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/View/tests => Plugin/TestPlugin/View/Tests}/index.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/View/tests => Plugin/TestPlugin/View/Tests}/scaffold.form.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/elements/plugin_element.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/elements/test_plugin_element.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/View/layouts/default.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/css/test_plugin_asset.css (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/css/theme_one.htc (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/css/unknown.extension (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/flash/plugin_test.swf (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/img/cake.icon.gif (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/js/test_plugin/test.js (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/pdfs/plugin_test.pdf (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPlugin/webroot/root.js (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPluginTwo/config => Plugin/TestPluginTwo/Config}/bootstrap.php (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPluginTwo/Console/Command/ExampleShell.php (100%)
 rename lib/Cake/Test/test_app/{View/scaffolds => Plugin/TestPluginTwo/Console/Command/Task}/empty (100%)
 rename lib/Cake/Test/test_app/{plugins => Plugin}/TestPluginTwo/Console/Command/WelcomeShell.php (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/Console/Command/Task => Plugin/TestPluginTwo/Console/templates}/empty (100%)
 rename lib/Cake/Test/test_app/{vendors => Vendor}/Test/MyTest.php (100%)
 rename lib/Cake/Test/test_app/{vendors => Vendor}/Test/hello.php (100%)
 rename lib/Cake/Test/test_app/{View/themed/test_theme/webroot => Vendor}/css/test_asset.css (100%)
 rename lib/Cake/Test/test_app/{View/themed/test_theme/webroot => Vendor}/img/test.jpg (100%)
 rename lib/Cake/Test/test_app/{vendors => Vendor}/sample/configure_test_vendor_sample.php (100%)
 rename lib/Cake/Test/test_app/{vendors => Vendor}/somename/some.name.php (100%)
 rename lib/Cake/Test/test_app/{vendors => Vendor}/welcome.php (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/html/custom.ctp (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/html/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/html/nested_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/text/custom.ctp (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/text/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{emails => Emails}/text/wide.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPlugin/Console/templates => View/Errors}/empty (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPluginTwo/Console/Command/Task => View/Pages}/empty (100%)
 rename lib/Cake/Test/test_app/View/{pages => Pages}/extract.ctp (100%)
 rename lib/Cake/Test/test_app/View/{pages => Pages}/home.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/alt_ext.alt (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/cache_empty_sections.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/cache_form.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/helper_overwrite.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/multiple_nocache.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/nocache_multiple_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/scaffold.form.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/sequencial_nocache.ctp (100%)
 rename lib/Cake/Test/test_app/View/{posts => Posts}/test_nocache_tags.ctp (100%)
 rename lib/Cake/Test/test_app/{plugins/TestPluginTwo/Console/templates => View/Scaffolds}/empty (100%)
 rename lib/Cake/Test/test_app/View/{tests_apps => TestsApps}/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/{tests_apps => TestsApps}/json/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed/test_theme/posts => Themed/test_theme/Posts}/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed/test_theme/posts => Themed/test_theme/Posts}/scaffold.index.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/elements/test_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/layouts/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/plugins/TestPlugin/layouts/plugin_default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/plugins/TestPlugin/tests/index.ctp (100%)
 rename lib/Cake/Test/test_app/{vendors => View/Themed/test_theme/webroot}/css/test_asset.css (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/css/theme_webroot.css (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/flash/theme_test.swf (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/img/cake.power.gif (100%)
 rename lib/Cake/Test/test_app/{vendors => View/Themed/test_theme/webroot}/img/test.jpg (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/js/one/theme_one.js (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/js/theme.js (100%)
 rename lib/Cake/Test/test_app/View/{themed => Themed}/test_theme/webroot/pdfs/theme_test.pdf (100%)
 rename lib/Cake/View/{emails => Emails}/html/default.ctp (100%)
 rename lib/Cake/View/{emails => Emails}/text/default.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/error400.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/error500.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_action.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_behavior_class.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_behavior_file.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_component_class.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_component_file.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_connection.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_controller.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_database.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_datasource_config.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_datasource_file.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_helper_class.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_helper_file.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_layout.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_table.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/missing_view.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/private_action.ctp (100%)
 rename lib/Cake/View/{errors => Errors}/scaffold_error.ctp (100%)
 rename lib/Cake/View/{pages => Pages}/home.ctp (100%)
 rename lib/Cake/View/{scaffolds => Scaffolds}/form.ctp (100%)
 rename lib/Cake/View/{scaffolds => Scaffolds}/index.ctp (100%)
 rename lib/Cake/View/{scaffolds => Scaffolds}/view.ctp (100%)

diff --git a/app/View/emails/html/empty b/app/View/Emails/html/empty
similarity index 100%
rename from app/View/emails/html/empty
rename to app/View/Emails/html/empty
diff --git a/app/View/emails/text/empty b/app/View/Emails/text/empty
similarity index 100%
rename from app/View/emails/text/empty
rename to app/View/Emails/text/empty
diff --git a/app/View/errors/empty b/app/View/Errors/empty
similarity index 100%
rename from app/View/errors/empty
rename to app/View/Errors/empty
diff --git a/app/View/scaffolds/empty b/app/View/Scaffolds/empty
similarity index 100%
rename from app/View/scaffolds/empty
rename to app/View/Scaffolds/empty
diff --git a/lib/Cake/Console/templates/skel/config/acl.ini.php b/lib/Cake/Console/templates/skel/Config/acl.ini.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/acl.ini.php
rename to lib/Cake/Console/templates/skel/Config/acl.ini.php
diff --git a/lib/Cake/Console/templates/skel/config/bootstrap.php b/lib/Cake/Console/templates/skel/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/bootstrap.php
rename to lib/Cake/Console/templates/skel/Config/bootstrap.php
diff --git a/lib/Cake/Console/templates/skel/config/core.php b/lib/Cake/Console/templates/skel/Config/core.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/core.php
rename to lib/Cake/Console/templates/skel/Config/core.php
diff --git a/lib/Cake/Console/templates/skel/config/database.php.default b/lib/Cake/Console/templates/skel/Config/database.php.default
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/database.php.default
rename to lib/Cake/Console/templates/skel/Config/database.php.default
diff --git a/lib/Cake/Console/templates/skel/config/email.php.default b/lib/Cake/Console/templates/skel/Config/email.php.default
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/email.php.default
rename to lib/Cake/Console/templates/skel/Config/email.php.default
diff --git a/lib/Cake/Console/templates/skel/config/routes.php b/lib/Cake/Console/templates/skel/Config/routes.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/routes.php
rename to lib/Cake/Console/templates/skel/Config/routes.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/db_acl.php b/lib/Cake/Console/templates/skel/Config/schema/db_acl.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/db_acl.php
rename to lib/Cake/Console/templates/skel/Config/schema/db_acl.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/db_acl.sql b/lib/Cake/Console/templates/skel/Config/schema/db_acl.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/db_acl.sql
rename to lib/Cake/Console/templates/skel/Config/schema/db_acl.sql
diff --git a/lib/Cake/Console/templates/skel/config/schema/i18n.php b/lib/Cake/Console/templates/skel/Config/schema/i18n.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/i18n.php
rename to lib/Cake/Console/templates/skel/Config/schema/i18n.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/i18n.sql b/lib/Cake/Console/templates/skel/Config/schema/i18n.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/i18n.sql
rename to lib/Cake/Console/templates/skel/Config/schema/i18n.sql
diff --git a/lib/Cake/Console/templates/skel/config/schema/sessions.php b/lib/Cake/Console/templates/skel/Config/schema/sessions.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/sessions.php
rename to lib/Cake/Console/templates/skel/Config/schema/sessions.php
diff --git a/lib/Cake/Console/templates/skel/config/schema/sessions.sql b/lib/Cake/Console/templates/skel/Config/schema/sessions.sql
similarity index 100%
rename from lib/Cake/Console/templates/skel/config/schema/sessions.sql
rename to lib/Cake/Console/templates/skel/Config/schema/sessions.sql
diff --git a/lib/Cake/Console/templates/skel/View/errors/empty b/lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/errors/empty
rename to lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty
diff --git a/lib/Cake/Console/templates/skel/View/pages/empty b/lib/Cake/Console/templates/skel/Plugin/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/pages/empty
rename to lib/Cake/Console/templates/skel/Plugin/empty
diff --git a/lib/Cake/Console/templates/skel/View/scaffolds/empty b/lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/scaffolds/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty
diff --git a/lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty b/lib/Cake/Console/templates/skel/Test/Case/Controller/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Controller/empty
diff --git a/lib/Cake/Console/templates/skel/plugins/empty b/lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/plugins/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty b/lib/Cake/Console/templates/skel/Test/Case/Model/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty
rename to lib/Cake/Console/templates/skel/Test/Case/Model/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Controller/empty b/lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Controller/empty
rename to lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty b/lib/Cake/Console/templates/skel/Test/Fixture/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty
rename to lib/Cake/Console/templates/skel/Test/Fixture/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Case/Model/empty b/lib/Cake/Console/templates/skel/Vendor/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/Model/empty
rename to lib/Cake/Console/templates/skel/Vendor/empty
diff --git a/lib/Cake/Console/templates/skel/View/emails/html/default.ctp b/lib/Cake/Console/templates/skel/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/emails/html/default.ctp
rename to lib/Cake/Console/templates/skel/View/Emails/html/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/emails/text/default.ctp b/lib/Cake/Console/templates/skel/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/emails/text/default.ctp
rename to lib/Cake/Console/templates/skel/View/Emails/text/default.ctp
diff --git a/lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty b/lib/Cake/Console/templates/skel/View/Errors/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty
rename to lib/Cake/Console/templates/skel/View/Errors/empty
diff --git a/lib/Cake/Console/templates/skel/tests/Fixture/empty b/lib/Cake/Console/templates/skel/View/Pages/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tests/Fixture/empty
rename to lib/Cake/Console/templates/skel/View/Pages/empty
diff --git a/lib/Cake/Console/templates/skel/vendors/empty b/lib/Cake/Console/templates/skel/View/Scaffolds/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/vendors/empty
rename to lib/Cake/Console/templates/skel/View/Scaffolds/empty
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index b0104918c..f83e0ca7f 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -311,10 +311,11 @@ class App {
 				'locales' => array(
 					'%s' . 'locale' . DS
 				),
-				'vendors' => array('%s' . 'vendors' . DS, VENDORS),
+				'vendors' => array('%s' . 'Vendor' . DS, VENDORS),
 				'plugins' => array(
-					APP . 'plugins' . DS,
-					dirname(dirname(CAKE)) . DS . 'plugins' . DS
+					APP . 'Plugin' . DS,
+					APP . 'plugin' . DS,
+					dirname(dirname(CAKE)) . DS . 'Plugin' . DS,
 				)
 			);
 		}
diff --git a/lib/Cake/Test/test_app/config/acl.ini.php b/lib/Cake/Test/test_app/Config/acl.ini.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/acl.ini.php
rename to lib/Cake/Test/test_app/Config/acl.ini.php
diff --git a/lib/Cake/Test/test_app/config/empty.php b/lib/Cake/Test/test_app/Config/empty.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/empty.php
rename to lib/Cake/Test/test_app/Config/empty.php
diff --git a/lib/Cake/Test/test_app/config/htmlhelper_minimized.ini b/lib/Cake/Test/test_app/Config/htmlhelper_minimized.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/htmlhelper_minimized.ini
rename to lib/Cake/Test/test_app/Config/htmlhelper_minimized.ini
diff --git a/lib/Cake/Test/test_app/config/htmlhelper_tags.php b/lib/Cake/Test/test_app/Config/htmlhelper_tags.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/htmlhelper_tags.php
rename to lib/Cake/Test/test_app/Config/htmlhelper_tags.php
diff --git a/lib/Cake/Test/test_app/config/nested.ini b/lib/Cake/Test/test_app/Config/nested.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/nested.ini
rename to lib/Cake/Test/test_app/Config/nested.ini
diff --git a/lib/Cake/Test/test_app/config/no_section.ini b/lib/Cake/Test/test_app/Config/no_section.ini
similarity index 100%
rename from lib/Cake/Test/test_app/config/no_section.ini
rename to lib/Cake/Test/test_app/Config/no_section.ini
diff --git a/lib/Cake/Test/test_app/config/routes.php b/lib/Cake/Test/test_app/Config/routes.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/routes.php
rename to lib/Cake/Test/test_app/Config/routes.php
diff --git a/lib/Cake/Test/test_app/config/var_test.php b/lib/Cake/Test/test_app/Config/var_test.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/var_test.php
rename to lib/Cake/Test/test_app/Config/var_test.php
diff --git a/lib/Cake/Test/test_app/config/var_test2.php b/lib/Cake/Test/test_app/Config/var_test2.php
similarity index 100%
rename from lib/Cake/Test/test_app/config/var_test2.php
rename to lib/Cake/Test/test_app/Config/var_test2.php
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/test_app/locale/ja_jp/LC_TIME
rename to lib/Cake/Test/test_app/Locale/ja_jp/LC_TIME
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/test_app/locale/po/LC_TIME b/lib/Cake/Test/test_app/Locale/po/LC_TIME
similarity index 100%
rename from lib/Cake/Test/test_app/locale/po/LC_TIME
rename to lib/Cake/Test/test_app/Locale/po/LC_TIME
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/test_app/locale/time_test/LC_TIME
rename to lib/Cake/Test/test_app/Locale/time_test/LC_TIME
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/PluginJs/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/PluginJs/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js b/lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/one/plugin_one.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/one/plugin_one.js
rename to lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/one/plugin_one.js
diff --git a/lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js b/lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/plugin_js.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/PluginJs/webroot/js/plugin_js.js
rename to lib/Cake/Test/test_app/Plugin/PluginJs/webroot/js/plugin_js.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/schema/schema.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/Schema/schema.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/custom_config.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/custom_config.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/custom_config.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/load.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/load.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/load.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/more.load.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/more.load.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/more.load.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Config/routes.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/config/routes.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Config/routes.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php
diff --git a/lib/Cake/Test/test_app/View/errors/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/errors/empty
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/other_task.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/Test/test_app/View/pages/empty b/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/empty
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Console/templates/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/other_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/other_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/plugins_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/Component/test_plugin_other_component.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginAppController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginAppController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestPluginController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestPluginController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Controller/TestsController.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/TestsController.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Custom/Package/CustomLibClass.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Error/TestPluginExceptionRenderer.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/Log/Engine/TestPluginLog.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Lib/test_plugin_library.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po b/lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MESSAGES/test_plugin.po
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MESSAGES/test_plugin.po
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MESSAGES/test_plugin.po
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po b/lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MONETARY/test_plugin.po
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/locale/po/LC_MONETARY/test_plugin.po
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Locale/po/LC_MONETARY/test_plugin.po
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_one.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Behavior/test_plugin_persister_two.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/DboDummy.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Database/TestDriver.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/Session/TestPluginSession.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/TestSource.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/Datasource/test_other_source.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/TestPluginPost.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginPost.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_app_model.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_auth_user.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_authors.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Model/test_plugin_comment.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/vendors/sample/sample_plugin.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/sample/sample_plugin.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/welcome.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/vendors/welcome.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/Vendor/welcome.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/OtherHelperHelper.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/plugged_helper.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/Helper/test_plugin_app.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/index.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/index.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/tests/scaffold.form.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Tests/scaffold.form.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/test_plugin_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/test_plugin_asset.css
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/test_plugin_asset.css
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/theme_one.htc
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/theme_one.htc
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/theme_one.htc
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/unknown.extension
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/css/unknown.extension
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/css/unknown.extension
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/flash/plugin_test.swf
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/flash/plugin_test.swf
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/flash/plugin_test.swf
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/img/cake.icon.gif
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/img/cake.icon.gif
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/img/cake.icon.gif
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/js/test_plugin/test.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/js/test_plugin/test.js
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/js/test_plugin/test.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/pdfs/plugin_test.pdf
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/pdfs/plugin_test.pdf
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/pdfs/plugin_test.pdf
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js b/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/webroot/root.js
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/config/bootstrap.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/ExampleShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php
diff --git a/lib/Cake/Test/test_app/View/scaffolds/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/scaffolds/empty
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/WelcomeShell.php
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty b/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/templates/empty
diff --git a/lib/Cake/Test/test_app/vendors/Test/MyTest.php b/lib/Cake/Test/test_app/Vendor/Test/MyTest.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/Test/MyTest.php
rename to lib/Cake/Test/test_app/Vendor/Test/MyTest.php
diff --git a/lib/Cake/Test/test_app/vendors/Test/hello.php b/lib/Cake/Test/test_app/Vendor/Test/hello.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/Test/hello.php
rename to lib/Cake/Test/test_app/Vendor/Test/hello.php
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css b/lib/Cake/Test/test_app/Vendor/css/test_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/css/test_asset.css
rename to lib/Cake/Test/test_app/Vendor/css/test_asset.css
diff --git a/lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg b/lib/Cake/Test/test_app/Vendor/img/test.jpg
similarity index 100%
rename from lib/Cake/Test/test_app/View/themed/test_theme/webroot/img/test.jpg
rename to lib/Cake/Test/test_app/Vendor/img/test.jpg
diff --git a/lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php b/lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/sample/configure_test_vendor_sample.php
rename to lib/Cake/Test/test_app/Vendor/sample/configure_test_vendor_sample.php
diff --git a/lib/Cake/Test/test_app/vendors/somename/some.name.php b/lib/Cake/Test/test_app/Vendor/somename/some.name.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/somename/some.name.php
rename to lib/Cake/Test/test_app/Vendor/somename/some.name.php
diff --git a/lib/Cake/Test/test_app/vendors/welcome.php b/lib/Cake/Test/test_app/Vendor/welcome.php
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/welcome.php
rename to lib/Cake/Test/test_app/Vendor/welcome.php
diff --git a/lib/Cake/Test/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/Test/test_app/View/emails/html/custom.ctp
rename to lib/Cake/Test/test_app/View/Emails/html/custom.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/emails/html/default.ctp
rename to lib/Cake/Test/test_app/View/Emails/html/default.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/test_app/View/emails/text/custom.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/custom.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/emails/text/default.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/default.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/emails/text/wide.ctp
rename to lib/Cake/Test/test_app/View/Emails/text/wide.ctp
diff --git a/lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty b/lib/Cake/Test/test_app/View/Errors/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPlugin/Console/templates/empty
rename to lib/Cake/Test/test_app/View/Errors/empty
diff --git a/lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty b/lib/Cake/Test/test_app/View/Pages/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/Command/Task/empty
rename to lib/Cake/Test/test_app/View/Pages/empty
diff --git a/lib/Cake/Test/test_app/View/pages/extract.ctp b/lib/Cake/Test/test_app/View/Pages/extract.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/extract.ctp
rename to lib/Cake/Test/test_app/View/Pages/extract.ctp
diff --git a/lib/Cake/Test/test_app/View/pages/home.ctp b/lib/Cake/Test/test_app/View/Pages/home.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/pages/home.ctp
rename to lib/Cake/Test/test_app/View/Pages/home.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/posts/alt_ext.alt
rename to lib/Cake/Test/test_app/View/Posts/alt_ext.alt
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/test_app/View/posts/cache_form.ctp
rename to lib/Cake/Test/test_app/View/Posts/cache_form.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/posts/helper_overwrite.ctp
rename to lib/Cake/Test/test_app/View/Posts/helper_overwrite.ctp
diff --git a/lib/Cake/Test/test_app/View/posts/index.ctp b/lib/Cake/Test/test_app/View/Posts/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/posts/index.ctp
rename to lib/Cake/Test/test_app/View/Posts/index.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/posts/multiple_nocache.ctp
rename to lib/Cake/Test/test_app/View/Posts/multiple_nocache.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/test_app/View/posts/scaffold.form.ctp
rename to lib/Cake/Test/test_app/View/Posts/scaffold.form.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/posts/sequencial_nocache.ctp
rename to lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/test_app/plugins/TestPluginTwo/Console/templates/empty b/lib/Cake/Test/test_app/View/Scaffolds/empty
similarity index 100%
rename from lib/Cake/Test/test_app/plugins/TestPluginTwo/Console/templates/empty
rename to lib/Cake/Test/test_app/View/Scaffolds/empty
diff --git a/lib/Cake/Test/test_app/View/tests_apps/index.ctp b/lib/Cake/Test/test_app/View/TestsApps/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/tests_apps/index.ctp
rename to lib/Cake/Test/test_app/View/TestsApps/index.ctp
diff --git a/lib/Cake/Test/test_app/View/tests_apps/json/index.ctp b/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/tests_apps/json/index.ctp
rename to lib/Cake/Test/test_app/View/TestsApps/json/index.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/test_app/vendors/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/Test/test_app/vendors/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/test_app/vendors/img/test.jpg b/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from lib/Cake/Test/test_app/vendors/img/test.jpg
rename to lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/View/emails/html/default.ctp b/lib/Cake/View/Emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/emails/html/default.ctp
rename to lib/Cake/View/Emails/html/default.ctp
diff --git a/lib/Cake/View/emails/text/default.ctp b/lib/Cake/View/Emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/emails/text/default.ctp
rename to lib/Cake/View/Emails/text/default.ctp
diff --git a/lib/Cake/View/errors/error400.ctp b/lib/Cake/View/Errors/error400.ctp
similarity index 100%
rename from lib/Cake/View/errors/error400.ctp
rename to lib/Cake/View/Errors/error400.ctp
diff --git a/lib/Cake/View/errors/error500.ctp b/lib/Cake/View/Errors/error500.ctp
similarity index 100%
rename from lib/Cake/View/errors/error500.ctp
rename to lib/Cake/View/Errors/error500.ctp
diff --git a/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/Errors/missing_action.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_action.ctp
rename to lib/Cake/View/Errors/missing_action.ctp
diff --git a/lib/Cake/View/errors/missing_behavior_class.ctp b/lib/Cake/View/Errors/missing_behavior_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_behavior_class.ctp
rename to lib/Cake/View/Errors/missing_behavior_class.ctp
diff --git a/lib/Cake/View/errors/missing_behavior_file.ctp b/lib/Cake/View/Errors/missing_behavior_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_behavior_file.ctp
rename to lib/Cake/View/Errors/missing_behavior_file.ctp
diff --git a/lib/Cake/View/errors/missing_component_class.ctp b/lib/Cake/View/Errors/missing_component_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_component_class.ctp
rename to lib/Cake/View/Errors/missing_component_class.ctp
diff --git a/lib/Cake/View/errors/missing_component_file.ctp b/lib/Cake/View/Errors/missing_component_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_component_file.ctp
rename to lib/Cake/View/Errors/missing_component_file.ctp
diff --git a/lib/Cake/View/errors/missing_connection.ctp b/lib/Cake/View/Errors/missing_connection.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_connection.ctp
rename to lib/Cake/View/Errors/missing_connection.ctp
diff --git a/lib/Cake/View/errors/missing_controller.ctp b/lib/Cake/View/Errors/missing_controller.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_controller.ctp
rename to lib/Cake/View/Errors/missing_controller.ctp
diff --git a/lib/Cake/View/errors/missing_database.ctp b/lib/Cake/View/Errors/missing_database.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_database.ctp
rename to lib/Cake/View/Errors/missing_database.ctp
diff --git a/lib/Cake/View/errors/missing_datasource_config.ctp b/lib/Cake/View/Errors/missing_datasource_config.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_datasource_config.ctp
rename to lib/Cake/View/Errors/missing_datasource_config.ctp
diff --git a/lib/Cake/View/errors/missing_datasource_file.ctp b/lib/Cake/View/Errors/missing_datasource_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_datasource_file.ctp
rename to lib/Cake/View/Errors/missing_datasource_file.ctp
diff --git a/lib/Cake/View/errors/missing_helper_class.ctp b/lib/Cake/View/Errors/missing_helper_class.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_helper_class.ctp
rename to lib/Cake/View/Errors/missing_helper_class.ctp
diff --git a/lib/Cake/View/errors/missing_helper_file.ctp b/lib/Cake/View/Errors/missing_helper_file.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_helper_file.ctp
rename to lib/Cake/View/Errors/missing_helper_file.ctp
diff --git a/lib/Cake/View/errors/missing_layout.ctp b/lib/Cake/View/Errors/missing_layout.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_layout.ctp
rename to lib/Cake/View/Errors/missing_layout.ctp
diff --git a/lib/Cake/View/errors/missing_table.ctp b/lib/Cake/View/Errors/missing_table.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_table.ctp
rename to lib/Cake/View/Errors/missing_table.ctp
diff --git a/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/Errors/missing_view.ctp
similarity index 100%
rename from lib/Cake/View/errors/missing_view.ctp
rename to lib/Cake/View/Errors/missing_view.ctp
diff --git a/lib/Cake/View/errors/private_action.ctp b/lib/Cake/View/Errors/private_action.ctp
similarity index 100%
rename from lib/Cake/View/errors/private_action.ctp
rename to lib/Cake/View/Errors/private_action.ctp
diff --git a/lib/Cake/View/errors/scaffold_error.ctp b/lib/Cake/View/Errors/scaffold_error.ctp
similarity index 100%
rename from lib/Cake/View/errors/scaffold_error.ctp
rename to lib/Cake/View/Errors/scaffold_error.ctp
diff --git a/lib/Cake/View/pages/home.ctp b/lib/Cake/View/Pages/home.ctp
similarity index 100%
rename from lib/Cake/View/pages/home.ctp
rename to lib/Cake/View/Pages/home.ctp
diff --git a/lib/Cake/View/scaffolds/form.ctp b/lib/Cake/View/Scaffolds/form.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/form.ctp
rename to lib/Cake/View/Scaffolds/form.ctp
diff --git a/lib/Cake/View/scaffolds/index.ctp b/lib/Cake/View/Scaffolds/index.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/index.ctp
rename to lib/Cake/View/Scaffolds/index.ctp
diff --git a/lib/Cake/View/scaffolds/view.ctp b/lib/Cake/View/Scaffolds/view.ctp
similarity index 100%
rename from lib/Cake/View/scaffolds/view.ctp
rename to lib/Cake/View/Scaffolds/view.ctp

From 3b725290baaf1fc11a967fc4a7d18e3ec54dde66 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 02:45:36 -0430
Subject: [PATCH 35/50] Renaming elements and layouts

---
 app/View/{elements => Elements}/empty                             | 0
 app/View/{layouts => Layouts}/emails/html/empty                   | 0
 app/View/{layouts => Layouts}/emails/text/empty                   | 0
 app/View/{layouts => Layouts}/js/empty                            | 0
 app/View/{layouts => Layouts}/rss/empty                           | 0
 app/View/{layouts => Layouts}/xml/empty                           | 0
 lib/Cake/Console/templates/skel/View/{elements => Elements}/empty | 0
 .../Console/templates/skel/View/{layouts => Layouts}/ajax.ctp     | 0
 .../Console/templates/skel/View/{layouts => Layouts}/default.ctp  | 0
 .../skel/View/{layouts => Layouts}/emails/html/default.ctp        | 0
 .../skel/View/{layouts => Layouts}/emails/text/default.ctp        | 0
 .../Console/templates/skel/View/{layouts => Layouts}/flash.ctp    | 0
 .../templates/skel/View/{layouts => Layouts}/js/default.ctp       | 0
 .../templates/skel/View/{layouts => Layouts}/rss/default.ctp      | 0
 .../templates/skel/View/{layouts => Layouts}/xml/default.ctp      | 0
 .../TestPlugin/View/{elements => Elements}/plugin_element.ctp     | 0
 .../View/{elements => Elements}/test_plugin_element.ctp           | 0
 .../Plugin/TestPlugin/View/{layouts => Layouts}/default.ctp       | 0
 lib/Cake/Test/test_app/View/{elements => Elements}/empty          | 0
 lib/Cake/Test/test_app/View/{elements => Elements}/html_call.ctp  | 0
 .../View/{elements => Elements}/nocache/contains_nocache.ctp      | 0
 .../Test/test_app/View/{elements => Elements}/nocache/plain.ctp   | 0
 .../Test/test_app/View/{elements => Elements}/nocache/sub1.ctp    | 0
 .../Test/test_app/View/{elements => Elements}/nocache/sub2.ctp    | 0
 .../Test/test_app/View/{elements => Elements}/session_helper.ctp  | 0
 .../Test/test_app/View/{elements => Elements}/test_element.ctp    | 0
 lib/Cake/Test/test_app/View/{elements => Elements}/type_check.ctp | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/ajax.ctp         | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/ajax2.ctp        | 0
 .../test_app/View/{layouts => Layouts}/cache_empty_sections.ctp   | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/cache_layout.ctp | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/default.ctp      | 0
 .../test_app/View/{layouts => Layouts}/emails/html/default.ctp    | 0
 .../Test/test_app/View/{layouts => Layouts}/emails/html/thin.ctp  | 0
 .../test_app/View/{layouts => Layouts}/emails/text/default.ctp    | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/flash.ctp        | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/js/default.ctp   | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/json/default.ctp | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/multi_cache.ctp  | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/rss/default.ctp  | 0
 lib/Cake/Test/test_app/View/{layouts => Layouts}/xml/default.ctp  | 0
 .../Themed/test_theme/{elements => Elements}/test_element.ctp     | 0
 .../View/Themed/test_theme/{layouts => Layouts}/default.ctp       | 0
 .../plugins/TestPlugin/{layouts => Layouts}/plugin_default.ctp    | 0
 lib/Cake/View/{elements => Elements}/exception_stack_trace.ctp    | 0
 lib/Cake/View/{elements => Elements}/sql_dump.ctp                 | 0
 lib/Cake/View/{layouts => Layouts}/ajax.ctp                       | 0
 lib/Cake/View/{layouts => Layouts}/default.ctp                    | 0
 lib/Cake/View/{layouts => Layouts}/emails/html/default.ctp        | 0
 lib/Cake/View/{layouts => Layouts}/emails/text/default.ctp        | 0
 lib/Cake/View/{layouts => Layouts}/flash.ctp                      | 0
 lib/Cake/View/{layouts => Layouts}/js/default.ctp                 | 0
 lib/Cake/View/{layouts => Layouts}/rss/default.ctp                | 0
 lib/Cake/View/{layouts => Layouts}/xml/default.ctp                | 0
 54 files changed, 0 insertions(+), 0 deletions(-)
 rename app/View/{elements => Elements}/empty (100%)
 rename app/View/{layouts => Layouts}/emails/html/empty (100%)
 rename app/View/{layouts => Layouts}/emails/text/empty (100%)
 rename app/View/{layouts => Layouts}/js/empty (100%)
 rename app/View/{layouts => Layouts}/rss/empty (100%)
 rename app/View/{layouts => Layouts}/xml/empty (100%)
 rename lib/Cake/Console/templates/skel/View/{elements => Elements}/empty (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/ajax.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/emails/html/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/emails/text/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/flash.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/js/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/rss/default.ctp (100%)
 rename lib/Cake/Console/templates/skel/View/{layouts => Layouts}/xml/default.ctp (100%)
 rename lib/Cake/Test/test_app/Plugin/TestPlugin/View/{elements => Elements}/plugin_element.ctp (100%)
 rename lib/Cake/Test/test_app/Plugin/TestPlugin/View/{elements => Elements}/test_plugin_element.ctp (100%)
 rename lib/Cake/Test/test_app/Plugin/TestPlugin/View/{layouts => Layouts}/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/empty (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/html_call.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/nocache/contains_nocache.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/nocache/plain.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/nocache/sub1.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/nocache/sub2.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/session_helper.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/test_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/{elements => Elements}/type_check.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/ajax.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/ajax2.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/cache_empty_sections.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/cache_layout.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/emails/html/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/emails/html/thin.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/emails/text/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/flash.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/js/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/json/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/multi_cache.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/rss/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/{layouts => Layouts}/xml/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/test_theme/{elements => Elements}/test_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/test_theme/{layouts => Layouts}/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/{layouts => Layouts}/plugin_default.ctp (100%)
 rename lib/Cake/View/{elements => Elements}/exception_stack_trace.ctp (100%)
 rename lib/Cake/View/{elements => Elements}/sql_dump.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/ajax.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/default.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/emails/html/default.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/emails/text/default.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/flash.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/js/default.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/rss/default.ctp (100%)
 rename lib/Cake/View/{layouts => Layouts}/xml/default.ctp (100%)

diff --git a/app/View/elements/empty b/app/View/Elements/empty
similarity index 100%
rename from app/View/elements/empty
rename to app/View/Elements/empty
diff --git a/app/View/layouts/emails/html/empty b/app/View/Layouts/emails/html/empty
similarity index 100%
rename from app/View/layouts/emails/html/empty
rename to app/View/Layouts/emails/html/empty
diff --git a/app/View/layouts/emails/text/empty b/app/View/Layouts/emails/text/empty
similarity index 100%
rename from app/View/layouts/emails/text/empty
rename to app/View/Layouts/emails/text/empty
diff --git a/app/View/layouts/js/empty b/app/View/Layouts/js/empty
similarity index 100%
rename from app/View/layouts/js/empty
rename to app/View/Layouts/js/empty
diff --git a/app/View/layouts/rss/empty b/app/View/Layouts/rss/empty
similarity index 100%
rename from app/View/layouts/rss/empty
rename to app/View/Layouts/rss/empty
diff --git a/app/View/layouts/xml/empty b/app/View/Layouts/xml/empty
similarity index 100%
rename from app/View/layouts/xml/empty
rename to app/View/Layouts/xml/empty
diff --git a/lib/Cake/Console/templates/skel/View/elements/empty b/lib/Cake/Console/templates/skel/View/Elements/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/elements/empty
rename to lib/Cake/Console/templates/skel/View/Elements/empty
diff --git a/lib/Cake/Console/templates/skel/View/layouts/ajax.ctp b/lib/Cake/Console/templates/skel/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/ajax.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/ajax.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/emails/html/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/emails/html/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/emails/html/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/emails/text/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/emails/text/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/emails/text/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/flash.ctp b/lib/Cake/Console/templates/skel/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/flash.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/flash.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/js/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/js/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/js/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/rss/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp b/lib/Cake/Console/templates/skel/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/layouts/xml/default.ctp
rename to lib/Cake/Console/templates/skel/View/Layouts/xml/default.ctp
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Elements/plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/Plugin/TestPlugin/View/elements/test_plugin_element.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Elements/test_plugin_element.ctp
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/Plugin/TestPlugin/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/View/elements/empty b/lib/Cake/Test/test_app/View/Elements/empty
similarity index 100%
rename from lib/Cake/Test/test_app/View/elements/empty
rename to lib/Cake/Test/test_app/View/Elements/empty
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/html_call.ctp
rename to lib/Cake/Test/test_app/View/Elements/html_call.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/test_app/View/elements/nocache/plain.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/plain.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/nocache/sub1.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/sub1.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/nocache/sub2.ctp
rename to lib/Cake/Test/test_app/View/Elements/nocache/sub2.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/session_helper.ctp
rename to lib/Cake/Test/test_app/View/Elements/session_helper.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/Elements/test_element.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/elements/type_check.ctp
rename to lib/Cake/Test/test_app/View/Elements/type_check.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/ajax.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/ajax.ctp
rename to lib/Cake/Test/test_app/View/Layouts/ajax.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/ajax2.ctp b/lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/ajax2.ctp
rename to lib/Cake/Test/test_app/View/Layouts/ajax2.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/test_app/View/layouts/cache_layout.ctp
rename to lib/Cake/Test/test_app/View/Layouts/cache_layout.ctp
diff --git a/lib/Cake/Test/test_app/View/layouts/default.ctp b/lib/Cake/Test/test_app/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/default.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/Test/test_app/View/layouts/flash.ctp b/lib/Cake/Test/test_app/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/layouts/flash.ctp
rename to lib/Cake/Test/test_app/View/Layouts/flash.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/layouts/js/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/js/default.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/layouts/json/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/json/default.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/layouts/multi_cache.ctp
rename to lib/Cake/Test/test_app/View/Layouts/multi_cache.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/layouts/rss/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/Test/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/Test/test_app/View/layouts/xml/default.ctp
rename to lib/Cake/Test/test_app/View/Layouts/xml/default.ctp
diff --git a/lib/Cake/Test/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/Test/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/Test/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/Test/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/Test/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/Test/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/View/elements/exception_stack_trace.ctp b/lib/Cake/View/Elements/exception_stack_trace.ctp
similarity index 100%
rename from lib/Cake/View/elements/exception_stack_trace.ctp
rename to lib/Cake/View/Elements/exception_stack_trace.ctp
diff --git a/lib/Cake/View/elements/sql_dump.ctp b/lib/Cake/View/Elements/sql_dump.ctp
similarity index 100%
rename from lib/Cake/View/elements/sql_dump.ctp
rename to lib/Cake/View/Elements/sql_dump.ctp
diff --git a/lib/Cake/View/layouts/ajax.ctp b/lib/Cake/View/Layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/View/layouts/ajax.ctp
rename to lib/Cake/View/Layouts/ajax.ctp
diff --git a/lib/Cake/View/layouts/default.ctp b/lib/Cake/View/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/default.ctp
rename to lib/Cake/View/Layouts/default.ctp
diff --git a/lib/Cake/View/layouts/emails/html/default.ctp b/lib/Cake/View/Layouts/emails/html/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/emails/html/default.ctp
rename to lib/Cake/View/Layouts/emails/html/default.ctp
diff --git a/lib/Cake/View/layouts/emails/text/default.ctp b/lib/Cake/View/Layouts/emails/text/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/emails/text/default.ctp
rename to lib/Cake/View/Layouts/emails/text/default.ctp
diff --git a/lib/Cake/View/layouts/flash.ctp b/lib/Cake/View/Layouts/flash.ctp
similarity index 100%
rename from lib/Cake/View/layouts/flash.ctp
rename to lib/Cake/View/Layouts/flash.ctp
diff --git a/lib/Cake/View/layouts/js/default.ctp b/lib/Cake/View/Layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/js/default.ctp
rename to lib/Cake/View/Layouts/js/default.ctp
diff --git a/lib/Cake/View/layouts/rss/default.ctp b/lib/Cake/View/Layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/rss/default.ctp
rename to lib/Cake/View/Layouts/rss/default.ctp
diff --git a/lib/Cake/View/layouts/xml/default.ctp b/lib/Cake/View/Layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/View/layouts/xml/default.ctp
rename to lib/Cake/View/Layouts/xml/default.ctp

From 8746a485bd2f48f0147b37e55725f21f41f7f220 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 02:53:35 -0430
Subject: [PATCH 36/50] Search and replace for changed paths

---
 lib/Cake/Controller/Controller.php               |  2 +-
 lib/Cake/Test/Case/Cache/CacheTest.php           |  6 +++---
 lib/Cake/Test/Case/Configure/PhpReaderTest.php   |  2 +-
 .../Case/Console/Command/SchemaShellTest.php     | 10 +++++-----
 lib/Cake/Test/Case/Console/Command/ShellTest.php |  2 +-
 .../Test/Case/Console/TaskCollectionTest.php     |  2 +-
 .../Component/Auth/FormAuthenticate.php          |  2 +-
 .../Controller/Component/EmailComponentTest.php  |  2 +-
 .../Case/Controller/ComponentCollectionTest.php  |  4 ++--
 lib/Cake/Test/Case/Controller/ComponentTest.php  |  2 +-
 lib/Cake/Test/Case/Controller/ControllerTest.php |  4 ++--
 lib/Cake/Test/Case/Controller/ScaffoldTest.php   |  2 +-
 lib/Cake/Test/Case/Core/AppTest.php              | 10 +++++-----
 lib/Cake/Test/Case/Core/ConfigureTest.php        |  2 +-
 lib/Cake/Test/Case/Core/ObjectTest.php           |  2 +-
 lib/Cake/Test/Case/I18n/I18nTest.php             |  4 ++--
 lib/Cake/Test/Case/Log/CakeLogTest.php           |  2 +-
 .../Test/Case/Model/BehaviorCollectionTest.php   |  2 +-
 lib/Cake/Test/Case/Model/CakeSchemaTest.php      |  4 ++--
 .../Test/Case/Model/ConnectionManagerTest.php    | 10 +++++-----
 .../Case/Model/Datasource/CakeSessionTest.php    |  4 ++--
 lib/Cake/Test/Case/Routing/DispatcherTest.php    |  6 +++---
 .../Case/TestSuite/ControllerTestCaseTest.php    |  2 +-
 lib/Cake/Test/Case/View/HelperCollectionTest.php |  4 ++--
 lib/Cake/Test/Case/View/HelperTest.php           |  4 ++--
 lib/Cake/Test/Case/View/ThemeViewTest.php        |  2 +-
 lib/Cake/Test/Case/View/ViewTest.php             | 16 ++++++++--------
 lib/Cake/View/View.php                           |  6 +++---
 lib/Cake/bootstrap.php                           |  8 ++++----
 29 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
index 615696803..a6f635970 100644
--- a/lib/Cake/Controller/Controller.php
+++ b/lib/Cake/Controller/Controller.php
@@ -315,7 +315,7 @@ class Controller extends Object {
 		}
 
 		if ($this->viewPath == null) {
-			$this->viewPath = Inflector::underscore($this->name);
+			$this->viewPath = $this->name;
 		}
 
 		$this->modelClass = Inflector::singularize($this->name);
diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php
index c30e9e644..474cb81c8 100644
--- a/lib/Cake/Test/Case/Cache/CacheTest.php
+++ b/lib/Cake/Test/Case/Cache/CacheTest.php
@@ -90,7 +90,7 @@ class CacheTest extends CakeTestCase {
 	function testConfigWithLibAndPluginEngines() {
 		App::build(array(
 			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
 
@@ -253,7 +253,7 @@ class CacheTest extends CakeTestCase {
 	function testDrop() {
 		App::build(array(
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 
 		$result = Cache::drop('some_config_that_does_not_exist');
@@ -306,7 +306,7 @@ class CacheTest extends CakeTestCase {
 	function testWriteTriggerError() {
 		App::build(array(
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 	
 		Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => ''));
diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
index 7fdb46a0e..1e3c22221 100644
--- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
@@ -83,7 +83,7 @@ class PhpReaderTest extends CakeTestCase {
  */
 	function testReadPluginValue() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
 		$reader = new PhpReader($this->path);
diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index 20b9c5315..89af8aee7 100644
--- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -187,7 +187,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testViewWithPlugins() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Shell->args = array('TestPlugin.schema');
@@ -238,7 +238,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testDumpFileWritingWithPlugins() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Shell->args = array('TestPlugin.TestPluginApp');
@@ -336,7 +336,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testGenerateWithPlugins() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
 
@@ -450,7 +450,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testPluginParam() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Shell->params = array(
@@ -470,7 +470,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testPluginDotSyntaxWithCreate() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Shell->params = array(
diff --git a/lib/Cake/Test/Case/Console/Command/ShellTest.php b/lib/Cake/Test/Case/Console/Command/ShellTest.php
index 94208bf79..0505bf868 100644
--- a/lib/Cake/Test/Case/Console/Command/ShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/ShellTest.php
@@ -169,7 +169,7 @@ class ShellTest extends CakeTestCase {
  */
 	public function testInitialize() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		), true);
 
diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
index 3f5a40511..0b11ce39a 100644
--- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php
+++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
@@ -88,7 +88,7 @@ class TaskCollectionTest extends CakeTestCase {
 		$dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false);
 		$shell = $this->getMock('Shell', array(), array(), '', false);
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Tasks = new TaskCollection($shell, $dispatcher);
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
index 9c71f494f..70397d997 100644
--- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
+++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
@@ -155,7 +155,7 @@ class FormAuthenticateTest extends CakeTestCase {
 	function testPluginModel() {
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 		), true);
 		CakePlugin::load('TestPlugin');
 
diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
index b70c46511..0ec6dc802 100644
--- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
@@ -799,7 +799,7 @@ HTMLBLOC;
 
 	function testPluginCustomViewClass() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
diff --git a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
index ec11e4d51..f21fc7d1f 100644
--- a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
+++ b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
@@ -84,7 +84,7 @@ class ComponentCollectionTest extends CakeTestCase {
 		$result = $this->Components->load('Cookie');
 		$this->assertInstanceOf('CookieAliasComponent', $result);
 
-		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
 		CakePlugin::load('TestPlugin');
 		$result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent'));
 		$this->assertInstanceOf('OtherComponentComponent', $result);
@@ -125,7 +125,7 @@ class ComponentCollectionTest extends CakeTestCase {
  */
 	function testLoadPluginComponent() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 		));
 		CakePlugin::load('TestPlugin');
 		$result = $this->Components->load('TestPlugin.OtherComponent');
diff --git a/lib/Cake/Test/Case/Controller/ComponentTest.php b/lib/Cake/Test/Case/Controller/ComponentTest.php
index c52f007bd..a93e231e2 100644
--- a/lib/Cake/Test/Case/Controller/ComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/ComponentTest.php
@@ -251,7 +251,7 @@ class ComponentTest extends CakeTestCase {
 	function setUp() {
 		$this->_pluginPaths = App::path('plugins');
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 	}
 
diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php
index 160f4b87b..2f0209f9b 100644
--- a/lib/Cake/Test/Case/Controller/ControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -439,7 +439,7 @@ class ControllerTest extends CakeTestCase {
  */
 	function testLoadModelInPlugins() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		));
@@ -482,7 +482,7 @@ class ControllerTest extends CakeTestCase {
 
 		unset($Controller);
 
-		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
 		CakePlugin::load('TestPlugin');
 
 		$Controller = new Controller($request);
diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php
index f46a00a05..9bd901415 100644
--- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php
+++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php
@@ -280,7 +280,7 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		App::build(array(
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 	}
 
diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index 4f4450b5f..5e949e637 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -318,7 +318,7 @@ class AppImportTest extends CakeTestCase {
 	function testListObjectsInPlugin() {
 		App::build(array(
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
 
@@ -369,7 +369,7 @@ class AppImportTest extends CakeTestCase {
  */
 	function testPluginPath() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
 
@@ -491,7 +491,7 @@ class AppImportTest extends CakeTestCase {
 	function testPluginImporting() {
 		App::build(array(
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
 
@@ -668,7 +668,7 @@ class AppImportTest extends CakeTestCase {
 
 	function testLoadingVendor() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
 		), App::RESET);
 		CakePlugin::loadAll();
@@ -726,7 +726,7 @@ class AppImportTest extends CakeTestCase {
 	public function testLoadClassInLibs() {
 		App::build(array(
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), App::RESET);
 		CakePlugin::loadAll();
 
diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php
index 1f51633d5..21770f660 100644
--- a/lib/Cake/Test/Case/Core/ConfigureTest.php
+++ b/lib/Cake/Test/Case/Core/ConfigureTest.php
@@ -241,7 +241,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadPlugin() {
-		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
+		App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)), true);
 		Configure::config('test', new PhpReader());
 		CakePlugin::load('TestPlugin');
 		$result = Configure::load('TestPlugin.load', 'test');
diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php
index c21b06855..8e69c6c77 100644
--- a/lib/Cake/Test/Case/Core/ObjectTest.php
+++ b/lib/Cake/Test/Case/Core/ObjectTest.php
@@ -716,7 +716,7 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestActionPlugins() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 		));
 		CakePlugin::loadAll();
 		Router::reload();
diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php
index d4b918472..cfed024b5 100644
--- a/lib/Cake/Test/Case/I18n/I18nTest.php
+++ b/lib/Cake/Test/Case/I18n/I18nTest.php
@@ -35,7 +35,7 @@ class I18nTest extends CakeTestCase {
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
 			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::loadAll();
 	}
@@ -2432,7 +2432,7 @@ class I18nTest extends CakeTestCase {
  */
 	function testPluginTranslation() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 
 		Configure::write('Config.language', 'po');
diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
index 94c0a6cd9..fa978b210 100644
--- a/lib/Cake/Test/Case/Log/CakeLogTest.php
+++ b/lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -48,7 +48,7 @@ class CakeLogTest extends CakeTestCase {
 	function testImportingLoggers() {
 		App::build(array(
 			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
 
diff --git a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
index 749b027f3..27508a12e 100644
--- a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
+++ b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
@@ -453,7 +453,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertEquals($Apple->testMethod(true), 'working');
 		$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working');
 
-		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
 		CakePlugin::load('TestPlugin');
 		$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
 		$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);
diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
index 5f1a5ab05..2abe76e74 100644
--- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php
+++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -665,7 +665,7 @@ class CakeSchemaTest extends CakeTestCase {
 	function testSchemaReadWithPlugins() {
 		App::objects('model', null, false);
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 
@@ -984,7 +984,7 @@ class CakeSchemaTest extends CakeTestCase {
  */
 	function testSchemaLoadingFromPlugin() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
diff --git a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
index 4f3e7e63c..08c224f16 100644
--- a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
+++ b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
@@ -80,7 +80,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSource() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$name = 'test_source';
@@ -102,7 +102,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSourceAndPluginDriver() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$name = 'test_plugin_source_and_driver';
@@ -126,7 +126,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetLocalDataSourceAndPluginDriver() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$name = 'test_local_source_and_plugin_driver';
@@ -149,7 +149,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSourceAndLocalDriver() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Model/Datasource/Database' => array(
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
 			)
@@ -272,7 +272,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testConnectionData() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Model/Datasource' => array(
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
 			)
diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
index 88e4a5cca..15e40f9e8 100644
--- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -530,7 +530,7 @@ class CakeSessionTest extends CakeTestCase {
 			'Model/Datasource/Session' => array(
 				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
 			),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		Configure::write('Session', array(
 			'defaults' => 'cake',
@@ -551,7 +551,7 @@ class CakeSessionTest extends CakeTestCase {
  */
 	function testUsingPluginHandler() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		
 		Configure::write('Session', array(
diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
index 398333036..220339778 100644
--- a/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -1042,7 +1042,7 @@ class DispatcherTest extends CakeTestCase {
 		}
 		Router::reload();
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::loadAll();
 
@@ -1142,7 +1142,7 @@ class DispatcherTest extends CakeTestCase {
 	public function testTestPluginDispatch() {
 		$Dispatcher = new TestDispatcher();
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
 		Router::reload();
@@ -1200,7 +1200,7 @@ class DispatcherTest extends CakeTestCase {
 		Router::reload();
 
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
index 54f6893b6..868314522 100644
--- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
+++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -122,7 +122,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 	function setUp() {
 		parent::setUp();
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
 			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS)
diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php
index 4586bd8a0..d3d093882 100644
--- a/lib/Cake/Test/Case/View/HelperCollectionTest.php
+++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php
@@ -82,7 +82,7 @@ class HelperCollectionTest extends CakeTestCase {
 		$result = $this->Helpers->load('Html');
 		$this->assertInstanceOf('HtmlAliasHelper', $result);
 
-		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
 		CakePlugin::loadAll();
 		$result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper'));
 		$this->assertInstanceOf('OtherHelperHelper', $result);
@@ -123,7 +123,7 @@ class HelperCollectionTest extends CakeTestCase {
  */
 	function testLoadPluginHelper() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 		));
 		CakePlugin::loadAll();
 		$result = $this->Helpers->load('TestPlugin.OtherHelper');
diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php
index 2c1f0edfd..f19ebb47f 100644
--- a/lib/Cake/Test/Case/View/HelperTest.php
+++ b/lib/Cake/Test/Case/View/HelperTest.php
@@ -518,7 +518,7 @@ class HelperTest extends CakeTestCase {
 		$_timestamp = Configure::read('Asset.timestamp');
 		Configure::write('Asset.timestamp', 'force');
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
 		));
 		CakePlugin::loadAll();
@@ -799,7 +799,7 @@ class HelperTest extends CakeTestCase {
  */
 	function testLazyLoadingHelpers() {
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),	
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),	
 		));
 		CakePlugin::loadAll();
 		$Helper = new TestHelper($this->View);
diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php
index 1c7c99a9c..43cb96b4f 100644
--- a/lib/Cake/Test/Case/View/ThemeViewTest.php
+++ b/lib/Cake/Test/Case/View/ThemeViewTest.php
@@ -117,7 +117,7 @@ class ThemeViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->ThemeView = new ThemeView($this->PostsController);
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
index 14c783d0b..67526f321 100644
--- a/lib/Cake/Test/Case/View/ViewTest.php
+++ b/lib/Cake/Test/Case/View/ViewTest.php
@@ -195,9 +195,9 @@ class ViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->View = new View($this->PostsController);
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		CakePlugin::loadAll();
@@ -227,16 +227,16 @@ class ViewTest extends CakeTestCase {
 	function testPluginGetTemplate() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
-		$this->Controller->viewPath = 'tests';
+		$this->Controller->viewPath = 'Tests';
 		$this->Controller->action = 'index';
 
 		$View = new TestView($this->Controller);
 
-		$expected = CakePlugin::path('TestPlugin') . 'View' . DS .'tests' . DS .'index.ctp';
+		$expected = CakePlugin::path('TestPlugin') . 'View' . DS .'Tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = CakePlugin::path('TestPlugin') . 'View' . DS . 'layouts' . DS .'default.ctp';
+		$expected = CakePlugin::path('TestPlugin') . 'View' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -249,7 +249,7 @@ class ViewTest extends CakeTestCase {
 	function testPluginPathGeneration() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
-		$this->Controller->viewPath = 'tests';
+		$this->Controller->viewPath = 'Tests';
 		$this->Controller->action = 'index';
 
 		$View = new TestView($this->Controller);
@@ -278,12 +278,12 @@ class ViewTest extends CakeTestCase {
 	function testCamelCasePluginGetTemplate() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
-		$this->Controller->viewPath = 'tests';
+		$this->Controller->viewPath = 'Tests';
 		$this->Controller->action = 'index';
 
 		$View = new TestView($this->Controller);
 		App::build(array(
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
index 91dd15696..e50bdb385 100644
--- a/lib/Cake/View/View.php
+++ b/lib/Cake/View/View.php
@@ -740,7 +740,7 @@ class View extends Object {
 			$subDir = $this->layoutPath . DS;
 		}
 		$paths = $this->_paths($this->plugin);
-		$file = 'layouts' . DS . $subDir . $name;
+		$file = 'Layouts' . DS . $subDir . $name;
 
 		$exts = $this->_getExtensions();
 		foreach ($exts as $ext) {
@@ -780,8 +780,8 @@ class View extends Object {
 		$exts = $this->_getExtensions();
 		foreach ($exts as $ext) {
 			foreach ($paths as $path) {
-				if (file_exists($path . 'elements' . DS . $name . $ext)) {
-					return $path . 'elements' . DS . $name . $ext;
+				if (file_exists($path . 'Elements' . DS . $name . $ext)) {
+					return $path . 'Elements' . DS . $name . $ext;
 				}
 			}
 		}
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 2c296fb6d..00284c1cd 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -86,20 +86,20 @@ if (!defined('APP')) {
 /**
  * Path to the application's view's layouts directory.
  */
-	define('LAYOUTS', VIEWS.'layouts'.DS);
+	define('LAYOUTS', VIEWS.'Layouts'.DS);
 
 /**
  * Path to the application's view's elements directory.
  * It's supposed to hold pieces of PHP/HTML that are used on multiple pages
  * and are not linked to a particular layout (like polls, footers and so on).
  */
-	define('ELEMENTS', VIEWS.'elements'.DS);
+	define('ELEMENTS', VIEWS.'Elements'.DS);
 
 /**
  * Path to the configuration files directory.
  */
 if (!defined('CONFIGS')) {
-	define('CONFIGS', APP.'config'.DS);
+	define('CONFIGS', APP.'Config'.DS);
 }
 
 /**
@@ -138,7 +138,7 @@ if (!defined('TESTS')) {
  * Path to the core tests directory.
  */
 if (!defined('CAKE_TESTS')) {
-	define('CAKE_TESTS', CAKE.'tests'.DS);
+	define('CAKE_TESTS', CAKE.'Test'.DS);
 }
 
 /**

From 7ba60ff424d941e8019b74fa6cc201df7bc9bcc8 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 03:15:04 -0430
Subject: [PATCH 37/50] Changing more paths

---
 .../Console/templates/default/views/home.ctp  |  2 +-
 .../Controller/Component/AuthComponent.php    |  2 +-
 lib/Cake/Test/Case/BasicsTest.php             |  2 +-
 lib/Cake/Test/Case/Cache/CacheTest.php        |  6 ++--
 .../Test/Case/Configure/IniReaderTest.php     |  2 +-
 .../Test/Case/Configure/PhpReaderTest.php     |  2 +-
 .../Console/Command/CommandListShellTest.php  |  4 +--
 .../Case/Console/Command/SchemaShellTest.php  |  2 +-
 .../Test/Case/Console/Command/ShellTest.php   |  2 +-
 .../Console/Command/Task/ExtractTaskTest.php  |  8 ++---
 .../Console/Command/Task/TestTaskTest.php     |  2 +-
 .../Test/Case/Console/ShellDispatcherTest.php |  4 +--
 .../Controller/Component/AclComponentTest.php |  4 +--
 .../Component/AuthComponentTest.php           |  2 +-
 .../Component/EmailComponentTest.php          |  8 ++---
 .../Component/RequestHandlerComponentTest.php |  4 +--
 .../Test/Case/Controller/ControllerTest.php   | 10 +++---
 .../Case/Controller/PagesControllerTest.php   |  2 +-
 .../Test/Case/Controller/ScaffoldTest.php     | 12 +++----
 lib/Cake/Test/Case/Core/AppTest.php           | 24 +++++++-------
 lib/Cake/Test/Case/Core/ConfigureTest.php     |  4 +--
 lib/Cake/Test/Case/Core/ObjectTest.php        | 24 +++++++-------
 lib/Cake/Test/Case/Error/ErrorHandlerTest.php |  4 +--
 .../Test/Case/Error/ExceptionRendererTest.php |  3 +-
 lib/Cake/Test/Case/I18n/I18nTest.php          |  2 +-
 lib/Cake/Test/Case/Log/CakeLogTest.php        |  2 +-
 .../Test/Case/Model/ConnectionManagerTest.php |  6 ++--
 .../Case/Model/Datasource/CakeSessionTest.php |  2 +-
 lib/Cake/Test/Case/Routing/DispatcherTest.php | 22 ++++++-------
 lib/Cake/Test/Case/Routing/RouterTest.php     |  4 +--
 .../Case/TestSuite/ControllerTestCaseTest.php | 16 +++++-----
 .../Test/Case/View/Helper/CacheHelperTest.php |  2 +-
 .../Test/Case/View/Helper/HtmlHelperTest.php  | 12 +++----
 .../Case/View/Helper/SessionHelperTest.php    |  4 +--
 .../Test/Case/View/Helper/TimeHelperTest.php  |  4 +--
 lib/Cake/Test/Case/View/HelperTest.php        |  6 ++--
 lib/Cake/Test/Case/View/MediaViewTest.php     | 12 +++----
 lib/Cake/Test/Case/View/ThemeViewTest.php     | 18 +++++------
 lib/Cake/Test/Case/View/ViewTest.php          | 32 +++++++++----------
 lib/Cake/View/View.php                        |  4 +--
 40 files changed, 143 insertions(+), 144 deletions(-)

diff --git a/lib/Cake/Console/templates/default/views/home.ctp b/lib/Cake/Console/templates/default/views/home.ctp
index b707e5eb3..506563c91 100644
--- a/lib/Cake/Console/templates/default/views/home.ctp
+++ b/lib/Cake/Console/templates/default/views/home.ctp
@@ -90,7 +90,7 @@ $output .= "<?php\n";
 $output .= "\techo __('To change the content of this page, edit: %s\n";
 $output .= "\t\tTo change its layout, edit: %s\n";
 $output .= "\t\tYou can also add some CSS styles for your pages at: %s',\n";
-$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
+$output .= "\t\tAPP . 'View' . DS . 'Pages' . DS . 'home.ctp.<br />',  APP . 'View' . DS . 'Layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
 $output .= "?>\n";
 $output .= "</p>\n";
 ?>
\ No newline at end of file
diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php
index 28b7e1bea..3b35d7edf 100644
--- a/lib/Cake/Controller/Component/AuthComponent.php
+++ b/lib/Cake/Controller/Component/AuthComponent.php
@@ -322,7 +322,7 @@ class AuthComponent extends Component {
 					$controller->redirect($loginAction);
 					return false;
 				} elseif (!empty($this->ajaxLogin)) {
-					$controller->viewPath = 'elements';
+					$controller->viewPath = 'Elements';
 					echo $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
 					$this->_stop();
 					return false;
diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
index 48da9c85b..1a95cda54 100644
--- a/lib/Cake/Test/Case/BasicsTest.php
+++ b/lib/Cake/Test/Case/BasicsTest.php
@@ -34,7 +34,7 @@ class BasicsTest extends CakeTestCase {
  */
 	public function setUp() {
 		App::build(array(
-			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
 		));
 		$this->_language = Configure::read('Config.language');
 	}
diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php
index 474cb81c8..a51881f83 100644
--- a/lib/Cake/Test/Case/Cache/CacheTest.php
+++ b/lib/Cake/Test/Case/Cache/CacheTest.php
@@ -89,7 +89,7 @@ class CacheTest extends CakeTestCase {
  */
 	function testConfigWithLibAndPluginEngines() {
 		App::build(array(
-			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'Lib' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
@@ -252,7 +252,7 @@ class CacheTest extends CakeTestCase {
  */
 	function testDrop() {
 		App::build(array(
-			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'libs' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 
@@ -305,7 +305,7 @@ class CacheTest extends CakeTestCase {
  */
 	function testWriteTriggerError() {
 		App::build(array(
-			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'libs' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 	
diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php
index dcc5a3f68..a03313886 100644
--- a/lib/Cake/Test/Case/Configure/IniReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php
@@ -34,7 +34,7 @@ class IniReaderTest extends CakeTestCase {
  */
 	function setup() {
 		parent::setup();
-		$this->path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$this->path = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS;
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
index 1e3c22221..1de4c2471 100644
--- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php
+++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
@@ -26,7 +26,7 @@ class PhpReaderTest extends CakeTestCase {
  */
 	function setUp() {
 		parent::setUp();
-		$this->path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$this->path = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS;
 	}
 /**
  * test reading files
diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
index af5c92002..4244354f0 100644
--- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
@@ -41,10 +41,10 @@ class CommandListTest extends CakeTestCase {
 		parent::setUp();
 		App::build(array(
 			'plugins' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
 			),
 			'Console/Command' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index 89af8aee7..4db2ebbd8 100644
--- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -458,7 +458,7 @@ class SchemaShellTest extends CakeTestCase {
 			'connection' => 'test'
 		);
 		$this->Shell->startup();
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'config' . DS . 'schema';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'Config' . DS . 'Schema';
 		$this->assertEqual($this->Shell->Schema->path, $expected);
 		CakePlugin::unload();
 	}
diff --git a/lib/Cake/Test/Case/Console/Command/ShellTest.php b/lib/Cake/Test/Case/Console/Command/ShellTest.php
index 0505bf868..28ddef756 100644
--- a/lib/Cake/Test/Case/Console/Command/ShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/ShellTest.php
@@ -170,7 +170,7 @@ class ShellTest extends CakeTestCase {
 	public function testInitialize() {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
+			'models' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
 		), true);
 
 		$this->Shell->uses = array('TestPlugin.TestPluginPost');
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index 346786da4..812fc38ea 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -70,7 +70,7 @@ class ExtractTaskTest extends CakeTestCase {
 	public function testExecute() {
 		$this->Task->interactive = false;
 
-		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages';
+		$this->Task->params['paths'] = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Pages';
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->expects($this->never())->method('err');
 		$this->Task->expects($this->any())->method('in')
@@ -162,7 +162,7 @@ class ExtractTaskTest extends CakeTestCase {
 	function testExtractWithExclude() {
 		$this->Task->interactive = false;
 
-		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View';
+		$this->Task->params['paths'] = LIBS . 'Test' . DS . 'test_app' . DS . 'View';
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['exclude'] = 'pages,layouts';
 
@@ -189,8 +189,8 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Task->interactive = false;
 
 		$this->Task->params['paths'] = 
-			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages,' .
-			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'posts';
+			LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Pages,' .
+			LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Posts';
 	
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->expects($this->never())->method('err');
diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
index de471b01f..5eb874a0b 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -542,7 +542,7 @@ class TestTaskTest extends CakeTestCase {
  * @return void
  */
 	function testInteractiveWithPlugin() {
-		$testApp = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS;
+		$testApp = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS;
 		App::build(array(
 			'plugins' => array($testApp)
 		), true);
diff --git a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
index e5bbfc78d..08ca66ea6 100644
--- a/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
+++ b/lib/Cake/Test/Case/Console/ShellDispatcherTest.php
@@ -117,10 +117,10 @@ class ShellDispatcherTest extends CakeTestCase {
 		parent::setUp();
 		App::build(array(
 			'plugins' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
 			),
 			'Console/Command' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
index 102a040d4..597ddce5d 100644
--- a/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
@@ -262,7 +262,7 @@ class IniAclTest extends CakeTestCase {
  * @return void
  */
 	function testCheck() {
-		$iniFile = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+		$iniFile = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS . 'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);
@@ -285,7 +285,7 @@ class IniAclTest extends CakeTestCase {
  * @return void
  */
 	function testCheckArray() {
-		$iniFile = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+		$iniFile = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS . 'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);
diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
index e7f1709e8..ad4be2a6c 100644
--- a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -951,7 +951,7 @@ class AuthTest extends CakeTestCase {
  */
 	function testAjaxLogin() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
 
diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
index 0ec6dc802..82e9e80c4 100644
--- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
@@ -157,7 +157,7 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->EmailTest->initialize($this->Controller, array());
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 	}
 
@@ -432,7 +432,7 @@ HTMLBLOC;
  */
 	function testMessageRetrievalWithoutTemplate() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->EmailTest->to = 'postmaster@example.com';
@@ -470,7 +470,7 @@ HTMLBLOC;
  */
 	function testMessageRetrievalWithTemplate() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->set('value', 22091985);
@@ -800,7 +800,7 @@ HTMLBLOC;
 	function testPluginCustomViewClass() {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->view = 'TestPlugin.Email';
diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index 172488d7c..ecbedf547 100644
--- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -695,7 +695,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestAction() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -724,7 +724,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestActionStillRenderingLayout() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php
index 2f0209f9b..af748b8b6 100644
--- a/lib/Cake/Test/Case/Controller/ControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -440,8 +440,8 @@ class ControllerTest extends CakeTestCase {
 	function testLoadModelInPlugins() {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
-			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
+			'Controller' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
+			'Model' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
 		));
 		CakePlugin::load('TestPlugin');
 		App::uses('TestPluginAppController', 'TestPlugin.Controller');
@@ -572,7 +572,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$Controller = new Controller($request);
 		$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -634,7 +634,7 @@ class ControllerTest extends CakeTestCase {
  */
 	function testRender() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 		$request = new CakeRequest('controller_posts/index');
 		$request->params['action'] = 'index';
@@ -680,7 +680,7 @@ class ControllerTest extends CakeTestCase {
 	function testComponentBeforeRenderChangingViewClass() {
 		App::build(array(
 			'View' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		$Controller = new Controller($this->getMock('CakeRequest'));
diff --git a/lib/Cake/Test/Case/Controller/PagesControllerTest.php b/lib/Cake/Test/Case/Controller/PagesControllerTest.php
index 452e7db77..20c4b0481 100644
--- a/lib/Cake/Test/Case/Controller/PagesControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/PagesControllerTest.php
@@ -45,7 +45,7 @@ class PagesControllerTest extends CakeTestCase {
 	function testDisplay() {
 		App::build(array(
 			'View' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
 			)
 		));
 		$Pages = new PagesController(new CakeRequest(null, false));
diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php
index 9bd901415..b0eec3a18 100644
--- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php
+++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php
@@ -279,7 +279,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 	}
@@ -349,11 +349,11 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_edit');
-		$expected = LIBS . 'tests' . DS . 'test_app' .DS . 'View' . DS . 'posts' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' .DS . 'View' . DS . 'Posts' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('edit');
-		$expected = LIBS . 'tests' . DS . 'test_app' .DS . 'View' . DS . 'posts' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' .DS . 'View' . DS . 'Posts' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$Controller = new ScaffoldMockController($this->request);
@@ -368,12 +368,12 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_add');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin'
 			. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('add');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin'
 			. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
@@ -392,7 +392,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		$ScaffoldView = new TestScaffoldView($this->Controller);
 
 		$result = $ScaffoldView->testGetFilename('index');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS 
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS 
 			. 'themed' . DS . 'test_theme' . DS . 'posts' . DS . 'scaffold.index.ctp';
 		$this->assertEqual($result, $expected);
 	}
diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index 5e949e637..462a331bd 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -300,7 +300,7 @@ class AppImportTest extends CakeTestCase {
 
 		App::build(array(
 			'plugins' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS
 			)
 		));
 		$result = App::objects('plugin', null, false);
@@ -317,7 +317,7 @@ class AppImportTest extends CakeTestCase {
  */
 	function testListObjectsInPlugin() {
 		App::build(array(
-			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
+			'Model' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
@@ -374,11 +374,11 @@ class AppImportTest extends CakeTestCase {
 		CakePlugin::loadAll();
 
 		$path = App::pluginPath('TestPlugin');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
 		$this->assertEqual($path, $expected);
 
 		$path = App::pluginPath('TestPluginTwo');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
 		$this->assertEqual($path, $expected);
 		App::build();
 	}
@@ -390,14 +390,14 @@ class AppImportTest extends CakeTestCase {
  */
 	function testThemePath() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS)
 		));
 		$path = App::themePath('test_theme');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS;
 		$this->assertEqual($path, $expected);
 
 		$path = App::themePath('TestTheme');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS;
 		$this->assertEqual($path, $expected);
 
 		App::build();
@@ -490,7 +490,7 @@ class AppImportTest extends CakeTestCase {
  */
 	function testPluginImporting() {
 		App::build(array(
-			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'libs' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
@@ -534,7 +534,7 @@ class AppImportTest extends CakeTestCase {
 		$this->assertFalse(class_exists('BananaHelper', false), 'BananaHelper exists, cannot test importing it.');
 		App::build(array(
 			'View/Helper' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'Helper' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Helper' . DS
 			)
 		));
 		$this->assertFalse(class_exists('BananaHelper', false), 'BananaHelper exists, cannot test importing it.');
@@ -649,7 +649,7 @@ class AppImportTest extends CakeTestCase {
 			$this->markTestSkipped('Cannot test loading of classes that exist.');
 		}
 		App::build(array(
-			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
+			'Model' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
 		));
 		$toLoad = array('PersisterOne', 'PersisterTwo');
 		$load = App::import('Model', $toLoad);
@@ -669,7 +669,7 @@ class AppImportTest extends CakeTestCase {
 	function testLoadingVendor() {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
+			'vendors' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Vendor'. DS),
 		), App::RESET);
 		CakePlugin::loadAll();
 
@@ -725,7 +725,7 @@ class AppImportTest extends CakeTestCase {
  */
 	public function testLoadClassInLibs() {
 		App::build(array(
-			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'libs' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), App::RESET);
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php
index 21770f660..f31a753ce 100644
--- a/lib/Cake/Test/Case/Core/ConfigureTest.php
+++ b/lib/Cake/Test/Case/Core/ConfigureTest.php
@@ -198,7 +198,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadWithMerge() {
-		Configure::config('test', new PhpReader(LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS));
+		Configure::config('test', new PhpReader(LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS));
 
 		$result = Configure::load('var_test', 'test');
 		$this->assertTrue($result);
@@ -219,7 +219,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadNoMerge() {
-		Configure::config('test', new PhpReader(LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS));
+		Configure::config('test', new PhpReader(LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS));
 
 		$result = Configure::load('var_test', 'test');
 		$this->assertTrue($result);
diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php
index 8e69c6c77..0f7f023de 100644
--- a/lib/Cake/Test/Case/Core/ObjectTest.php
+++ b/lib/Cake/Test/Case/Core/ObjectTest.php
@@ -471,9 +471,9 @@ class ObjectTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'. DS),
-			'behaviors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+			'models' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS),
+			'behaviors' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model'. DS . 'Behavior' . DS),
 		), true);
 
 		$this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
@@ -532,8 +532,8 @@ class ObjectTest extends CakeTestCase {
 		$this->assertFalse(class_exists('ContainableBehavior'));
 
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'behaviors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+			'models' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+			'behaviors' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model'. DS . 'Behavior' . DS),
 		), true);
 
 		$this->assertFalse(class_exists('PersistOneBehaviorBehavior'));
@@ -676,9 +676,9 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestAction() {
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
-			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS)
+			'models' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+			'controllers' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Controller' . DS)
 		));
 		$result = $this->object->requestAction('');
 		$this->assertFalse($result);
@@ -756,10 +756,10 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestActionArray() {
 		App::build(array(
-			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
-			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
-			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'. DS)
+			'models' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+			'controllers' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
+			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin'. DS)
 		));
 		CakePlugin::loadAll();
 
diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
index 89077ab8d..a045f4ad5 100644
--- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
+++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php
@@ -37,7 +37,7 @@ class ErrorHandlerTest extends CakeTestCase {
 	function setUp() {
 		App::build(array(
 			'View' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		Router::reload();
@@ -230,7 +230,7 @@ class ErrorHandlerTest extends CakeTestCase {
 	function testLoadPluginHanlder() {
 		App::build(array(
 			'plugins' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
 			)
 		), true);
 		CakePlugin::load('TestPlugin');
diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
index 7e56f7c9c..beca8eac2 100644
--- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
+++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
@@ -158,8 +158,7 @@ class ExceptionRendererTest extends CakeTestCase {
 	function setUp() {
 		App::build(array(
 			'views' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				LIBS . 'libs' . DS . 'view' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		Router::reload();
diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php
index cfed024b5..5c4f87669 100644
--- a/lib/Cake/Test/Case/I18n/I18nTest.php
+++ b/lib/Cake/Test/Case/I18n/I18nTest.php
@@ -34,7 +34,7 @@ class I18nTest extends CakeTestCase {
 	function setUp() {
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
+			'locales' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Locale' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php
index fa978b210..c910780f7 100644
--- a/lib/Cake/Test/Case/Log/CakeLogTest.php
+++ b/lib/Cake/Test/Case/Log/CakeLogTest.php
@@ -47,7 +47,7 @@ class CakeLogTest extends CakeTestCase {
  */
 	function testImportingLoggers() {
 		App::build(array(
-			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'libs' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Lib' . DS),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 		CakePlugin::load('TestPlugin');
diff --git a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
index 08c224f16..2fdc1d0fe 100644
--- a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
+++ b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php
@@ -151,7 +151,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Model/Datasource/Database' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
 			)
 		));
 
@@ -274,7 +274,7 @@ class ConnectionManagerTest extends CakeTestCase {
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
 			'Model/Datasource' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
 			)
 		));
 		CakePlugin::loadAll();
@@ -328,7 +328,7 @@ class ConnectionManagerTest extends CakeTestCase {
 	public function testDrop() {
 		App::build(array(
 			'Model/Datasource' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
 			)
 		));
 		ConnectionManager::create('droppable', array('datasource' => 'Test2Source'));
diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
index 15e40f9e8..dbd87e892 100644
--- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -528,7 +528,7 @@ class CakeSessionTest extends CakeTestCase {
 	function testUsingAppLibsHandler() {
 		App::build(array(
 			'Model/Datasource/Session' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
 			),
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
index 220339778..d2838286c 100644
--- a/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -765,7 +765,7 @@ class DispatcherTest extends CakeTestCase {
  */
 	public function testDispatchBasic() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$Dispatcher = new TestDispatcher();
 		Configure::write('App.baseUrl', '/index.php');
@@ -1201,8 +1201,8 @@ class DispatcherTest extends CakeTestCase {
 
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'vendors' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Vendor'. DS),
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		CakePlugin::loadAll();
 
@@ -1227,21 +1227,21 @@ class DispatcherTest extends CakeTestCase {
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/flash/theme_test.swf'));
 		$result = ob_get_clean();
 
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/pdfs/theme_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load pdf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/img/test.jpg'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
 		$this->assertEqual($file, $result);
 
 		ob_start();
@@ -1262,20 +1262,20 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/root.js');
 		$result = ob_get_clean();
-		$expected = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'root.js');
+		$expected = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'root.js');
 		$this->assertEqual($result, $expected);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/flash/plugin_test.swf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the plugin.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/pdfs/plugin_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
 		$this->assertEqual($file, $result);
 		 $this->assertEqual('this is just a test to load pdf file from the plugin.', $result);
 
@@ -1297,7 +1297,7 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/img/cake.icon.gif');
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
 		$this->assertEqual($file, $result);
 
 		ob_start();
@@ -1388,7 +1388,7 @@ class DispatcherTest extends CakeTestCase {
 		Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index'));
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS),
 		), true);
 
 		$dispatcher = new TestDispatcher();
diff --git a/lib/Cake/Test/Case/Routing/RouterTest.php b/lib/Cake/Test/Case/Routing/RouterTest.php
index 4bc07851e..eed1d2fb0 100644
--- a/lib/Cake/Test/Case/Routing/RouterTest.php
+++ b/lib/Cake/Test/Case/Routing/RouterTest.php
@@ -1186,7 +1186,7 @@ class RouterTest extends CakeTestCase {
 		$paths = App::path('plugins');
 		App::build(array(
 			'plugins' =>  array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
 			)
 		), true);
 		CakePlugin::loadAll();
@@ -2211,7 +2211,7 @@ class RouterTest extends CakeTestCase {
 	function testConnectDefaultRoutes() {
 		App::build(array(
 			'plugins' =>  array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
 			)
 		), true);
 		CakePlugin::loadAll();
diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
index 868314522..f7fe86db9 100644
--- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
+++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -123,9 +123,9 @@ class ControllerTestCaseTest extends CakeTestCase {
 		parent::setUp();
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
-			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS)
+			'Controller' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
+			'Model' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS)
 		));
 		CakePlugin::loadAll();
 		$this->Case = new ControllerTestCase();
@@ -273,7 +273,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * Tests using loaded routes during tests
  */
 	function testUseRoutes() {
-		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'routes.php';
 		$controller = $this->Case->generate('TestsApps');
 		$controller->Components->load('RequestHandler');
 		$result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'view'));
@@ -281,16 +281,16 @@ class ControllerTestCaseTest extends CakeTestCase {
 		$expected = array('cakephp' => 'cool');
 		$this->assertEquals($result, $expected);
 
-		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'routes.php';
 		$result = $this->Case->testAction('/some_alias');
 		$this->assertEquals($result, 5);
 
-		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'routes.php';
 		$this->Case->testAction('/redirect_me_now');
 		$result = $this->Case->headers['Location'];
 		$this->assertEquals($result, 'http://cakephp.org');
 
-		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'routes.php';
 		$this->Case->testAction('/redirect_me');
 		$result = $this->Case->headers['Location'];
 		$this->assertEquals($result, Router::url(array('controller' => 'tests_apps', 'action' => 'some_method'), true));		
@@ -302,7 +302,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * @expectedException MissingActionException
  */
 	function testSkipRoutes() {
-		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'routes.php';
 
 		$this->Case->loadRoutes = false;
 		$result = $this->Case->testAction('/tests_apps/missing_action.json', array('return' => 'view'));
diff --git a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
index adb8fb315..d41d86f79 100644
--- a/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
@@ -84,7 +84,7 @@ class CacheHelperTest extends CakeTestCase {
 		Configure::write('Cache.check', true);
 		Configure::write('Cache.disable', false);
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 	}
 
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
index cbb29fb8b..0a15c691b 100644
--- a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -381,7 +381,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$file = new File($testfile, true);
 
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		Configure::write('Asset.timestamp', true);
 		Configure::write('debug', 1);
@@ -416,10 +416,10 @@ class HtmlHelperTest extends CakeTestCase {
  */
 	function testThemeAssetsInMainWebrootPath() {
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', LIBS . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', LIBS . 'Test' . DS . 'test_app' . DS . 'webroot' . DS);
 
 		$this->Html->theme = 'test_theme';
 		$result = $this->Html->css('webroot_test');
@@ -662,7 +662,7 @@ class HtmlHelperTest extends CakeTestCase {
 		$file = new File($testfile, true);
 
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Html->webroot = '/';
@@ -1383,7 +1383,7 @@ class HtmlHelperTest extends CakeTestCase {
  */
 
 	public function testLoadConfig() {
-		$path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$path = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS;
 
 		$result = $this->Html->loadConfig('htmlhelper_tags', $path);
 		$expected = array(
@@ -1423,7 +1423,7 @@ class HtmlHelperTest extends CakeTestCase {
  * @expectedException ConfigureException
  */
 	public function testLoadConfigWrongReader() {
-		$path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$path = LIBS . 'Test' . DS . 'test_app' . DS . 'Config'. DS;
 		$result = $this->Html->loadConfig(array('htmlhelper_tags', 'wrong_reader'), $path);
 	}
 
diff --git a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
index 60ee8653d..d0eae9740 100644
--- a/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/SessionHelperTest.php
@@ -132,7 +132,7 @@ class SessionHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$result = $this->Session->flash('notification');
 		$result = str_replace("\r\n", "\n", $result);
@@ -165,7 +165,7 @@ class SessionHelperTest extends CakeTestCase {
  */
 	function testFlashElementInAttrs() {
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$result = $this->Session->flash('flash', array(
 			'element' => 'session_helper', 
diff --git a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
index 08bacf297..c5e4f1ce1 100644
--- a/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
@@ -656,7 +656,7 @@ class TimeHelperTest extends CakeTestCase {
  */
 	function testConvertSpecifiers() {
 		App::build(array(
-			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
 		), true);
 		Configure::write('Config.language', 'time_test');
 		$time = strtotime('Thu Jan 14 11:43:39 2010');
@@ -765,7 +765,7 @@ class TimeHelperTest extends CakeTestCase {
  */
 	function testI18nFormat() {
 		App::build(array(
-			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
 		), true);
 		Configure::write('Config.language', 'time_test');
 		$time = strtotime('Thu Jan 14 13:59:28 2010');
diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php
index f19ebb47f..f04834863 100644
--- a/lib/Cake/Test/Case/View/HelperTest.php
+++ b/lib/Cake/Test/Case/View/HelperTest.php
@@ -519,7 +519,7 @@ class HelperTest extends CakeTestCase {
 		Configure::write('Asset.timestamp', 'force');
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS),
 		));
 		CakePlugin::loadAll();
 
@@ -759,7 +759,7 @@ class HelperTest extends CakeTestCase {
 		$this->Helper->theme = 'test_theme';
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
@@ -771,7 +771,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', LIBS . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', LIBS . 'Test' . DS . 'test_app' . DS . 'webroot' . DS);
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
 		$expected = '/theme/test_theme/img/cake.power.gif';
diff --git a/lib/Cake/Test/Case/View/MediaViewTest.php b/lib/Cake/Test/Case/View/MediaViewTest.php
index d0f4be960..2a8cd5b86 100644
--- a/lib/Cake/Test/Case/View/MediaViewTest.php
+++ b/lib/Cake/Test/Case/View/MediaViewTest.php
@@ -72,7 +72,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testRender() {
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
@@ -120,7 +120,7 @@ class MediaViewTest extends CakeTestCase {
 		$currentUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 		$_SERVER['HTTP_USER_AGENT'] = 'Some generic browser';
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS,
 			'id' => 'no_section.ini',
 			'extension' => 'ini',
 		);
@@ -180,7 +180,7 @@ class MediaViewTest extends CakeTestCase {
 		$currentUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 		$_SERVER['HTTP_USER_AGENT'] = 'Opera/9.80 (Windows NT 6.0; U; en) Presto/2.8.99 Version/11.10';
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS,
 			'id' => 'no_section.ini',
 			'extension' => 'ini',
 		);
@@ -245,7 +245,7 @@ class MediaViewTest extends CakeTestCase {
 		$currentUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 5.2; Trident/4.0; Media Center PC 4.0; SLCC1; .NET CLR 3.0.04320)';
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Config' . DS,
 			'id' => 'no_section.ini',
 			'extension' => 'ini',
 		);
@@ -308,7 +308,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testConnectionAborted() {
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
@@ -332,7 +332,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testConnectionAbortedOnBuffering() {
 		$this->MediaView->viewVars = array(
-			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php
index 43cb96b4f..05d1d8161 100644
--- a/lib/Cake/Test/Case/View/ThemeViewTest.php
+++ b/lib/Cake/Test/Case/View/ThemeViewTest.php
@@ -118,7 +118,7 @@ class ThemeViewTest extends CakeTestCase {
 		$this->ThemeView = new ThemeView($this->PostsController);
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		CakePlugin::loadAll();
 	}
@@ -152,15 +152,15 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->theme = 'test_theme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'tests' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'layouts' . DS .'plugin_default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'layouts' . DS .'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName('default');
 		$this->assertEqual($result, $expected);
 	}
@@ -180,25 +180,25 @@ class ThemeViewTest extends CakeTestCase {
 
 		$ThemeView = new TestThemeView($this->Controller);
 		$ThemeView->theme = 'test_theme';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('/posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'rss';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'emails' . DS . 'html';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
index 67526f321..0f0801eb2 100644
--- a/lib/Cake/Test/Case/View/ViewTest.php
+++ b/lib/Cake/Test/Case/View/ViewTest.php
@@ -260,11 +260,11 @@ class ViewTest extends CakeTestCase {
 		$paths = $View->paths('TestPlugin');
 		$pluginPath = CakePlugin::path('TestPlugin');
 		$expected = array(
-			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'plugins' . DS . 'TestPlugin' . DS,
+			LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Plugins' . DS . 'TestPlugin' . DS,
 			$pluginPath . 'View' . DS,
 			$pluginPath . 'views' . DS,
 			$pluginPath . 'Lib' . DS . 'View' . DS,
-			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS,
+			LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS,
 			LIBS . 'View' . DS
 		);
 		$this->assertEqual($paths, $expected);
@@ -284,15 +284,15 @@ class ViewTest extends CakeTestCase {
 		$View = new TestView($this->Controller);
 		App::build(array(
 			'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$pluginPath = CakePlugin::path('TestPlugin');
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'TestPlugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS .'TestPlugin' . DS . 'View' . DS .'Tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = $pluginPath. 'View' . DS . 'layouts' . DS .'default.ctp';
+		$expected = $pluginPath. 'View' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -306,35 +306,35 @@ class ViewTest extends CakeTestCase {
 	function testGetTemplate() {
 		$this->Controller->plugin = null;
 		$this->Controller->name = 'Pages';
-		$this->Controller->viewPath = 'pages';
+		$this->Controller->viewPath = 'Pages';
 		$this->Controller->action = 'display';
 		$this->Controller->params['pass'] = array('home');
 
 		$View = new TestView($this->Controller);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Pages' . DS .'home.ctp';
 		$result = $View->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
-		$result = $View->getViewFileName('/posts/index');
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('/Posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
-		$result = $View->getViewFileName('../posts/index');
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('../Posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$View->layoutPath = 'rss';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'rss' . DS . 'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$View->layoutPath = 'emails' . DS . 'html';
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
 		$result = $View->getLayoutFileName();
 
 		$this->assertEqual($result, $expected);
@@ -762,8 +762,8 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getViewFileName('../themed/test_theme/posts/index');
 		$this->assertPattern('/themed(\/|\\\)test_theme(\/|\\\)posts(\/|\\\)index.ctp/', $result);
 
-		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
-		$result = $View->getViewFileName('../posts/index');
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('../Posts/index');
 		$this->assertEqual($result, $expected);
 
 	}
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
index e50bdb385..1a2f75564 100644
--- a/lib/Cake/View/View.php
+++ b/lib/Cake/View/View.php
@@ -353,7 +353,7 @@ class View extends Object {
 			}
 			return $element;
 		}
-		$file = 'elements' . DS . $name . $this->ext;
+		$file = 'Elements' . DS . $name . $this->ext;
 
 		if (Configure::read('debug') > 0) {
 			return "Element Not Found: " . $file;
@@ -807,7 +807,7 @@ class View extends Object {
 			$count = count($viewPaths);
 			for ($i = 0; $i < $count; $i++) {
 				if (!isset($corePaths[$viewPaths[$i]])) {
-					$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
+					$paths[] = $viewPaths[$i] . 'Plugins' . DS . $plugin . DS;
 				}
 			}
 			$paths = array_merge($paths, App::path('View', $plugin));

From 649b863fc5a2452d1c2bc8a670cf834b391fe588 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 03:19:00 -0430
Subject: [PATCH 38/50] Changing more strings after renaming folders

---
 lib/Cake/Test/Case/View/ThemeViewTest.php | 24 +++++++++++------------
 lib/Cake/View/ThemeView.php               |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php
index 05d1d8161..8ae0f78d5 100644
--- a/lib/Cake/Test/Case/View/ThemeViewTest.php
+++ b/lib/Cake/Test/Case/View/ThemeViewTest.php
@@ -147,20 +147,20 @@ class ThemeViewTest extends CakeTestCase {
 	function testPluginThemedGetTemplate() {
 		$this->Controller->plugin = 'TestPlugin';
 		$this->Controller->name = 'TestPlugin';
-		$this->Controller->viewPath = 'tests';
+		$this->Controller->viewPath = 'Tests';
 		$this->Controller->action = 'index';
 		$this->Controller->theme = 'test_theme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'tests' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'layouts' . DS .'plugin_default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Layouts' . DS .'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName('default');
 		$this->assertEqual($result, $expected);
 	}
@@ -174,31 +174,31 @@ class ThemeViewTest extends CakeTestCase {
 	function testGetTemplate() {
 		$this->Controller->plugin = null;
 		$this->Controller->name = 'Pages';
-		$this->Controller->viewPath = 'pages';
+		$this->Controller->viewPath = 'Pages';
 		$this->Controller->action = 'display';
 		$this->Controller->params['pass'] = array('home');
 
 		$ThemeView = new TestThemeView($this->Controller);
 		$ThemeView->theme = 'test_theme';
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Pages' . DS .'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
-		$result = $ThemeView->getViewFileName('/posts/index');
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Posts' . DS .'index.ctp';
+		$result = $ThemeView->getViewFileName('/Posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'rss';
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'rss' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'emails' . DS . 'html';
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'emails' . DS . 'html' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -213,7 +213,7 @@ class ThemeViewTest extends CakeTestCase {
 	function testMissingView() {
 		$this->Controller->plugin = null;
 		$this->Controller->name = 'Pages';
-		$this->Controller->viewPath = 'pages';
+		$this->Controller->viewPath = 'Pages';
 		$this->Controller->action = 'display';
 		$this->Controller->theme = 'my_theme';
 
diff --git a/lib/Cake/View/ThemeView.php b/lib/Cake/View/ThemeView.php
index df85282b7..622ce2a28 100644
--- a/lib/Cake/View/ThemeView.php
+++ b/lib/Cake/View/ThemeView.php
@@ -57,12 +57,12 @@ class ThemeView extends View {
 		if (!empty($this->theme)) {
 			$count = count($paths);
 			for ($i = 0; $i < $count; $i++) {
-				if (strpos($paths[$i], DS . 'plugins' . DS) === false
+				if (strpos($paths[$i], DS . 'Plugins' . DS) === false
 					&& strpos($paths[$i], DS . 'Cake' . DS . 'View') === false) {
 						if ($plugin) {
-							$themePaths[] = $paths[$i] . 'themed'. DS . $this->theme . DS . 'plugins' . DS . $plugin . DS;
+							$themePaths[] = $paths[$i] . 'Themed'. DS . $this->theme . DS . 'Plugins' . DS . $plugin . DS;
 						}
-						$themePaths[] = $paths[$i] . 'themed'. DS . $this->theme . DS;
+						$themePaths[] = $paths[$i] . 'Themed'. DS . $this->theme . DS;
 					}
 			}
 			$paths = array_merge($themePaths, $paths);

From 2a54f0923d0ba38b08ebd1506849381bdf4953b2 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 03:23:53 -0430
Subject: [PATCH 39/50] More string replacing for new paths

---
 lib/Cake/Console/Command/Task/PluginTask.php              | 2 +-
 lib/Cake/Test/Case/Console/Command/SchemaShellTest.php    | 2 +-
 .../Test/Case/Console/Command/Task/ControllerTaskTest.php | 6 +++---
 .../Test/Case/Console/Command/Task/FixtureTaskTest.php    | 4 ++--
 lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php | 4 ++--
 lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php  | 8 ++++----
 lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php  | 4 ++--
 lib/Cake/Test/Case/Core/AppTest.php                       | 4 ++--
 lib/Cake/Test/Case/Core/CakePluginTest.php                | 6 +++---
 lib/Cake/Test/Case/Network/Email/CakeEmailTest.php        | 2 +-
 lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php   | 2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index 19a91d232..8f48e43a9 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -41,7 +41,7 @@ class PluginTask extends Shell {
  * @return void
  */
 	function initialize() {
-		$this->path = APP . 'plugins' . DS;
+		$this->path =  APP . 'Plugin' . DS;
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index 4db2ebbd8..d06811d32 100644
--- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -458,7 +458,7 @@ class SchemaShellTest extends CakeTestCase {
 			'connection' => 'test'
 		);
 		$this->Shell->startup();
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS . 'Config' . DS . 'Schema';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'Config' . DS . 'Schema';
 		$this->assertEqual($this->Shell->Schema->path, $expected);
 		CakePlugin::unload();
 	}
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
index 6cc6f01ff..04a3e9fd3 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -301,8 +301,8 @@ class ControllerTaskTest extends CakeTestCase {
 		$uses = array('Comment', 'User');
 
 		//fake plugin path
-		CakePlugin::load('ControllerTest', array('path' => APP . 'plugins' . DS . 'ControllerTest' . DS));
-		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
+		CakePlugin::load('ControllerTest', array('path' =>  APP . 'Plugin' . DS . 'ControllerTest' . DS));
+		$path = APP . 'Plugin' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
 
 		$this->Task->expects($this->at(1))->method('createFile')->with(
 			$path,
@@ -316,7 +316,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
 		$this->Task->plugin = 'ControllerTest';
-		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
+		$path = APP . 'Plugin' . DS . 'ControllerTest' . DS . 'Controller' . DS . 'ArticlesController.php';
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
 		$this->assertEqual($this->Task->Template->templateVars['plugin'], 'ControllerTest');
diff --git a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
index ee86a3adf..8ba349692 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/FixtureTaskTest.php
@@ -362,10 +362,10 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
 		$this->Task->plugin = 'TestFixture';
-		$filename = APP . 'plugins' . DS . 'TestFixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
+		$filename = APP . 'Plugin' . DS . 'TestFixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
 
 		//fake plugin path
-		CakePlugin::load('TestFixture', array('path' => APP . 'plugins' . DS . 'TestFixture' . DS));
+		CakePlugin::load('TestFixture', array('path' =>  APP . 'Plugin' . DS . 'TestFixture' . DS));
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/Article/'));
 
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
index 08ae01f6a..661cf7921 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php
@@ -746,8 +746,8 @@ STRINGEND;
 		$this->Task->plugin = 'ControllerTest';
 
 		//fake plugin path
-		CakePlugin::load('ControllerTest', array('path' => APP . 'plugins' . DS . 'ControllerTest' . DS));
-		$path = APP . 'plugins' . DS . 'ControllerTest' . DS . 'Model' . DS . 'BakeArticle.php';
+		CakePlugin::load('ControllerTest', array('path' =>  APP . 'Plugin' . DS . 'ControllerTest' . DS));
+		$path = APP . 'Plugin' . DS . 'ControllerTest' . DS . 'Model' . DS . 'BakeArticle.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_PCREMatch('/BakeArticle extends ControllerTestAppModel/'));
 	
diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
index 5eb874a0b..fd811d67a 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -527,8 +527,8 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->plugin = 'TestTest';
 
 		//fake plugin path
-		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS));
-		$path = APP . 'plugins' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS  .'FormHelperTest.php';
+		CakePlugin::load('TestTest', array('path' =>  APP . 'Plugin' . DS . 'TestTest' . DS));
+		$path =  APP . 'Plugin' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS  .'FormHelperTest.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
@@ -596,10 +596,10 @@ class TestTaskTest extends CakeTestCase {
 		$expected = $this->Task->path . 'Case' . DS . 'Controller' . DS  . 'Component' . DS . 'AuthComponentTest.php';
 		$this->assertEqual($result, $expected);
 
-		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS ));
+		CakePlugin::load('TestTest', array('path' =>  APP . 'Plugin' . DS . 'TestTest' . DS ));
 		$this->Task->plugin = 'TestTest';
 		$result = $this->Task->testCaseFileName('Model', 'Post');
-		$expected = APP . 'plugins' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
+		$expected =  APP . 'Plugin' . DS . 'TestTest' . DS . 'tests' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
 		$this->assertEqual($result, $expected);
 	}
 
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
index c5577b19f..cc151f0af 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php
@@ -396,8 +396,8 @@ class ViewTaskTest extends CakeTestCase {
 		$this->Task->name = 'View';
 
 		//fake plugin path
-		CakePlugin::load('TestTest', array('path' => APP . 'plugins' . DS . 'TestTest' . DS));
-		$path = APP . 'plugins' . DS . 'TestTest' . DS . 'View' . DS . 'view_task_comments' . DS  . 'view.ctp';
+		CakePlugin::load('TestTest', array('path' =>  APP . 'Plugin' . DS . 'TestTest' . DS));
+		$path =  APP . 'Plugin' . DS . 'TestTest' . DS . 'View' . DS . 'view_task_comments' . DS  . 'view.ctp';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index 462a331bd..5a91e5935 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -374,11 +374,11 @@ class AppImportTest extends CakeTestCase {
 		CakePlugin::loadAll();
 
 		$path = App::pluginPath('TestPlugin');
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS;
 		$this->assertEqual($path, $expected);
 
 		$path = App::pluginPath('TestPluginTwo');
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS . 'TestPluginTwo' . DS;
 		$this->assertEqual($path, $expected);
 		App::build();
 	}
diff --git a/lib/Cake/Test/Case/Core/CakePluginTest.php b/lib/Cake/Test/Case/Core/CakePluginTest.php
index 5ef5a4602..9937b3608 100644
--- a/lib/Cake/Test/Case/Core/CakePluginTest.php
+++ b/lib/Cake/Test/Case/Core/CakePluginTest.php
@@ -16,7 +16,7 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function setUp() {
 		App::build(array(
-			'plugins' => array(CAKE_TESTS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(CAKE_TESTS . 'test_app' . DS . 'Plugin' . DS)
 		), true);
 	}
 
@@ -177,10 +177,10 @@ class CakePluginTest extends CakeTestCase {
  */
 	public function testPath() {
 		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPlugin' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'Plugin' . DS . 'TestPlugin' . DS;
 		$this->assertEquals(CakePlugin::path('TestPlugin'), $expected);
 
-		$expected = CAKE_TESTS . 'test_app' . DS . 'plugins' . DS . 'TestPluginTwo' . DS;
+		$expected = CAKE_TESTS . 'test_app' . DS . 'Plugin' . DS . 'TestPluginTwo' . DS;
 		$this->assertEquals(CakePlugin::path('TestPluginTwo'), $expected);
 	}
 
diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
index 45c7b1443..2b8c128c1 100644
--- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
+++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -136,7 +136,7 @@ class CakeEmailTest extends CakeTestCase {
 		$this->CakeEmail = new TestCakeEmail();
 
 		App::build(array(
-			'views' => array(CAKE . 'tests' . DS . 'test_app' . DS . 'View'. DS)
+			'views' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS)
 		));
 	}
 
diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
index 9a7f61462..87718d0fb 100644
--- a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
+++ b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php
@@ -27,7 +27,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
  */
 	public function setUp() {
 		App::build(array(
-			'plugins' => array(CAKE . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
 		));
 		CakePlugin::loadAll();
 		$reporter = new CakeBaseReporter();

From d24aca34f1f420b8f08e996335610429c8026610 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 03:31:12 -0430
Subject: [PATCH 40/50] Replacing more string to match new paths

---
 .../Case/Console/Command/Task/TemplateTaskTest.php     |  4 ++--
 lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php      |  4 ++--
 lib/Cake/Test/Case/Utility/XmlTest.php                 | 10 +++++-----
 lib/Cake/TestSuite/Fixture/CakeFixtureManager.php      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
index 693637fb4..88ad25082 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
@@ -126,7 +126,7 @@ class TemplateTaskTest extends CakeTestCase {
 	public function testGenerate() {
 		App::build(array(
 			'Console' => array(
-				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS
+				LIBS . 'Test' . DS .  'test_app' . DS . 'console' . DS
 			)
 		));
 		$this->Task->initialize();
@@ -146,7 +146,7 @@ class TemplateTaskTest extends CakeTestCase {
 	public function testGenerateWithTemplateFallbacks() {
 		App::build(array(
 			'Console' => array(
-				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS,
+				LIBS . 'Test' . DS .  'test_app' . DS . 'console' . DS,
 				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
 			)
 		));
diff --git a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
index 72743e3a9..f20514fad 100644
--- a/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
+++ b/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
@@ -36,8 +36,8 @@ if (!class_exists('AppController', false)) {
 class CakeTestCaseTest extends CakeTestCase {
 
 	public static function setUpBeforeClass() {
-		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php';
-		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'FixturizedTestCase.php';
+		require_once LIBS . 'Test' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php';
+		require_once LIBS . 'Test' . DS . 'Fixture' . DS . 'FixturizedTestCase.php';
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
index ccc71f07e..fbdcfa170 100644
--- a/lib/Cake/Test/Case/Utility/XmlTest.php
+++ b/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -133,7 +133,7 @@ class XmlTest extends CakeTestCase {
 		$this->assertEqual($obj->firstChild->nodeName, 'tag');
 		$this->assertEqual($obj->firstChild->nodeValue, 'value');
 
-		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
+		$xml = LIBS . 'Test' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$this->assertEqual($obj->getName(), 'tags');
 		$this->assertEqual(count($obj), 2);
@@ -374,7 +374,7 @@ class XmlTest extends CakeTestCase {
 		$obj = Xml::build($xml);
 		$this->assertEqual(Xml::toArray($obj), array('tag' => 'name'));
 
-		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
+		$xml = LIBS . 'Test' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$expected = array(
 			'tags' => array(
@@ -516,7 +516,7 @@ class XmlTest extends CakeTestCase {
  * @return void
  */
 	public function testRss() {
-		$rss = file_get_contents(LIBS . 'tests' . DS . 'Fixture' . DS . 'rss.xml');
+		$rss = file_get_contents(LIBS . 'Test' . DS . 'Fixture' . DS . 'rss.xml');
 		$rssAsArray = Xml::toArray(Xml::build($rss));
 		$this->assertEqual($rssAsArray['rss']['@version'], '2.0');
 		$this->assertEqual(count($rssAsArray['rss']['channel']['item']), 2);
@@ -647,7 +647,7 @@ class XmlTest extends CakeTestCase {
  * @return void
  */
 	public function testSoap() {
-		$xmlRequest = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_request.xml');
+		$xmlRequest = Xml::build(LIBS . 'Test' . DS . 'Fixture' . DS . 'soap_request.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
@@ -660,7 +660,7 @@ class XmlTest extends CakeTestCase {
 		);
 		$this->assertEqual(Xml::toArray($xmlRequest), $expected);
 
-		$xmlResponse = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_response.xml');
+		$xmlResponse = Xml::build(LIBS . 'Test' . DS . 'Fixture' . DS . 'soap_response.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
index 51c0392d9..246251aed 100644
--- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
+++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
@@ -105,7 +105,7 @@ class CakeFixtureManager {
 
 			if (strpos($fixture, 'core.') === 0) {
 				$fixture = substr($fixture, strlen('core.'));
-				$fixturePaths[] = LIBS . 'tests' . DS . 'Fixture';
+				$fixturePaths[] = LIBS . 'Test' . DS . 'Fixture';
 			} elseif (strpos($fixture, 'app.') === 0) {
 				$fixture = substr($fixture, strlen('app.'));
 				$fixturePaths = array(

From eea981940e9af7d7bffc031254a6d43098be0ae3 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Fri, 13 May 2011 03:36:45 -0430
Subject: [PATCH 41/50] Replacing config string in favor of Config

---
 lib/Cake/Configure/PhpReader.php              |  2 +-
 .../Console/Command/Task/DbConfigTask.php     |  2 +-
 lib/Cake/Console/Command/Task/PluginTask.php  |  2 +-
 lib/Cake/Console/Command/Task/ProjectTask.php |  6 +-
 lib/Cake/Console/ShellDispatcher.php          |  6 +-
 lib/Cake/Core/CakePlugin.php                  |  6 +-
 lib/Cake/Core/Configure.php                   |  2 +-
 lib/Cake/I18n/Multibyte.php                   |  2 +-
 lib/Cake/Model/CakeSchema.php                 |  2 +-
 .../Case/Console/Command/SchemaShellTest.php  |  4 +-
 .../Console/Command/Task/DbConfigTaskTest.php |  4 +-
 .../Console/Command/Task/PluginTaskTest.php   |  2 +-
 .../Console/Command/Task/ProjectTaskTest.php  | 12 ++--
 lib/Cake/Test/Case/Core/AppTest.php           | 16 ++---
 lib/Cake/Test/Case/Utility/FolderTest.php     | 60 +++++++++----------
 lib/Cake/View/Errors/missing_connection.ctp   |  2 +-
 lib/Cake/View/Errors/missing_database.ctp     |  2 +-
 17 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/lib/Cake/Configure/PhpReader.php b/lib/Cake/Configure/PhpReader.php
index 54f99dae1..4d00b2aee 100644
--- a/lib/Cake/Configure/PhpReader.php
+++ b/lib/Cake/Configure/PhpReader.php
@@ -63,7 +63,7 @@ class PhpReader implements ConfigReaderInterface {
 		list($plugin, $key) = pluginSplit($key);
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'config' . DS . $key;
+			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
 		} else {
 			$file = $this->_path . $key;
 		}
diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
index 73959f099..7fb1064c8 100644
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -64,7 +64,7 @@ class DbConfigTask extends Shell {
  * @var string
  */
 	public function initialize() {
-		$this->path = APP . 'config' . DS;
+		$this->path = APP . 'Config' . DS;
 	}
 
 /**
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index 8f48e43a9..9d409a872 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -103,7 +103,7 @@ class PluginTask extends Shell {
 		if (strtolower($looksGood) == 'y') {
 			$Folder = new Folder($this->path . $pluginPath);
 			$directories = array(
-				'config' . DS . 'schema',
+				'Config' . DS . 'schema',
 				'Model' . DS . 'Behavior',
 				'Model' . DS . 'Datasource',
 				'Console' . DS . 'Command' . DS . 'Task',
diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
index 190f99819..c2f9abf47 100644
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/lib/Cake/Console/Command/Task/ProjectTask.php
@@ -60,7 +60,7 @@ class ProjectTask extends Shell {
 
 		if ($project) {
 			$response = false;
-			while ($response == false && is_dir($project) === true && file_exists($project . 'config' . 'core.php')) {
+			while ($response == false && is_dir($project) === true && file_exists($project . 'Config' . 'core.php')) {
 				$prompt = __d('cake_console', '<warning>A project already exists in this location:</warning> %s Overwrite?', $project);
 				$response = $this->in($prompt, array('y','n'), 'n');
 				if (strtolower($response) === 'n') {
@@ -236,7 +236,7 @@ class ProjectTask extends Shell {
  * @return boolean Success
  */
 	public function securitySalt($path) {
-		$File = new File($path . 'config' . DS . 'core.php');
+		$File = new File($path . 'Config' . DS . 'core.php');
 		$contents = $File->read();
 		if (preg_match('/([\s]*Configure::write\(\'Security.salt\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
 			$string = Security::generateAuthKey();
@@ -256,7 +256,7 @@ class ProjectTask extends Shell {
  * @return boolean Success
 	 */
 	public function securityCipherSeed($path) {
-		$File = new File($path . 'config' . DS . 'core.php');
+		$File = new File($path . 'Config' . DS . 'core.php');
 		$contents = $File->read();
 		if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
 			if (!class_exists('Security')) {
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
index f12550249..3d044f9b6 100644
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.php
@@ -129,11 +129,11 @@ class ShellDispatcher {
 		if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
 			define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS);
 		}
-		$boot = file_exists(ROOT . DS . APP_DIR . DS . 'config' . DS . 'bootstrap.php');
+		$boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php');
 		require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
 
-		if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
-			include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
+		if (!file_exists(APP_PATH . 'Config' . DS . 'core.php')) {
+			include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
 			App::build();
 		}
 		require_once CONSOLE_LIBS . 'ConsoleErrorHandler.php';
diff --git a/lib/Cake/Core/CakePlugin.php b/lib/Cake/Core/CakePlugin.php
index 3215e5781..1770f6c9c 100644
--- a/lib/Cake/Core/CakePlugin.php
+++ b/lib/Cake/Core/CakePlugin.php
@@ -137,12 +137,12 @@ class CakePlugin {
 
 		$path = self::path($plugin);
 		if ($config['bootstrap'] === true) {
-			return include($path . 'config' . DS . 'bootstrap.php');
+			return include($path . 'Config' . DS . 'bootstrap.php');
 		}
 
 		$bootstrap = (array)$config['bootstrap'];
 		foreach ($bootstrap as $file) {
-			include $path . 'config' . DS . $file . '.php';
+			include $path . 'Config' . DS . $file . '.php';
 		}
 
 		return true;
@@ -159,7 +159,7 @@ class CakePlugin {
 		if ($config['routes'] === false) {
 			return false;
 		}
-		return (bool) include self::path($plugin) . 'config' . DS . 'routes.php';
+		return (bool) include self::path($plugin) . 'Config' . DS . 'routes.php';
 	}
 
 /**
diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php
index ee139eb54..4cf575775 100644
--- a/lib/Cake/Core/Configure.php
+++ b/lib/Cake/Core/Configure.php
@@ -318,7 +318,7 @@ class Configure {
  */
 	public static function version() {
 		if (!isset(self::$_values['Cake']['version'])) {
-			require(LIBS . 'config' . DS . 'config.php');
+			require(LIBS . 'Config' . DS . 'config.php');
 			self::write($config);
 		}
 		return self::$_values['Cake']['version'];
diff --git a/lib/Cake/I18n/Multibyte.php b/lib/Cake/I18n/Multibyte.php
index 122e1f123..d242d2ad4 100644
--- a/lib/Cake/I18n/Multibyte.php
+++ b/lib/Cake/I18n/Multibyte.php
@@ -1073,7 +1073,7 @@ class Multibyte {
 			}
 			if (!Configure::configured('_cake_core_')) {
 				App::uses('PhpReader', 'Configure');
-				Configure::config('_cake_core_', new PhpReader(CAKE . 'config' . DS));
+				Configure::config('_cake_core_', new PhpReader(CAKE . 'Config' . DS));
 			}
 			Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_');
 			self::$__caseFold[$range] = Configure::read($range);
diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php
index 67f1cb87a..f09829b9a 100644
--- a/lib/Cake/Model/CakeSchema.php
+++ b/lib/Cake/Model/CakeSchema.php
@@ -128,7 +128,7 @@ class CakeSchema extends Object {
 		if (file_exists($this->path . DS . $file) && is_file($this->path . DS . $file)) {
 			$this->file = $file;
 		} elseif (!empty($this->plugin)) {
-			$this->path = App::pluginPath($this->plugin) . 'config' . DS . 'schema';
+			$this->path = App::pluginPath($this->plugin) . 'Config' . DS . 'schema';
 		}
 	}
 
diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index d06811d32..ad8b9ad77 100644
--- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -151,7 +151,7 @@ class SchemaShellTest extends CakeTestCase {
 		$this->assertEqual($this->Shell->Schema->name, 'TestSchema');
 		$this->assertEqual($this->Shell->Schema->file, 'test_schema.php');
 		$this->assertEqual($this->Shell->Schema->connection, 'default');
-		$this->assertEqual($this->Shell->Schema->path, APP . 'config' . DS . 'schema');
+		$this->assertEqual($this->Shell->Schema->path, APP . 'Config' . DS . 'schema');
 
 		$this->Shell->Schema = null;
 		$this->Shell->params = array(
@@ -173,7 +173,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testView() {
 		$this->Shell->startup();
-		$this->Shell->Schema->path = APP . 'config' . DS . 'schema';
+		$this->Shell->Schema->path = APP . 'Config' . DS . 'schema';
 		$this->Shell->params['file'] = 'i18n.php';
 		$this->Shell->expects($this->once())->method('_stop');
 		$this->Shell->expects($this->once())->method('out');
diff --git a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
index e00e31249..0d5132b88 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php
@@ -67,7 +67,7 @@ class DbConfigTaskTest extends CakeTestCase {
 			array($out, $out, $in)
 		);
 
-		$this->Task->path = APP . 'config' . DS;
+		$this->Task->path = APP . 'Config' . DS;
 		$this->Task->databaseClassName = 'TEST_DATABASE_CONFIG';
 	}
 
@@ -100,7 +100,7 @@ class DbConfigTaskTest extends CakeTestCase {
 	public function testInitialize() {
 		$this->Task->initialize();
 		$this->assertFalse(empty($this->Task->path));
-		$this->assertEquals(APP . 'config' . DS, $this->Task->path);
+		$this->assertEquals(APP . 'Config' . DS, $this->Task->path);
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
index 18ba45b42..1b113d69d 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
@@ -81,7 +81,7 @@ class PluginTaskTest extends CakeTestCase {
 		$this->assertTrue(is_dir($path), 'No plugin dir %s');
 		
 		$directories = array(
-			'config' . DS . 'schema',
+			'Config' . DS . 'schema',
 			'Model' . DS . 'Behavior',
 			'Model' . DS . 'Datasource',
 			'Console' . DS . 'Command' . DS . 'Task',
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
index ebf29913b..f1c426c61 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
@@ -86,8 +86,8 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$this->assertTrue(is_dir($path), 'No project dir %s');
 		$dirs = array(
-			'config',
-			'config' . DS . 'schema',
+			'Config',
+			'Config' . DS . 'schema',
 			'Console',
 			'Console' . DS . 'Command',
 			'Console' . DS . 'Command' . DS . 'Task',
@@ -150,7 +150,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$result = $this->Task->securitySalt($path);
 		$this->assertTrue($result);
 
-		$file = new File($path . 'config' . DS . 'core.php');
+		$file = new File($path . 'Config' . DS . 'core.php');
 		$contents = $file->read();
 		$this->assertNoPattern('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
 	}
@@ -167,7 +167,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$result = $this->Task->securityCipherSeed($path);
 		$this->assertTrue($result);
 
-		$file = new File($path . 'config' . DS . 'core.php');
+		$file = new File($path . 'Config' . DS . 'core.php');
 		$contents = $file->read();
 		$this->assertNoPattern('/76859309657453542496749683645/', $contents, 'Default CipherSeed left behind. %s');
 	}
@@ -204,7 +204,7 @@ class ProjectTaskTest extends CakeTestCase {
 
 		Configure::write('Routing.prefixes', null);
 		$this->_setupTestProject();
-		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'config' . DS;
+		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'Config' . DS;
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue('super_duper_admin'));
 
 		$result = $this->Task->getPrefix();
@@ -242,7 +242,7 @@ class ProjectTaskTest extends CakeTestCase {
 	public function testGetPrefixWithMultiplePrefixes() {
 		Configure::write('Routing.prefixes', array('admin', 'ninja', 'shinobi'));
 		$this->_setupTestProject();
-		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'config' . DS;
+		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'Config' . DS;
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue(2));
 
 		$result = $this->Task->getPrefix();
diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index 5a91e5935..6087d8884 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -551,10 +551,10 @@ class AppImportTest extends CakeTestCase {
  * @return void
  */
 	function testFileLoading () {
-		$file = App::import('File', 'RealFile', false, array(), LIBS  . 'config' . DS . 'config.php');
+		$file = App::import('File', 'RealFile', false, array(), LIBS  . 'Config' . DS . 'config.php');
 		$this->assertTrue($file);
 
-		$file = App::import('File', 'NoFile', false, array(), LIBS  . 'config' . DS . 'cake' . DS . 'config.php');
+		$file = App::import('File', 'NoFile', false, array(), LIBS  . 'Config' . DS . 'cake' . DS . 'config.php');
 		$this->assertFalse($file);
 	}
 
@@ -566,12 +566,12 @@ class AppImportTest extends CakeTestCase {
  */
 	function testFileLoadingWithArray() {
 		$type = array('type' => 'File', 'name' => 'SomeName', 'parent' => false,
-				'file' => LIBS  . DS . 'config' . DS . 'config.php');
+				'file' => LIBS  . DS . 'Config' . DS . 'config.php');
 		$file = App::import($type);
 		$this->assertTrue($file);
 
 		$type = array('type' => 'File', 'name' => 'NoFile', 'parent' => false,
-				'file' => LIBS  . 'config' . DS . 'cake' . DS . 'config.php');
+				'file' => LIBS  . 'Config' . DS . 'cake' . DS . 'config.php');
 		$file = App::import($type);
 		$this->assertFalse($file);
 	}
@@ -583,13 +583,13 @@ class AppImportTest extends CakeTestCase {
  * @return void
  */
 	function testFileLoadingReturnValue () {
-		$file = App::import('File', 'Name', false, array(), LIBS  . 'config' . DS . 'config.php', true);
+		$file = App::import('File', 'Name', false, array(), LIBS  . 'Config' . DS . 'config.php', true);
 		$this->assertTrue(!empty($file));
 
 		$this->assertTrue(isset($file['Cake.version']));
 
 		$type = array('type' => 'File', 'name' => 'OtherName', 'parent' => false,
-				'file' => LIBS  . 'config' . DS . 'config.php', 'return' => true);
+				'file' => LIBS  . 'Config' . DS . 'config.php', 'return' => true);
 		$file = App::import($type);
 		$this->assertTrue(!empty($file));
 
@@ -603,7 +603,7 @@ class AppImportTest extends CakeTestCase {
  * @return void
  */
 	function testLoadingWithSearch () {
-		$file = App::import('File', 'NewName', false, array(LIBS . 'config' . DS), 'config.php');
+		$file = App::import('File', 'NewName', false, array(LIBS . 'Config' . DS), 'config.php');
 		$this->assertTrue($file);
 
 		$file = App::import('File', 'AnotherNewName', false, array(LIBS), 'config.php');
@@ -622,7 +622,7 @@ class AppImportTest extends CakeTestCase {
 			'name' => 'RandomName',
 			'parent' => false,
 			'file' => 'config.php',
-			'search' => array(LIBS . 'config' . DS)
+			'search' => array(LIBS . 'Config' . DS)
 		);
 		$file = App::import($type);
 		$this->assertTrue($file);
diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php
index 08ef5dc14..ccedc82eb 100644
--- a/lib/Cake/Test/Case/Utility/FolderTest.php
+++ b/lib/Cake/Test/Case/Utility/FolderTest.php
@@ -316,41 +316,41 @@ class FolderTest extends CakeTestCase {
 		$Folder = new Folder();
 		$expected = array(
 			array(
-				LIBS . 'config',
-				LIBS . 'config' . DS . 'unicode',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding'
+				LIBS . 'Config',
+				LIBS . 'Config' . DS . 'unicode',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding'
 			),
 			array(
-				LIBS . 'config' . DS . 'config.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0080_00ff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0100_017f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0180_024F.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0250_02af.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0370_03ff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0400_04ff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0500_052f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0530_058f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1e00_1eff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1f00_1fff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2100_214f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2150_218f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2460_24ff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c00_2c5f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c60_2c7f.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c80_2cff.php',
-				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . 'ff00_ffef.php'
+				LIBS . 'Config' . DS . 'config.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0080_00ff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0100_017f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0180_024F.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0250_02af.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0370_03ff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0400_04ff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0500_052f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0530_058f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1e00_1eff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1f00_1fff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2100_214f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2150_218f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2460_24ff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c00_2c5f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c60_2c7f.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c80_2cff.php',
+				LIBS . 'Config' . DS . 'unicode' .  DS . 'casefolding' . DS . 'ff00_ffef.php'
 			)
 		);
 
-		$result = $Folder->tree(LIBS . 'config', false);
+		$result = $Folder->tree(LIBS . 'Config', false);
 		$this->assertIdentical(array_diff($expected[0], $result[0]), array());
 		$this->assertIdentical(array_diff($result[0], $expected[0]), array());
 
-		$result = $Folder->tree(LIBS . 'config', false, 'dir');
+		$result = $Folder->tree(LIBS . 'Config', false, 'dir');
 		$this->assertIdentical(array_diff($expected[0], $result), array());
 		$this->assertIdentical(array_diff($result, $expected[0]), array());
 
-		$result = $Folder->tree(LIBS . 'config', false, 'files');
+		$result = $Folder->tree(LIBS . 'Config', false, 'files');
 		$this->assertIdentical(array_diff($expected[1], $result), array());
 		$this->assertIdentical(array_diff($result, $expected[1]), array());
 	}
@@ -472,8 +472,8 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->inCakePath($path);
 		$this->assertFalse($result);
 
-		$path = DS . 'lib' . DS . 'Cake' . DS . 'config';
-		$Folder->cd(ROOT . DS . 'lib' . DS . 'Cake' . DS . 'config');
+		$path = DS . 'lib' . DS . 'Cake' . DS . 'Config';
+		$Folder->cd(ROOT . DS . 'lib' . DS . 'Cake' . DS . 'Config');
 		$result = $Folder->inCakePath($path);
 		$this->assertTrue($result);
 	}
@@ -486,7 +486,7 @@ class FolderTest extends CakeTestCase {
  */
 	function testFind() {
 		$Folder = new Folder();
-		$Folder->cd(LIBS . 'config');
+		$Folder->cd(LIBS . 'Config');
 		$result = $Folder->find();
 		$expected = array('config.php');
 		$this->assertIdentical(array_diff($expected, $result), array());
@@ -542,14 +542,14 @@ class FolderTest extends CakeTestCase {
 		$Folder->cd(LIBS);
 		$result = $Folder->findRecursive('(config|paths)\.php');
 		$expected = array(
-			LIBS . 'config' . DS . 'config.php'
+			LIBS . 'Config' . DS . 'config.php'
 		);
 		$this->assertIdentical(array_diff($expected, $result), array());
 		$this->assertIdentical(array_diff($result, $expected), array());
 
 		$result = $Folder->findRecursive('(config|paths)\.php', true);
 		$expected = array(
-			LIBS . 'config' . DS . 'config.php'
+			LIBS . 'Config' . DS . 'config.php'
 		);
 		$this->assertIdentical($result, $expected);
 
@@ -583,7 +583,7 @@ class FolderTest extends CakeTestCase {
 		);
 		$this->assertIdentical($result, $expected);
 
-		$Folder->cd(LIBS . 'config');
+		$Folder->cd(LIBS . 'Config');
 		$Folder->cd(TMP);
 		$Folder->delete($Folder->pwd() . DS . 'testme');
 		$File->delete();
diff --git a/lib/Cake/View/Errors/missing_connection.ctp b/lib/Cake/View/Errors/missing_connection.ctp
index ae4887b8a..11346fc85 100644
--- a/lib/Cake/View/Errors/missing_connection.ctp
+++ b/lib/Cake/View/Errors/missing_connection.ctp
@@ -23,7 +23,7 @@
 </p>
 <p class="error">
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
-	<?php echo __d('cake_dev', 'Confirm you have created the file : %s.', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+	<?php echo __d('cake_dev', 'Confirm you have created the file : %s.', APP_DIR . DS . 'Config' . DS . 'database.php'); ?>
 </p>
 <p class="notice">
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>
diff --git a/lib/Cake/View/Errors/missing_database.ctp b/lib/Cake/View/Errors/missing_database.ctp
index e7764506f..eac33ca78 100644
--- a/lib/Cake/View/Errors/missing_database.ctp
+++ b/lib/Cake/View/Errors/missing_database.ctp
@@ -23,7 +23,7 @@
 </p>
 <p class="error">
 	<strong><?php echo __d('cake_dev', 'Error'); ?>: </strong>
-	<?php echo __d('cake_dev', 'Confirm you have created the file: %s', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+	<?php echo __d('cake_dev', 'Confirm you have created the file: %s', APP_DIR . DS . 'Config' . DS . 'database.php'); ?>
 </p>
 <p class="notice">
 	<strong><?php echo __d('cake_dev', 'Notice'); ?>: </strong>

From 5f56642e0eaf8d5f4bbdb724f9520103e6c6f16e Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sat, 14 May 2011 23:40:09 -0430
Subject: [PATCH 42/50] Updating tests and classes in Console package after
 most recent updates in folder casing

---
 lib/Cake/Console/Command/SchemaShell.php      |  2 +-
 lib/Cake/Model/CakeSchema.php                 |  4 +--
 .../Case/Console/Command/SchemaShellTest.php  |  2 +-
 .../Console/Command/Task/ExtractTaskTest.php  |  2 +-
 .../Console/Command/Task/PluginTaskTest.php   |  3 +-
 .../Console/Command/Task/ProjectTaskTest.php  | 28 +++++++++----------
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/Cake/Console/Command/SchemaShell.php b/lib/Cake/Console/Command/SchemaShell.php
index 20454e4d6..27b26f728 100644
--- a/lib/Cake/Console/Command/SchemaShell.php
+++ b/lib/Cake/Console/Command/SchemaShell.php
@@ -440,7 +440,7 @@ class SchemaShell extends Shell {
 		);
 		$path = array(
 			'help' => __d('cake_console', 'Path to read and write schema.php'),
-			'default' => CONFIGS . 'schema'
+			'default' => CONFIGS . 'Schema'
 		);
 		$file = array(
 			'help' => __d('cake_console', 'File name to read and write.'),
diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php
index f09829b9a..9080d52b1 100644
--- a/lib/Cake/Model/CakeSchema.php
+++ b/lib/Cake/Model/CakeSchema.php
@@ -94,7 +94,7 @@ class CakeSchema extends Object {
 		}
 
 		if (empty($options['path'])) {
-			$this->path = CONFIGS . 'schema';
+			$this->path = CONFIGS . 'Schema';
 		}
 
 		$options = array_merge(get_object_vars($this), $options);
@@ -128,7 +128,7 @@ class CakeSchema extends Object {
 		if (file_exists($this->path . DS . $file) && is_file($this->path . DS . $file)) {
 			$this->file = $file;
 		} elseif (!empty($this->plugin)) {
-			$this->path = App::pluginPath($this->plugin) . 'Config' . DS . 'schema';
+			$this->path = CakePlugin::path($this->plugin) . 'Config' . DS . 'Schema';
 		}
 	}
 
diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
index ad8b9ad77..3bd3b71ed 100644
--- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
@@ -151,7 +151,7 @@ class SchemaShellTest extends CakeTestCase {
 		$this->assertEqual($this->Shell->Schema->name, 'TestSchema');
 		$this->assertEqual($this->Shell->Schema->file, 'test_schema.php');
 		$this->assertEqual($this->Shell->Schema->connection, 'default');
-		$this->assertEqual($this->Shell->Schema->path, APP . 'Config' . DS . 'schema');
+		$this->assertEqual($this->Shell->Schema->path, APP . 'Config' . DS . 'Schema');
 
 		$this->Shell->Schema = null;
 		$this->Shell->params = array(
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index 812fc38ea..4c19f6440 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -164,7 +164,7 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->params['paths'] = LIBS . 'Test' . DS . 'test_app' . DS . 'View';
 		$this->Task->params['output'] = $this->path . DS;
-		$this->Task->params['exclude'] = 'pages,layouts';
+		$this->Task->params['exclude'] = 'Pages,Layouts';
 
 		$this->Task->expects($this->any())->method('in')
 			->will($this->returnValue('y'));
diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
index 1b113d69d..d6a5d5d6d 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
@@ -110,11 +110,12 @@ class PluginTaskTest extends CakeTestCase {
  */
 	public function testExecuteWithNoArgs() {
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('TestPlugin'));
-		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue('3'));
+		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue($this->_testPath));
 		$this->Task->expects($this->at(2))->method('in')->will($this->returnValue('y'));
 
 		$path = $this->Task->path . 'TestPlugin';
 		$file = $path . DS . 'Controller' . DS . 'TestPluginAppController.php';
+
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
index f1c426c61..b4eb78dbd 100644
--- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
+++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php
@@ -87,7 +87,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->assertTrue(is_dir($path), 'No project dir %s');
 		$dirs = array(
 			'Config',
-			'Config' . DS . 'schema',
+			'Config' . DS . 'Schema',
 			'Console',
 			'Console' . DS . 'Command',
 			'Console' . DS . 'Command' . DS . 'Task',
@@ -95,10 +95,10 @@ class ProjectTaskTest extends CakeTestCase {
 			'Model', 
 			'View',
 			'View' . DS . 'Helper',
-			'tests',
-			'tests' . DS . 'Case', 
-			'tests' . DS . 'Case' . DS . 'Model',
-			'tests' . DS . 'Fixture',
+			'Test',
+			'Test' . DS . 'Case', 
+			'Test' . DS . 'Case' . DS . 'Model',
+			'Test' . DS . 'Fixture',
 			'tmp',
 			'webroot',
 			'webroot' . DS . 'js',
@@ -124,12 +124,12 @@ class ProjectTaskTest extends CakeTestCase {
 			'Controller' . DS . 'Component', 
 			'Model' . DS . 'Behavior', 
 			'View' . DS . 'Helper',
-			'View' . DS . 'errors',
-			'View' . DS . 'scaffolds',
-			'tests' . DS . 'Case' . DS . 'Model', 
-			'tests' . DS . 'Case' . DS . 'Controller',
-			'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper',
-			'tests' . DS . 'Fixture',
+			'View' . DS . 'Errors',
+			'View' . DS . 'Scaffolds',
+			'Test' . DS . 'Case' . DS . 'Model', 
+			'Test' . DS . 'Case' . DS . 'Controller',
+			'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
+			'Test' . DS . 'Fixture',
 			'webroot' . DS . 'js'
 		);
 	
@@ -269,9 +269,9 @@ class ProjectTaskTest extends CakeTestCase {
 		$this->assertTrue(is_dir($path . DS . 'Model'), 'No models dir');
 		$this->assertTrue(is_dir($path . DS . 'View'), 'No views dir');
 		$this->assertTrue(is_dir($path . DS . 'View' . DS . 'Helper'), 'No helpers dir');
-		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir');
-		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'Case'), 'No cases dir');
-		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'Fixture'), 'No fixtures dir');
+		$this->assertTrue(is_dir($path . DS . 'Test'), 'No tests dir');
+		$this->assertTrue(is_dir($path . DS . 'Test' . DS . 'Case'), 'No cases dir');
+		$this->assertTrue(is_dir($path . DS . 'Test' . DS . 'Fixture'), 'No fixtures dir');
 	}
 
 /**

From 1930452da01702bf28c5ff63f3355ff5be9c9eb0 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sat, 14 May 2011 23:42:55 -0430
Subject: [PATCH 43/50] Fixing Folder test case after recent updates in folder
 casing

---
 lib/Cake/Test/Case/Utility/FolderTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Cake/Test/Case/Utility/FolderTest.php b/lib/Cake/Test/Case/Utility/FolderTest.php
index ccedc82eb..f30c59e43 100644
--- a/lib/Cake/Test/Case/Utility/FolderTest.php
+++ b/lib/Cake/Test/Case/Utility/FolderTest.php
@@ -69,10 +69,10 @@ class FolderTest extends CakeTestCase {
 		$result = Folder::isSlashTerm($inside);
 		$this->assertTrue($result);
 
-		$result = $Folder->realpath('tests/');
-		$this->assertEqual($result, $path . DS .'tests' . DS);
+		$result = $Folder->realpath('Test/');
+		$this->assertEqual($result, $path . DS .'Test' . DS);
 
-		$result = $Folder->inPath('tests' . DS);
+		$result = $Folder->inPath('Test' . DS);
 		$this->assertTrue($result);
 
 		$result = $Folder->inPath(DS . 'non-existing' . $inside);
@@ -147,7 +147,7 @@ class FolderTest extends CakeTestCase {
  * @return void
  */
 	function testOperations() {
-		$path = LIBS . 'console' . DS . 'templates' . DS . 'skel';
+		$path = LIBS . 'Console' . DS . 'templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$result = is_dir($Folder->pwd());
@@ -220,7 +220,7 @@ class FolderTest extends CakeTestCase {
 	public function testChmod() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', '%s Folder permissions tests not supported on Windows');
 
-		$path = LIBS . 'console' . DS . 'templates' . DS . 'skel';
+		$path = LIBS . 'Console' . DS . 'templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$subdir = 'test_folder_new';

From 6713bb154e4b261bb71cf6f4dffeac4d10a66d5b Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:08:01 -0430
Subject: [PATCH 44/50] Making themes also CamelCased

---
 lib/Cake/Core/App.php                           |   4 ++--
 lib/Cake/Test/Case/Core/AppTest.php             |   4 ++--
 lib/Cake/Test/Case/Routing/DispatcherTest.php   |   6 +++---
 lib/Cake/Test/Case/View/ThemeViewTest.php       |  16 ++++++++--------
 lib/Cake/Test/Case/View/ViewTest.php            |  12 ++++++------
 .../Elements/test_element.ctp                   |   0
 .../Layouts/default.ctp                         |   0
 .../{test_theme => TestTheme}/Posts/index.ctp   |   0
 .../Posts/scaffold.index.ctp                    |   0
 .../TestPlugin/Layouts/plugin_default.ctp       |   0
 .../plugins/TestPlugin/tests/index.ctp          |   0
 .../webroot/css/test_asset.css                  |   0
 .../webroot/css/theme_webroot.css               |   0
 .../webroot/flash/theme_test.swf                |   0
 .../webroot/img/cake.power.gif                  | Bin
 .../webroot/img/test.jpg                        | Bin
 .../webroot/js/one/theme_one.js                 |   0
 .../webroot/js/theme.js                         |   0
 .../webroot/pdfs/theme_test.pdf                 | Bin
 lib/Cake/View/Helper.php                        |  13 ++++---------
 20 files changed, 25 insertions(+), 30 deletions(-)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/Elements/test_element.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/Layouts/default.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/Posts/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/Posts/scaffold.index.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/plugins/TestPlugin/Layouts/plugin_default.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/plugins/TestPlugin/tests/index.ctp (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/css/test_asset.css (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/css/theme_webroot.css (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/flash/theme_test.swf (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/img/cake.power.gif (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/img/test.jpg (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/js/one/theme_one.js (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/js/theme.js (100%)
 rename lib/Cake/Test/test_app/View/Themed/{test_theme => TestTheme}/webroot/pdfs/theme_test.pdf (100%)

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index f83e0ca7f..f5ac9a63a 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -387,11 +387,11 @@ class App {
  *
  * `App::themePath('MyTheme'); will return the full path to the 'MyTheme' theme`
  *
- * @param string $theme lower_cased theme name to find the path of.
+ * @param string $theme theme name to find the path of.
  * @return string full path to the theme.
  */
 	public static function themePath($theme) {
-		$themeDir = 'themed' . DS . Inflector::underscore($theme);
+		$themeDir = 'Themed' . DS . Inflector::camelize($theme);
 		foreach (self::$__packages['View'] as $path) {
 			if (is_dir($path . $themeDir)) {
 				return $path . $themeDir . DS ;
diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index 6087d8884..d2c7bbf18 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -393,11 +393,11 @@ class AppImportTest extends CakeTestCase {
 			'View' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS)
 		));
 		$path = App::themePath('test_theme');
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS;
 		$this->assertEqual($path, $expected);
 
 		$path = App::themePath('TestTheme');
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS;
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS;
 		$this->assertEqual($path, $expected);
 
 		App::build();
diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php
index d2838286c..e4da9ee47 100644
--- a/lib/Cake/Test/Case/Routing/DispatcherTest.php
+++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -1227,21 +1227,21 @@ class DispatcherTest extends CakeTestCase {
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/flash/theme_test.swf'));
 		$result = ob_get_clean();
 
-		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/pdfs/theme_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load pdf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/img/test.jpg'));
 		$result = ob_get_clean();
-		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
+		$file = file_get_contents(LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
 		$this->assertEqual($file, $result);
 
 		ob_start();
diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php
index 8ae0f78d5..3ca49982f 100644
--- a/lib/Cake/Test/Case/View/ThemeViewTest.php
+++ b/lib/Cake/Test/Case/View/ThemeViewTest.php
@@ -149,18 +149,18 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->name = 'TestPlugin';
 		$this->Controller->viewPath = 'Tests';
 		$this->Controller->action = 'index';
-		$this->Controller->theme = 'test_theme';
+		$this->Controller->theme = 'TestTheme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Tests' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Layouts' . DS .'plugin_default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Plugins' . DS . 'TestPlugin' . DS . 'Layouts' . DS .'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName('default');
 		$this->assertEqual($result, $expected);
 	}
@@ -179,16 +179,16 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->params['pass'] = array('home');
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$ThemeView->theme = 'test_theme';
+		$ThemeView->theme = 'TestTheme';
 		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Pages' . DS .'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Posts' . DS .'index.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Posts' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('/Posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'test_theme' . DS . 'Layouts' . DS .'default.ctp';
+		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
@@ -259,7 +259,7 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->name = 'Posts';
 		$this->Controller->viewPath = 'posts';
 		$this->Controller->layout = 'whatever';
-		$this->Controller->theme = 'test_theme';
+		$this->Controller->theme = 'TestTheme';
 
 		$View = new ThemeView($this->Controller);
 		$View->element('test_element');
diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php
index 0f0801eb2..eac6401fc 100644
--- a/lib/Cake/Test/Case/View/ViewTest.php
+++ b/lib/Cake/Test/Case/View/ViewTest.php
@@ -753,14 +753,14 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getViewFileName('index');
 		$this->assertPattern('/posts(\/|\\\)index.ctp/', $result);
 
-		$result = $View->getViewFileName('/pages/home');
-		$this->assertPattern('/pages(\/|\\\)home.ctp/', $result);
+		$result = $View->getViewFileName('/Pages/home');
+		$this->assertPattern('/Pages(\/|\\\)home.ctp/', $result);
 
-		$result = $View->getViewFileName('../elements/test_element');
-		$this->assertPattern('/elements(\/|\\\)test_element.ctp/', $result);
+		$result = $View->getViewFileName('../Elements/test_element');
+		$this->assertPattern('/Elements(\/|\\\)test_element.ctp/', $result);
 
-		$result = $View->getViewFileName('../themed/test_theme/posts/index');
-		$this->assertPattern('/themed(\/|\\\)test_theme(\/|\\\)posts(\/|\\\)index.ctp/', $result);
+		$result = $View->getViewFileName('../Themed/TestTheme/Posts/index');
+		$this->assertPattern('/Themed(\/|\\\)TestTheme(\/|\\\)Posts(\/|\\\)index.ctp/', $result);
 
 		$expected = LIBS . 'Test' . DS . 'test_app' . DS . 'View' . DS .'Posts' . DS .'index.ctp';
 		$result = $View->getViewFileName('../Posts/index');
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/Elements/test_element.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/Elements/test_element.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/Layouts/default.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/Layouts/default.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/Layouts/default.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/Posts/index.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/Posts/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/Posts/index.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/Posts/index.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/Posts/scaffold.index.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/Posts/scaffold.index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/Posts/scaffold.index.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/Posts/scaffold.index.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/Layouts/plugin_default.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/plugins/TestPlugin/Layouts/plugin_default.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/Layouts/plugin_default.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/plugins/TestPlugin/Layouts/plugin_default.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/tests/index.ctp b/lib/Cake/Test/test_app/View/Themed/TestTheme/plugins/TestPlugin/tests/index.ctp
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/plugins/TestPlugin/tests/index.ctp
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/plugins/TestPlugin/tests/index.ctp
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/test_asset.css b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/css/test_asset.css
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/test_asset.css
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/css/test_asset.css
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/theme_webroot.css b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/css/theme_webroot.css
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/css/theme_webroot.css
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/css/theme_webroot.css
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/flash/theme_test.swf b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/flash/theme_test.swf
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/flash/theme_test.swf
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/flash/theme_test.swf
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/cake.power.gif b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/img/cake.power.gif
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/cake.power.gif
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/img/cake.power.gif
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/img/test.jpg
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/img/test.jpg
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/img/test.jpg
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/one/theme_one.js b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/one/theme_one.js
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/one/theme_one.js
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/one/theme_one.js
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/theme.js b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/js/theme.js
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js
diff --git a/lib/Cake/Test/test_app/View/Themed/test_theme/webroot/pdfs/theme_test.pdf b/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from lib/Cake/Test/test_app/View/Themed/test_theme/webroot/pdfs/theme_test.pdf
rename to lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf
diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
index 6fa3c37f0..a292a02ee 100644
--- a/lib/Cake/View/Helper.php
+++ b/lib/Cake/View/Helper.php
@@ -211,15 +211,10 @@ class Helper extends Object {
 			if (file_exists(Configure::read('App.www_root') . 'theme' . DS . $this->theme . DS  . $file)) {
 				$webPath = "{$this->request->webroot}theme/" . $theme . $asset[0];
 			} else {
-				$viewPaths = App::path('views');
-
-				foreach ($viewPaths as $viewPath) {
-					$path = $viewPath . 'themed'. DS . $this->theme . DS  . 'webroot' . DS  . $file;
-
-					if (file_exists($path)) {
-						$webPath = "{$this->request->webroot}theme/" . $theme . $asset[0];
-						break;
-					}
+				$themePath = App::themePath($this->theme);
+				$path = $themePath . 'webroot' . DS  . $file;
+				if (file_exists($path)) {
+					$webPath = "{$this->request->webroot}theme/" . $theme . $asset[0];
 				}
 			}
 		}

From e09f825f8bec1d905cd6405865ef723f0ad26f86 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:14:41 -0430
Subject: [PATCH 45/50] Fixing controller tests

---
 lib/Cake/Controller/Scaffold.php                      | 2 +-
 lib/Cake/Test/Case/Controller/ControllerTest.php      | 2 +-
 lib/Cake/Test/Case/Controller/PagesControllerTest.php | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Cake/Controller/Scaffold.php b/lib/Cake/Controller/Scaffold.php
index 054e3a1a3..2f10bbb1b 100644
--- a/lib/Cake/Controller/Scaffold.php
+++ b/lib/Cake/Controller/Scaffold.php
@@ -125,7 +125,7 @@ class Scaffold {
 		}
 
 		$this->ScaffoldModel = $this->controller->{$this->modelClass};
-		$this->scaffoldTitle = Inflector::humanize($this->viewPath);
+		$this->scaffoldTitle = Inflector::humanize(Inflector::underscore($this->viewPath));
 		$this->scaffoldActions = $controller->scaffold;
 		$title_for_layout = __d('cake', 'Scaffold :: ') . Inflector::humanize($request->action) . ' :: ' . $this->scaffoldTitle;
 		$modelClass = $this->controller->modelClass;
diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php
index af748b8b6..75ebf7625 100644
--- a/lib/Cake/Test/Case/Controller/ControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/ControllerTest.php
@@ -689,7 +689,7 @@ class ControllerTest extends CakeTestCase {
 		$Controller->constructClasses();
 		$Controller->Test->viewclass = 'Theme';
 		$Controller->viewPath = 'posts';
-		$Controller->theme = 'test_theme';
+		$Controller->theme = 'TestTheme';
 		$result = $Controller->render('index');
 		$this->assertPattern('/default test_theme layout/', $result);
 		App::build();
diff --git a/lib/Cake/Test/Case/Controller/PagesControllerTest.php b/lib/Cake/Test/Case/Controller/PagesControllerTest.php
index 20c4b0481..cebf1c365 100644
--- a/lib/Cake/Test/Case/Controller/PagesControllerTest.php
+++ b/lib/Cake/Test/Case/Controller/PagesControllerTest.php
@@ -55,10 +55,10 @@ class PagesControllerTest extends CakeTestCase {
 		$this->assertPattern('/posts index/', $Pages->getResponse()->body());
 		$this->assertEqual($Pages->viewVars['page'], 'index');
 
-		$Pages->viewPath = 'themed';
-		$Pages->display('test_theme', 'posts', 'index');
+		$Pages->viewPath = 'Themed';
+		$Pages->display('TestTheme', 'Posts', 'index');
 		$this->assertPattern('/posts index themed view/', $Pages->getResponse()->body());
-		$this->assertEqual($Pages->viewVars['page'], 'test_theme');
-		$this->assertEqual($Pages->viewVars['subpage'], 'posts');
+		$this->assertEqual($Pages->viewVars['page'], 'TestTheme');
+		$this->assertEqual($Pages->viewVars['subpage'], 'Posts');
 	}
 }

From 5e635c74e20c8292c67755311d34c6e9912ac015 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:16:42 -0430
Subject: [PATCH 46/50] Fixing components tests

---
 .../Controller/Component/RequestHandlerComponentTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index ecbedf547..fea7d6813 100644
--- a/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -387,7 +387,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		
 		$this->RequestHandler->renderAs($this->Controller, 'xml', array('attachment' => 'myfile.xml'));
 
-		$expected = 'request_handler_test' . DS . 'xml';
+		$expected = 'RequestHandlerTest' . DS . 'xml';
 		$this->assertEquals($expected, $this->Controller->viewPath);
 	}
 
@@ -445,11 +445,11 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testRenderAsCalledTwice() {
 		$this->RequestHandler->renderAs($this->Controller, 'xml');
-		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'xml');
+		$this->assertEqual($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'xml');
 		$this->assertEqual($this->Controller->layoutPath, 'xml');
 
 		$this->RequestHandler->renderAs($this->Controller, 'js');
-		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
+		$this->assertEqual($this->Controller->viewPath, 'RequestHandlerTest' . DS . 'js');
 		$this->assertEqual($this->Controller->layoutPath, 'js');
 		$this->assertTrue(in_array('Js', $this->Controller->helpers));
 	}

From cee46f5ee3dcf0c5b6fbfe8826f8d7800f094535 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:22:39 -0430
Subject: [PATCH 47/50] Fixing debug tests

---
 lib/Cake/Test/Case/BasicsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
index 1a95cda54..6866d03d5 100644
--- a/lib/Cake/Test/Case/BasicsTest.php
+++ b/lib/Cake/Test/Case/BasicsTest.php
@@ -678,7 +678,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('this-is-a-test');
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
+		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s';
 		$this->assertPattern($pattern, $result);
@@ -686,7 +686,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('<div>this-is-a-test</div>', true);
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
+		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
 		$this->assertPattern($pattern, $result);
@@ -694,7 +694,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('<div>this-is-a-test</div>', false);
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
+		$pattern = '/(.+?Test(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*\<div\>this-is-a-test\<\/div\>.*/s';
 		$this->assertPattern($pattern, $result);

From 082a5e1607bc09ecb3e29455d7895b288e785e98 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:26:23 -0430
Subject: [PATCH 48/50] Fixing ControllerTestCase test

---
 lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
index f5b6dc89e..881053386 100644
--- a/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
+++ b/lib/Cake/Test/test_app/Controller/TestsAppsPostsController.php
@@ -19,7 +19,7 @@
 class TestsAppsPostsController extends AppController {
 	public $name = 'TestsAppsPosts';
 	public $uses = array('Post');
-	public $viewPath = 'tests_apps';
+	public $viewPath = 'TestsApps';
 
 	function add() {
 		$data = array(

From a6fb16beeff6589d910a389079e7281789524907 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:42:10 -0430
Subject: [PATCH 49/50] Moving tests cases to their new location

---
 .../{tests => Test}/Case/Model/Behavior/TreeBehaviorAfterTest.php | 0
 .../Case/Model/Behavior/TreeBehaviorNumberTest.php                | 0
 .../Case/Model/Behavior/TreeBehaviorScopedTest.php                | 0
 .../{tests => Test}/Case/Model/Behavior/TreeBehaviorUuidTest.php  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename lib/Cake/{tests => Test}/Case/Model/Behavior/TreeBehaviorAfterTest.php (100%)
 rename lib/Cake/{tests => Test}/Case/Model/Behavior/TreeBehaviorNumberTest.php (100%)
 rename lib/Cake/{tests => Test}/Case/Model/Behavior/TreeBehaviorScopedTest.php (100%)
 rename lib/Cake/{tests => Test}/Case/Model/Behavior/TreeBehaviorUuidTest.php (100%)

diff --git a/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorAfterTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TreeBehaviorAfterTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TreeBehaviorAfterTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorNumberTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TreeBehaviorNumberTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorScopedTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TreeBehaviorScopedTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
diff --git a/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorUuidTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
similarity index 100%
rename from lib/Cake/tests/Case/Model/Behavior/TreeBehaviorUuidTest.php
rename to lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php

From 29298d746eabef7bdea3e9decadeb4c282fd5e30 Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Sun, 15 May 2011 00:56:33 -0430
Subject: [PATCH 50/50] Fixing App tests

---
 lib/Cake/Test/Case/Core/AppTest.php                           | 4 ++--
 .../Helper/{TestPLuginApp.php => TestPluginAppHelper.php}     | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/{TestPLuginApp.php => TestPluginAppHelper.php} (100%)

diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php
index d2c7bbf18..6edd0758d 100644
--- a/lib/Cake/Test/Case/Core/AppTest.php
+++ b/lib/Cake/Test/Case/Core/AppTest.php
@@ -334,11 +334,11 @@ class AppImportTest extends CakeTestCase {
 
 		$result = App::objects('TestPlugin.helper');
 		sort($result);
-		$expected = array('OtherHelperHelper', 'PluggedHelper', 'TestPluginApp');
+		$expected = array('OtherHelperHelper', 'PluggedHelperHelper', 'TestPluginAppHelper');
 		$this->assertEquals($result, $expected);
 		$result = App::objects('TestPlugin.View/Helper');
 		sort($result);
-		$expected = array('OtherHelperHelper', 'PluggedHelper', 'TestPluginApp');
+		$expected = array('OtherHelperHelper', 'PluggedHelperHelper', 'TestPluginAppHelper');
 		$this->assertEquals($result, $expected);
 
 		$result = App::objects('TestPlugin.component');
diff --git a/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/TestPLuginApp.php b/lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/TestPluginAppHelper.php
similarity index 100%
rename from lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/TestPLuginApp.php
rename to lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/TestPluginAppHelper.php