refactor client package

refactor client package