Rearranged files / nuget package restore changes