Cleaned up the refactoring a bit.

Tested and works consistently.  I'd like to modify GISData to use the
same format as the other parameter classes.  Still need to clean up
namespaces.