Refactor: split into keyvalue and structured servers