diff --git a/kallithea/model/notification.py b/kallithea/model/notification.py
--- a/kallithea/model/notification.py
+++ b/kallithea/model/notification.py
@@ -204,7 +204,7 @@ class EmailNotificationModel(object):
         return generated template for email based on given type
         """
 
-        base = 'email_templates/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type
+        base = 'email/' + self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT]) + '.' + content_type
         email_template = self._tmpl_lookup.get_template(base)
         # translator and helpers inject
         _kwargs = {'_': _,
diff --git a/kallithea/templates/email_templates/button.html b/kallithea/templates/email/button.html
rename from kallithea/templates/email_templates/button.html
rename to kallithea/templates/email/button.html
diff --git a/kallithea/templates/email_templates/button.txt b/kallithea/templates/email/button.txt
rename from kallithea/templates/email_templates/button.txt
rename to kallithea/templates/email/button.txt
diff --git a/kallithea/templates/email_templates/changeset_comment.html b/kallithea/templates/email/changeset_comment.html
rename from kallithea/templates/email_templates/changeset_comment.html
rename to kallithea/templates/email/changeset_comment.html
diff --git a/kallithea/templates/email_templates/changeset_comment.txt b/kallithea/templates/email/changeset_comment.txt
rename from kallithea/templates/email_templates/changeset_comment.txt
rename to kallithea/templates/email/changeset_comment.txt
diff --git a/kallithea/templates/email_templates/comment.html b/kallithea/templates/email/comment.html
rename from kallithea/templates/email_templates/comment.html
rename to kallithea/templates/email/comment.html
diff --git a/kallithea/templates/email_templates/comment.txt b/kallithea/templates/email/comment.txt
rename from kallithea/templates/email_templates/comment.txt
rename to kallithea/templates/email/comment.txt
diff --git a/kallithea/templates/email_templates/default.html b/kallithea/templates/email/default.html
rename from kallithea/templates/email_templates/default.html
rename to kallithea/templates/email/default.html
diff --git a/kallithea/templates/email_templates/default.txt b/kallithea/templates/email/default.txt
rename from kallithea/templates/email_templates/default.txt
rename to kallithea/templates/email/default.txt
diff --git a/kallithea/templates/email_templates/header.html b/kallithea/templates/email/header.html
rename from kallithea/templates/email_templates/header.html
rename to kallithea/templates/email/header.html
diff --git a/kallithea/templates/email_templates/header.txt b/kallithea/templates/email/header.txt
rename from kallithea/templates/email_templates/header.txt
rename to kallithea/templates/email/header.txt
diff --git a/kallithea/templates/email_templates/main.html b/kallithea/templates/email/main.html
rename from kallithea/templates/email_templates/main.html
rename to kallithea/templates/email/main.html
diff --git a/kallithea/templates/email_templates/password_reset.html b/kallithea/templates/email/password_reset.html
rename from kallithea/templates/email_templates/password_reset.html
rename to kallithea/templates/email/password_reset.html
diff --git a/kallithea/templates/email_templates/password_reset.txt b/kallithea/templates/email/password_reset.txt
rename from kallithea/templates/email_templates/password_reset.txt
rename to kallithea/templates/email/password_reset.txt
diff --git a/kallithea/templates/email_templates/pull_request.html b/kallithea/templates/email/pull_request.html
rename from kallithea/templates/email_templates/pull_request.html
rename to kallithea/templates/email/pull_request.html
diff --git a/kallithea/templates/email_templates/pull_request.txt b/kallithea/templates/email/pull_request.txt
rename from kallithea/templates/email_templates/pull_request.txt
rename to kallithea/templates/email/pull_request.txt
diff --git a/kallithea/templates/email_templates/pull_request_comment.html b/kallithea/templates/email/pull_request_comment.html
rename from kallithea/templates/email_templates/pull_request_comment.html
rename to kallithea/templates/email/pull_request_comment.html
diff --git a/kallithea/templates/email_templates/pull_request_comment.txt b/kallithea/templates/email/pull_request_comment.txt
rename from kallithea/templates/email_templates/pull_request_comment.txt
rename to kallithea/templates/email/pull_request_comment.txt
diff --git a/kallithea/templates/email_templates/registration.html b/kallithea/templates/email/registration.html
rename from kallithea/templates/email_templates/registration.html
rename to kallithea/templates/email/registration.html
diff --git a/kallithea/templates/email_templates/registration.txt b/kallithea/templates/email/registration.txt
rename from kallithea/templates/email_templates/registration.txt
rename to kallithea/templates/email/registration.txt
diff --git a/scripts/whitespacecleanup.sh b/scripts/whitespacecleanup.sh
--- a/scripts/whitespacecleanup.sh
+++ b/scripts/whitespacecleanup.sh
@@ -2,7 +2,7 @@
 
 # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes
 
-files=`hg mani | egrep -v '/fontello/|/email_templates/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'`
+files=`hg mani | egrep -v '/fontello/|/templates/email/|(^LICENSE-MERGELY.html|^docs/Makefile|^scripts/whitespacecleanup.sh|/(graph|mergely|native.history)\.js|/test_dump_html_mails.ref.html|\.png|\.gif|\.ico|\.pot|\.po|\.mo|\.tar\.gz|\.diff)$'`
 
 sed -i "s/`printf '\r'`//g" $files
 sed -i -e "s,`printf '\t'`,    ,g" $files