WIP: Extracting the packager