[patch 3/4] Re-factor package download code