From 21348169faadda484fdc245d6978e4239cd038e7 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Mon, 30 May 2011 23:02:39 -0400
Subject: [PATCH] Camelized templates folder.

---
 lib/Cake/Console/Command/Task/ProjectTask.php      |  10 +++++-----
 lib/Cake/Console/Command/Task/TemplateTask.php     |  13 ++++++-------
 lib/Cake/Console/Command/UpgradeShell.php          |   2 +-
 lib/Cake/Console/ShellDispatcher.php               |   4 ++--
 .../default/actions/controller_actions.ctp         |   0
 .../default/classes/controller.ctp                 |   0
 .../default/classes/fixture.ctp                    |   0
 .../default/classes/model.ctp                      |   0
 .../default/classes/test.ctp                       |   0
 .../default/views/form.ctp                         |   0
 .../default/views/home.ctp                         |   0
 .../default/views/index.ctp                        |   0
 .../default/views/view.ctp                         |   0
 .../{templates => Templates}/skel/.htaccess        |   0
 .../skel/Config/Schema/db_acl.php                  |   0
 .../skel/Config/Schema/db_acl.sql                  |   0
 .../skel/Config/Schema/i18n.php                    |   0
 .../skel/Config/Schema/i18n.sql                    |   0
 .../skel/Config/Schema/sessions.php                |   0
 .../skel/Config/Schema/sessions.sql                |   0
 .../skel/Config/acl.ini.php                        |   0
 .../skel/Config/bootstrap.php                      |   0
 .../{templates => Templates}/skel/Config/core.php  |   0
 .../skel/Config/database.php.default               |   0
 .../skel/Config/email.php.default                  |   0
 .../skel/Config/routes.php                         |   0
 .../skel/Console/Command/Task/empty                |   0
 .../{templates => Templates}/skel/Console/cake     |   0
 .../{templates => Templates}/skel/Console/cake.bat |   0
 .../{templates => Templates}/skel/Console/cake.php |   0
 .../skel/Controller/AppController.php              |   0
 .../skel/Controller/Component/empty                |   0
 .../skel/Controller/PagesController.php            |   0
 .../{templates => Templates}/skel/Lib/empty        |   0
 .../skel/Locale/eng/LC_MESSAGES/empty              |   0
 .../skel/Model/AppModel.php                        |   0
 .../skel/Model/Behavior/empty                      |   0
 .../skel/Model/Datasource/empty                    |   0
 .../{templates => Templates}/skel/Plugin/empty     |   0
 .../skel/Test/Case/Controller/Component/empty      |   0
 .../skel/Test/Case/Controller/empty                |   0
 .../skel/Test/Case/Model/Behavior/empty            |   0
 .../skel/Test/Case/Model/empty                     |   0
 .../skel/Test/Case/View/Helper/empty               |   0
 .../skel/Test/Fixture/empty                        |   0
 .../{templates => Templates}/skel/Vendor/empty     |   0
 .../skel/View/Elements/empty                       |   0
 .../skel/View/Emails/html/default.ctp              |   0
 .../skel/View/Emails/text/default.ctp              |   0
 .../skel/View/Errors/empty                         |   0
 .../skel/View/Helper/AppHelper.php                 |   0
 .../skel/View/Helper/empty                         |   0
 .../skel/View/Layouts/Emails/html/default.ctp      |   0
 .../skel/View/Layouts/Emails/text/default.ctp      |   0
 .../skel/View/Layouts/ajax.ctp                     |   0
 .../skel/View/Layouts/default.ctp                  |   0
 .../skel/View/Layouts/flash.ctp                    |   0
 .../skel/View/Layouts/js/default.ctp               |   0
 .../skel/View/Layouts/rss/default.ctp              |   0
 .../skel/View/Layouts/xml/default.ctp              |   0
 .../{templates => Templates}/skel/View/Pages/empty |   0
 .../skel/View/Scaffolds/empty                      |   0
 .../{templates => Templates}/skel/index.php        |   0
 .../skel/tmp/cache/models/empty                    |   0
 .../skel/tmp/cache/persistent/empty                |   0
 .../skel/tmp/cache/views/empty                     |   0
 .../{templates => Templates}/skel/tmp/logs/empty   |   0
 .../skel/tmp/sessions/empty                        |   0
 .../{templates => Templates}/skel/tmp/tests/empty  |   0
 .../skel/webroot/.htaccess                         |   0
 .../skel/webroot/css/cake.generic.css              |   0
 .../skel/webroot/favicon.ico                       | Bin
 .../skel/webroot/img/cake.icon.png                 | Bin
 .../skel/webroot/img/cake.power.gif                | Bin
 .../skel/webroot/index.php                         |   0
 .../{templates => Templates}/skel/webroot/js/empty |   0
 .../{templates => Templates}/skel/webroot/test.php |   0
 77 files changed, 14 insertions(+), 15 deletions(-)
 rename lib/Cake/Console/{templates => Templates}/default/actions/controller_actions.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/classes/controller.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/classes/fixture.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/classes/model.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/classes/test.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/views/form.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/views/home.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/views/index.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/default/views/view.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/.htaccess (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/db_acl.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/db_acl.sql (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/i18n.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/i18n.sql (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/sessions.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/Schema/sessions.sql (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/acl.ini.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/bootstrap.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/core.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/database.php.default (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/email.php.default (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Config/routes.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Console/Command/Task/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Console/cake (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Console/cake.bat (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Console/cake.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Controller/AppController.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Controller/Component/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Controller/PagesController.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Lib/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Locale/eng/LC_MESSAGES/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Model/AppModel.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Model/Behavior/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Model/Datasource/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Plugin/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Case/Controller/Component/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Case/Controller/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Case/Model/Behavior/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Case/Model/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Case/View/Helper/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Test/Fixture/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/Vendor/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Elements/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Emails/html/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Emails/text/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Errors/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Helper/AppHelper.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Helper/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/Emails/html/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/Emails/text/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/ajax.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/flash.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/js/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/rss/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Layouts/xml/default.ctp (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Pages/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/View/Scaffolds/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/index.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/cache/models/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/cache/persistent/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/cache/views/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/logs/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/sessions/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/tmp/tests/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/.htaccess (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/css/cake.generic.css (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/favicon.ico (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/img/cake.icon.png (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/img/cake.power.gif (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/index.php (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/js/empty (100%)
 rename lib/Cake/Console/{templates => Templates}/skel/webroot/test.php (100%)

diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php
index 36a537843..a7c8d4d0a 100644
--- a/lib/Cake/Console/Command/Task/ProjectTask.php
+++ b/lib/Cake/Console/Command/Task/ProjectTask.php
@@ -140,7 +140,7 @@ class ProjectTask extends Shell {
 			$skel = $this->in(
 				__d('cake_console', "What is the path to the directory layout you wish to copy?"),
 				null,
-				CAKE . 'Console' . DS . 'templates' . DS . 'skel'
+				CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
 			);
 			if (!$skel) {
 				$this->err(__d('cake_console', 'The directory path you supplied was empty. Please try again.'));
@@ -149,7 +149,7 @@ class ProjectTask extends Shell {
 					$skel = $this->in(
 						__d('cake_console', 'Directory path does not exist please choose another:'),
 						null,
-						CAKE . 'Console' . DS . 'templates' . DS . 'skel'
+						CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
 					);
 				}
 			}
@@ -203,7 +203,7 @@ class ProjectTask extends Shell {
 	public function createHome($dir) {
 		$app = basename($dir);
 		$path = $dir . 'View' . DS . 'Pages' . DS;
-		$source = CAKE . 'Console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp';
+		$source = CAKE . 'Console' . DS . 'Templates' . DS .'default' . DS . 'views' . DS . 'home.ctp';
 		include($source);
 		return $this->createFile($path.'home.ctp', $output);
 	}
@@ -388,8 +388,8 @@ class ProjectTask extends Shell {
 			))->addOption('empty', array(
 				'help' => __d('cake_console', 'Create empty files in each of the directories. Good if you are using git')
 			))->addOption('skel', array(
-				'default' => current(App::core('Console')) . 'templates' . DS . 'skel',
-				'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/console/templates/skel of CakePHP used to create the project.')
+				'default' => current(App::core('Console')) . 'Templates' . DS . 'skel',
+				'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/Console/Templates/skel of CakePHP used to create the project.')
 			));
 	}
 
diff --git a/lib/Cake/Console/Command/Task/TemplateTask.php b/lib/Cake/Console/Command/Task/TemplateTask.php
index fc4efcd87..fc4f40e93 100644
--- a/lib/Cake/Console/Command/Task/TemplateTask.php
+++ b/lib/Cake/Console/Command/Task/TemplateTask.php
@@ -49,7 +49,7 @@ class TemplateTask extends Shell {
 /**
  * Find the paths to all the installed shell themes in the app.
  *
- * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
+ * Bake themes are directories not named `skel` inside a `Console/Templates` path.
  *
  * @return array Array of bake themes that are installed.
  */
@@ -59,15 +59,14 @@ class TemplateTask extends Shell {
 		$separator = DS === '/' ? '/' : '\\\\';
 		$core = preg_replace('#shells' . $separator . '$#', '', $core);
 
-		$Folder = new Folder($core . 'templates' . DS . 'default');
+		$Folder = new Folder($core . 'Templates' . DS . 'default');
 
 		$contents = $Folder->read();
 		$themeFolders = $contents[0];
 
 		$plugins = App::objects('plugin');
 		foreach ($plugins as $plugin) {
-			$paths[] = $this->_pluginPath($plugin) . 'console' . DS . 'shells' . DS;
-			$paths[] = $this->_pluginPath($plugin) . 'vendors' . DS . 'shells' . DS;
+			$paths[] = $this->_pluginPath($plugin) . 'Console' . DS;
 		}
 		$paths[] = $core;
 
@@ -78,18 +77,18 @@ class TemplateTask extends Shell {
 
 		$themes = array();
 		foreach ($paths as $path) {
-			$Folder = new Folder($path . 'templates', false);
+			$Folder = new Folder($path . 'Templates', false);
 			$contents = $Folder->read();
 			$subDirs = $contents[0];
 			foreach ($subDirs as $dir) {
 				if (empty($dir) || preg_match('@^skel$|_skel$@', $dir)) {
 					continue;
 				}
-				$Folder = new Folder($path . 'templates' . DS . $dir);
+				$Folder = new Folder($path . 'Templates' . DS . $dir);
 				$contents = $Folder->read();
 				$subDirs = $contents[0];
 				if (array_intersect($contents[0], $themeFolders)) {
-					$templateDir = $path . 'templates' . DS . $dir . DS;
+					$templateDir = $path . 'Templates' . DS . $dir . DS;
 					$themes[$dir] = $templateDir;
 				}
 			}
diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
index 0b9b6e57f..1ff68b3aa 100644
--- a/lib/Cake/Console/Command/UpgradeShell.php
+++ b/lib/Cake/Console/Command/UpgradeShell.php
@@ -88,7 +88,7 @@ class UpgradeShell extends Shell {
 
 		$moves = array(
 			'libs' => 'Lib',
-			'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'templates',
+			'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'Templates',
 		);
 		foreach($moves as $old => $new) {
 			if (is_dir($old)) {
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
index 55267b28f..48b7a6ac3 100644
--- a/lib/Cake/Console/ShellDispatcher.php
+++ b/lib/Cake/Console/ShellDispatcher.php
@@ -127,13 +127,13 @@ class ShellDispatcher {
 		define('APP_PATH', $this->params['working'] . DS);
 		define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS);
 		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);
+			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');
 		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';
+			include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
 			App::build();
 		}
 		require_once CAKE . 'Console' . DS . 'ConsoleErrorHandler.php';
diff --git a/lib/Cake/Console/templates/default/actions/controller_actions.ctp b/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/actions/controller_actions.ctp
rename to lib/Cake/Console/Templates/default/actions/controller_actions.ctp
diff --git a/lib/Cake/Console/templates/default/classes/controller.ctp b/lib/Cake/Console/Templates/default/classes/controller.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/classes/controller.ctp
rename to lib/Cake/Console/Templates/default/classes/controller.ctp
diff --git a/lib/Cake/Console/templates/default/classes/fixture.ctp b/lib/Cake/Console/Templates/default/classes/fixture.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/classes/fixture.ctp
rename to lib/Cake/Console/Templates/default/classes/fixture.ctp
diff --git a/lib/Cake/Console/templates/default/classes/model.ctp b/lib/Cake/Console/Templates/default/classes/model.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/classes/model.ctp
rename to lib/Cake/Console/Templates/default/classes/model.ctp
diff --git a/lib/Cake/Console/templates/default/classes/test.ctp b/lib/Cake/Console/Templates/default/classes/test.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/classes/test.ctp
rename to lib/Cake/Console/Templates/default/classes/test.ctp
diff --git a/lib/Cake/Console/templates/default/views/form.ctp b/lib/Cake/Console/Templates/default/views/form.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/views/form.ctp
rename to lib/Cake/Console/Templates/default/views/form.ctp
diff --git a/lib/Cake/Console/templates/default/views/home.ctp b/lib/Cake/Console/Templates/default/views/home.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/views/home.ctp
rename to lib/Cake/Console/Templates/default/views/home.ctp
diff --git a/lib/Cake/Console/templates/default/views/index.ctp b/lib/Cake/Console/Templates/default/views/index.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/views/index.ctp
rename to lib/Cake/Console/Templates/default/views/index.ctp
diff --git a/lib/Cake/Console/templates/default/views/view.ctp b/lib/Cake/Console/Templates/default/views/view.ctp
similarity index 100%
rename from lib/Cake/Console/templates/default/views/view.ctp
rename to lib/Cake/Console/Templates/default/views/view.ctp
diff --git a/lib/Cake/Console/templates/skel/.htaccess b/lib/Cake/Console/Templates/skel/.htaccess
similarity index 100%
rename from lib/Cake/Console/templates/skel/.htaccess
rename to lib/Cake/Console/Templates/skel/.htaccess
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/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/Console/Command/Task/empty b/lib/Cake/Console/Templates/skel/Console/Command/Task/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Console/Command/Task/empty
rename to lib/Cake/Console/Templates/skel/Console/Command/Task/empty
diff --git a/lib/Cake/Console/templates/skel/Console/cake b/lib/Cake/Console/Templates/skel/Console/cake
similarity index 100%
rename from lib/Cake/Console/templates/skel/Console/cake
rename to lib/Cake/Console/Templates/skel/Console/cake
diff --git a/lib/Cake/Console/templates/skel/Console/cake.bat b/lib/Cake/Console/Templates/skel/Console/cake.bat
similarity index 100%
rename from lib/Cake/Console/templates/skel/Console/cake.bat
rename to lib/Cake/Console/Templates/skel/Console/cake.bat
diff --git a/lib/Cake/Console/templates/skel/Console/cake.php b/lib/Cake/Console/Templates/skel/Console/cake.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/Console/cake.php
rename to lib/Cake/Console/Templates/skel/Console/cake.php
diff --git a/lib/Cake/Console/templates/skel/Controller/AppController.php b/lib/Cake/Console/Templates/skel/Controller/AppController.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/Controller/AppController.php
rename to lib/Cake/Console/Templates/skel/Controller/AppController.php
diff --git a/lib/Cake/Console/templates/skel/Controller/Component/empty b/lib/Cake/Console/Templates/skel/Controller/Component/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Controller/Component/empty
rename to lib/Cake/Console/Templates/skel/Controller/Component/empty
diff --git a/lib/Cake/Console/templates/skel/Controller/PagesController.php b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/Controller/PagesController.php
rename to lib/Cake/Console/Templates/skel/Controller/PagesController.php
diff --git a/lib/Cake/Console/templates/skel/Lib/empty b/lib/Cake/Console/Templates/skel/Lib/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Lib/empty
rename to lib/Cake/Console/Templates/skel/Lib/empty
diff --git a/lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty b/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Locale/eng/LC_MESSAGES/empty
rename to lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty
diff --git a/lib/Cake/Console/templates/skel/Model/AppModel.php b/lib/Cake/Console/Templates/skel/Model/AppModel.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/Model/AppModel.php
rename to lib/Cake/Console/Templates/skel/Model/AppModel.php
diff --git a/lib/Cake/Console/templates/skel/Model/Behavior/empty b/lib/Cake/Console/Templates/skel/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Model/Behavior/empty
rename to lib/Cake/Console/Templates/skel/Model/Behavior/empty
diff --git a/lib/Cake/Console/templates/skel/Model/Datasource/empty b/lib/Cake/Console/Templates/skel/Model/Datasource/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Model/Datasource/empty
rename to lib/Cake/Console/Templates/skel/Model/Datasource/empty
diff --git a/lib/Cake/Console/templates/skel/Plugin/empty b/lib/Cake/Console/Templates/skel/Plugin/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Plugin/empty
rename to lib/Cake/Console/Templates/skel/Plugin/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty b/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Case/Controller/Component/empty
rename to lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Case/Controller/empty b/lib/Cake/Console/Templates/skel/Test/Case/Controller/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Case/Controller/empty
rename to lib/Cake/Console/Templates/skel/Test/Case/Controller/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty b/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Case/Model/Behavior/empty
rename to lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Case/Model/empty b/lib/Cake/Console/Templates/skel/Test/Case/Model/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Case/Model/empty
rename to lib/Cake/Console/Templates/skel/Test/Case/Model/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty b/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Case/View/Helper/empty
rename to lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty
diff --git a/lib/Cake/Console/templates/skel/Test/Fixture/empty b/lib/Cake/Console/Templates/skel/Test/Fixture/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Test/Fixture/empty
rename to lib/Cake/Console/Templates/skel/Test/Fixture/empty
diff --git a/lib/Cake/Console/templates/skel/Vendor/empty b/lib/Cake/Console/Templates/skel/Vendor/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/Vendor/empty
rename to lib/Cake/Console/Templates/skel/Vendor/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/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/View/Errors/empty b/lib/Cake/Console/Templates/skel/View/Errors/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/Errors/empty
rename to lib/Cake/Console/Templates/skel/View/Errors/empty
diff --git a/lib/Cake/Console/templates/skel/View/Helper/AppHelper.php b/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/Helper/AppHelper.php
rename to lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
diff --git a/lib/Cake/Console/templates/skel/View/Helper/empty b/lib/Cake/Console/Templates/skel/View/Helper/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/Helper/empty
rename to lib/Cake/Console/Templates/skel/View/Helper/empty
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/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/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/Console/templates/skel/View/Pages/empty b/lib/Cake/Console/Templates/skel/View/Pages/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/Pages/empty
rename to lib/Cake/Console/Templates/skel/View/Pages/empty
diff --git a/lib/Cake/Console/templates/skel/View/Scaffolds/empty b/lib/Cake/Console/Templates/skel/View/Scaffolds/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/View/Scaffolds/empty
rename to lib/Cake/Console/Templates/skel/View/Scaffolds/empty
diff --git a/lib/Cake/Console/templates/skel/index.php b/lib/Cake/Console/Templates/skel/index.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/index.php
rename to lib/Cake/Console/Templates/skel/index.php
diff --git a/lib/Cake/Console/templates/skel/tmp/cache/models/empty b/lib/Cake/Console/Templates/skel/tmp/cache/models/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/cache/models/empty
rename to lib/Cake/Console/Templates/skel/tmp/cache/models/empty
diff --git a/lib/Cake/Console/templates/skel/tmp/cache/persistent/empty b/lib/Cake/Console/Templates/skel/tmp/cache/persistent/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/cache/persistent/empty
rename to lib/Cake/Console/Templates/skel/tmp/cache/persistent/empty
diff --git a/lib/Cake/Console/templates/skel/tmp/cache/views/empty b/lib/Cake/Console/Templates/skel/tmp/cache/views/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/cache/views/empty
rename to lib/Cake/Console/Templates/skel/tmp/cache/views/empty
diff --git a/lib/Cake/Console/templates/skel/tmp/logs/empty b/lib/Cake/Console/Templates/skel/tmp/logs/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/logs/empty
rename to lib/Cake/Console/Templates/skel/tmp/logs/empty
diff --git a/lib/Cake/Console/templates/skel/tmp/sessions/empty b/lib/Cake/Console/Templates/skel/tmp/sessions/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/sessions/empty
rename to lib/Cake/Console/Templates/skel/tmp/sessions/empty
diff --git a/lib/Cake/Console/templates/skel/tmp/tests/empty b/lib/Cake/Console/Templates/skel/tmp/tests/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/tmp/tests/empty
rename to lib/Cake/Console/Templates/skel/tmp/tests/empty
diff --git a/lib/Cake/Console/templates/skel/webroot/.htaccess b/lib/Cake/Console/Templates/skel/webroot/.htaccess
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/.htaccess
rename to lib/Cake/Console/Templates/skel/webroot/.htaccess
diff --git a/lib/Cake/Console/templates/skel/webroot/css/cake.generic.css b/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/css/cake.generic.css
rename to lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
diff --git a/lib/Cake/Console/templates/skel/webroot/favicon.ico b/lib/Cake/Console/Templates/skel/webroot/favicon.ico
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/favicon.ico
rename to lib/Cake/Console/Templates/skel/webroot/favicon.ico
diff --git a/lib/Cake/Console/templates/skel/webroot/img/cake.icon.png b/lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/img/cake.icon.png
rename to lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png
diff --git a/lib/Cake/Console/templates/skel/webroot/img/cake.power.gif b/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/img/cake.power.gif
rename to lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif
diff --git a/lib/Cake/Console/templates/skel/webroot/index.php b/lib/Cake/Console/Templates/skel/webroot/index.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/index.php
rename to lib/Cake/Console/Templates/skel/webroot/index.php
diff --git a/lib/Cake/Console/templates/skel/webroot/js/empty b/lib/Cake/Console/Templates/skel/webroot/js/empty
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/js/empty
rename to lib/Cake/Console/Templates/skel/webroot/js/empty
diff --git a/lib/Cake/Console/templates/skel/webroot/test.php b/lib/Cake/Console/Templates/skel/webroot/test.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/webroot/test.php
rename to lib/Cake/Console/Templates/skel/webroot/test.php