Major rework of streaming infrastructure to allow multiple servers