Added World and moved Stream related code into it