Refacting item JSON structure