restructured for readability in lists. Merge with master will be problematic as the same has happened there already. Keep that version but add the avro entries when the time comes.