Fix the email templates and restructure the templates dir