diff --git a/cmd/open_im_api/Makefile b/cmd/api/Makefile
similarity index 100%
rename from cmd/open_im_api/Makefile
rename to cmd/api/Makefile
diff --git a/cmd/open_im_api/main.go b/cmd/api/main.go
similarity index 100%
rename from cmd/open_im_api/main.go
rename to cmd/api/main.go
diff --git a/cmd/open_im_cmd_utils/Makefile b/cmd/cmdutils/Makefile
similarity index 100%
rename from cmd/open_im_cmd_utils/Makefile
rename to cmd/cmdutils/Makefile
diff --git a/cmd/open_im_cmd_utils/main.go b/cmd/cmdutils/main.go
similarity index 100%
rename from cmd/open_im_cmd_utils/main.go
rename to cmd/cmdutils/main.go
diff --git a/cmd/open_im_cron_task/Makefile b/cmd/crontask/Makefile
similarity index 100%
rename from cmd/open_im_cron_task/Makefile
rename to cmd/crontask/Makefile
diff --git a/cmd/open_im_cron_task/main.go b/cmd/crontask/main.go
similarity index 100%
rename from cmd/open_im_cron_task/main.go
rename to cmd/crontask/main.go
diff --git a/cmd/open_im_msg_gateway/Makefile b/cmd/msggateway/Makefile
similarity index 100%
rename from cmd/open_im_msg_gateway/Makefile
rename to cmd/msggateway/Makefile
diff --git a/cmd/open_im_msg_gateway/main.go b/cmd/msggateway/main.go
similarity index 100%
rename from cmd/open_im_msg_gateway/main.go
rename to cmd/msggateway/main.go
diff --git a/cmd/open_im_msg_transfer/Makefile b/cmd/msgtransfer/Makefile
similarity index 100%
rename from cmd/open_im_msg_transfer/Makefile
rename to cmd/msgtransfer/Makefile
diff --git a/cmd/open_im_msg_transfer/main.go b/cmd/msgtransfer/main.go
similarity index 100%
rename from cmd/open_im_msg_transfer/main.go
rename to cmd/msgtransfer/main.go
diff --git a/cmd/open_im_push/Makefile b/cmd/push/Makefile
similarity index 100%
rename from cmd/open_im_push/Makefile
rename to cmd/push/Makefile
diff --git a/cmd/open_im_push/main.go b/cmd/push/main.go
similarity index 100%
rename from cmd/open_im_push/main.go
rename to cmd/push/main.go
diff --git a/cmd/rpc/open_im_auth/Makefile b/cmd/rpc/auth/Makefile
similarity index 100%
rename from cmd/rpc/open_im_auth/Makefile
rename to cmd/rpc/auth/Makefile
diff --git a/cmd/rpc/open_im_auth/main.go b/cmd/rpc/auth/main.go
similarity index 100%
rename from cmd/rpc/open_im_auth/main.go
rename to cmd/rpc/auth/main.go
diff --git a/cmd/rpc/open_im_conversation/Makefile b/cmd/rpc/conversation/Makefile
similarity index 100%
rename from cmd/rpc/open_im_conversation/Makefile
rename to cmd/rpc/conversation/Makefile
diff --git a/cmd/rpc/open_im_conversation/main.go b/cmd/rpc/conversation/main.go
similarity index 100%
rename from cmd/rpc/open_im_conversation/main.go
rename to cmd/rpc/conversation/main.go
diff --git a/cmd/rpc/open_im_friend/Makefile b/cmd/rpc/friend/Makefile
similarity index 100%
rename from cmd/rpc/open_im_friend/Makefile
rename to cmd/rpc/friend/Makefile
diff --git a/cmd/rpc/open_im_friend/main.go b/cmd/rpc/friend/main.go
similarity index 100%
rename from cmd/rpc/open_im_friend/main.go
rename to cmd/rpc/friend/main.go
diff --git a/cmd/rpc/open_im_group/Makefile b/cmd/rpc/group/Makefile
similarity index 100%
rename from cmd/rpc/open_im_group/Makefile
rename to cmd/rpc/group/Makefile
diff --git a/cmd/rpc/open_im_group/main.go b/cmd/rpc/group/main.go
similarity index 100%
rename from cmd/rpc/open_im_group/main.go
rename to cmd/rpc/group/main.go
diff --git a/cmd/rpc/open_im_msg/Makefile b/cmd/rpc/msg/Makefile
similarity index 100%
rename from cmd/rpc/open_im_msg/Makefile
rename to cmd/rpc/msg/Makefile
diff --git a/cmd/rpc/open_im_msg/main.go b/cmd/rpc/msg/main.go
similarity index 100%
rename from cmd/rpc/open_im_msg/main.go
rename to cmd/rpc/msg/main.go
diff --git a/cmd/rpc/open_im_third/main.go b/cmd/rpc/third/main.go
similarity index 100%
rename from cmd/rpc/open_im_third/main.go
rename to cmd/rpc/third/main.go
diff --git a/cmd/rpc/open_im_user/Makefile b/cmd/rpc/user/Makefile
similarity index 100%
rename from cmd/rpc/open_im_user/Makefile
rename to cmd/rpc/user/Makefile
diff --git a/cmd/rpc/open_im_user/main.go b/cmd/rpc/user/main.go
similarity index 100%
rename from cmd/rpc/open_im_user/main.go
rename to cmd/rpc/user/main.go