Move some more configuration into the corrent packages, correctly configure multiple radios