diff --git a/.goreleaser-client-only-all.yml b/.goreleaser-client-only-all.yml
index 512b52e..e522e6e 100644
--- a/.goreleaser-client-only-all.yml
+++ b/.goreleaser-client-only-all.yml
@@ -18,7 +18,7 @@ before:
 builds:
   - 
     id: "ssh3"
-    main: ./cli/client/main.go
+    main: ./cmd/ssh3/main.go
     binary: ssh3
     goos:
       - linux
diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml
index a85caeb..5a8de24 100644
--- a/.goreleaser-darwin.yml
+++ b/.goreleaser-darwin.yml
@@ -18,7 +18,7 @@ before:
 builds:
   - 
     id: "ssh3"
-    main: ./cli/client/main.go
+    main: ./cmd/ssh3/main.go
     binary: ssh3
     env:
       - CGO_ENABLED=1
diff --git a/.goreleaser-linux-amd64.yml b/.goreleaser-linux-amd64.yml
index 680c936..c9ffc08 100644
--- a/.goreleaser-linux-amd64.yml
+++ b/.goreleaser-linux-amd64.yml
@@ -18,7 +18,7 @@ before:
 builds:
   - 
     id: "ssh3"
-    main: ./cli/client/main.go
+    main: ./cmd/ssh3/main.go
     binary: ssh3
     goos:
       - linux
@@ -31,7 +31,7 @@ builds:
       - feature
   - 
     id: "ssh3-server"
-    main: ./cli/server/main.go
+    main: ./cmd/ssh3-server/main.go
     binary: ssh3-server
     env:
       - CGO_ENABLED=1
diff --git a/.goreleaser-linux-arm64.yml b/.goreleaser-linux-arm64.yml
index 44671cf..1eb3e59 100644
--- a/.goreleaser-linux-arm64.yml
+++ b/.goreleaser-linux-arm64.yml
@@ -18,7 +18,7 @@ before:
 builds:
   - 
     id: "ssh3"
-    main: ./cli/client/main.go
+    main: ./cmd/ssh3/main.go
     binary: ssh3
     goos:
       - linux
@@ -31,7 +31,7 @@ builds:
       - feature
   - 
     id: "ssh3-server"
-    main: ./cli/server/main.go
+    main: ./cmd/ssh3-server/main.go
     binary: ssh3-server
     env:
       - CC=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc