combine image and video services into single assets service and update controller@