Download and Package script refactored
Name changed