Client restructure