Updated to match reorganization of functions

Not completed - only updated GIS.R to correspond to the major
reorganization of functions.