#39 refactoring Server module: not finished