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

refactor: redesign package.