diff --git a/server/imserver_new/app/app.go b/server/imserver/app/app.go
similarity index 100%
rename from server/imserver_new/app/app.go
rename to server/imserver/app/app.go
diff --git a/server/imserver_new/app/export.go b/server/imserver/app/export.go
similarity index 100%
rename from server/imserver_new/app/export.go
rename to server/imserver/app/export.go
diff --git a/server/imserver_new/cache/cachemgr.go b/server/imserver/cache/cachemgr.go
similarity index 100%
rename from server/imserver_new/cache/cachemgr.go
rename to server/imserver/cache/cachemgr.go
diff --git a/server/imserver_new/cache/export.go b/server/imserver/cache/export.go
similarity index 100%
rename from server/imserver_new/cache/export.go
rename to server/imserver/cache/export.go
diff --git a/server/imserver_new/cache/user_profile.go b/server/imserver/cache/user_profile.go
similarity index 100%
rename from server/imserver_new/cache/user_profile.go
rename to server/imserver/cache/user_profile.go
diff --git a/server/imserver_new/common/types.go b/server/imserver/common/types.go
similarity index 100%
rename from server/imserver_new/common/types.go
rename to server/imserver/common/types.go
diff --git a/server/imserver_new/constant/constant.go b/server/imserver/constant/constant.go
similarity index 100%
rename from server/imserver_new/constant/constant.go
rename to server/imserver/constant/constant.go
diff --git a/server/imserver_new/cs/cs.auto_gen.go b/server/imserver/cs/cs.auto_gen.go
similarity index 100%
rename from server/imserver_new/cs/cs.auto_gen.go
rename to server/imserver/cs/cs.auto_gen.go
diff --git a/server/imserver_new/cs/go.mod b/server/imserver/cs/go.mod
similarity index 100%
rename from server/imserver_new/cs/go.mod
rename to server/imserver/cs/go.mod
diff --git a/server/imserver_new/cs/go.sum b/server/imserver/cs/go.sum
similarity index 100%
rename from server/imserver_new/cs/go.sum
rename to server/imserver/cs/go.sum
diff --git a/server/imserver_new/dblog/dblogmgr.go b/server/imserver/dblog/dblogmgr.go
similarity index 100%
rename from server/imserver_new/dblog/dblogmgr.go
rename to server/imserver/dblog/dblogmgr.go
diff --git a/server/imserver_new/dblog/export.go b/server/imserver/dblog/export.go
similarity index 100%
rename from server/imserver_new/dblog/export.go
rename to server/imserver/dblog/export.go
diff --git a/server/imserver_new/friend/export.go b/server/imserver/friend/export.go
similarity index 100%
rename from server/imserver_new/friend/export.go
rename to server/imserver/friend/export.go
diff --git a/server/imserver_new/friend/friendmgr.go b/server/imserver/friend/friendmgr.go
similarity index 100%
rename from server/imserver_new/friend/friendmgr.go
rename to server/imserver/friend/friendmgr.go
diff --git a/server/imserver_new/global/global.go b/server/imserver/global/global.go
similarity index 100%
rename from server/imserver_new/global/global.go
rename to server/imserver/global/global.go
diff --git a/server/imserver_new/go.mod b/server/imserver/go.mod
similarity index 100%
rename from server/imserver_new/go.mod
rename to server/imserver/go.mod
diff --git a/server/imserver_new/go.sum b/server/imserver/go.sum
similarity index 100%
rename from server/imserver_new/go.sum
rename to server/imserver/go.sum
diff --git a/server/imserver_new/guild/export.go b/server/imserver/guild/export.go
similarity index 100%
rename from server/imserver_new/guild/export.go
rename to server/imserver/guild/export.go
diff --git a/server/imserver_new/guild/guild.go b/server/imserver/guild/guild.go
similarity index 100%
rename from server/imserver_new/guild/guild.go
rename to server/imserver/guild/guild.go
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver/guild/guildmgr.go
similarity index 100%
rename from server/imserver_new/guild/guildmgr.go
rename to server/imserver/guild/guildmgr.go
diff --git a/server/imserver_new/guild/member.go b/server/imserver/guild/member.go
similarity index 100%
rename from server/imserver_new/guild/member.go
rename to server/imserver/guild/member.go
diff --git a/server/imserver_new/initialize/enter.go b/server/imserver/initialize/enter.go
similarity index 100%
rename from server/imserver_new/initialize/enter.go
rename to server/imserver/initialize/enter.go
diff --git a/server/imserver_new/listener/export.go b/server/imserver/listener/export.go
similarity index 100%
rename from server/imserver_new/listener/export.go
rename to server/imserver/listener/export.go
diff --git a/server/imserver_new/listener/handlermgr.go b/server/imserver/listener/handlermgr.go
similarity index 100%
rename from server/imserver_new/listener/handlermgr.go
rename to server/imserver/listener/handlermgr.go
diff --git a/server/imserver_new/listener/wsplistener.go b/server/imserver/listener/wsplistener.go
similarity index 100%
rename from server/imserver_new/listener/wsplistener.go
rename to server/imserver/listener/wsplistener.go
diff --git a/server/imserver_new/main.go b/server/imserver/main.go
similarity index 100%
rename from server/imserver_new/main.go
rename to server/imserver/main.go
diff --git a/server/imserver_new/makefile b/server/imserver/makefile
similarity index 100%
rename from server/imserver_new/makefile
rename to server/imserver/makefile
diff --git a/server/imserver_new/model/friend.go b/server/imserver/model/friend.go
similarity index 100%
rename from server/imserver_new/model/friend.go
rename to server/imserver/model/friend.go
diff --git a/server/imserver_new/model/friend_apply.go b/server/imserver/model/friend_apply.go
similarity index 100%
rename from server/imserver_new/model/friend_apply.go
rename to server/imserver/model/friend_apply.go
diff --git a/server/imserver_new/model/friend_black.go b/server/imserver/model/friend_black.go
similarity index 100%
rename from server/imserver_new/model/friend_black.go
rename to server/imserver/model/friend_black.go
diff --git a/server/imserver_new/model/guild.go b/server/imserver/model/guild.go
similarity index 100%
rename from server/imserver_new/model/guild.go
rename to server/imserver/model/guild.go
diff --git a/server/imserver_new/model/guild_apply.go b/server/imserver/model/guild_apply.go
similarity index 100%
rename from server/imserver_new/model/guild_apply.go
rename to server/imserver/model/guild_apply.go
diff --git a/server/imserver_new/model/guild_member.go b/server/imserver/model/guild_member.go
similarity index 100%
rename from server/imserver_new/model/guild_member.go
rename to server/imserver/model/guild_member.go
diff --git a/server/imserver_new/mt/Config.go b/server/imserver/mt/Config.go
similarity index 100%
rename from server/imserver_new/mt/Config.go
rename to server/imserver/mt/Config.go
diff --git a/server/imserver_new/mt/FriendDb.go b/server/imserver/mt/FriendDb.go
similarity index 100%
rename from server/imserver_new/mt/FriendDb.go
rename to server/imserver/mt/FriendDb.go
diff --git a/server/imserver_new/mt/GameDb.go b/server/imserver/mt/GameDb.go
similarity index 100%
rename from server/imserver_new/mt/GameDb.go
rename to server/imserver/mt/GameDb.go
diff --git a/server/imserver_new/mt/IMCluster.go b/server/imserver/mt/IMCluster.go
similarity index 100%
rename from server/imserver_new/mt/IMCluster.go
rename to server/imserver/mt/IMCluster.go
diff --git a/server/imserver_new/mt/MasterCluster.go b/server/imserver/mt/MasterCluster.go
similarity index 100%
rename from server/imserver_new/mt/MasterCluster.go
rename to server/imserver/mt/MasterCluster.go
diff --git a/server/imserver_new/mt/export.go b/server/imserver/mt/export.go
similarity index 100%
rename from server/imserver_new/mt/export.go
rename to server/imserver/mt/export.go
diff --git a/server/imserver_new/mt/go.mod b/server/imserver/mt/go.mod
similarity index 100%
rename from server/imserver_new/mt/go.mod
rename to server/imserver/mt/go.mod
diff --git a/server/imserver_new/mtb/go.mod b/server/imserver/mtb/go.mod
similarity index 100%
rename from server/imserver_new/mtb/go.mod
rename to server/imserver/mtb/go.mod
diff --git a/server/imserver_new/mtb/go.sum b/server/imserver/mtb/go.sum
similarity index 100%
rename from server/imserver_new/mtb/go.sum
rename to server/imserver/mtb/go.sum
diff --git a/server/imserver_new/mtb/mtb.auto_gen.go b/server/imserver/mtb/mtb.auto_gen.go
similarity index 100%
rename from server/imserver_new/mtb/mtb.auto_gen.go
rename to server/imserver/mtb/mtb.auto_gen.go
diff --git a/server/imserver_new/player/export.go b/server/imserver/player/export.go
similarity index 100%
rename from server/imserver_new/player/export.go
rename to server/imserver/player/export.go
diff --git a/server/imserver_new/player/player.go b/server/imserver/player/player.go
similarity index 100%
rename from server/imserver_new/player/player.go
rename to server/imserver/player/player.go
diff --git a/server/imserver_new/player/playermgr.go b/server/imserver/player/playermgr.go
similarity index 100%
rename from server/imserver_new/player/playermgr.go
rename to server/imserver/player/playermgr.go
diff --git a/server/imserver_new/proto/cs_msgid.proto b/server/imserver/proto/cs_msgid.proto
similarity index 100%
rename from server/imserver_new/proto/cs_msgid.proto
rename to server/imserver/proto/cs_msgid.proto
diff --git a/server/imserver_new/proto/cs_proto.proto b/server/imserver/proto/cs_proto.proto
similarity index 100%
rename from server/imserver_new/proto/cs_proto.proto
rename to server/imserver/proto/cs_proto.proto
diff --git a/server/imserver_new/proto/mt.proto b/server/imserver/proto/mt.proto
similarity index 100%
rename from server/imserver_new/proto/mt.proto
rename to server/imserver/proto/mt.proto
diff --git a/server/imserver_new/proto/protoc-gen.bat b/server/imserver/proto/protoc-gen.bat
similarity index 100%
rename from server/imserver_new/proto/protoc-gen.bat
rename to server/imserver/proto/protoc-gen.bat
diff --git a/server/imserver_new/proto/ss_msgid.proto b/server/imserver/proto/ss_msgid.proto
similarity index 100%
rename from server/imserver_new/proto/ss_msgid.proto
rename to server/imserver/proto/ss_msgid.proto
diff --git a/server/imserver_new/proto/ss_proto.proto b/server/imserver/proto/ss_proto.proto
similarity index 100%
rename from server/imserver_new/proto/ss_proto.proto
rename to server/imserver/proto/ss_proto.proto
diff --git a/server/imserver_new/ss/go.mod b/server/imserver/ss/go.mod
similarity index 100%
rename from server/imserver_new/ss/go.mod
rename to server/imserver/ss/go.mod
diff --git a/server/imserver_new/ss/go.sum b/server/imserver/ss/go.sum
similarity index 100%
rename from server/imserver_new/ss/go.sum
rename to server/imserver/ss/go.sum
diff --git a/server/imserver_new/ss/ss.auto_gen.go b/server/imserver/ss/ss.auto_gen.go
similarity index 100%
rename from server/imserver_new/ss/ss.auto_gen.go
rename to server/imserver/ss/ss.auto_gen.go