refactor: redesign package.
Merge branch '1020-2'