Adding some additional class structure for the ray-tracer design