Better handling of media folder.