Move templates and typo