Categories for Teams?

I’ve recently found that we’ve been dealing with more teams than expected due to compartmentalization of projects and so forth. Is there a way to - or is a feature planned to - allow Teams to be similarly organized into Categories like channels? Another option could be to make it similar to how Discord handles “server” groups (since teams in Mattermost and servers in Discord are essentially the same thing).