WIP: restructuring templates.