Revised the packager to use the refactored code