Fixbug: lost some package.
Merge client and server.