refactor templates
Finished ep10