Nearly done refactoring Iris

Only GeometryHit left.