reorganize according to teams