diff --git a/NOTICE.md b/NOTICE.md
deleted file mode 100644
index 5a9ef9f4e..000000000
--- a/NOTICE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2021-2022 Dashborg Inc
-
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
diff --git a/go.mod b/waveshell/go.mod
similarity index 100%
rename from go.mod
rename to waveshell/go.mod
diff --git a/go.sum b/waveshell/go.sum
similarity index 100%
rename from go.sum
rename to waveshell/go.sum
diff --git a/main-mshell.go b/waveshell/main-waveshell.go
similarity index 100%
rename from main-mshell.go
rename to waveshell/main-waveshell.go
diff --git a/pkg/base/base.go b/waveshell/pkg/base/base.go
similarity index 100%
rename from pkg/base/base.go
rename to waveshell/pkg/base/base.go
diff --git a/pkg/base/optsiter.go b/waveshell/pkg/base/optsiter.go
similarity index 100%
rename from pkg/base/optsiter.go
rename to waveshell/pkg/base/optsiter.go
diff --git a/pkg/binpack/binpack.go b/waveshell/pkg/binpack/binpack.go
similarity index 100%
rename from pkg/binpack/binpack.go
rename to waveshell/pkg/binpack/binpack.go
diff --git a/pkg/cirfile/cirfile.go b/waveshell/pkg/cirfile/cirfile.go
similarity index 100%
rename from pkg/cirfile/cirfile.go
rename to waveshell/pkg/cirfile/cirfile.go
diff --git a/pkg/cirfile/cirfile_test.go b/waveshell/pkg/cirfile/cirfile_test.go
similarity index 100%
rename from pkg/cirfile/cirfile_test.go
rename to waveshell/pkg/cirfile/cirfile_test.go
diff --git a/pkg/cmdtail/cmdtail.go b/waveshell/pkg/cmdtail/cmdtail.go
similarity index 100%
rename from pkg/cmdtail/cmdtail.go
rename to waveshell/pkg/cmdtail/cmdtail.go
diff --git a/pkg/mpio/bufreader.go b/waveshell/pkg/mpio/bufreader.go
similarity index 100%
rename from pkg/mpio/bufreader.go
rename to waveshell/pkg/mpio/bufreader.go
diff --git a/pkg/mpio/bufwriter.go b/waveshell/pkg/mpio/bufwriter.go
similarity index 100%
rename from pkg/mpio/bufwriter.go
rename to waveshell/pkg/mpio/bufwriter.go
diff --git a/pkg/mpio/mpio.go b/waveshell/pkg/mpio/mpio.go
similarity index 100%
rename from pkg/mpio/mpio.go
rename to waveshell/pkg/mpio/mpio.go
diff --git a/pkg/packet/combined.go b/waveshell/pkg/packet/combined.go
similarity index 100%
rename from pkg/packet/combined.go
rename to waveshell/pkg/packet/combined.go
diff --git a/pkg/packet/packet.go b/waveshell/pkg/packet/packet.go
similarity index 100%
rename from pkg/packet/packet.go
rename to waveshell/pkg/packet/packet.go
diff --git a/pkg/packet/parser.go b/waveshell/pkg/packet/parser.go
similarity index 100%
rename from pkg/packet/parser.go
rename to waveshell/pkg/packet/parser.go
diff --git a/pkg/packet/shellstate.go b/waveshell/pkg/packet/shellstate.go
similarity index 100%
rename from pkg/packet/shellstate.go
rename to waveshell/pkg/packet/shellstate.go
diff --git a/pkg/server/server.go b/waveshell/pkg/server/server.go
similarity index 100%
rename from pkg/server/server.go
rename to waveshell/pkg/server/server.go
diff --git a/pkg/shexec/client.go b/waveshell/pkg/shexec/client.go
similarity index 100%
rename from pkg/shexec/client.go
rename to waveshell/pkg/shexec/client.go
diff --git a/pkg/shexec/parser.go b/waveshell/pkg/shexec/parser.go
similarity index 100%
rename from pkg/shexec/parser.go
rename to waveshell/pkg/shexec/parser.go
diff --git a/pkg/shexec/shexec.go b/waveshell/pkg/shexec/shexec.go
similarity index 100%
rename from pkg/shexec/shexec.go
rename to waveshell/pkg/shexec/shexec.go
diff --git a/pkg/simpleexpand/simpleexpand.go b/waveshell/pkg/simpleexpand/simpleexpand.go
similarity index 100%
rename from pkg/simpleexpand/simpleexpand.go
rename to waveshell/pkg/simpleexpand/simpleexpand.go
diff --git a/pkg/statediff/linediff.go b/waveshell/pkg/statediff/linediff.go
similarity index 100%
rename from pkg/statediff/linediff.go
rename to waveshell/pkg/statediff/linediff.go
diff --git a/pkg/statediff/mapdiff.go b/waveshell/pkg/statediff/mapdiff.go
similarity index 100%
rename from pkg/statediff/mapdiff.go
rename to waveshell/pkg/statediff/mapdiff.go
diff --git a/pkg/statediff/statediff_test.go b/waveshell/pkg/statediff/statediff_test.go
similarity index 100%
rename from pkg/statediff/statediff_test.go
rename to waveshell/pkg/statediff/statediff_test.go
diff --git a/scripthaus.md b/waveshell/scripthaus.md
similarity index 66%
rename from scripthaus.md
rename to waveshell/scripthaus.md
index 57539e2bf..d6a26698d 100644
--- a/scripthaus.md
+++ b/waveshell/scripthaus.md
@@ -2,17 +2,17 @@
 ```bash
 # @scripthaus command build
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-mshell.go
+go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
 ```
 
 ```bash
 # @scripthaus command fullbuild
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-go build -ldflags="$GO_LDFLAGS" -o ~/.mshell/mshell-v0.2 main-mshell.go
-GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.amd64 main-mshell.go
-GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.arm64 main-mshell.go
-GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-mshell.go
-GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.arm64 main-mshell.go
+go build -ldflags="$GO_LDFLAGS" -o ~/.mshell/mshell-v0.2 main-waveshell.go
+GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.amd64 main-waveshell.go
+GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.arm64 main-waveshell.go
+GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
+GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.arm64 main-waveshell.go
 ```