mostly intert changes, cleanup of Stream
drwxr-xr-x - src