Refactoring the Server into Modules and DataStructures