Refactor downloader WIP