Refactored multiple video to use one class per video