Rearange to match CM repos Pt3