restructure the thesis and add more in the client implementation framework