Refactor to not automatically include adc cpu modules; supply a backward compatible...