Changes to decouple nuget dependency package decoupling