Refactorings, esp. of package structure in osm part.
Renamed osm component labeller to reflect new focus on points of
interest. Removed ability to label things as "buildings" from this code.
further small improvements