Remove dead templates and move used templates
Merge pull request #2238 from darkwing/remove-dead-templates

Remove dead templates and move used templates