Explicitly use organisations instead of principals.

The API has changed, so that we need to distinguish users and organisations.
Since we have currently no users configured, we just implement organisations
for now.