Tweaked classes to work with Jackson,
jackson parsing json from/to finished (with tests)