Merge "Replace classes in the org.json package"