Begin refactoring project model
Finish refactoring project model