Update the service structure
Fix the conflicts in server.server module