re-factor packaging
refactor packaging