Refactor of network resources to make base client modular.