1) Fix new WebStreamFirehose stuff to have tests in the tests directory
2) Change the webStream package to the web package, because capital letters in packages suck
1) Fix stray imports from libraries that aren't depended on and fix annotations/methods accordingly.
before merging master into this
moved tests into correct folder