Stash overlay-refactor changes: this begins to reduce some osmdroid cruft. I am going to make a compromise branch