Partial Commit of JSON FIle I/O refactoring.