checking in for w2olabs code review
upgraded xml & json pojo libraries, continued refactoring