diff --git a/app/console/shells/empty b/app/Console/Command/Task/empty
similarity index 100%
rename from app/console/shells/empty
rename to app/Console/Command/Task/empty
diff --git a/app/console/shells/tasks/empty b/app/Console/Command/empty
similarity index 100%
rename from app/console/shells/tasks/empty
rename to app/Console/Command/empty
diff --git a/app/console/cake b/app/Console/cake
similarity index 100%
rename from app/console/cake
rename to app/Console/cake
diff --git a/app/console/cake.bat b/app/Console/cake.bat
similarity index 100%
rename from app/console/cake.bat
rename to app/Console/cake.bat
diff --git a/app/console/cake.php b/app/Console/cake.php
similarity index 100%
rename from app/console/cake.php
rename to app/Console/cake.php
diff --git a/app/console/templates/empty b/app/Console/templates/empty
similarity index 100%
rename from app/console/templates/empty
rename to app/Console/templates/empty
diff --git a/app/controllers/components/empty b/app/Controller/Component/empty
similarity index 100%
rename from app/controllers/components/empty
rename to app/Controller/Component/empty
diff --git a/app/libs/empty b/app/Lib/empty
similarity index 100%
rename from app/libs/empty
rename to app/Lib/empty
diff --git a/app/models/behaviors/empty b/app/Model/Behavior/empty
similarity index 100%
rename from app/models/behaviors/empty
rename to app/Model/Behavior/empty
diff --git a/app/models/datasources/empty b/app/Model/Datasource/empty
similarity index 100%
rename from app/models/datasources/empty
rename to app/Model/Datasource/empty
diff --git a/app/views/elements/email/html/empty b/app/View/Helper/empty
similarity index 100%
rename from app/views/elements/email/html/empty
rename to app/View/Helper/empty
diff --git a/app/views/elements/email/text/empty b/app/View/elements/email/html/empty
similarity index 100%
rename from app/views/elements/email/text/empty
rename to app/View/elements/email/html/empty
diff --git a/app/views/elements/empty b/app/View/elements/email/text/empty
similarity index 100%
rename from app/views/elements/empty
rename to app/View/elements/email/text/empty
diff --git a/app/views/errors/empty b/app/View/elements/empty
similarity index 100%
rename from app/views/errors/empty
rename to app/View/elements/empty
diff --git a/app/views/helpers/empty b/app/View/errors/empty
similarity index 100%
rename from app/views/helpers/empty
rename to app/View/errors/empty
diff --git a/app/views/layouts/email/html/empty b/app/View/layouts/email/html/empty
similarity index 100%
rename from app/views/layouts/email/html/empty
rename to app/View/layouts/email/html/empty
diff --git a/app/views/layouts/email/text/empty b/app/View/layouts/email/text/empty
similarity index 100%
rename from app/views/layouts/email/text/empty
rename to app/View/layouts/email/text/empty
diff --git a/app/views/layouts/js/empty b/app/View/layouts/js/empty
similarity index 100%
rename from app/views/layouts/js/empty
rename to app/View/layouts/js/empty
diff --git a/app/views/layouts/rss/empty b/app/View/layouts/rss/empty
similarity index 100%
rename from app/views/layouts/rss/empty
rename to app/View/layouts/rss/empty
diff --git a/app/views/layouts/xml/empty b/app/View/layouts/xml/empty
similarity index 100%
rename from app/views/layouts/xml/empty
rename to app/View/layouts/xml/empty
diff --git a/app/views/pages/empty b/app/View/pages/empty
similarity index 100%
rename from app/views/pages/empty
rename to app/View/pages/empty
diff --git a/app/views/scaffolds/empty b/app/View/scaffolds/empty
similarity index 100%
rename from app/views/scaffolds/empty
rename to app/View/scaffolds/empty
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 9710f0c56..014f812db 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -203,7 +203,7 @@ class App {
 					$path[] = sprintf($f, $pluginPath);
 				}
 			}
-			$path[] = $pluginPath . 'libs' . DS . $type . DS;
+			$path[] = $pluginPath . 'Lib' . DS . $type . DS;
 			return $path;
 		}
 
