Updated packaging scripts