Update hierarchy to reflect new opal build system