Restructuring to support multiple servers