Refactor the bundle-package step