FifoSensors separation and LineSensor fixes