Saving state before major refactoring of stream_organizer.js. Current version is functional - this commit allows safe rollback.