diff --git a/site/templates/_func.php b/site/templates/layout/func.php
similarity index 100%
rename from site/templates/_func.php
rename to site/templates/layout/func.php
diff --git a/site/templates/_init.php b/site/templates/layout/init.php
similarity index 84%
rename from site/templates/_init.php
rename to site/templates/layout/init.php
index 4982b17..461b41a 100644
--- a/site/templates/_init.php
+++ b/site/templates/layout/init.php
@@ -1,6 +1,6 @@
get('/');
diff --git a/site/templates/_main.php b/site/templates/layout/main.php
similarity index 56%
rename from site/templates/_main.php
rename to site/templates/layout/main.php
index 324ffe8..c28d466 100644
--- a/site/templates/_main.php
+++ b/site/templates/layout/main.php
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/site/templates/_foot.php b/site/templates/layout/partial/main_foot.php
similarity index 100%
rename from site/templates/_foot.php
rename to site/templates/layout/partial/main_foot.php
diff --git a/site/templates/_head.php b/site/templates/layout/partial/main_head.php
similarity index 100%
rename from site/templates/_head.php
rename to site/templates/layout/partial/main_head.php
diff --git a/site/templates/_xes-foot.php b/site/templates/layout/partial/xes-foot.php
similarity index 100%
rename from site/templates/_xes-foot.php
rename to site/templates/layout/partial/xes-foot.php
diff --git a/site/templates/_xes-head.php b/site/templates/layout/partial/xes-head.php
similarity index 100%
rename from site/templates/_xes-head.php
rename to site/templates/layout/partial/xes-head.php
diff --git a/site/templates/_xes-main.php b/site/templates/layout/xes.php
similarity index 53%
rename from site/templates/_xes-main.php
rename to site/templates/layout/xes.php
index 664ffbb..6f380c9 100644
--- a/site/templates/_xes-main.php
+++ b/site/templates/layout/xes.php
@@ -1,6 +1,6 @@