reorganized server client