Cleanup and reorganization
Merge pull request #20 from socrata/urmilan/reorganise

Geospace cleanup and reorganization