Moved templates to external files