Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>