Revert "[team] moving team"

This reverts commit cc4c0432018e16991d8ab9fbeec7f6878610c17b.