Upgrade to visual studio solution to 2010

Changes to project and files need to compile with visual studio on
windows.
Revert "Upgrade to visual studio solution to 2010"

This reverts commit 341f95c84a87dd6bb42d19fb71b1fafef5eab0d7.