Re-Designed the cliserver and client