More refactoring on the repository for the .NET Plug-in.