Refactor packaging