Consolidate server implementations

We have two competing server implementations with semi duplicate code. We should join those in order to have a more unified and maintainable interface.