diff --git a/taiga/projects/issues/templates/emails/update_issue_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/update_issue_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja
diff --git a/taiga/projects/issues/templates/emails/update_issue_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/update_issue_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja
diff --git a/taiga/projects/issues/templates/emails/update_issue_notification-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/update_issue_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
diff --git a/taiga/projects/issues/templates/emails/create_issue_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/create_issue_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja
diff --git a/taiga/projects/issues/templates/emails/create_issue_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/create_issue_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja
diff --git a/taiga/projects/issues/templates/emails/create_issue_notification-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/create_issue_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
diff --git a/taiga/projects/issues/templates/emails/destroy_issue_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/destroy_issue_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja
diff --git a/taiga/projects/issues/templates/emails/destroy_issue_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/destroy_issue_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja
diff --git a/taiga/projects/issues/templates/emails/destroy_issue_notification-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
similarity index 100%
rename from taiga/projects/issues/templates/emails/destroy_issue_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
diff --git a/taiga/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja
diff --git a/taiga/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja
diff --git a/taiga/projects/milestones/templates/emails/update_milestone_notification-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/update_milestone_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
diff --git a/taiga/projects/milestones/templates/emails/create_milestone_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/create_milestone_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja
diff --git a/taiga/projects/milestones/templates/emails/create_milestone_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/create_milestone_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja
diff --git a/taiga/projects/milestones/templates/emails/create_milestone_notification-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/create_milestone_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
diff --git a/taiga/projects/milestones/templates/emails/destroy_milestone_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/destroy_milestone_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja
diff --git a/taiga/projects/milestones/templates/emails/destroy_milestone_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/destroy_milestone_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja
diff --git a/taiga/projects/milestones/templates/emails/destroy_milestone_notification-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
similarity index 100%
rename from taiga/projects/milestones/templates/emails/destroy_milestone_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
diff --git a/taiga/projects/templates/emails/update_project_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
similarity index 100%
rename from taiga/projects/templates/emails/update_project_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
diff --git a/taiga/projects/templates/emails/update_project_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
similarity index 100%
rename from taiga/projects/templates/emails/update_project_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
diff --git a/taiga/projects/templates/emails/update_project_notification-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
similarity index 100%
rename from taiga/projects/templates/emails/update_project_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
diff --git a/taiga/projects/templates/emails/create_project_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
similarity index 100%
rename from taiga/projects/templates/emails/create_project_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
diff --git a/taiga/projects/templates/emails/create_project_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
similarity index 100%
rename from taiga/projects/templates/emails/create_project_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
diff --git a/taiga/projects/templates/emails/create_project_notification-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
similarity index 100%
rename from taiga/projects/templates/emails/create_project_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
diff --git a/taiga/projects/templates/emails/destroy_project_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/templates/emails/destroy_project_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
diff --git a/taiga/projects/templates/emails/destroy_project_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/templates/emails/destroy_project_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
diff --git a/taiga/projects/templates/emails/destroy_project_notification-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
similarity index 100%
rename from taiga/projects/templates/emails/destroy_project_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
diff --git a/taiga/projects/tasks/templates/emails/update_task_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/update_task_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja
diff --git a/taiga/projects/tasks/templates/emails/update_task_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/update_task_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja
diff --git a/taiga/projects/tasks/templates/emails/update_task_notification-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/update_task_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
diff --git a/taiga/projects/tasks/templates/emails/create_task_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/create_task_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja
diff --git a/taiga/projects/tasks/templates/emails/create_task_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/create_task_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja
diff --git a/taiga/projects/tasks/templates/emails/create_task_notification-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/create_task_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
diff --git a/taiga/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja
diff --git a/taiga/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
diff --git a/taiga/projects/tasks/templates/emails/destroy_task_notification-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
similarity index 100%
rename from taiga/projects/tasks/templates/emails/destroy_task_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
diff --git a/taiga/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja
diff --git a/taiga/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja
diff --git a/taiga/projects/userstories/templates/emails/update_userstory_notification-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/update_userstory_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
diff --git a/taiga/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja
diff --git a/taiga/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja
diff --git a/taiga/projects/userstories/templates/emails/create_userstory_notification-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/create_userstory_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
diff --git a/taiga/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja
diff --git a/taiga/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja
diff --git a/taiga/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
similarity index 100%
rename from taiga/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
diff --git a/taiga/projects/wiki/templates/emails/update_wiki_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/update_wiki_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja
diff --git a/taiga/projects/wiki/templates/emails/update_wiki_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/update_wiki_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja
diff --git a/taiga/projects/wiki/templates/emails/update_wiki_notification-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/update_wiki_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
diff --git a/taiga/projects/wiki/templates/emails/create_wiki_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/create_wiki_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja
diff --git a/taiga/projects/wiki/templates/emails/create_wiki_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/create_wiki_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja
diff --git a/taiga/projects/wiki/templates/emails/create_wiki_notification-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/create_wiki_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
diff --git a/taiga/projects/wiki/templates/emails/destroy_wiki_notification-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/destroy_wiki_notification-body-html.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja
diff --git a/taiga/projects/wiki/templates/emails/destroy_wiki_notification-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/destroy_wiki_notification-body-text.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja
diff --git a/taiga/projects/wiki/templates/emails/destroy_wiki_notification-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
similarity index 100%
rename from taiga/projects/wiki/templates/emails/destroy_wiki_notification-subject.jinja
rename to taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja