Client restructure
Client restructure