28 files changed, 17 insertions, 41 deletions
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