Add Unpack and Repack tools