diff --git a/FluentCMS.csproj b/FluentCMS.csproj
index 4bc38cc..0a8be11 100644
--- a/FluentCMS.csproj
+++ b/FluentCMS.csproj
@@ -7,28 +7,28 @@
0.0.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Templates/Blank/AdminLayout.body.html b/Templates/Blank/Layouts/AdminLayout.body.html
similarity index 100%
rename from Templates/Blank/AdminLayout.body.html
rename to Templates/Blank/Layouts/AdminLayout.body.html
diff --git a/Templates/Blank/AdminLayout.head.html b/Templates/Blank/Layouts/AdminLayout.head.html
similarity index 100%
rename from Templates/Blank/AdminLayout.head.html
rename to Templates/Blank/Layouts/AdminLayout.head.html
diff --git a/Templates/Blank/AdminLayout.html b/Templates/Blank/Layouts/AdminLayout.html
similarity index 100%
rename from Templates/Blank/AdminLayout.html
rename to Templates/Blank/Layouts/AdminLayout.html
diff --git a/Templates/Blank/AuthLayout.body.html b/Templates/Blank/Layouts/AuthLayout.body.html
similarity index 100%
rename from Templates/Blank/AuthLayout.body.html
rename to Templates/Blank/Layouts/AuthLayout.body.html
diff --git a/Templates/Blank/AuthLayout.head.html b/Templates/Blank/Layouts/AuthLayout.head.html
similarity index 100%
rename from Templates/Blank/AuthLayout.head.html
rename to Templates/Blank/Layouts/AuthLayout.head.html
diff --git a/Templates/Blank/AuthLayout.html b/Templates/Blank/Layouts/AuthLayout.html
similarity index 100%
rename from Templates/Blank/AuthLayout.html
rename to Templates/Blank/Layouts/AuthLayout.html
diff --git a/Templates/Blank/DefaultLayout.body.html b/Templates/Blank/Layouts/DefaultLayout.body.html
similarity index 100%
rename from Templates/Blank/DefaultLayout.body.html
rename to Templates/Blank/Layouts/DefaultLayout.body.html
diff --git a/Templates/Blank/DefaultLayout.head.html b/Templates/Blank/Layouts/DefaultLayout.head.html
similarity index 100%
rename from Templates/Blank/DefaultLayout.head.html
rename to Templates/Blank/Layouts/DefaultLayout.head.html
diff --git a/Templates/Blank/DefaultLayout.html b/Templates/Blank/Layouts/DefaultLayout.html
similarity index 100%
rename from Templates/Blank/DefaultLayout.html
rename to Templates/Blank/Layouts/DefaultLayout.html
diff --git a/Templates/Blank/EditLayout.body.html b/Templates/Blank/Layouts/EditLayout.body.html
similarity index 100%
rename from Templates/Blank/EditLayout.body.html
rename to Templates/Blank/Layouts/EditLayout.body.html
diff --git a/Templates/Blank/EditLayout.head.html b/Templates/Blank/Layouts/EditLayout.head.html
similarity index 100%
rename from Templates/Blank/EditLayout.head.html
rename to Templates/Blank/Layouts/EditLayout.head.html
diff --git a/Templates/Blank/EditLayout.html b/Templates/Blank/Layouts/EditLayout.html
similarity index 100%
rename from Templates/Blank/EditLayout.html
rename to Templates/Blank/Layouts/EditLayout.html
diff --git a/Templates/Blank/SingleLayout.body.html b/Templates/Blank/Layouts/SingleLayout.body.html
similarity index 100%
rename from Templates/Blank/SingleLayout.body.html
rename to Templates/Blank/Layouts/SingleLayout.body.html
diff --git a/Templates/Blank/SingleLayout.head.html b/Templates/Blank/Layouts/SingleLayout.head.html
similarity index 100%
rename from Templates/Blank/SingleLayout.head.html
rename to Templates/Blank/Layouts/SingleLayout.head.html
diff --git a/Templates/Blank/SingleLayout.html b/Templates/Blank/Layouts/SingleLayout.html
similarity index 100%
rename from Templates/Blank/SingleLayout.html
rename to Templates/Blank/Layouts/SingleLayout.html
diff --git a/Templates/Blog/AdminLayout.body.html b/Templates/Blog/Layouts/AdminLayout.body.html
similarity index 100%
rename from Templates/Blog/AdminLayout.body.html
rename to Templates/Blog/Layouts/AdminLayout.body.html
diff --git a/Templates/Blog/AdminLayout.head.html b/Templates/Blog/Layouts/AdminLayout.head.html
similarity index 100%
rename from Templates/Blog/AdminLayout.head.html
rename to Templates/Blog/Layouts/AdminLayout.head.html
diff --git a/Templates/Blog/AdminLayout.html b/Templates/Blog/Layouts/AdminLayout.html
similarity index 100%
rename from Templates/Blog/AdminLayout.html
rename to Templates/Blog/Layouts/AdminLayout.html
diff --git a/Templates/Blog/AuthLayout.body.html b/Templates/Blog/Layouts/AuthLayout.body.html
similarity index 100%
rename from Templates/Blog/AuthLayout.body.html
rename to Templates/Blog/Layouts/AuthLayout.body.html
diff --git a/Templates/Blog/AuthLayout.head.html b/Templates/Blog/Layouts/AuthLayout.head.html
similarity index 100%
rename from Templates/Blog/AuthLayout.head.html
rename to Templates/Blog/Layouts/AuthLayout.head.html
diff --git a/Templates/Blog/AuthLayout.html b/Templates/Blog/Layouts/AuthLayout.html
similarity index 100%
rename from Templates/Blog/AuthLayout.html
rename to Templates/Blog/Layouts/AuthLayout.html
diff --git a/Templates/Blog/DefaultLayout.head.html b/Templates/Blog/Layouts/DefaultLayout.head.html
similarity index 100%
rename from Templates/Blog/DefaultLayout.head.html
rename to Templates/Blog/Layouts/DefaultLayout.head.html
diff --git a/Templates/Blog/DefaultLayout.html b/Templates/Blog/Layouts/DefaultLayout.html
similarity index 100%
rename from Templates/Blog/DefaultLayout.html
rename to Templates/Blog/Layouts/DefaultLayout.html
diff --git a/Templates/Default/AdminLayout.body.html b/Templates/Default/Layouts/AdminLayout.body.html
similarity index 100%
rename from Templates/Default/AdminLayout.body.html
rename to Templates/Default/Layouts/AdminLayout.body.html
diff --git a/Templates/Default/AdminLayout.head.html b/Templates/Default/Layouts/AdminLayout.head.html
similarity index 100%
rename from Templates/Default/AdminLayout.head.html
rename to Templates/Default/Layouts/AdminLayout.head.html
diff --git a/Templates/Default/AdminLayout.html b/Templates/Default/Layouts/AdminLayout.html
similarity index 100%
rename from Templates/Default/AdminLayout.html
rename to Templates/Default/Layouts/AdminLayout.html
diff --git a/Templates/Default/AuthLayout.body.html b/Templates/Default/Layouts/AuthLayout.body.html
similarity index 100%
rename from Templates/Default/AuthLayout.body.html
rename to Templates/Default/Layouts/AuthLayout.body.html
diff --git a/Templates/Default/AuthLayout.head.html b/Templates/Default/Layouts/AuthLayout.head.html
similarity index 100%
rename from Templates/Default/AuthLayout.head.html
rename to Templates/Default/Layouts/AuthLayout.head.html
diff --git a/Templates/Default/AuthLayout.html b/Templates/Default/Layouts/AuthLayout.html
similarity index 100%
rename from Templates/Default/AuthLayout.html
rename to Templates/Default/Layouts/AuthLayout.html
diff --git a/Templates/Default/DefaultLayout.body.html b/Templates/Default/Layouts/DefaultLayout.body.html
similarity index 100%
rename from Templates/Default/DefaultLayout.body.html
rename to Templates/Default/Layouts/DefaultLayout.body.html
diff --git a/Templates/Default/DefaultLayout.head.html b/Templates/Default/Layouts/DefaultLayout.head.html
similarity index 100%
rename from Templates/Default/DefaultLayout.head.html
rename to Templates/Default/Layouts/DefaultLayout.head.html
diff --git a/Templates/Default/DefaultLayout.html b/Templates/Default/Layouts/DefaultLayout.html
similarity index 100%
rename from Templates/Default/DefaultLayout.html
rename to Templates/Default/Layouts/DefaultLayout.html
diff --git a/Templates/Default/EditLayout.body.html b/Templates/Default/Layouts/EditLayout.body.html
similarity index 100%
rename from Templates/Default/EditLayout.body.html
rename to Templates/Default/Layouts/EditLayout.body.html
diff --git a/Templates/Default/EditLayout.head.html b/Templates/Default/Layouts/EditLayout.head.html
similarity index 100%
rename from Templates/Default/EditLayout.head.html
rename to Templates/Default/Layouts/EditLayout.head.html
diff --git a/Templates/Default/EditLayout.html b/Templates/Default/Layouts/EditLayout.html
similarity index 100%
rename from Templates/Default/EditLayout.html
rename to Templates/Default/Layouts/EditLayout.html
diff --git a/Templates/Default/SingleLayout.body.html b/Templates/Default/Layouts/SingleLayout.body.html
similarity index 100%
rename from Templates/Default/SingleLayout.body.html
rename to Templates/Default/Layouts/SingleLayout.body.html
diff --git a/Templates/Default/SingleLayout.head.html b/Templates/Default/Layouts/SingleLayout.head.html
similarity index 100%
rename from Templates/Default/SingleLayout.head.html
rename to Templates/Default/Layouts/SingleLayout.head.html
diff --git a/Templates/Default/SingleLayout.html b/Templates/Default/Layouts/SingleLayout.html
similarity index 100%
rename from Templates/Default/SingleLayout.html
rename to Templates/Default/Layouts/SingleLayout.html
diff --git a/Templates/JobBoard/AdminLayout.body.html b/Templates/JobBoard/Layouts/AdminLayout.body.html
similarity index 100%
rename from Templates/JobBoard/AdminLayout.body.html
rename to Templates/JobBoard/Layouts/AdminLayout.body.html
diff --git a/Templates/JobBoard/AdminLayout.head.html b/Templates/JobBoard/Layouts/AdminLayout.head.html
similarity index 100%
rename from Templates/JobBoard/AdminLayout.head.html
rename to Templates/JobBoard/Layouts/AdminLayout.head.html
diff --git a/Templates/JobBoard/AdminLayout.html b/Templates/JobBoard/Layouts/AdminLayout.html
similarity index 100%
rename from Templates/JobBoard/AdminLayout.html
rename to Templates/JobBoard/Layouts/AdminLayout.html
diff --git a/Templates/JobBoard/AuthLayout.body.html b/Templates/JobBoard/Layouts/AuthLayout.body.html
similarity index 100%
rename from Templates/JobBoard/AuthLayout.body.html
rename to Templates/JobBoard/Layouts/AuthLayout.body.html
diff --git a/Templates/JobBoard/AuthLayout.head.html b/Templates/JobBoard/Layouts/AuthLayout.head.html
similarity index 100%
rename from Templates/JobBoard/AuthLayout.head.html
rename to Templates/JobBoard/Layouts/AuthLayout.head.html
diff --git a/Templates/JobBoard/AuthLayout.html b/Templates/JobBoard/Layouts/AuthLayout.html
similarity index 100%
rename from Templates/JobBoard/AuthLayout.html
rename to Templates/JobBoard/Layouts/AuthLayout.html
diff --git a/Templates/JobBoard/DefaultLayout.body.html b/Templates/JobBoard/Layouts/DefaultLayout.body.html
similarity index 100%
rename from Templates/JobBoard/DefaultLayout.body.html
rename to Templates/JobBoard/Layouts/DefaultLayout.body.html
diff --git a/Templates/JobBoard/DefaultLayout.head.html b/Templates/JobBoard/Layouts/DefaultLayout.head.html
similarity index 100%
rename from Templates/JobBoard/DefaultLayout.head.html
rename to Templates/JobBoard/Layouts/DefaultLayout.head.html
diff --git a/Templates/JobBoard/DefaultLayout.html b/Templates/JobBoard/Layouts/DefaultLayout.html
similarity index 100%
rename from Templates/JobBoard/DefaultLayout.html
rename to Templates/JobBoard/Layouts/DefaultLayout.html
diff --git a/Templates/Portfolio/AdminLayout.body.html b/Templates/Portfolio/Layouts/AdminLayout.body.html
similarity index 100%
rename from Templates/Portfolio/AdminLayout.body.html
rename to Templates/Portfolio/Layouts/AdminLayout.body.html
diff --git a/Templates/Portfolio/AdminLayout.head.html b/Templates/Portfolio/Layouts/AdminLayout.head.html
similarity index 100%
rename from Templates/Portfolio/AdminLayout.head.html
rename to Templates/Portfolio/Layouts/AdminLayout.head.html
diff --git a/Templates/Portfolio/AdminLayout.html b/Templates/Portfolio/Layouts/AdminLayout.html
similarity index 100%
rename from Templates/Portfolio/AdminLayout.html
rename to Templates/Portfolio/Layouts/AdminLayout.html
diff --git a/Templates/Portfolio/AuthLayout.body.html b/Templates/Portfolio/Layouts/AuthLayout.body.html
similarity index 100%
rename from Templates/Portfolio/AuthLayout.body.html
rename to Templates/Portfolio/Layouts/AuthLayout.body.html
diff --git a/Templates/Portfolio/AuthLayout.head.html b/Templates/Portfolio/Layouts/AuthLayout.head.html
similarity index 100%
rename from Templates/Portfolio/AuthLayout.head.html
rename to Templates/Portfolio/Layouts/AuthLayout.head.html
diff --git a/Templates/Portfolio/AuthLayout.html b/Templates/Portfolio/Layouts/AuthLayout.html
similarity index 100%
rename from Templates/Portfolio/AuthLayout.html
rename to Templates/Portfolio/Layouts/AuthLayout.html
diff --git a/Templates/Portfolio/Columns-1-3.body.html b/Templates/Portfolio/Layouts/Columns-1-3.body.html
similarity index 100%
rename from Templates/Portfolio/Columns-1-3.body.html
rename to Templates/Portfolio/Layouts/Columns-1-3.body.html
diff --git a/Templates/Portfolio/Columns-1-3.head.html b/Templates/Portfolio/Layouts/Columns-1-3.head.html
similarity index 100%
rename from Templates/Portfolio/Columns-1-3.head.html
rename to Templates/Portfolio/Layouts/Columns-1-3.head.html
diff --git a/Templates/Portfolio/Columns-1-3.html b/Templates/Portfolio/Layouts/Columns-1-3.html
similarity index 100%
rename from Templates/Portfolio/Columns-1-3.html
rename to Templates/Portfolio/Layouts/Columns-1-3.html
diff --git a/Templates/Portfolio/DefaultLayout.body.html b/Templates/Portfolio/Layouts/DefaultLayout.body.html
similarity index 100%
rename from Templates/Portfolio/DefaultLayout.body.html
rename to Templates/Portfolio/Layouts/DefaultLayout.body.html
diff --git a/Templates/Portfolio/DefaultLayout.head.html b/Templates/Portfolio/Layouts/DefaultLayout.head.html
similarity index 100%
rename from Templates/Portfolio/DefaultLayout.head.html
rename to Templates/Portfolio/Layouts/DefaultLayout.head.html
diff --git a/Templates/Portfolio/DefaultLayout.html b/Templates/Portfolio/Layouts/DefaultLayout.html
similarity index 100%
rename from Templates/Portfolio/DefaultLayout.html
rename to Templates/Portfolio/Layouts/DefaultLayout.html
diff --git a/Templates/Portfolio/EditLayout.body.html b/Templates/Portfolio/Layouts/EditLayout.body.html
similarity index 100%
rename from Templates/Portfolio/EditLayout.body.html
rename to Templates/Portfolio/Layouts/EditLayout.body.html
diff --git a/Templates/Portfolio/EditLayout.head.html b/Templates/Portfolio/Layouts/EditLayout.head.html
similarity index 100%
rename from Templates/Portfolio/EditLayout.head.html
rename to Templates/Portfolio/Layouts/EditLayout.head.html
diff --git a/Templates/Portfolio/EditLayout.html b/Templates/Portfolio/Layouts/EditLayout.html
similarity index 100%
rename from Templates/Portfolio/EditLayout.html
rename to Templates/Portfolio/Layouts/EditLayout.html
diff --git a/Templates/Portfolio/SingleLayout.body.html b/Templates/Portfolio/Layouts/SingleLayout.body.html
similarity index 100%
rename from Templates/Portfolio/SingleLayout.body.html
rename to Templates/Portfolio/Layouts/SingleLayout.body.html
diff --git a/Templates/Portfolio/SingleLayout.head.html b/Templates/Portfolio/Layouts/SingleLayout.head.html
similarity index 100%
rename from Templates/Portfolio/SingleLayout.head.html
rename to Templates/Portfolio/Layouts/SingleLayout.head.html
diff --git a/Templates/Portfolio/SingleLayout.html b/Templates/Portfolio/Layouts/SingleLayout.html
similarity index 100%
rename from Templates/Portfolio/SingleLayout.html
rename to Templates/Portfolio/Layouts/SingleLayout.html