Refactor Project Model