move variables to per FIFO structs