Changed response JSON structure, fixed uploading files