diff --git a/server/imserver/groupmgr.cc b/server/imserver/groupmgr.cc
index 96101e7..fd74894 100644
--- a/server/imserver/groupmgr.cc
+++ b/server/imserver/groupmgr.cc
@@ -25,53 +25,53 @@ void GroupMgr::_SS_MS_LoadGroup(f8::MsgHdr& hdr, const ss::SS_MS_LoadGroup& msg)
 void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg)
 {
     switch (hdr.msgid) {
-    case cs::CMMessageId_e::_CMGroupCreate:
+    case cs::CMMessageId_e::_CMTeamCreate:
         {
-            cs::CMGroupCreate cmmsg;
+            cs::CMTeamCreate cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupCreate(msg.context(), cmmsg);
+            _CMTeamCreate(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupJoin:
+    case cs::CMMessageId_e::_CMTeamJoin:
         {
-            cs::CMGroupJoin cmmsg;
+            cs::CMTeamJoin cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupJoin(msg.context(), cmmsg);
+            _CMTeamJoin(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupAgree:
+    case cs::CMMessageId_e::_CMTeamAgree:
         {
-            cs::CMGroupAgree cmmsg;
+            cs::CMTeamAgree cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupAgree(msg.context(), cmmsg);
+            _CMTeamAgree(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupKick:
+    case cs::CMMessageId_e::_CMTeamKick:
         {
-            cs::CMGroupKick cmmsg;
+            cs::CMTeamKick cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupKick(msg.context(), cmmsg);
+            _CMTeamKick(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupQuit:
+    case cs::CMMessageId_e::_CMTeamQuit:
         {
-            cs::CMGroupQuit cmmsg;
+            cs::CMTeamQuit cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupQuit(msg.context(), cmmsg);
+            _CMTeamQuit(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupDismiss:
+    case cs::CMMessageId_e::_CMTeamDismiss:
         {
-            cs::CMGroupDismiss cmmsg;
+            cs::CMTeamDismiss cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupDismiss(msg.context(), cmmsg);
+            _CMTeamDismiss(msg.context(), cmmsg);
         }
         break;
-    case cs::CMMessageId_e::_CMGroupRename:
+    case cs::CMMessageId_e::_CMTeamRename:
         {
-            cs::CMGroupRename cmmsg;
+            cs::CMTeamRename cmmsg;
             cmmsg.ParseFromArray(msg.payload().data(), msg.payload().size());
-            _CMGroupRename(msg.context(), cmmsg);
+            _CMTeamRename(msg.context(), cmmsg);
         }
         break;
     default:
@@ -81,12 +81,12 @@ void GroupMgr::_SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_Forward
     }
 }
 
-void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGroupCreate& msg)
+void GroupMgr::_CMTeamCreate(const ss::MFIMMsgConext& context, const cs::CMTeamCreate& msg)
 {
     #if 0
     Group* group = GetGroup(context.group_id());
     if (group) {
-        cs::SMGroupCreate respmsg;
+        cs::SMTeamCreate respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("群id已经存在");
         ForwardGroupSMMsg(context, respmsg);
@@ -95,12 +95,12 @@ void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGrou
     #endif
 }
 
-void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJoin& msg)
+void GroupMgr::_CMTeamJoin(const ss::MFIMMsgConext& context, const cs::CMTeamJoin& msg)
 {
     #if 0
     Group* group = GetGroup(msg.group_id());
     if (!group) {
-        cs::SMGroupJoin respmsg;
+        cs::SMTeamJoin respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("群id已经存在");
         ForwardGroupSMMsg(context, respmsg);
@@ -108,12 +108,12 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ
     }
     GroupMember* member = group->GetMember(context.account_id());
     if (member) {
-        cs::SMGroupJoin respmsg;
+        cs::SMTeamJoin respmsg;
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     if (group->IsFull()) {
-        cs::SMGroupJoin respmsg;
+        cs::SMTeamJoin respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("群已满");
         ForwardGroupSMMsg(context, respmsg);
@@ -131,7 +131,7 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ
     #endif
 }
 
-void GroupMgr::_CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroupAgree& msg)
+void GroupMgr::_CMTeamAgree(const ss::MFIMMsgConext& context, const cs::CMTeamAgree& msg)
 {
 #if 0
     Group* group = GetGroup(context.group_id());
@@ -141,52 +141,52 @@ void GroupMgr::_CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroup
 #endif
 }
 
-void GroupMgr::_CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupKick& msg)
+void GroupMgr::_CMTeamKick(const ss::MFIMMsgConext& context, const cs::CMTeamKick& msg)
 {
     #if 0
     Group* group = GetGroup(context.group_id());
     if (!group) {
-        cs::SMGroupKick respmsg;
+        cs::SMTeamKick respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("群id错误");
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     if (!group->GetMember(msg.account_id())) {
-        cs::SMGroupKick respmsg;
+        cs::SMTeamKick respmsg;
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     group->RemoveMember(msg.account_id());
-    cs::SMGroupKick respmsg;
+    cs::SMTeamKick respmsg;
     ForwardGroupSMMsg(context, respmsg);
     return;
     #endif
 }
 
-void GroupMgr::_CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQuit& msg)
+void GroupMgr::_CMTeamQuit(const ss::MFIMMsgConext& context, const cs::CMTeamQuit& msg)
 {
 #if 0
     Group* group = GetGroup(context.group_id());
     if (!group) {
-        cs::SMGroupQuit respmsg;
+        cs::SMTeamQuit respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("群id错误");
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     if (!group->GetMember(context.account_id())) {
-        cs::SMGroupQuit respmsg;
+        cs::SMTeamQuit respmsg;
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     group->RemoveMember(context.account_id());
-    cs::SMGroupQuit respmsg;
+    cs::SMTeamQuit respmsg;
     ForwardGroupSMMsg(context, respmsg);
 #endif
 }
 
-void GroupMgr::_CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGroupDismiss& msg)
+void GroupMgr::_CMTeamDismiss(const ss::MFIMMsgConext& context, const cs::CMTeamDismiss& msg)
 {
     #if 0
     Group* group = GetGroup(context.group_id());
@@ -196,12 +196,12 @@ void GroupMgr::_CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGro
     #endif
 }
 
-void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGroupRename& msg)
+void GroupMgr::_CMTeamRename(const ss::MFIMMsgConext& context, const cs::CMTeamRename& msg)
 {
     #if 0
     Group* group = GetGroup(context.group_id());
     if (!group) {
-        cs::SMGroupRename respmsg;
+        cs::SMTeamRename respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("群id错误");
         ForwardGroupSMMsg(context, respmsg);
@@ -209,14 +209,14 @@ void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGrou
     }
     GroupMember* member = group->GetMember(context.account_id());
     if (!member) {
-        cs::SMGroupRename respmsg;
+        cs::SMTeamRename respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("没有权限");
         ForwardGroupSMMsg(context, respmsg);
         return;
     }
     group->RemoveMember(msg.new_group_name());
-    cs::SMGroupRename respmsg;
+    cs::SMTeamRename respmsg;
     ForwardGroupSMMsg(context, respmsg);
     #endif
 }
diff --git a/server/imserver/groupmgr.h b/server/imserver/groupmgr.h
index 2f4180b..baf2d0b 100644
--- a/server/imserver/groupmgr.h
+++ b/server/imserver/groupmgr.h
@@ -2,13 +2,13 @@
 
 namespace cs
 {
-    class CMGroupCreate;
-    class CMGroupJoin;
-    class CMGroupAgree;
-    class CMGroupKick;
-    class CMGroupQuit;
-    class CMGroupDismiss;
-    class CMGroupRename;
+    class CMTeamCreate;
+    class CMTeamJoin;
+    class CMTeamAgree;
+    class CMTeamKick;
+    class CMTeamQuit;
+    class CMTeamDismiss;
+    class CMTeamRename;
 }
 
 namespace ss
@@ -44,13 +44,13 @@ class GroupMgr : public a8::Singleton<GroupMgr>
     void _SS_MS_ForwardGroupCMMsg(f8::MsgHdr& hdr, const ss::SS_MS_ForwardGroupCMMsg& msg);
 
  private:
-    void _CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGroupCreate& msg);
-    void _CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJoin& msg);
-    void _CMGroupAgree(const ss::MFIMMsgConext& context, const cs::CMGroupAgree& msg);
-    void _CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupKick& msg);
-    void _CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQuit& msg);
-    void _CMGroupDismiss(const ss::MFIMMsgConext& context, const cs::CMGroupDismiss& msg);
-    void _CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGroupRename& msg);
+    void _CMTeamCreate(const ss::MFIMMsgConext& context, const cs::CMTeamCreate& msg);
+    void _CMTeamJoin(const ss::MFIMMsgConext& context, const cs::CMTeamJoin& msg);
+    void _CMTeamAgree(const ss::MFIMMsgConext& context, const cs::CMTeamAgree& msg);
+    void _CMTeamKick(const ss::MFIMMsgConext& context, const cs::CMTeamKick& msg);
+    void _CMTeamQuit(const ss::MFIMMsgConext& context, const cs::CMTeamQuit& msg);
+    void _CMTeamDismiss(const ss::MFIMMsgConext& context, const cs::CMTeamDismiss& msg);
+    void _CMTeamRename(const ss::MFIMMsgConext& context, const cs::CMTeamRename& msg);
 
     Group* GetGroup(long long group_id);
     void ForwardGroupSMMsg(const ss::MFIMMsgConext& context,
diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 89e0a1f..0ad5986 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -92,13 +92,13 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendChatMsg);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMSendCustomMsg);
 
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupCreate);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupJoin);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupAgree);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupKick);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupQuit);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupDismiss);
-    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGroupRename);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamCreate);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamJoin);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamAgree);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamKick);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamQuit);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamDismiss);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMTeamRename);
 
     RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildCMMsg);
     RegisterNetMsgHandler(&immsghandler, &GuildMgr::_SS_IM_ForwardGuildSMMsg);
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 4fafee1..44eed5b 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -515,11 +515,11 @@ void Player::_CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg)
     }
 }
 
