diff --git a/cmake/myproto.cmake b/cmake/myproto.cmake
index 8e6c0cf..43832bc 100644
--- a/cmake/myproto.cmake
+++ b/cmake/myproto.cmake
@@ -1,7 +1,7 @@
 find_package(Protobuf CONFIG REQUIRED)
 
 set(PROTO_FILES
-        core/cmd/nekobox_core/server/gen/libcore.proto
+        core/server/gen/libcore.proto
         )
 
 add_library(myproto STATIC ${PROTO_FILES})
diff --git a/core/cmd/nekobox_core/gen/libcore.pb.go b/core/server/gen/libcore.pb.go
similarity index 100%
rename from core/cmd/nekobox_core/gen/libcore.pb.go
rename to core/server/gen/libcore.pb.go
diff --git a/core/cmd/nekobox_core/gen/libcore.proto b/core/server/gen/libcore.proto
similarity index 100%
rename from core/cmd/nekobox_core/gen/libcore.proto
rename to core/server/gen/libcore.proto
diff --git a/core/cmd/nekobox_core/gen/libcore_grpc.pb.go b/core/server/gen/libcore_grpc.pb.go
similarity index 100%
rename from core/cmd/nekobox_core/gen/libcore_grpc.pb.go
rename to core/server/gen/libcore_grpc.pb.go
diff --git a/core/cmd/nekobox_core/gen/update_proto.sh b/core/server/gen/update_proto.sh
similarity index 100%
rename from core/cmd/nekobox_core/gen/update_proto.sh
rename to core/server/gen/update_proto.sh
diff --git a/core/cmd/nekobox_core/go.mod b/core/server/go.mod
similarity index 100%
rename from core/cmd/nekobox_core/go.mod
rename to core/server/go.mod
diff --git a/core/cmd/nekobox_core/go.sum b/core/server/go.sum
similarity index 100%
rename from core/cmd/nekobox_core/go.sum
rename to core/server/go.sum
diff --git a/core/cmd/nekobox_core/internal/boxapi/go_http.go b/core/server/internal/boxapi/go_http.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxapi/go_http.go
rename to core/server/internal/boxapi/go_http.go
diff --git a/core/cmd/nekobox_core/internal/boxapi/go_net.go b/core/server/internal/boxapi/go_net.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxapi/go_net.go
rename to core/server/internal/boxapi/go_net.go
diff --git a/core/cmd/nekobox_core/internal/boxbox/api.go b/core/server/internal/boxbox/api.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxbox/api.go
rename to core/server/internal/boxbox/api.go
diff --git a/core/cmd/nekobox_core/internal/boxbox/box.go b/core/server/internal/boxbox/box.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxbox/box.go
rename to core/server/internal/boxbox/box.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/boxdns.go b/core/server/internal/boxdns/boxdns.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/boxdns.go
rename to core/server/internal/boxdns/boxdns.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go b/core/server/internal/boxdns/dns_manager_windows.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/dns_manager_windows.go
rename to core/server/internal/boxdns/dns_manager_windows.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/monitor_windows.go b/core/server/internal/boxdns/monitor_windows.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/monitor_windows.go
rename to core/server/internal/boxdns/monitor_windows.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/underlying_dns.go b/core/server/internal/boxdns/underlying_dns.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/underlying_dns.go
rename to core/server/internal/boxdns/underlying_dns.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go b/core/server/internal/boxdns/winipcfg/interface_change_handler.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/interface_change_handler.go
rename to core/server/internal/boxdns/winipcfg/interface_change_handler.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go b/core/server/internal/boxdns/winipcfg/luid.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/luid.go
rename to core/server/internal/boxdns/winipcfg/luid.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go b/core/server/internal/boxdns/winipcfg/mksyscall.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/mksyscall.go
rename to core/server/internal/boxdns/winipcfg/mksyscall.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go b/core/server/internal/boxdns/winipcfg/netsh.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/netsh.go
rename to core/server/internal/boxdns/winipcfg/netsh.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go b/core/server/internal/boxdns/winipcfg/route_change_handler.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/route_change_handler.go
rename to core/server/internal/boxdns/winipcfg/route_change_handler.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go b/core/server/internal/boxdns/winipcfg/types.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types.go
rename to core/server/internal/boxdns/winipcfg/types.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go b/core/server/internal/boxdns/winipcfg/types_32.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types_32.go
rename to core/server/internal/boxdns/winipcfg/types_32.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go b/core/server/internal/boxdns/winipcfg/types_64.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types_64.go
rename to core/server/internal/boxdns/winipcfg/types_64.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go b/core/server/internal/boxdns/winipcfg/types_test.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test.go
rename to core/server/internal/boxdns/winipcfg/types_test.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go b/core/server/internal/boxdns/winipcfg/types_test_32.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_32.go
rename to core/server/internal/boxdns/winipcfg/types_test_32.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go b/core/server/internal/boxdns/winipcfg/types_test_64.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/types_test_64.go
rename to core/server/internal/boxdns/winipcfg/types_test_64.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go b/core/server/internal/boxdns/winipcfg/unicast_address_change_handler.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/unicast_address_change_handler.go
rename to core/server/internal/boxdns/winipcfg/unicast_address_change_handler.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go b/core/server/internal/boxdns/winipcfg/winipcfg.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg.go
rename to core/server/internal/boxdns/winipcfg/winipcfg.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go b/core/server/internal/boxdns/winipcfg/winipcfg_test.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/winipcfg_test.go
rename to core/server/internal/boxdns/winipcfg/winipcfg_test.go
diff --git a/core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go b/core/server/internal/boxdns/winipcfg/zwinipcfg_windows.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxdns/winipcfg/zwinipcfg_windows.go
rename to core/server/internal/boxdns/winipcfg/zwinipcfg_windows.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_check.go b/core/server/internal/boxmain/cmd_check.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_check.go
rename to core/server/internal/boxmain/cmd_check.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go b/core/server/internal/boxmain/cmd_geoip.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geoip.go
rename to core/server/internal/boxmain/cmd_geoip.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go b/core/server/internal/boxmain/cmd_geoip_export.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geoip_export.go
rename to core/server/internal/boxmain/cmd_geoip_export.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go b/core/server/internal/boxmain/cmd_geoip_list.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geoip_list.go
rename to core/server/internal/boxmain/cmd_geoip_list.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go b/core/server/internal/boxmain/cmd_geosite.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geosite.go
rename to core/server/internal/boxmain/cmd_geosite.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go b/core/server/internal/boxmain/cmd_geosite_export.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geosite_export.go
rename to core/server/internal/boxmain/cmd_geosite_export.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go b/core/server/internal/boxmain/cmd_geosite_list.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_geosite_list.go
rename to core/server/internal/boxmain/cmd_geosite_list.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go b/core/server/internal/boxmain/cmd_rule_set_compile.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_rule_set_compile.go
rename to core/server/internal/boxmain/cmd_rule_set_compile.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_run.go b/core/server/internal/boxmain/cmd_run.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_run.go
rename to core/server/internal/boxmain/cmd_run.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/cmd_version.go b/core/server/internal/boxmain/cmd_version.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/cmd_version.go
rename to core/server/internal/boxmain/cmd_version.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/color.go b/core/server/internal/boxmain/color.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/color.go
rename to core/server/internal/boxmain/color.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/debug.go b/core/server/internal/boxmain/debug.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/debug.go
rename to core/server/internal/boxmain/debug.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/debug_linux.go b/core/server/internal/boxmain/debug_linux.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/debug_linux.go
rename to core/server/internal/boxmain/debug_linux.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/debug_stub.go b/core/server/internal/boxmain/debug_stub.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/debug_stub.go
rename to core/server/internal/boxmain/debug_stub.go
diff --git a/core/cmd/nekobox_core/internal/boxmain/main.go b/core/server/internal/boxmain/main.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/boxmain/main.go
rename to core/server/internal/boxmain/main.go
diff --git a/core/cmd/nekobox_core/internal/distro/all/all.go b/core/server/internal/distro/all/all.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/distro/all/all.go
rename to core/server/internal/distro/all/all.go
diff --git a/core/cmd/nekobox_core/internal/sys/set_dns_darwin.go b/core/server/internal/sys/set_dns_darwin.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/sys/set_dns_darwin.go
rename to core/server/internal/sys/set_dns_darwin.go
diff --git a/core/cmd/nekobox_core/internal/sys/set_dns_stub.go b/core/server/internal/sys/set_dns_stub.go
similarity index 100%
rename from core/cmd/nekobox_core/internal/sys/set_dns_stub.go
rename to core/server/internal/sys/set_dns_stub.go
diff --git a/core/cmd/nekobox_core/main.go b/core/server/main.go
similarity index 100%
rename from core/cmd/nekobox_core/main.go
rename to core/server/main.go
diff --git a/core/cmd/nekobox_core/server.go b/core/server/server.go
similarity index 100%
rename from core/cmd/nekobox_core/server.go
rename to core/server/server.go
diff --git a/core/cmd/nekobox_core/server_windows.go b/core/server/server_windows.go
similarity index 100%
rename from core/cmd/nekobox_core/server_windows.go
rename to core/server/server_windows.go
diff --git a/core/cmd/nekobox_core/test_utils.go b/core/server/test_utils.go
similarity index 100%
rename from core/cmd/nekobox_core/test_utils.go
rename to core/server/test_utils.go
diff --git a/core/cmd/updater/.gitignore b/core/updater/.gitignore
similarity index 100%
rename from core/cmd/updater/.gitignore
rename to core/updater/.gitignore
diff --git a/core/cmd/updater/go.mod b/core/updater/go.mod
similarity index 100%
rename from core/cmd/updater/go.mod
rename to core/updater/go.mod
diff --git a/core/cmd/updater/go.sum b/core/updater/go.sum
similarity index 100%
rename from core/cmd/updater/go.sum
rename to core/updater/go.sum
diff --git a/core/cmd/updater/main.go b/core/updater/main.go
similarity index 100%
rename from core/cmd/updater/main.go
rename to core/updater/main.go
diff --git a/core/cmd/updater/msgbox.go b/core/updater/msgbox.go
similarity index 100%
rename from core/cmd/updater/msgbox.go
rename to core/updater/msgbox.go
diff --git a/core/cmd/updater/msgbox_windows.go b/core/updater/msgbox_windows.go
similarity index 100%
rename from core/cmd/updater/msgbox_windows.go
rename to core/updater/msgbox_windows.go
diff --git a/core/cmd/updater/updater.go b/core/updater/updater.go
similarity index 100%
rename from core/cmd/updater/updater.go
rename to core/updater/updater.go
diff --git a/script/build_go.sh b/script/build_go.sh
index 0907c11..38c5b0d 100755
--- a/script/build_go.sh
+++ b/script/build_go.sh
@@ -19,12 +19,12 @@ mkdir -p $DEST
 export CGO_ENABLED=0
 
 #### Go: updater ####
-pushd core/cmd/updater
+pushd core/updater
 [ "$GOOS" == "darwin" ] || go build -o $DEST -trimpath -ldflags "-w -s"
 popd
 
-#### Go: nekobox_core ####
-pushd core/cmd/nekobox_core
+#### Go: core ####
+pushd core/server
 VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box)
 go build -v -o $DEST -trimpath -ldflags "-w -s -X 'github.com/sagernet/sing-box/constant.Version=${VERSION_SINGBOX}'" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp"
 popd