Moved data directories around, tweaked locations.
Bit stuck on clipping the map - 1.5.1 doesn't allow me to just call clip(). Will implement as an ImageMarker class in Unfolding next, see if that helps.