refactor some package changes