Uri generation moved to an external class 'MediaFileUriManager'. This is to be refactored so explicit calls to media types can be called directly as methods.