More Iris driver reorganization. (dm)