Adjust base.gems to new modules