Start working on server refactoring