reorganize
add the OpenStreetMaps stuff in