converting to JSON instead of XML
removing unused files
fixing conflict