change location of change template files
Merge branch 'hotfix/template-rewrite'