holoirc: more reorganization and cleanups