Updated versions.
Add stream dependency and rearrange others.
Experimenting with streams.