diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
index 364ee1bf0..047e22687 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
@@ -29,7 +29,7 @@ namespace Orchard.Blogs.Drivers {
 
         protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) {
             return ContentShape("Parts_Blogs_BlogArchives_Edit",
-                                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.BlogArchives", Model: part, Prefix: Prefix));
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.BlogArchives", Model: part, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(BlogArchivesPart part, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
index 01452dfd8..ad1013836 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
@@ -65,7 +65,7 @@ namespace Orchard.Blogs.Drivers {
 
         protected override DriverResult Editor(BlogPart blogPart, dynamic shapeHelper) {
             return ContentShape("Parts_Blogs_Blog_Fields",
-                                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.Blog.Fields", Model: blogPart, Prefix: Prefix));
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.Blog.Fields", Model: blogPart, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(BlogPart blogPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
index 082bf4019..198eb908b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
@@ -48,7 +48,7 @@ namespace Orchard.Blogs.Drivers {
 
         protected override DriverResult Editor(RecentBlogPostsPart part, dynamic shapeHelper) {
             return ContentShape("Parts_Blogs_RecentBlogPosts_Edit",
-                                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.RecentBlogPosts", Model: part, Prefix: Prefix));
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.RecentBlogPosts", Model: part, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(RecentBlogPostsPart part, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 8f68e0986..485adb414 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -116,13 +116,13 @@
     <Content Include="Views\BlogPost\ListByArchive.cshtml" />
     <Content Include="Views\Blog\Item.cshtml" />
     <Content Include="Views\Blog\List.cshtml" />
-    <Content Include="Views\Parts\Blogs.Blog.Manage.cshtml" />
-    <Content Include="Views\Parts\Blogs.Blog.Description.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Blogs.Blog.Fields.cshtml" />
-    <Content Include="Views\Parts\Blogs.BlogPost.ListAdmin.cshtml">
+    <Content Include="Views\Parts.Blogs.Blog.Manage.cshtml" />
+    <Content Include="Views\Parts.Blogs.Blog.Description.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Blogs.Blog.Fields.cshtml" />
+    <Content Include="Views\Parts.Blogs.BlogPost.ListAdmin.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Views\Items\Content-Blog.SummaryAdmin.cshtml" />
+    <Content Include="Views\Content-Blog.SummaryAdmin.cshtml" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
@@ -139,15 +139,15 @@
     <Content Include="Placement.info">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\Parts\Blogs.RemotePublishing.cshtml" />
-    <Content Include="Views\Parts\Blogs.BlogArchives.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Blogs.RecentBlogPosts.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Blogs.BlogArchives.cshtml" />
-    <Content Include="Views\Items\Content-Blog.DetailAdmin.cshtml" />
-    <Content Include="Views\Items\Content-Blog.Edit.cshtml" />
-    <Content Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
-    <Content Include="Views\Parts\Blogs.RecentBlogPosts.cshtml" />
-    <Content Include="Views\Parts\Blogs.Blog.BlogPostCount.cshtml" />
+    <Content Include="Views\Parts.Blogs.RemotePublishing.cshtml" />
+    <Content Include="Views\Parts.Blogs.BlogArchives.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Blogs.RecentBlogPosts.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Blogs.BlogArchives.cshtml" />
+    <Content Include="Views\Content-Blog.DetailAdmin.cshtml" />
+    <Content Include="Views\Content-Blog.Edit.cshtml" />
+    <Content Include="Views\Parts.Blogs.BlogPost.List.cshtml" />
+    <Content Include="Views\Parts.Blogs.RecentBlogPosts.cshtml" />
+    <Content Include="Views\Parts.Blogs.Blog.BlogPostCount.cshtml" />
     <Content Include="Scripts\Web.config">
       <SubType>Designer</SubType>
     </Content>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.DetailAdmin.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.DetailAdmin.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.Edit.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.Edit.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.Blog.Fields.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.Blog.Fields.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.BlogArchives.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.BlogArchives.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.BlogPostCount.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.BlogPostCount.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Description.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Description.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Manage.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Manage.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Manage.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Manage.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogArchives.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.List.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.List.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.ListAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.ListAdmin.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RecentBlogPosts.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RecentBlogPosts.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RemotePublishing.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RemotePublishing.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RemotePublishing.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RemotePublishing.cshtml