Organize threads one more level

So I have a course I'm moving to Heartbeat. Discussion is a big part so I have thread channels for each cohort. I can see this getting unwieldy fast with groups of channels for each cohort, very quickly growing that list of thread groups too fast.

I would love to be able to group threads one more level. So, now, I see the thread group name for that cohort and then the threads. I would love another level so cohorts are grouped under the course name, on the left side of threads.