Move email templates for consistency with other functional cohesion refactoring