Reorganinzing prior to nuget publication