Data model refactored again and tested via console
Team and team memberships refactored and tested