Switch fundings to work with groups
reorder functions to make them easier to find
merge from master
Merge pull request #1359 from ORCID/switchFundingsToGroups

Switch fundings to work with groups
merge from master