Update: Refactor server codeBase