Restructure the MCCGB package