Refactored the normalisation out of the detector into it's own module.