re-organizing packages
Server package done.
Client package
Passed the basic test cases.