Split old/new mpv into separate classes + add wait timeout for new mpv