C++ server code

Latest master merged in. We should discuss the layout of the code.
is this here in case we want to limit the name or is there another use for it?