After converting all groups to components, you can replace them all by a single one using component replacer plugin, also from thomthom