partial merge of Simon's changes
This merges almost all of @g-simonperkins's changes, except for the package naming, which needs more discussion.
There is a maintenance of MPCDF Gitlab on Thursday, April 22st 2020, 9:00 am CEST - Expect some service interruptions during this time
This merges almost all of @g-simonperkins's changes, except for the package naming, which needs more discussion.
This will create a new commit in order to revert the existing changes.