Move network config blocks out of ifconfig