Move templates to their own folder and write to etc dir