@@ -233,32 +233,61 @@ class App {
 	public static function build($paths = array(), $reset = false) {
 		if (empty(self::$__packageFormat)) {
 			self::$__packageFormat = array(
-				'Model' => array('%s' . 'models' . DS),
-				'Model/Behavior' => array('%s' . 'models' . DS . 'behaviors' . DS),
-				'Model/Datasource' => array('%s' . 'models' . DS . 'datasources' . DS),
-				'Model/Datasource/Database' => array('%s' . 'models' . DS . 'datasources' . DS . 'database' . DS),
-				'Model/Datasource/Session' => array('%s' . 'models' . DS . 'datasources' . DS . 'session' . DS),
-				'Controller' => array('%s' . 'controllers' . DS),
-				'Controller/Component' => array('%s' . 'controllers' . DS . 'components' . DS),
-				'View' => array('%s' . 'views' . DS),
-				'View/Helper' => array('%s' . 'views' . DS . 'helpers' . DS),
+				'Model' => array(
+					'%s' . 'Model' . DS,
+					'%s' . 'models' . DS
+				),
+				'Model/Behavior' => array(
+					'%s' . 'Model' . DS . 'Behavior' . DS,
+					'%s' . 'models' . DS . 'behaviors' . DS
+				),
+				'Model/Datasource' => array(
+					'%s' . 'Model' . DS . 'Datasource' . DS,
+					'%s' . 'models' . DS . 'datasources' . DS
+				),
+				'Model/Datasource/Database' => array(
+					'%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS,
+					'%s' . 'models' . DS . 'datasources' . DS . 'database' . DS
+				),
+				'Model/Datasource/Session' => array(
+					'%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS,
+					'%s' . 'models' . DS . 'datasources' . DS . 'session' . DS
+				),
+				'Controller' => array(
+					'%s' . 'Controller' . DS,
+					'%s' . 'controllers' . DS
+				),
+				'Controller/Component' => array(
+					'%s' . 'Controller' . DS . 'Component' . DS,
+					'%s' . 'controllers' . DS . 'components' . DS
+				),
+				'View' => array(
+					'%s' . 'View' . DS,
+					'%s' . 'views' . DS
+				),
+				'View/Helper' => array(
+					'%s' . 'View' . DS . 'Helper' . DS,
+					'%s' . 'views' . DS . 'helpers' . DS
+				),
 				'Console' => array(
-					'%s' . 'console' . DS,
-					'%s' . 'vendors' . DS . 'shells' . DS,
-					VENDORS . 'shells' . DS
+					'%s' . 'Console' . DS,
+					'%s' . 'console' . DS
 				),
 				'Console/Command' => array(
+					'%s' . 'Console' . DS . 'Command' . DS,
 					'%s' . 'console' . DS . 'shells' . DS,
-					'%s' . 'vendors' . DS . 'shells' . DS,
-					VENDORS . 'shells' . DS
 				),
 				'Console/Command/Task' => array(
-					'%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS,
-					'%s' . 'vendors' . DS . 'shells' . DS . 'tasks' . DS,
-					VENDORS . 'shells' . DS . 'tasks' . DS
+					'%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS,
+					'%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS
+				),
+				'Lib' => array(
+					'%s' . 'Lib' . DS,
+					'%s' . 'libs' . DS
+				),
+				'locales' => array(
+					'%s' . 'locale' . DS
 				),
-				'Lib' => array('%s' . 'libs' . DS),
-				'locales' => array('%s' . 'locale' . DS),
 				'vendors' => array('%s' . 'vendors' . DS, VENDORS),
 				'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS)
 			);
diff --git a/lib/Cake/tests/cases/console/shells/command_list.test.php b/lib/Cake/tests/cases/console/shells/command_list.test.php
index 461fe00c0..57a0cbd90 100644
--- a/lib/Cake/tests/cases/console/shells/command_list.test.php
+++ b/lib/Cake/tests/cases/console/shells/command_list.test.php
@@ -44,7 +44,7 @@ class CommandListTest extends CakeTestCase {
 				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			),
 			'Console/Command' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'console' . DS . 'shells' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
 		App::objects('plugin', null, false);
diff --git a/lib/Cake/tests/cases/console/shells/tasks/extract.test.php b/lib/Cake/tests/cases/console/shells/tasks/extract.test.php
index a4409225b..c401bbd09 100644
--- a/lib/Cake/tests/cases/console/shells/tasks/extract.test.php
+++ b/lib/Cake/tests/cases/console/shells/tasks/extract.test.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 . 'views' . DS . 'pages';
+		$this->Task->params['paths'] = LIBS . 'tests' . 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')
@@ -157,7 +157,7 @@ class ExtractTaskTest extends CakeTestCase {
 	function testExtractWithExclude() {
 		$this->Task->interactive = false;
 
-		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'views';
+		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View';
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['exclude'] = 'pages,layouts';
 
@@ -184,8 +184,8 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Task->interactive = false;
 
 		$this->Task->params['paths'] = 
-			LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages,' .
-			LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'posts';
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages,' .
+			LIBS . 'tests' . 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/tests/cases/libs/app.test.php b/lib/Cake/tests/cases/libs/app.test.php
index e90e1b06b..f12f79785 100644
--- a/lib/Cake/tests/cases/libs/app.test.php
+++ b/lib/Cake/tests/cases/libs/app.test.php
@@ -16,6 +16,7 @@ class AppImportTest extends CakeTestCase {
 	function testBuild() {
 		$old = App::path('Model');
 		$expected = array(
+			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
 		$this->assertEqual($expected, $old);
@@ -26,6 +27,7 @@ class AppImportTest extends CakeTestCase {
 
 		$expected = array(
 			'/path/to/models/',
+			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
 		$this->assertEqual($expected, $new);
@@ -44,6 +46,7 @@ class AppImportTest extends CakeTestCase {
 	function testCompatibleBuild() {
 		$old = App::path('models');
 		$expected = array(
+			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
 		$this->assertEqual($expected, $old);
@@ -54,6 +57,7 @@ class AppImportTest extends CakeTestCase {
 
 		$expected = array(
 			'/path/to/models/',
+			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
 		$this->assertEqual($expected, $new);
@@ -62,6 +66,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('datasources' => array('/path/to/datasources/')));
 		$expected = array(
 			'/path/to/datasources/',
+			APP . 'Model' . DS . 'Datasource' . DS,
 			APP . 'models' . DS . 'datasources' . DS
 		);
 		$result = App::path('datasources');
@@ -71,6 +76,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('behaviors' => array('/path/to/behaviors/')));
 		$expected = array(
 			'/path/to/behaviors/',
+			APP . 'Model' . DS . 'Behavior' . DS,
 			APP . 'models' . DS . 'behaviors' . DS
 		);
 		$result = App::path('behaviors');
@@ -80,6 +86,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('controllers' => array('/path/to/controllers/')));
 		$expected = array(
 			'/path/to/controllers/',
+			APP . 'Controller' . DS,
 			APP . 'controllers' . DS
 		);
 		$result = App::path('controllers');
@@ -89,6 +96,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('components' => array('/path/to/components/')));
 		$expected = array(
 			'/path/to/components/',
+			APP . 'Controller' . DS . 'Component' . DS,
 			APP . 'controllers' . DS . 'components' . DS
 		);
 		$result = App::path('components');
@@ -98,6 +106,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('views' => array('/path/to/views/')));
 		$expected = array(
 			'/path/to/views/',
+			APP . 'View' . DS,
 			APP . 'views' . DS
 		);
 		$result = App::path('views');
@@ -107,6 +116,7 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('helpers' => array('/path/to/helpers/')));
 		$expected = array(
 			'/path/to/helpers/',
+			APP . 'View' . DS . 'Helper' .DS,
 			APP . 'views' . DS . 'helpers' . DS
 		);
 		$result = App::path('helpers');
@@ -116,9 +126,8 @@ class AppImportTest extends CakeTestCase {
 		App::build(array('shells' => array('/path/to/shells/')));
 		$expected = array(
 			'/path/to/shells/',
+			APP . 'Console' . DS . 'Command' . DS,
 			APP . 'console' . DS . 'shells' . DS,
-			APP . 'vendors' . DS . 'shells' . DS,
-			ROOT . DS . 'vendors' . DS . 'shells' . DS
 		);
 		$result = App::path('shells');
 		$this->assertEqual($expected, $result);
@@ -138,6 +147,7 @@ class AppImportTest extends CakeTestCase {
 	function testBuildWithReset() {
 		$old = App::path('Model');
 		$expected = array(
+			APP . 'Model' . DS,
 			APP . 'models' . DS
 		);
 		$this->assertEqual($expected, $old);
diff --git a/lib/Cake/tests/cases/libs/controller/components/auth.test.php b/lib/Cake/tests/cases/libs/controller/components/auth.test.php
index dbc939990..73ccda96c 100644
--- a/lib/Cake/tests/cases/libs/controller/components/auth.test.php
+++ b/lib/Cake/tests/cases/libs/controller/components/auth.test.php
@@ -948,7 +948,7 @@ class AuthTest extends CakeTestCase {
  */
 	function testAjaxLogin() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
 
diff --git a/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php b/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
index 3d0ea9c9b..047db025e 100644
--- a/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/lib/Cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -670,7 +670,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestAction() {
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -699,7 +699,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestActionStillRenderingLayout() {
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
diff --git a/lib/Cake/tests/cases/libs/controller/controller.test.php b/lib/Cake/tests/cases/libs/controller/controller.test.php
index ec7345ca2..82ea88dbe 100644
--- a/lib/Cake/tests/cases/libs/controller/controller.test.php
+++ b/lib/Cake/tests/cases/libs/controller/controller.test.php
@@ -439,8 +439,8 @@ class ControllerTest extends CakeTestCase {
 	function testLoadModelInPlugins() {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS),
-			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
+			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		));
 		App::uses('TestPluginAppController', 'TestPlugin.Controller');
 		App::uses('TestPluginController', 'TestPlugin.Controller');
@@ -578,7 +578,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$Controller = new Controller($request);
 		$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -640,7 +640,7 @@ class ControllerTest extends CakeTestCase {
  */
 	function testRender() {
 		App::build(array(
-			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 		$request = new CakeRequest('controller_posts/index');
 		$request->params['action'] = 'index';
@@ -684,11 +684,9 @@ class ControllerTest extends CakeTestCase {
  * @return void
  */
 	function testComponentBeforeRenderChangingViewClass() {
-		$core = App::core('views');
 		App::build(array(
-			'views' => array(
-				LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				$core[0]
+			'View' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		$Controller = new Controller($this->getMock('CakeRequest'));
diff --git a/lib/Cake/tests/cases/libs/controller/pages_controller.test.php b/lib/Cake/tests/cases/libs/controller/pages_controller.test.php
index de1dd5b11..452e7db77 100644
--- a/lib/Cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/lib/Cake/tests/cases/libs/controller/pages_controller.test.php
@@ -44,7 +44,9 @@ class PagesControllerTest extends CakeTestCase {
  */
 	function testDisplay() {
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS, LIBS . 'libs' . DS . 'view' . DS)
+			'View' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+			)
 		));
 		$Pages = new PagesController(new CakeRequest(null, false));
 
diff --git a/lib/Cake/tests/cases/libs/model/connection_manager.test.php b/lib/Cake/tests/cases/libs/model/connection_manager.test.php
index 4fe0daec6..2256a3696 100644
--- a/lib/Cake/tests/cases/libs/model/connection_manager.test.php
+++ b/lib/Cake/tests/cases/libs/model/connection_manager.test.php
@@ -141,7 +141,9 @@ class ConnectionManagerTest extends CakeTestCase {
 	function testGetPluginDataSourceAndLocalDriver() {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'Model/Datasource/Database' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS . 'Database' . DS)
+			'Model/Datasource/Database' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+			)
 		));
 
 		$name = 'test_plugin_source_and_local_driver';
@@ -262,7 +264,9 @@ class ConnectionManagerTest extends CakeTestCase {
 	function testConnectionData() {
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'Model/Datasource' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+			'Model/Datasource' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
+			)
 		));
 
 		$expected = array(
diff --git a/lib/Cake/tests/cases/libs/view/helper.test.php b/lib/Cake/tests/cases/libs/view/helper.test.php
index 6c1093bf9..641a32828 100644
--- a/lib/Cake/tests/cases/libs/view/helper.test.php
+++ b/lib/Cake/tests/cases/libs/view/helper.test.php
@@ -518,7 +518,7 @@ class HelperTest extends CakeTestCase {
 		Configure::write('Asset.timestamp', 'force');
 		App::build(array(
 			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
 		));
 
 		$result = $this->Helper->assetTimestamp('/test_plugin/css/test_plugin_asset.css');
@@ -757,7 +757,7 @@ class HelperTest extends CakeTestCase {
 		$this->Helper->theme = 'test_theme';
 
 		App::build(array(
-			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
diff --git a/lib/Cake/tests/cases/libs/view/view.test.php b/lib/Cake/tests/cases/libs/view/view.test.php
index b4542d064..523ecf73c 100644
--- a/lib/Cake/tests/cases/libs/view/view.test.php
+++ b/lib/Cake/tests/cases/libs/view/view.test.php
@@ -260,8 +260,9 @@ class ViewTest extends CakeTestCase {
 
 		$expected = array(
 			LIBS . 'tests' . DS . 'test_app' . DS . 'views' . 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 . 'libs' . DS . 'View' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'Lib' . DS . 'View' . DS,
 			LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS,
 			LIBS . 'View' . DS
 		);
diff --git a/lib/Cake/tests/test_app/console/shells/SampleShell.php b/lib/Cake/tests/test_app/Console/Command/SampleShell.php
similarity index 100%
rename from lib/Cake/tests/test_app/console/shells/SampleShell.php
rename to lib/Cake/tests/test_app/Console/Command/SampleShell.php
diff --git a/lib/Cake/tests/test_app/console/shells/tasks/empty b/lib/Cake/tests/test_app/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/console/shells/tasks/empty
rename to lib/Cake/tests/test_app/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/console/templates/test/classes/test_object.ctp b/lib/Cake/tests/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/tests/test_app/Console/templates/test/classes/test_object.ctp
diff --git a/lib/Cake/tests/test_app/controllers/components/empty b/lib/Cake/tests/test_app/Controller/Component/empty
similarity index 100%
rename from lib/Cake/tests/test_app/controllers/components/empty
rename to lib/Cake/tests/test_app/Controller/Component/empty
diff --git a/lib/Cake/tests/test_app/controllers/tests_apps_controller.php b/lib/Cake/tests/test_app/Controller/tests_apps_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/controllers/tests_apps_controller.php
rename to lib/Cake/tests/test_app/Controller/tests_apps_controller.php
diff --git a/lib/Cake/tests/test_app/controllers/tests_apps_posts_controller.php b/lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/controllers/tests_apps_posts_controller.php
rename to lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
diff --git a/lib/Cake/tests/test_app/libs/Cache/Engine/TestAppCacheEngine.php b/lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/libs/Cache/Engine/TestAppCacheEngine.php
rename to lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
diff --git a/lib/Cake/tests/test_app/libs/Log/Engine/TestAppLog.php b/lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/libs/Log/Engine/TestAppLog.php
rename to lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
diff --git a/lib/Cake/tests/test_app/libs/Utility/TestUtilityClass.php b/lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/libs/Utility/TestUtilityClass.php
rename to lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php
diff --git a/lib/Cake/tests/test_app/libs/library.php b/lib/Cake/tests/test_app/Lib/library.php
similarity index 100%
rename from lib/Cake/tests/test_app/libs/library.php
rename to lib/Cake/tests/test_app/Lib/library.php
diff --git a/lib/Cake/tests/test_app/models/behaviors/empty b/lib/Cake/tests/test_app/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/tests/test_app/models/behaviors/empty
rename to lib/Cake/tests/test_app/Model/Behavior/empty
diff --git a/lib/Cake/tests/test_app/models/behaviors/persister_one_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/behaviors/persister_one_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php
diff --git a/lib/Cake/tests/test_app/models/behaviors/persister_two_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/behaviors/persister_two_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php
diff --git a/lib/Cake/tests/test_app/models/datasources/database/TestLocalDriver.php b/lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/datasources/database/TestLocalDriver.php
rename to lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php
diff --git a/lib/Cake/tests/test_app/models/datasources/session/TestAppLibSession.php b/lib/Cake/tests/test_app/Model/Datasource/Session/TestAppLibSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/datasources/session/TestAppLibSession.php
rename to lib/Cake/tests/test_app/Model/Datasource/Session/TestAppLibSession.php
diff --git a/lib/Cake/tests/test_app/models/datasources/test2_other_source.php b/lib/Cake/tests/test_app/Model/Datasource/test2_other_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/datasources/test2_other_source.php
rename to lib/Cake/tests/test_app/Model/Datasource/test2_other_source.php
diff --git a/lib/Cake/tests/test_app/models/datasources/test2_source.php b/lib/Cake/tests/test_app/Model/Datasource/test2_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/datasources/test2_source.php
rename to lib/Cake/tests/test_app/Model/Datasource/test2_source.php
diff --git a/lib/Cake/tests/test_app/models/comment.php b/lib/Cake/tests/test_app/Model/comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/comment.php
rename to lib/Cake/tests/test_app/Model/comment.php
diff --git a/lib/Cake/tests/test_app/models/persister_one.php b/lib/Cake/tests/test_app/Model/persister_one.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/persister_one.php
rename to lib/Cake/tests/test_app/Model/persister_one.php
diff --git a/lib/Cake/tests/test_app/models/persister_two.php b/lib/Cake/tests/test_app/Model/persister_two.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/persister_two.php
rename to lib/Cake/tests/test_app/Model/persister_two.php
diff --git a/lib/Cake/tests/test_app/models/post.php b/lib/Cake/tests/test_app/Model/post.php
similarity index 100%
rename from lib/Cake/tests/test_app/models/post.php
rename to lib/Cake/tests/test_app/Model/post.php
diff --git a/lib/Cake/tests/test_app/views/helpers/banana.php b/lib/Cake/tests/test_app/View/Helper/banana.php
similarity index 100%
rename from lib/Cake/tests/test_app/views/helpers/banana.php
rename to lib/Cake/tests/test_app/View/Helper/banana.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/empty b/lib/Cake/tests/test_app/View/Helper/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/empty
rename to lib/Cake/tests/test_app/View/Helper/empty
diff --git a/lib/Cake/tests/test_app/views/elements/email/html/custom.ctp b/lib/Cake/tests/test_app/View/elements/email/html/custom.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/html/custom.ctp
rename to lib/Cake/tests/test_app/View/elements/email/html/custom.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/email/html/default.ctp b/lib/Cake/tests/test_app/View/elements/email/html/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/html/default.ctp
rename to lib/Cake/tests/test_app/View/elements/email/html/default.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/email/html/nested_element.ctp b/lib/Cake/tests/test_app/View/elements/email/html/nested_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/html/nested_element.ctp
rename to lib/Cake/tests/test_app/View/elements/email/html/nested_element.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/email/text/custom.ctp b/lib/Cake/tests/test_app/View/elements/email/text/custom.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/text/custom.ctp
rename to lib/Cake/tests/test_app/View/elements/email/text/custom.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/email/text/default.ctp b/lib/Cake/tests/test_app/View/elements/email/text/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/text/default.ctp
rename to lib/Cake/tests/test_app/View/elements/email/text/default.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/email/text/wide.ctp b/lib/Cake/tests/test_app/View/elements/email/text/wide.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/email/text/wide.ctp
rename to lib/Cake/tests/test_app/View/elements/email/text/wide.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/console/templates/empty b/lib/Cake/tests/test_app/View/elements/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/console/templates/empty
rename to lib/Cake/tests/test_app/View/elements/empty
diff --git a/lib/Cake/tests/test_app/views/elements/html_call.ctp b/lib/Cake/tests/test_app/View/elements/html_call.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/html_call.ctp
rename to lib/Cake/tests/test_app/View/elements/html_call.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/nocache/contains_nocache.ctp b/lib/Cake/tests/test_app/View/elements/nocache/contains_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
rename to lib/Cake/tests/test_app/View/elements/nocache/contains_nocache.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/nocache/plain.ctp b/lib/Cake/tests/test_app/View/elements/nocache/plain.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/nocache/plain.ctp
rename to lib/Cake/tests/test_app/View/elements/nocache/plain.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/nocache/sub1.ctp b/lib/Cake/tests/test_app/View/elements/nocache/sub1.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/nocache/sub1.ctp
rename to lib/Cake/tests/test_app/View/elements/nocache/sub1.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/nocache/sub2.ctp b/lib/Cake/tests/test_app/View/elements/nocache/sub2.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/nocache/sub2.ctp
rename to lib/Cake/tests/test_app/View/elements/nocache/sub2.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/session_helper.ctp b/lib/Cake/tests/test_app/View/elements/session_helper.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/session_helper.ctp
rename to lib/Cake/tests/test_app/View/elements/session_helper.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/test_element.ctp b/lib/Cake/tests/test_app/View/elements/test_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/test_element.ctp
rename to lib/Cake/tests/test_app/View/elements/test_element.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/type_check.ctp b/lib/Cake/tests/test_app/View/elements/type_check.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/type_check.ctp
rename to lib/Cake/tests/test_app/View/elements/type_check.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/tasks/empty b/lib/Cake/tests/test_app/View/errors/empty
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/tasks/empty
rename to lib/Cake/tests/test_app/View/errors/empty
diff --git a/lib/Cake/tests/test_app/views/layouts/ajax.ctp b/lib/Cake/tests/test_app/View/layouts/ajax.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/ajax.ctp
rename to lib/Cake/tests/test_app/View/layouts/ajax.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/ajax2.ctp b/lib/Cake/tests/test_app/View/layouts/ajax2.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/ajax2.ctp
rename to lib/Cake/tests/test_app/View/layouts/ajax2.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/cache_empty_sections.ctp b/lib/Cake/tests/test_app/View/layouts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/cache_empty_sections.ctp
rename to lib/Cake/tests/test_app/View/layouts/cache_empty_sections.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/cache_layout.ctp b/lib/Cake/tests/test_app/View/layouts/cache_layout.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/cache_layout.ctp
rename to lib/Cake/tests/test_app/View/layouts/cache_layout.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/default.ctp b/lib/Cake/tests/test_app/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/email/html/default.ctp b/lib/Cake/tests/test_app/View/layouts/email/html/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/email/html/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/html/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/email/html/thin.ctp b/lib/Cake/tests/test_app/View/layouts/email/html/thin.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/email/html/thin.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/html/thin.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/email/text/default.ctp b/lib/Cake/tests/test_app/View/layouts/email/text/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/email/text/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/text/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/flash.ctp b/lib/Cake/tests/test_app/View/layouts/flash.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/flash.ctp
rename to lib/Cake/tests/test_app/View/layouts/flash.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/js/default.ctp b/lib/Cake/tests/test_app/View/layouts/js/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/js/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/js/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/json/default.ctp b/lib/Cake/tests/test_app/View/layouts/json/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/json/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/json/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/multi_cache.ctp b/lib/Cake/tests/test_app/View/layouts/multi_cache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/multi_cache.ctp
rename to lib/Cake/tests/test_app/View/layouts/multi_cache.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/rss/default.ctp b/lib/Cake/tests/test_app/View/layouts/rss/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/rss/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/rss/default.ctp
diff --git a/lib/Cake/tests/test_app/views/layouts/xml/default.ctp b/lib/Cake/tests/test_app/View/layouts/xml/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/layouts/xml/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/xml/default.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/templates/empty b/lib/Cake/tests/test_app/View/pages/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/View/pages/empty
diff --git a/lib/Cake/tests/test_app/views/pages/extract.ctp b/lib/Cake/tests/test_app/View/pages/extract.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/pages/extract.ctp
rename to lib/Cake/tests/test_app/View/pages/extract.ctp
diff --git a/lib/Cake/tests/test_app/views/pages/home.ctp b/lib/Cake/tests/test_app/View/pages/home.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/pages/home.ctp
rename to lib/Cake/tests/test_app/View/pages/home.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/cache_empty_sections.ctp b/lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/cache_empty_sections.ctp
rename to lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/cache_form.ctp b/lib/Cake/tests/test_app/View/posts/cache_form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/cache_form.ctp
rename to lib/Cake/tests/test_app/View/posts/cache_form.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/helper_overwrite.ctp b/lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/helper_overwrite.ctp
rename to lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/index.ctp b/lib/Cake/tests/test_app/View/posts/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/index.ctp
rename to lib/Cake/tests/test_app/View/posts/index.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/multiple_nocache.ctp b/lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/multiple_nocache.ctp
rename to lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/nocache_multiple_element.ctp b/lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/nocache_multiple_element.ctp
rename to lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/scaffold.form.ctp b/lib/Cake/tests/test_app/View/posts/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/scaffold.form.ctp
rename to lib/Cake/tests/test_app/View/posts/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/sequencial_nocache.ctp b/lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/sequencial_nocache.ctp
rename to lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp
diff --git a/lib/Cake/tests/test_app/views/posts/test_nocache_tags.ctp b/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/posts/test_nocache_tags.ctp
rename to lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
diff --git a/lib/Cake/tests/test_app/views/elements/empty b/lib/Cake/tests/test_app/View/scaffolds/empty
similarity index 100%
rename from lib/Cake/tests/test_app/views/elements/empty
rename to lib/Cake/tests/test_app/View/scaffolds/empty
diff --git a/lib/Cake/tests/test_app/views/tests_apps/index.ctp b/lib/Cake/tests/test_app/View/tests_apps/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/tests_apps/index.ctp
rename to lib/Cake/tests/test_app/View/tests_apps/index.ctp
diff --git a/lib/Cake/tests/test_app/views/tests_apps/json/index.ctp b/lib/Cake/tests/test_app/View/tests_apps/json/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/tests_apps/json/index.ctp
rename to lib/Cake/tests/test_app/View/tests_apps/json/index.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/layouts/default.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/posts/index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/posts/index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js
diff --git a/lib/Cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from lib/Cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
diff --git a/lib/Cake/tests/test_app/views/errors/empty b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/views/errors/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/console/shells/example.php b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/console/shells/example.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/views/helpers/empty b/lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/views/helpers/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_app_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/libs/Cache/Engine/TestPluginCacheEngine.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/libs/Cache/Engine/TestPluginCacheEngine.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/libs/Custom/Package/CustomLibClass.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/libs/Custom/Package/CustomLibClass.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/libs/Log/Engine/TestPluginLog.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/libs/Log/Engine/TestPluginLog.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/database/DboDummy.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/database/DboDummy.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/database/TestDriver.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/database/TestDriver.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/session/TestPluginSession.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/session/TestPluginSession.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Session/TestPluginSession.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/TestSource.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/TestSource.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/TestSource.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/test_other_source.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_app_model.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_app_model.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_app_model.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_auth_user.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_authors.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_comment.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/test_plugin_post.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/OtherHelperHelper.php b/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/OtherHelperHelper.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/OtherHelperHelper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php b/lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp b/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/elements/plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp b/lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/elements/test_plugin_element.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp b/lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/layouts/default.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp b/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/tests/index.ctp
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp b/lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
rename to lib/Cake/tests/test_app/plugins/test_plugin/View/tests/scaffold.form.ctp
diff --git a/lib/Cake/tests/test_app/views/pages/empty b/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/tests/test_app/views/pages/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/Task/empty
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php b/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/example.php
rename to lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/example.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php b/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin_two/console/shells/welcome.php
rename to lib/Cake/tests/test_app/plugins/test_plugin_two/Console/Command/welcome.php
diff --git a/lib/Cake/tests/test_app/views/scaffolds/empty b/lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty
similarity index 100%
rename from lib/Cake/tests/test_app/views/scaffolds/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin_two/Console/templates/empty