some more reorganizing the IR

hopefully this should be the last of it...