Refactored OSM downloader to have a better name. Fixes #596 Fixes #595