Modularize dns minus config changes, as requested by Attila