Refactoring 2
Done refactoring Server