Extend organisation schema to prepare for controlled vocabularies

This is a mostly mechanical change which will allow us to eventually introduced other variants which refer to external controlled vocabularies.

(The harvester changes where actually written using my text editor's search & replace function, but they appear to work fine.)