Integrated streaming server into main project