Moves mixer out
mixer tsi
Adds Mixer back in
Renames to Mixer