Move the Instrument and Instrument interface classes down to Geometry. The new raytracing framework needs instrument access and it should all be in geometry. Also, given that everything else was defined in geometry it seems to make more sense to have it all in one place. Re #1212