Refactor multimedia module