Tidying, update packages, create Nuget package spec