many changes to get Nuget pack to work.