Merge in ReaderWriter.h and simplify code
JSONParser can read directly from file now
Use new JSONParser facility