Refactored file downloads to use only 1 type.