Moved stuff from MediaFile module into MediaEntry