add OpenStreetMap; reorganize US data links