Move streamer to separate module