NuGet refactoring