* RGeo refactoring