discover: move device sources to the device handler