Changing structure of media handling classes.