Move audio and subtitle data into struct