Consolidate extra CM external projects