Collapsed the client as we are now not exposing the server - service layer api just the REST API  we is the Public interface to the server.
Merge origin/master