Broke into two due to file size restriction for nupkg