44 files changed, 44 insertions, 69 deletions

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e8014f2a2..856aa2d36 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -587,7 +587,7 @@ function get_register($register_name) {
  *
  * The method of displaying these messages differs depending upon plugins and
  * viewtypes.  The core default viewtype retrieves messages in
- * {@link views/default/page_shells/default.php} and displays messages as
+ * {@link views/default/page/shells/default.php} and displays messages as
  * javascript popups.
  *
  * @internal Messages are stored as strings in the $_SESSION['msg'][$register] array.
diff --git a/engine/lib/views.php b/engine/lib/views.php
index 26d48be2f..6fd6cfb8c 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -552,7 +552,7 @@ function extend_view($view, $view_name, $priority = 501, $viewtype = '') {
  *
  * @param string $title      Title
  * @param string $body       Body
- * @param string $page_shell Optional page shell to use. See page_shells view directory
+ * @param string $page_shell Optional page shell to use. See page/shells view directory
  * @param array  $vars       Optional vars array to pass to the page
  *                           shell. Automatically adds title, body, and sysmessages
  *
@@ -578,7 +578,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array())
 	$vars['sysmessages'] = $messages;
 
 	// Draw the page
-	$output = elgg_view("page_shells/$page_shell", $vars);
+	$output = elgg_view("page/shells/$page_shell", $vars);
 
 	$vars['page_shell'] = $page_shell;
 
@@ -884,7 +884,7 @@ function elgg_view_entity_annotations(ElggEntity $entity, $full = true) {
 /**
  * Returns a rendered title.
  *
- * This is a shortcut for {@elgg_view page_elements/title}.
+ * This is a shortcut for {@elgg_view layout/elements/title}.
  *
  * @param string $title   The page title
  * @param string $submenu Should a submenu be displayed? (default false, use not recommended and deprecated)
@@ -896,7 +896,7 @@ function elgg_view_title($title, $submenu = false) {
 		elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8);
 	}
 
-	$title = elgg_view('page_elements/title', array('title' => $title, 'submenu' => $submenu));
+	$title = elgg_view('layout/elements/title', array('title' => $title, 'submenu' => $submenu));
 
 	return $title;
 }
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 331871fc8..035105a7d 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -161,7 +161,6 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
 	$now = time();
 
 	elgg_push_breadcrumb(elgg_echo('blog:archives'));
-	//$content = elgg_view('page_elements/content_header_member', array('type' => 'blog'));
 
 	if ($lower) {
 		$lower = (int)$lower;
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index 7a2f1a16f..7a0c88a8d 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -19,7 +19,7 @@ if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) {
 }
 		
 // get the content area header
-$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'bookmarks'));
+$area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'bookmarks'));
 		
 // List bookmarks
 $area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index cc34d6e76..e3f7394d2 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -222,11 +222,11 @@ function bookmarks_page_handler($page) {
 	//select the header depending on whether a user is looking at their bookmarks or someone elses
 	if($owner){
 		if ($owner != $logged_in_user && !($owner instanceof ElggGroup)) {
-			$header .= elgg_view("page_elements/content_header_member", array(
+			$header .= elgg_view("page/elements/content_header_member", array(
 				'type' => 'bookmarks'
 			));
 		}else{
-			$header .= elgg_view("page_elements/content_header", array(
+			$header .= elgg_view("page/elements/content_header", array(
 				'context' => $context,
 				'type' => 'bookmarks',
 				'all_link' => "pg/bookmarks/",
@@ -234,7 +234,7 @@ function bookmarks_page_handler($page) {
 			));
 		}
 	}else{
-		$header .= elgg_view("page_elements/content_header", array(
+		$header .= elgg_view("page/elements/content_header", array(
 				'context' => $context,
 				'type' => 'bookmarks',
 				'all_link' => "pg/bookmarks/",
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index ad77b5085..4f746c1c1 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -13,7 +13,7 @@ elgg_set_context('admin');
 // system diagnostics
 $content = elgg_view_title(elgg_echo('diagnostics'));
 $content .= "<div class='admin_settings diagnostics'>";
-$content .= elgg_view('page_elements/content', array('body' =>
+$content .= elgg_view('page/elements/content', array('body' =>
 	"<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
 );
 
@@ -32,7 +32,7 @@ if (isset($CONFIG->debug)) {
 	$test_body .= elgg_echo('diagnostics:unittester:debug');
 }
 
-$content .= elgg_view('page_elements/content', array(
+$content .= elgg_view('page/elements/content', array(
 	'body' => $test_body)
 );
 $content .= "</div>";
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 44532dfba..6ead3cf40 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -14,7 +14,7 @@
 	$owner = elgg_get_page_owner();
 
 	$title = elgg_echo("file:friends",array($owner->name));
-	$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 	elgg_push_context('search');
 	// offset is grabbed in list_user_friends_objects
 	$content = list_user_friends_objects($owner->guid, 'file', 10, false);
diff --git a/mod/file/index.php b/mod/file/index.php
index ae2353724..e0ec1451f 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -16,10 +16,10 @@
 	//set the title
 	if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
 		$title = elgg_echo('file:yours');
-		$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
+		$area1 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file'));
 	} else {
 		$title = elgg_echo("file:user",array(elgg_get_page_owner()->name));
-		$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+		$area1 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 	}
 
 	// Get objects
diff --git a/mod/file/search.php b/mod/file/search.php
index 5c6c0a969..fa6c5ea71 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -47,18 +47,18 @@
 		if (empty($tag)) {
 			$title = elgg_echo('file:type:all');
 			$area2 = elgg_view_title(elgg_echo('file:type:all'));
-			$area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+			$area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 		} else {
 			$title = elgg_echo('searchtitle',array($tag));
 			if (is_array($owner_guid)) {
 				//$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "friends", 'type' => 'file'));
 			} else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != get_loggedin_userid()) {
 				//$area2 = elgg_view_title(elgg_echo("file:user:type:" . $tag,array(elgg_get_page_owner()->name)));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'file'));
 			} else{
 				//$area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
-				$area2 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+				$area2 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 			}
 		}
 		if ($friends) {
diff --git a/mod/file/world.php b/mod/file/world.php
index 6ac4ba38a..3bacaad00 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -20,7 +20,7 @@
 	$title = elgg_echo('file:all');
 	
 	// Get objects
-	$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'file'));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'file'));
 	$area1 .= get_filetype_cloud(); // the filter
 	elgg_push_context('search');
 	$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 6e472459d..08bdd4a0a 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -56,7 +56,7 @@
 
 	$title = elgg_echo("groups:all", array(elgg_get_page_owner()->name));
 	if(isloggedin()){
-		$area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+		$area1 .= elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	}
 	$area1 .= elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects;
 
diff --git a/mod/groups/index.php b/mod/groups/index.php
index a8c81b27e..1deabb3de 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -13,7 +13,7 @@
 	$title = elgg_echo("groups:owned");
 
 	// Get objects
-	$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+	$area1 = elgg_view('page/elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	
 	elgg_push_context('search');
 	$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 8eea0b6bb..6af38f4ae 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -19,7 +19,7 @@
 	} else $title = elgg_echo("groups:owned");
 
 	// Get objects
-	$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new"));
+	$area2 = elgg_view('page/elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new"));
 	
 	elgg_push_context('search');
 	// offset is grabbed in the list_entities_from_relationship() function
diff --git a/mod/members/index.php b/mod/members/index.php
index 5a62e9d46..8e6141dfa 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -71,7 +71,7 @@ switch($filter){
 		break;
 }
 
-$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
+$area2 .= elgg_view('page/elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
 
 //select the correct canvas area
 $params = array(
diff --git a/mod/search/index.php b/mod/search/index.php
index 7f7be9860..4e73b78ae 100644
--- a/mod/search/index.php
+++ b/mod/search/index.php
@@ -137,7 +137,7 @@ foreach ($custom_types as $type) {
 // check that we have an actual query
 if (!$query) {
 	$body  = elgg_view_title(elgg_echo('search:search_error'));
-	$body .= elgg_view('page_elements/content', array('body' => elgg_echo('search:no_query')));
+	$body .= elgg_view('page/elements/content', array('body' => elgg_echo('search:no_query')));
 
 	$layout = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
 	echo elgg_view_page($title, $layout);
@@ -247,7 +247,7 @@ $highlighted_query = search_highlight_words($searched_words, $query);
 $body = elgg_view_title(elgg_echo('search:results', array("\"$highlighted_query\"")));
 
 if (!$results_html) {
-	$body .= elgg_view('page_elements/contentwrapper', array('body' => elgg_echo('search:no_results')));
+	$body .= elgg_view('page/elements/contentwrapper', array('body' => elgg_echo('search:no_results')));
 } else {
 	$body .= $results_html;
 }
diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php
index f1dfdd047..3a6c10359 100644
--- a/mod/sitepages/sitepages_functions.php
+++ b/mod/sitepages/sitepages_functions.php
@@ -92,9 +92,9 @@ function sitepages_get_page_content($page_type) {
 	$sitepage = sitepages_get_sitepage_object($page_type);
 
 	if ($sitepage) {
-		$body .= elgg_view('page_elements/content', array('body' => $sitepage->description));
+		$body .= elgg_view('page/elements/content', array('body' => $sitepage->description));
 	} else {
-		$body .= elgg_view('page_elements/content', array('body' => elgg_echo('sitepages:notset')));
+		$body .= elgg_view('page/elements/content', array('body' => elgg_echo('sitepages:notset')));
 	}
 
 	$content = elgg_view_layout('one_column_with_sidebar', array('content' => $body));
diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php
index d0a6825c9..cc4eee78b 100644
--- a/views/default/layout/shells/two_sidebar.php
+++ b/views/default/layout/shells/two_sidebar.php
@@ -22,7 +22,7 @@
 			//$params = $vars;
 			//$params['sidebar'] = $vars['sidebar-alt'];
 			$params = array(
-				'sidebar' => elgg_view('layout_elements/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
+				'sidebar' => elgg_view('layout/objects/module', array('title' => 'Testing', 'body' => 'Hello, world!'))
 			);
 			echo elgg_view('layout/elements/sidebar', $params);
 		?>
diff --git a/views/default/page_elements/body.php b/views/default/page/elements/body.php
index 6f7691693..6f7691693 100644
--- a/views/default/page_elements/body.php
+++ b/views/default/page/elements/body.php
diff --git a/views/default/page_elements/content.php b/views/default/page/elements/content.php
index f82720c2f..f82720c2f 100644
--- a/views/default/page_elements/content.php
+++ b/views/default/page/elements/content.php
diff --git a/views/default/page_elements/content_header.php b/views/default/page/elements/content_header.php
index 8809ad8b7..8809ad8b7 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page/elements/content_header.php
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page/elements/content_header_member.php
index 4cfee9258..4cfee9258 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page/elements/content_header_member.php
diff --git a/views/default/page_elements/footer.php b/views/default/page/elements/footer.php
index 6c9cdc55e..6c9cdc55e 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page/elements/footer.php
diff --git a/views/default/page_elements/header.php b/views/default/page/elements/header.php
index df23fcbff..148279b2e 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page/elements/header.php
@@ -9,7 +9,7 @@
 	<div class="elgg-page-header-inner elgg-center elgg-width-classic">
 		<?php
 			// link back to main site.
-			echo elgg_view('page_elements/header_logo', $vars);
+			echo elgg_view('page/elements/header_logo', $vars);
 			
 			// drop-down login
 			echo elgg_view('account/login-dropdown');
diff --git a/views/default/page_elements/header_logo.php b/views/default/page/elements/header_logo.php
index 6ae6a0fab..6ae6a0fab 100644
--- a/views/default/page_elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
diff --git a/views/default/page_elements/html_begin.php b/views/default/page/elements/html_begin.php
index 23879dde8..23879dde8 100644
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page/elements/html_begin.php
diff --git a/views/default/page_elements/html_end.php b/views/default/page/elements/html_end.php
index 0862934cf..0862934cf 100644
--- a/views/default/page_elements/html_end.php
+++ b/views/default/page/elements/html_end.php
diff --git a/views/default/page_elements/messages.php b/views/default/page/elements/messages.php
index f44d1204b..f44d1204b 100644
--- a/views/default/page_elements/messages.php
+++ b/views/default/page/elements/messages.php
diff --git a/views/default/page_elements/topbar.php b/views/default/page/elements/topbar.php
index 83ffdf54b..75df5fa93 100644
--- a/views/default/page_elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -20,7 +20,7 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) {
 	echo "<a href=\"$user_link\"><img class=\"user-mini-avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
 
 	// logout link
-	echo elgg_view('page_elements/topbar_logout', $vars);
+	echo elgg_view('page/elements/topbar_logout', $vars);
 	
 	// elgg tools menu
 	// need to echo this empty view for backward compatibility.
diff --git a/views/default/page_elements/topbar_logout.php b/views/default/page/elements/topbar_logout.php
index 2d2ecf67c..2d2ecf67c 100644
--- a/views/default/page_elements/topbar_logout.php
+++ b/views/default/page/elements/topbar_logout.php
diff --git a/views/default/page_shells/admin.php b/views/default/page/shells/admin.php
index ff427a6b7..c2581b23f 100644
--- a/views/default/page_shells/admin.php
+++ b/views/default/page/shells/admin.php
@@ -23,7 +23,7 @@ if (empty($vars['title'])) {
 	$title = $site_title . ": " . $vars['title'];

 }

 

-echo elgg_view('page_elements/html_begin', $vars);

-echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));

-echo elgg_view('page_elements/content', $vars);

-echo elgg_view('page_elements/html_end', $vars);
\ No newline at end of file
+echo elgg_view('page/elements/html_begin', $vars);

+echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));

+echo elgg_view('page/elements/content', $vars);

+echo elgg_view('page/elements/html_end', $vars);
\ No newline at end of file
diff --git a/views/default/page_shells/default.php b/views/default/page/shells/default.php
index 3380188d9..080bc7099 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page/shells/default.php
@@ -24,14 +24,14 @@ if (empty($vars['title'])) {
 	$title = $site_title . ": " . $vars['title'];
 }
 
-echo elgg_view('page_elements/html_begin', $vars);
+echo elgg_view('page/elements/html_begin', $vars);
 
 echo '<div class="elgg-page">';
-echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
-echo elgg_view('page_elements/topbar', $vars);
-echo elgg_view('page_elements/header', $vars);
-echo elgg_view('page_elements/body', $vars);
-echo elgg_view('page_elements/footer', $vars);
+echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+echo elgg_view('page/elements/topbar', $vars);
+echo elgg_view('page/elements/header', $vars);
+echo elgg_view('page/elements/body', $vars);
+echo elgg_view('page/elements/footer', $vars);
 echo '</div>';
 
-echo elgg_view('page_elements/html_end', $vars);
+echo elgg_view('page/elements/html_end', $vars);
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page/shells/walled_garden.php
index dbd8d3ac0..4e64276c1 100644
--- a/views/default/page_shells/walled_garden.php
+++ b/views/default/page/shells/walled_garden.php
@@ -16,7 +16,7 @@ if (empty($vars['title'])) {
 	$title = $site_title . ": " . $vars['title'];
 }
 
-echo elgg_view('page_elements/html_begin', $vars);
+echo elgg_view('page/elements/html_begin', $vars);
 // @todo - move the css below into it's own style-sheet 
 // that is called when running as a private network
 ?>
@@ -268,7 +268,7 @@ body {background: white;}
 </style>
 
 <?php
-$view = elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
+$view = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
 
 echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";       
 echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';
@@ -278,4 +278,4 @@ echo '</div>';
 echo '<div id="walledgarden_bottom"></div>';
 echo '</div>';
 
-echo elgg_view('page_elements/html_end', $vars);
+echo elgg_view('page/elements/html_end', $vars);
diff --git a/views/failsafe/page_shells/default.php b/views/failsafe/page/shells/default.php
index 0ce63cc1d..0ce63cc1d 100644
--- a/views/failsafe/page_shells/default.php
+++ b/views/failsafe/page/shells/default.php
diff --git a/views/foaf/page_shells/default.php b/views/foaf/page/shells/default.php
index 7bd69b875..7bd69b875 100644
--- a/views/foaf/page_shells/default.php
+++ b/views/foaf/page/shells/default.php
diff --git a/views/foaf/page_elements/contentwrapper.php b/views/foaf/page_elements/contentwrapper.php
deleted file mode 100644
index 643492a92..000000000
--- a/views/foaf/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/ical/pageshells/pageshell.php b/views/ical/page/shells/default.php
index 9a529b24f..9a529b24f 100644
--- a/views/ical/pageshells/pageshell.php
+++ b/views/ical/page/shells/default.php
diff --git a/views/installation/page_shells/default.php b/views/installation/page/shells/default.php
index fbc5ccbf2..fbc5ccbf2 100644
--- a/views/installation/page_shells/default.php
+++ b/views/installation/page/shells/default.php
diff --git a/views/json/page_shells/default.php b/views/json/page/shells/default.php
index d1f86c8a7..d1f86c8a7 100644
--- a/views/json/page_shells/default.php
+++ b/views/json/page/shells/default.php
diff --git a/views/json/page_elements/contentwrapper.php b/views/json/page_elements/contentwrapper.php
deleted file mode 100644
index 272419e97..000000000
--- a/views/json/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/opendd/pageshells/pageshell.php b/views/opendd/page/shells/default.php
index bdd59d45e..bdd59d45e 100644
--- a/views/opendd/pageshells/pageshell.php
+++ b/views/opendd/page/shells/default.php
diff --git a/views/php/page_shells/default.php b/views/php/page/shells/default.php
index c7692c432..c7692c432 100644
--- a/views/php/page_shells/default.php
+++ b/views/php/page/shells/default.php
diff --git a/views/rss/page_shells/default.php b/views/rss/page/shells/default.php
index 444fa99b5..444fa99b5 100644
--- a/views/rss/page_shells/default.php
+++ b/views/rss/page/shells/default.php
diff --git a/views/rss/page_elements/contentwrapper.php b/views/rss/page_elements/contentwrapper.php
deleted file mode 100644
index 3e056ae91..000000000
--- a/views/rss/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @package Elgg
- * @subpackage Core
- */
-
-echo $vars['body'];
\ No newline at end of file
diff --git a/views/xml/page_shells/default.php b/views/xml/page/shells/default.php
index 0f0aecbe4..0f0aecbe4 100644
--- a/views/xml/page_shells/default.php
+++ b/views/xml/page/shells/default.php