diff --git a/base/alert.tmpl b/base/alert.tmpl
deleted file mode 100644
index 61b9948..0000000
--- a/base/alert.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{if .Flash.ErrorMsg}}
-
-
{{.Flash.ErrorMsg | Str2html}}
-
-{{end}}
-{{if .Flash.SuccessMsg}}
-
-
{{.Flash.SuccessMsg | Str2html}}
-
-{{end}}
-{{if .Flash.InfoMsg}}
-
-
{{.Flash.InfoMsg | Str2html}}
-
-{{end}}
diff --git a/base/delete_modal_actions.tmpl b/base/delete_modal_actions.tmpl
deleted file mode 100644
index a889c67..0000000
--- a/base/delete_modal_actions.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- {{.i18n.Tr "modal.no"}}
-
-
-
- {{.i18n.Tr "modal.yes"}}
-
-
diff --git a/base/paginate.tmpl b/base/paginate.tmpl
deleted file mode 100644
index da07fd2..0000000
--- a/base/paginate.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{$paginationLink := .Page.GetParams}}
-{{with .Page.Paginater}}
- {{if gt .TotalPages 1}}
-
-
-
- {{end}}
-{{end}}
diff --git a/base/footer.tmpl b/templates/base/footer.tmpl
similarity index 100%
rename from base/footer.tmpl
rename to templates/base/footer.tmpl
diff --git a/base/footer_content.tmpl b/templates/base/footer_content.tmpl
similarity index 100%
rename from base/footer_content.tmpl
rename to templates/base/footer_content.tmpl
diff --git a/base/head.tmpl b/templates/base/head.tmpl
similarity index 100%
rename from base/head.tmpl
rename to templates/base/head.tmpl
diff --git a/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
similarity index 100%
rename from base/head_navbar.tmpl
rename to templates/base/head_navbar.tmpl
diff --git a/home.tmpl b/templates/home.tmpl
similarity index 100%
rename from home.tmpl
rename to templates/home.tmpl