Refactoring continues ... Updated the Visual Studio solutions.