Refactored project model into a new file