Refactor for a more consistent hierarchy.