Tidied up nuget packages