Revert json-parser submodulization (too many issues)