refactored mediabrowser view/models to clearer structure