7 files changed, 7 insertions, 8 deletions
diff --git a/views/default/widgets/wrapper.php b/views/default/layout/objects/widget.php
index 5c71aa8f8..d109693e1 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/layout/objects/widget.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Elgg widget wrapper
+ * Widget object
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['entity']
  */
 
 $widget = $vars['entity'];
@@ -30,13 +29,13 @@ $widget_instance = "widget-instance-$handler";
 	</div>
 	<?php
 	if ($can_edit) {
-		echo elgg_view('widgets/controls', array('widget' => $widget));
+		echo elgg_view('layout/objects/widget/controls', array('widget' => $widget));
 	}
 	?>
 	<div class="widget-container">
 		<?php
 		if ($can_edit) {
-			echo elgg_view('widgets/settings', array('widget' => $widget));
+			echo elgg_view('layout/objects/widget/settings', array('widget' => $widget));
 		}
 		?>
 		<div class="widget-content">
diff --git a/views/default/widgets/controls.php b/views/default/layout/objects/widget/controls.php
index 5e6aaf193..5e6aaf193 100644
--- a/views/default/widgets/controls.php
+++ b/views/default/layout/objects/widget/controls.php
diff --git a/views/default/widgets/settings.php b/views/default/layout/objects/widget/settings.php
index 5814e5821..5814e5821 100644
--- a/views/default/widgets/settings.php
+++ b/views/default/layout/objects/widget/settings.php
diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index 130b2eaad..e5b63114b 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -19,13 +19,13 @@ $widgets = elgg_get_widgets($owner->guid, $context);
 
 if (elgg_can_edit_widget_layout($context)) {
 	if ($show_add_widgets) {
-		echo elgg_view('widgets/add-button');
+		echo elgg_view('layout/shells/widgets/add_button');
 	}
 	$params = array(
 		'widgets' => $widgets,
 		'context' => $context,
 	);
-	echo elgg_view('widgets/add_panel', $params);
+	echo elgg_view('layout/shells/widgets/add_panel', $params);
 }
 
 echo $vars['box'];
diff --git a/views/default/widgets/add_button.php b/views/default/layout/shells/widgets/add_button.php
index 92de8a99f..92de8a99f 100644
--- a/views/default/widgets/add_button.php
+++ b/views/default/layout/shells/widgets/add_button.php
diff --git a/views/default/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php
index d9acc5518..d9acc5518 100644
--- a/views/default/widgets/add_panel.php
+++ b/views/default/layout/shells/widgets/add_panel.php
diff --git a/views/default/object/widget.php b/views/default/object/widget.php
index b3ef5bb8c..1da5897c3 100644
--- a/views/default/object/widget.php
+++ b/views/default/object/widget.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view('widgets/wrapper',$vars);
+echo elgg_view('layout/objects/widget', $vars);