Refactor Album / MediaFile