Topics/multiple orgs

Apologies for the weird branch name. This is an "in-between-refactoring" to support multiple organisations.

Any feedback?