refactor management client package