9 files changed, 7 insertions, 7 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 6783cfcc5..5ea93de7c 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -621,7 +621,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array())
  *  - two_sidebar             A content column with two sidebars.
  *  - widgets                 A widget canvas.
  *
- * The layout views take the form layout/shells/$layout_name
+ * The layout views take the form page/layouts/$layout_name
  * See the individual layouts for what options are supported. The three most
  * common layouts have these parameters:
  * one_column
@@ -637,7 +637,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array())
  *     filter_context => string (selected content filter)
  *     See the content layout view for more parameters
  *
- * @param string $layout The name of the view in layout/shells/.
+ * @param string $layout The name of the view in page/layouts/.
  * @param array  $vars   Associative array of parameters for the layout view
  *
  * @return string The layout
@@ -656,10 +656,10 @@ function elgg_view_layout($layout_name, $vars = array()) {
 		$param_array = $vars;
 	}
 
-	if (elgg_view_exists("layout/shells/$layout_name")) {
-		return elgg_view("layout/shells/$layout_name", $param_array);
+	if (elgg_view_exists("page/layouts/$layout_name")) {
+		return elgg_view("page/layouts/$layout_name", $param_array);
 	} else {
-		return elgg_view("layout/shells/default", $param_array);
+		return elgg_view("page/layouts/default", $param_array);
 	}
 }
 
diff --git a/views/default/layout/shells/admin.php b/views/default/page/layouts/admin.php
index 7ba4abbd1..7ba4abbd1 100644
--- a/views/default/layout/shells/admin.php
+++ b/views/default/page/layouts/admin.php
diff --git a/views/default/layout/shells/content.php b/views/default/page/layouts/content.php
index 69772985a..69772985a 100644
--- a/views/default/layout/shells/content.php
+++ b/views/default/page/layouts/content.php
diff --git a/views/default/layout/shells/default.php b/views/default/page/layouts/default.php
index 60dc90b0d..60dc90b0d 100644
--- a/views/default/layout/shells/default.php
+++ b/views/default/page/layouts/default.php
diff --git a/views/default/layout/shells/one_column.php b/views/default/page/layouts/one_column.php
index ab6a24878..ab6a24878 100644
--- a/views/default/layout/shells/one_column.php
+++ b/views/default/page/layouts/one_column.php
diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/page/layouts/one_sidebar.php
index 53f065b3e..53f065b3e 100644
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/page/layouts/one_sidebar.php
diff --git a/views/default/layout/shells/two_column_left_sidebar.php b/views/default/page/layouts/two_column_left_sidebar.php
index 247ba920b..97f4d2719 100644
--- a/views/default/layout/shells/two_column_left_sidebar.php
+++ b/views/default/page/layouts/two_column_left_sidebar.php
@@ -19,8 +19,8 @@ unset($vars['area3']);
 // backward compatability support for plugins that are not using the new approach
 // of routing through pg/admin
 if (elgg_get_context() == 'admin') {
-	echo elgg_view('layout/shells/admin', $vars);
+	echo elgg_view('page/layouts/admin', $vars);
 	return true;
 }
 
-echo elgg_view('layout/shells/one_sidebar', $vars);
+echo elgg_view('page/layouts/one_sidebar', $vars);
diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
index 1e6c2aae7..1e6c2aae7 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/page/layouts/two_sidebar.php
diff --git a/views/default/layout/shells/widgets.php b/views/default/page/layouts/widgets.php
index 8d122738e..8d122738e 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/page/layouts/widgets.php