Refactoring ArgosDownloader and AddFile