raoxunrong, do refactor and rename package