JBCTS-1308 - adjust JSON modules to avoid duplicate API classes