Improvements to the project structure for NuGet