Changelog:
- Collapse AbstractHierarchyDevice and AbstractHierarchy into one class