Updated package building scripts