Refactor multimedia modules