Moved types around, upgraded NuGet packages.