Major refactor of C++ code, switch to using a C++ server