CC-5450 : Refactor Media Management

fixing up services so controllers will just use one instance.