More tweaks to the organization and structure for the log streaming.