Many changes

+ converted solution to VS2010 format.