Preparing for split and nuget publish, plus adjustments in terms of streams mostly