Inline the OrganisationPresenter

This change moves the JSON representation of Organisation onto the model,
because the representation is the same everywhere.

This change also reduces the reliance on mocking for presenter testing, because
this reliance makes the unit tests very brittle.