Finish refactoring Server and Editor