-void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
+void Player::_CMTeamCreate(f8::MsgHdr& hdr, const cs::CMTeamCreate& msg)
 {
     #if 0
     if (myself.base_data.group_id != 0) {
-        cs::SMGroupCreate respmsg;
+        cs::SMTeamCreate respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("你已经有群");
         SendMsg(respmsg);
@@ -529,11 +529,11 @@ void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
     #endif
 }
 
-void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
+void Player::_CMTeamJoin(f8::MsgHdr& hdr, const cs::CMTeamJoin& msg)
 {
     #if 0
     if (myself.base_data.group_id != 0) {
-        cs::SMGroupJoin respmsg;
+        cs::SMTeamJoin respmsg;
         respmsg.set_errcode(1);
         respmsg.set_errmsg("你已经有群");
         SendMsg(respmsg);
@@ -543,11 +543,11 @@ void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
     #endif
 }
 
-void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
+void Player::_CMTeamAgree(f8::MsgHdr& hdr, const cs::CMTeamAgree& msg)
 {
     #if 0
     if (myself.base_data.group_id == 0) {
-        cs::SMGroupAgree respmsg;
+        cs::SMTeamAgree respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("你还没有群");
         SendMsg(respmsg);
@@ -557,11 +557,11 @@ void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
     #endif
 }
 
-void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
+void Player::_CMTeamKick(f8::MsgHdr& hdr, const cs::CMTeamKick& msg)
 {
     #if 0
     if (myself.base_data.group_id == 0) {
-        cs::SMGroupKick respmsg;
+        cs::SMTeamKick respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("你还没有群");
         SendMsg(respmsg);
@@ -571,11 +571,11 @@ void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
     #endif
 }
 
-void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
+void Player::_CMTeamQuit(f8::MsgHdr& hdr, const cs::CMTeamQuit& msg)
 {
     #if 0
     if (myself.base_data.group_id == 0) {
-        cs::SMGroupQuit respmsg;
+        cs::SMTeamQuit respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("你还没有群");
         SendMsg(respmsg);
@@ -585,11 +585,11 @@ void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
     #endif
 }
 
-void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
+void Player::_CMTeamDismiss(f8::MsgHdr& hdr, const cs::CMTeamDismiss& msg)
 {
     #if 0
     if (myself.base_data.group_id == 0) {
-        cs::SMGroupQuit respmsg;
+        cs::SMTeamQuit respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("你还没有群");
         SendMsg(respmsg);
@@ -599,11 +599,11 @@ void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
     #endif
 }
 
-void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg)
+void Player::_CMTeamRename(f8::MsgHdr& hdr, const cs::CMTeamRename& msg)
 {
     #if 0
     if (myself.base_data.group_id == 0) {
-        cs::SMGroupRename respmsg;
+        cs::SMTeamRename respmsg;
         respmsg.set_errcode(2);
         respmsg.set_errmsg("你还没有群");
         SendMsg(respmsg);
diff --git a/server/imserver/player.h b/server/imserver/player.h
index f3f5466..bcdedab 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -87,13 +87,13 @@ class Player
     void _CMSendChatMsg(f8::MsgHdr& hdr, const cs::CMSendChatMsg& msg);
     void _CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg);
 
-    void _CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg);
-    void _CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg);
-    void _CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg);
-    void _CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg);
-    void _CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg);
-    void _CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg);
-    void _CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg);
+    void _CMTeamCreate(f8::MsgHdr& hdr, const cs::CMTeamCreate& msg);
+    void _CMTeamJoin(f8::MsgHdr& hdr, const cs::CMTeamJoin& msg);
+    void _CMTeamAgree(f8::MsgHdr& hdr, const cs::CMTeamAgree& msg);
+    void _CMTeamKick(f8::MsgHdr& hdr, const cs::CMTeamKick& msg);
+    void _CMTeamQuit(f8::MsgHdr& hdr, const cs::CMTeamQuit& msg);
+    void _CMTeamDismiss(f8::MsgHdr& hdr, const cs::CMTeamDismiss& msg);
+    void _CMTeamRename(f8::MsgHdr& hdr, const cs::CMTeamRename& msg);
 
     void _CMGuildInfo(f8::MsgHdr& hdr, const cs::CMGuildInfo& msg);
     void _CMGuildCreate(f8::MsgHdr& hdr, const cs::CMGuildCreate& msg);
