refactored project with new template