Refactor the media modules.