diff --git a/server/groupserver/CMakeLists.txt b/server/teamserver/CMakeLists.txt
similarity index 93%
rename from server/groupserver/CMakeLists.txt
rename to server/teamserver/CMakeLists.txt
index f6ebaf4..e79e11a 100644
--- a/server/groupserver/CMakeLists.txt
+++ b/server/teamserver/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(friend_groupserver)
+project(friend_teamserver)
 cmake_minimum_required(VERSION 2.8)
 
 set(GAME_ID 9003)
@@ -74,7 +74,7 @@ set(EXECUTABLE_OUTPUT_PATH
 )
 
 add_executable(
-  friend_groupserver ${SRC_LIST}
+  friend_teamserver ${SRC_LIST}
 )
 
 add_custom_target(script_pb_protocol ALL)
@@ -82,12 +82,12 @@ add_custom_command(TARGET script_pb_protocol
   PRE_BUILD
   COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=ss_proto,ss_msgid,cs_msgid,cs_proto --python_out=../tools/robot/virtualclient
 )
-add_dependencies(friend_groupserver script_pb_protocol)
+add_dependencies(friend_teamserver script_pb_protocol)
 
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_link_libraries(
-    friend_groupserver
+    friend_teamserver
     pthread
     mysqlclient
     protobuf
@@ -105,7 +105,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     )
 else()
   target_link_libraries(
-    friend_groupserver
+    friend_teamserver
     pthread
     mysqlclient
     protobuf
diff --git a/server/groupserver/IMListener.cc b/server/teamserver/IMListener.cc
similarity index 100%
rename from server/groupserver/IMListener.cc
rename to server/teamserver/IMListener.cc
diff --git a/server/groupserver/IMListener.h b/server/teamserver/IMListener.h
similarity index 100%
rename from server/groupserver/IMListener.h
rename to server/teamserver/IMListener.h
diff --git a/server/groupserver/app.cc b/server/teamserver/app.cc
similarity index 100%
rename from server/groupserver/app.cc
rename to server/teamserver/app.cc
diff --git a/server/groupserver/app.h b/server/teamserver/app.h
similarity index 100%
rename from server/groupserver/app.h
rename to server/teamserver/app.h
diff --git a/server/groupserver/constant.h b/server/teamserver/constant.h
similarity index 100%
rename from server/groupserver/constant.h
rename to server/teamserver/constant.h
diff --git a/server/groupserver/handlermgr.cc b/server/teamserver/handlermgr.cc
similarity index 100%
rename from server/groupserver/handlermgr.cc
rename to server/teamserver/handlermgr.cc
diff --git a/server/groupserver/handlermgr.h b/server/teamserver/handlermgr.h
similarity index 100%
rename from server/groupserver/handlermgr.h
rename to server/teamserver/handlermgr.h
diff --git a/server/groupserver/jsondatamgr.cc b/server/teamserver/jsondatamgr.cc
similarity index 100%
rename from server/groupserver/jsondatamgr.cc
rename to server/teamserver/jsondatamgr.cc
diff --git a/server/groupserver/jsondatamgr.h b/server/teamserver/jsondatamgr.h
similarity index 100%
rename from server/groupserver/jsondatamgr.h
rename to server/teamserver/jsondatamgr.h
diff --git a/server/groupserver/main.cc b/server/teamserver/main.cc
similarity index 100%
rename from server/groupserver/main.cc
rename to server/teamserver/main.cc
diff --git a/server/groupserver/perfmonitor.cc b/server/teamserver/perfmonitor.cc
similarity index 100%
rename from server/groupserver/perfmonitor.cc
rename to server/teamserver/perfmonitor.cc
diff --git a/server/groupserver/perfmonitor.h b/server/teamserver/perfmonitor.h
similarity index 100%
rename from server/groupserver/perfmonitor.h
rename to server/teamserver/perfmonitor.h
diff --git a/server/groupserver/precompile.h b/server/teamserver/precompile.h
similarity index 100%
rename from server/groupserver/precompile.h
rename to server/teamserver/precompile.h
diff --git a/server/groupserver/typeconvert.cc b/server/teamserver/typeconvert.cc
similarity index 100%
rename from server/groupserver/typeconvert.cc
rename to server/teamserver/typeconvert.cc
diff --git a/server/groupserver/typeconvert.h b/server/teamserver/typeconvert.h
similarity index 100%
rename from server/groupserver/typeconvert.h
rename to server/teamserver/typeconvert.h
diff --git a/server/groupserver/types.cc b/server/teamserver/types.cc
similarity index 100%
rename from server/groupserver/types.cc
rename to server/teamserver/types.cc
diff --git a/server/groupserver/types.h b/server/teamserver/types.h
similarity index 100%
rename from server/groupserver/types.h
rename to server/teamserver/types.h
diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index 2067a99..890361f 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -25,14 +25,6 @@ enum CMMessageId_e
     _CMUpdateTempCustomData = 153;
     _CMUpdateUserInfo = 154;
 
-    _CMGroupCreate = 201;
-    _CMGroupJoin = 202;
-    _CMGroupAgree = 203;
-    _CMGroupKick = 204;
-    _CMGroupQuit = 205;
-    _CMGroupDismiss = 206;
-    _CMGroupRename = 207;
-
     _CMGuildMsgBegin = 230;
     _CMGuildCreate = 231;
     _CMGuildJoin = 232;
@@ -50,6 +42,15 @@ enum CMMessageId_e
     _CMGuildMemberPromote = 244;
     _CMGuildMemberFire = 245;
     _CMGuildMsgEnd = 270;
+
+    _CMTeamCreate = 301;
+    _CMTeamJoin = 302;
+    _CMTeamAgree = 303;
+    _CMTeamKick = 304;
+    _CMTeamQuit = 305;
+    _CMTeamDismiss = 306;
+    _CMTeamRename = 307;
+
 }
 
 enum SMMessageId_e
