diff --git a/.air.toml b/.air.toml
index 6792b7b..38e0144 100644
--- a/.air.toml
+++ b/.air.toml
@@ -5,14 +5,14 @@ tmp_dir = "tmp"
 [build]
   args_bin = []
   bin = "./coolify"
-  cmd = "go build -o ./coolify ."
+  cmd = "go build -o ./coolify ./coolify"
   delay = 1000
   exclude_dir = ["assets", "tmp", "vendor", "testdata", ".git", ".conductor"]
   exclude_file = []
   exclude_regex = ["_test.go"]
   exclude_unchanged = false
   follow_symlink = false
-  full_bin = "echo 'Build complete. Binary: ./coolify'"
+  full_bin = "echo 'Build complete. Binary: ./coolify/coolify'"
   include_dir = []
   include_ext = ["go", "tpl", "tmpl", "html"]
   include_file = []
diff --git a/CLAUDE.md b/CLAUDE.md
index c764cc5..90f54be 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -67,13 +67,13 @@ go build -o coolify ./coolify
 
 ### Run locally
 ```bash
-go run ./coolify [command]
+go run ./coolify/coolify [command]
 ```
 
 ### Test a command
 ```bash
-go run ./coolify context list
-go run ./coolify servers list --debug
+go run ./coolify/coolify context list
+go run ./coolify/coolify servers list --debug
 ```
 
 ### Install locally
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b3e904c..cd4b260 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,7 +37,7 @@ git clone https://github.com/YOUR_USERNAME/coolify-cli.git
 cd coolify-cli
 
 # Build the CLI
-go build -o coolify .
+go build -o coolify ./coolify
 
 # Install locally
 go install
@@ -47,14 +47,14 @@ go install
 
 ```bash
 # Run without installing
-go run main.go [command]
+go run ./coolify [command]
 
 # Example commands
-go run main.go context list
-go run main.go server list --debug
+go run ./coolify context list
+go run ./coolify server list --debug
 
 # With flags
-go run main.go server list --format json --debug
+go run ./coolify server list --format json --debug
 ```
 
 ### Project Structure
diff --git a/README.md b/README.md
index e2ab288..42c9236 100644
--- a/README.md
+++ b/README.md
@@ -457,7 +457,7 @@ This CLI follows a clean architecture with:
 
 ```bash
 # Build
-go build -o coolify .
+go build -o coolify ./coolify
 
 # Run tests
 go test ./...
@@ -466,7 +466,7 @@ go test ./...
 go test -cover ./...
 
 # Install locally
-go install
+go install ./coolify
 ```
 
 ## Contributing
diff --git a/conductor-setup.sh b/conductor-setup.sh
index 46f3099..2c5a86b 100755
--- a/conductor-setup.sh
+++ b/conductor-setup.sh
@@ -47,11 +47,11 @@ fi
 
 # Build the binary
 echo "🔨 Building coolify binary..."
-if ! go build -o coolify .; then
+if ! go build -o coolify ./coolify; then
     echo "❌ Error: Build failed"
     exit 1
 fi
 
-echo "✅ Binary built successfully: ./coolify"
+echo "✅ Binary built successfully: ./coolify/coolify"
 echo "🎉 Workspace setup complete!"
 echo "🔥 Use the run script for hot reload during development"