Remove dependency on org.json and use xml files instead