Refactor project template