More project template cleanups
Merge pull request #1788 from ussuri/new-project-templates

More project template cleanups