Maintenance

General maintenance.  Looks like the city zips files into subfolders now which broke some things.  This also fixes the OSM export in which all shapefiles (lines, polygons and points) come on the same archive.