VideoStreaming Separation

Separated video streaming functionality for simpler bug fixing, patching
and upgrading.

Messages edited for non overlapping functionality