Client and Server code architectures are changed according to new
design.