added subtree switch for hierarchy, the rest of hierarchy will be organic
* most classes were just refactored