Move templates and parts into a 'template/' subdir
Merge branch 'master' into shiny - catch up template changes
Fix typo in path
Merge branch 'master' into shiny