Switch to simpler internal data structure.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Merge branch 'SensibleData' into gh-pages