Restructure the way the TOF signal is handled and saved