Switch to C++ VS solution