Client calls for Put and Get, and refactoring RPCs
merging