Updated packaging and licensing