Remove the unneeded struct
Rework the playback infrastructure to be able to support stopping