Team functionality might be going away, indeed. Still, this commit only moves existing code here, so the API would anyway need cleaning from team stuff.