[UPDATE] updated module dependencies. In process of moving streams.