Hi, this doesn't exactly answer your question but we're actually rebuilding our group structure right now too. We've rebuilt everything in one of our sandboxes to test out before removing our current structure - it might be worth looking into for your instance as well!