Refactoring Server and folder structure