refactoring for test server
refactoring client
Merge pull request #5 from jinchung/refactoring

Refactoring