Reorganize FIFO switch