C++ server code

Latest master merged in. We should discuss the layout of the code.
Alright, wasn't familiar with it, didn't know the differences.