@@ -72,14 +73,6 @@ enum SMMessageId_e
     _SMQueryUserStatus = 116;
     _SMRecommandFriend = 117;
 
-    _SMGroupCreate = 201;
-    _SMGroupJoin = 202;
-    _SMGroupAgree = 203;
-    _SMGroupKick = 204;
-    _SMGroupQuit = 205;
-    _SMGroupDismiss = 206;
-    _SMGroupRename = 207;
-
     _SMGuildMsgBegin = 230;
     _SMGuildCreate = 231;
     _SMGuildJoin = 232;
@@ -98,6 +91,14 @@ enum SMMessageId_e
     _SMGuildMemberFire = 245;
     _SMGuildMsgEnd = 270;
 
+    _SMTeamCreate = 301;
+    _SMTeamJoin = 302;
+    _SMTeamAgree = 303;
+    _SMTeamKick = 304;
+    _SMTeamQuit = 305;
+    _SMTeamDismiss = 306;
+    _SMTeamRename = 307;
+
     _SMUserStatusNotify = 501;
     _SMUserInfoUpdate = 502;
     _SMCustomMsgNotify = 503;
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 1063307..c369e11 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -273,78 +273,78 @@ message SMFriendDeleteBlack
 }
 
 //建群
-message CMGroupCreate
+message CMTeamCreate
 {
     optional string group_name = 1; //群名称
 }
 //建群返回
