Hierarchical organizations

Ok, will you create such commit? I will revert the change above.