refactored a bunch of tier3 ogc code and starting to refactor a bunch of geoserver code