Nuget and project structure
Merge conflict