Remove grouped classes, and reduce down to single module.