Refactor the Project