diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
index 8009bca01..9267afece 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
@@ -28,7 +28,7 @@ namespace Orchard.Widgets.Drivers {
 
         protected override DriverResult Editor(LayerPart layerPart, dynamic shapeHelper) {
             return ContentShape("Parts_Widgets_LayerPart",
-                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.LayerPart", Model: layerPart, Prefix: Prefix));
+                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.LayerPart", Model: layerPart, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(LayerPart layerPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
index 889595ee2..b6464358a 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
@@ -20,7 +20,7 @@ namespace Orchard.Widgets.Drivers {
             widgetPart.AvailableLayers = _widgetsService.GetLayers();
 
             return ContentShape("Parts_Widgets_WidgetPart",
-                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix));
+                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(WidgetPart widgetPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index 4e9284f5c..d5d1068cc 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -105,13 +105,10 @@
     <Content Include="Views\Admin\EditWidget.cshtml" />
     <Content Include="Views\Admin\EditLayer.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\Items\Widget.Edit.cshtml" />
-    <Content Include="Views\Items\Widget.cshtml" />
+    <Content Include="Views\Widget.Edit.cshtml" />
+    <Content Include="Views\Widget.cshtml" />
     <Content Include="Views\Widget.ControlWrapper.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Widgets.WidgetPart.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Widgets.LayerPart.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Widgets.WidgetBagPart.cshtml" />
-    <Content Include="Views\Items\Content-WidgetPage.cshtml" />
+    <Content Include="Views\Content-WidgetPage.cshtml" />
     <Content Include="Views\Widget.Wrapper.cshtml" />
   </ItemGroup>
   <ItemGroup>
@@ -124,6 +121,15 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Content-WidgetPage.cshtml" />
+    <Content Include="Views\Widget.cshtml" />
+    <Content Include="Views\Widget.Edit.cshtml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\EditorTemplates\Parts.Widgets.LayerPart.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Widgets.WidgetPart.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Content-WidgetPage.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Content-WidgetPage.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/Content-WidgetPage.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.LayerPart.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.LayerPart.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetBagPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetBagPart.cshtml
deleted file mode 100644
index 9ef9756a2..000000000
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetBagPart.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-@{
-    Style.Require("WidgetsAdmin");
-}
-<div class="widgetsbag-editor">
-    <h5>@T("Widgets")</h5>
-    @* todo: (heskew) either embed some widget management here or link to a more specific widget management URL that's a little more specific to managing widgets for the Content zone for this item *@
-    <p>@T("Manage content widgets with the {0}.", @Html.ActionLink(T("widget manager").Text, "Index", "Admin", new {area = "Orchard.Widgets"}, null))</p>
-</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Edit.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Edit.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.cshtml