refactoring
refactoring Client
Refactoring server.