Clean up Model classes
Upgrade team organization + Add product with participants