merge json structs and client context, remove accessor functions, greatl...

...y simplifying the implementation.