Clean up models
Clean up unneded namespace
Add Opportunity model and tests