Converted solution to VS 2010 format