Reorganized templates for jinja