Prepare for Hex packaging