Refactored Project model with Draper
Merged