Put back new files from upstream
Fix boogered up neutron_net -> neutron_network