Reorganizations of the teams
Merge pull request #87 from AndreiH/teams_reorg

Reorganizations of the teams