#46 refactoring Server: move functions to Base etc