diff --git a/waveshell/go.mod b/waveshell/go.mod
index 7fd6d4cd..a199d79b 100644
--- a/waveshell/go.mod
+++ b/waveshell/go.mod
@@ -1,4 +1,4 @@
-module github.com/commandlinedev/apishell
+module github.com/wavetermdev/waveterm/waveshell
 
 go 1.18
 
diff --git a/waveshell/main-waveshell.go b/waveshell/main-waveshell.go
index 36b8ce1c..086ad0be 100644
--- a/waveshell/main-waveshell.go
+++ b/waveshell/main-waveshell.go
@@ -9,10 +9,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/server"
-	"github.com/commandlinedev/apishell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/server"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/waveshell/pkg/cmdtail/cmdtail.go b/waveshell/pkg/cmdtail/cmdtail.go
index 2578c3b5..f60ed67e 100644
--- a/waveshell/pkg/cmdtail/cmdtail.go
+++ b/waveshell/pkg/cmdtail/cmdtail.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/fsnotify/fsnotify"
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
 )
 
 const MaxDataBytes = 4096
diff --git a/waveshell/pkg/mpio/bufreader.go b/waveshell/pkg/mpio/bufreader.go
index ab4f5709..f3ad32e8 100644
--- a/waveshell/pkg/mpio/bufreader.go
+++ b/waveshell/pkg/mpio/bufreader.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/commandlinedev/apishell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
 )
 
 type FdReader struct {
diff --git a/waveshell/pkg/mpio/mpio.go b/waveshell/pkg/mpio/mpio.go
index fe8fed09..d58dd5f6 100644
--- a/waveshell/pkg/mpio/mpio.go
+++ b/waveshell/pkg/mpio/mpio.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
 )
 
 const ReadBufSize = 128 * 1024
diff --git a/waveshell/pkg/packet/packet.go b/waveshell/pkg/packet/packet.go
index 30c36f77..88ce0420 100644
--- a/waveshell/pkg/packet/packet.go
+++ b/waveshell/pkg/packet/packet.go
@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/commandlinedev/apishell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
 )
 
 // single          : <init, >run, >cmddata, >cmddone, <cmdstart, <>data, <>dataack, <cmddone
diff --git a/waveshell/pkg/packet/shellstate.go b/waveshell/pkg/packet/shellstate.go
index bcf59f27..33907238 100644
--- a/waveshell/pkg/packet/shellstate.go
+++ b/waveshell/pkg/packet/shellstate.go
@@ -7,8 +7,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/commandlinedev/apishell/pkg/binpack"
-	"github.com/commandlinedev/apishell/pkg/statediff"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/binpack"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/statediff"
 )
 
 const ShellStatePackVersion = 0
diff --git a/waveshell/pkg/server/server.go b/waveshell/pkg/server/server.go
index 3ccbb318..fa0bcb5b 100644
--- a/waveshell/pkg/server/server.go
+++ b/waveshell/pkg/server/server.go
@@ -15,9 +15,9 @@ import (
 	"time"
 
 	"github.com/alessio/shellescape"
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/shexec"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/shexec"
 )
 
 const MaxFileDataPacketSize = 16 * 1024
diff --git a/waveshell/pkg/shexec/client.go b/waveshell/pkg/shexec/client.go
index c6292b82..14d8c9d9 100644
--- a/waveshell/pkg/shexec/client.go
+++ b/waveshell/pkg/shexec/client.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
 	"golang.org/x/mod/semver"
 )
 
diff --git a/waveshell/pkg/shexec/parser.go b/waveshell/pkg/shexec/parser.go
index 5123d444..215a4c05 100644
--- a/waveshell/pkg/shexec/parser.go
+++ b/waveshell/pkg/shexec/parser.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	"github.com/alessio/shellescape"
-	"github.com/commandlinedev/apishell/pkg/packet"
-	"github.com/commandlinedev/apishell/pkg/simpleexpand"
-	"github.com/commandlinedev/apishell/pkg/statediff"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/statediff"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/syntax"
 )
diff --git a/waveshell/pkg/shexec/shexec.go b/waveshell/pkg/shexec/shexec.go
index d5dc865f..d5912194 100644
--- a/waveshell/pkg/shexec/shexec.go
+++ b/waveshell/pkg/shexec/shexec.go
@@ -18,10 +18,10 @@ import (
 	"time"
 
 	"github.com/alessio/shellescape"
-	"github.com/commandlinedev/apishell/pkg/base"
-	"github.com/commandlinedev/apishell/pkg/cirfile"
-	"github.com/commandlinedev/apishell/pkg/mpio"
-	"github.com/commandlinedev/apishell/pkg/packet"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/base"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/cirfile"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/mpio"
+	"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
 	"github.com/creack/pty"
 	"golang.org/x/mod/semver"
 	"golang.org/x/sys/unix"