Project Template v2 refactoring