package: repackage a bit