diff --git a/templates/forms/TabSet_holder.ss b/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
similarity index 93%
rename from templates/forms/TabSet_holder.ss
rename to templates/SilverStripe/Blog/Forms/TabSet_holder.ss
index 85bc11c..dd2337d 100644
--- a/templates/forms/TabSet_holder.ss
+++ b/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
@@ -1,4 +1,4 @@
-<div class="blog-admin-outer">
-	<%-- this resets ths template (from TabSet_holder) and renders using forTemplate --%>
-	$setTemplate('')
-</div>
\ No newline at end of file
+<div class="blog-admin-outer">
+	<%-- this resets ths template (from TabSet_holder) and renders using forTemplate --%>
+	$setTemplate('')
+</div>
diff --git a/templates/Layout/Blog.ss b/templates/SilverStripe/Blog/Model/Layout/Blog.ss
similarity index 100%
rename from templates/Layout/Blog.ss
rename to templates/SilverStripe/Blog/Model/Layout/Blog.ss
diff --git a/templates/Layout/BlogPost.ss b/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
similarity index 100%
rename from templates/Layout/BlogPost.ss
rename to templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
diff --git a/templates/Layout/Blog_profile.ss b/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
similarity index 100%
rename from templates/Layout/Blog_profile.ss
rename to templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss