Put relationships in a more logical order

It now more closely matches the organisational hierarchy.