Move some classes, add ref to StageVideo