-message SMGroupCreate
+message SMTeamCreate
 {
     optional int32 errcode = 1; //1:群已存在 2: 你已经有群
     optional string errmsg = 2; //错误消息
 }
 
 //加群
-message CMGroupJoin
+message CMTeamJoin
 {
     optional int64 group_id = 1; //群id
 }
 //加群返回
-message SMGroupJoin
+message SMTeamJoin
 {
     optional int32 errcode = 1; //1:群id不存在 2:群已满
     optional string errmsg = 2; //错误消息
 }
 
 //同意加群
-message CMGroupAgree
+message CMTeamAgree
 {
 }
-message SMGroupAgree
+message SMTeamAgree
 {
     optional int32 errcode = 1;
     optional string errmsg = 2;
 }
 
 //踢人
-message CMGroupKick
+message CMTeamKick
 {
     optional string account_id = 1;
 }
 
 //踢人回复
-message SMGroupKick
+message SMTeamKick
 {
     optional int32 errcode = 1; //1:群id错误
     optional string errmsg = 2; //错误消息
 }
 
 //退群
-message CMGroupQuit
+message CMTeamQuit
 {
 }
-message SMGroupQuit
+message SMTeamQuit
 {
     optional int32 errcode = 1; //错误码
     optional string errmsg = 2; //错误消息
 }
 
 //解散群
-message CMGroupDismiss
+message CMTeamDismiss
 {
 }
-message SMGroupDismiss
+message SMTeamDismiss
 {
     optional int32 errcode = 1; //错误码
     optional string errmsg = 2; //错误信息
 }
 
 //群改名
-message CMGroupRename
+message CMTeamRename
 {
     optional string new_group_name = 1; //新群名
 }
-message SMGroupRename
+message SMTeamRename
 {
     optional int32 errcode = 1; //错误码
     optional string errmsg = 2; //错误信息