modified for json
fixed results controller conflict, added json files