Refactored project and started market model