Refactor network_client and as network_object and client
cleanup
Finally fixed