Hierarchical organizations

If this module is disabled because of a registration bug, we should put it in a separate commit.