moved SpatialBinStore and SimpleSpatialBinStore up one level
(cherry-picked from 6c39dad)