simplify repackaging