GIS Spatial Realignment of Water System Features