Refactor project entity