Moved templates to separate files