[Internal] Change Solution Folders to point to appropriate folders.

This way, we have a clean directory query and we actually do what we need to do. We had a few items pointing to main and that caused some speed problems when using MonoDevelop solution under Git.
Merge pull request #555 from mono/speedGit

[Internal] Change Solution Folders to point to appropriate folders.