WIP

refactoring package_builder