refactored the separate dvd and instant queue controllers into one