Rearange to match CM repos