Code re-org to facilitate distributing esmond.api.client.* as stand alone package esmond_client