Move templates to seperate folder