Changes look good to me, thanks for addressing this. In order to go one step further, I wonder if it would be good to add a bit of documentation on the meaning of these files perhaps somewhere in here https://github.com/dotnet/runtime/blob/3553284bea7b650874c8dcc3f78d6be085a047bb/docs/coding-guidelines/project-guidelines.md ? It doesn't need to happen as part of this PR, but that would just help to people not involved on the effort to understand why these files exist and what they are used for.