Reorganized code, added instantiation of server sets