Adapting bs_tools to new stream module.

OMG. What a mess