refactor: org.json stuff

Change-Id: Ida53eb8b3f3d8243f5a46ef7641117018f17f743
Signed-off-by: broberts <baily.e.roberts@boeing.com>
22 files changed