holoirc: yet more reorganization