Moved to servlet instead of streamserver