Converted to new VS solution format