Refactoring the download

Trying to have a more user friendly approach and a single entry point
to the download.