refactor: redesign package.
Merge branch '1020-2'
Merge pull request #463 from forumbyr/master

refactor: redesign package.