Brightcove refactor continues