[dp.json][s]: move fields into schema.