diff --git a/.gitignore b/.gitignore
index 501d05e..1f8639d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # Wetware
 .envrc
-ww
 
 # Binaries for programs and plugins
 *.exe
diff --git a/Makefile b/Makefile
index 296796c..ceca8e4 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,5 @@ generate:
 publish: generate
 	ipfs add -r .
 
-binary: generate
-	go build -o ww cmd/main.go
-
 install:
-	go install github.com/wetware/go/cmd
+	go install github.com/wetware/go/cmd/ww
diff --git a/cmd/export/export.go b/cmd/internal/export/export.go
similarity index 100%
rename from cmd/export/export.go
rename to cmd/internal/export/export.go
diff --git a/cmd/run/run.go b/cmd/internal/run/run.go
similarity index 100%
rename from cmd/run/run.go
rename to cmd/internal/run/run.go
diff --git a/cmd/main.go b/cmd/ww/main.go
similarity index 89%
rename from cmd/main.go
rename to cmd/ww/main.go
index 8a8bc63..91e1d76 100644
--- a/cmd/main.go
+++ b/cmd/ww/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/lmittmann/tint"
 	"github.com/urfave/cli/v2"
 
-	"github.com/wetware/go/cmd/export"
-	"github.com/wetware/go/cmd/run"
+	"github.com/wetware/go/cmd/internal/export"
+	"github.com/wetware/go/cmd/internal/run"
 )
 
 func main() {
diff --git a/examples/hello-world/main.wasm b/examples/hello-world/main.wasm
index 4c8b2d9..3faf18a 100755
Binary files a/examples/hello-world/main.wasm and b/examples/hello-world/main.wasm differ
diff --git a/system/cmd/nop/main.wasm b/system/cmd/nop/main.wasm
index b69cfd3..2feb502 100755
Binary files a/system/cmd/nop/main.wasm and b/system/cmd/nop/main.wasm differ
diff --git a/system/testdata/testdata b/system/testdata/socket/testdata
similarity index 100%
rename from system/testdata/testdata
rename to system/testdata/socket/testdata