Project template cleanup
Merge pull request #1787 from ussuri/new-project-templates

Project template cleanup