Make spec less brittle
Refactor org browser

Make it clearer what is public and what isn't, and where initialisation
is happening.