holoirc: more reorganization