Client state related work

Global re-factorization of client-state and client-info.