Total remake of packaging scripts