[FIX] Reorganize groups