Refactor hierarchical organizations

The module was getting old ;)