Add unpack and repack tools