Nuget config and refactoring