Refactor project model