Simplify internal data structure.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Gordon, will this require a change to HIPIE generated JSON or the structure of data coming back from Roxie services?