Add department and contributing organizations to metadata form

[peer35]

• Extra block: Department: maps to contributor type, researchGroup

• Extra block: Organization: just one name field and just the organizational types

• Remove the organizational types from the "contributor person" block