diff --git a/cmd/pnl.go b/cmd/pnl.go
index da5113c78..5bfc650e7 100644
--- a/cmd/pnl.go
+++ b/cmd/pnl.go
@@ -8,9 +8,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/accounting"
 	"github.com/c9s/bbgo/pkg/accounting/pnl"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/service"
 	"github.com/c9s/bbgo/pkg/types"
 )
diff --git a/cmd/run.go b/cmd/run.go
index cf3d94d61..7dd8e035c 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -9,8 +9,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/bbgo"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/config"
 	"github.com/c9s/bbgo/pkg/slack/slacklog"
 )
diff --git a/cmd/transfers.go b/cmd/transfers.go
index 8c13723d4..be533640e 100644
--- a/cmd/transfers.go
+++ b/cmd/transfers.go
@@ -8,7 +8,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/types"
 )
 
diff --git a/examples/max-eqmaker/main.go b/examples/max-eqmaker/main.go
index bb2fd6fab..b393b9693 100644
--- a/examples/max-eqmaker/main.go
+++ b/examples/max-eqmaker/main.go
@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/exchange/max"
 	maxapi "github.com/c9s/bbgo/pkg/exchange/max/maxapi"
 	"github.com/c9s/bbgo/pkg/fixedpoint"
diff --git a/pkg/bbgo/environment.go b/pkg/bbgo/environment.go
index 8b6cef0cd..b76f89010 100644
--- a/pkg/bbgo/environment.go
+++ b/pkg/bbgo/environment.go
@@ -11,7 +11,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/service"
 	"github.com/c9s/bbgo/pkg/store"
 	"github.com/c9s/bbgo/pkg/types"
diff --git a/cmd/cmdutil/db.go b/pkg/cmd/cmdutil/db.go
similarity index 100%
rename from cmd/cmdutil/db.go
rename to pkg/cmd/cmdutil/db.go
diff --git a/cmd/cmdutil/exchange.go b/pkg/cmd/cmdutil/exchange.go
similarity index 100%
rename from cmd/cmdutil/exchange.go
rename to pkg/cmd/cmdutil/exchange.go
diff --git a/cmd/cmdutil/signal.go b/pkg/cmd/cmdutil/signal.go
similarity index 100%
rename from cmd/cmdutil/signal.go
rename to pkg/cmd/cmdutil/signal.go
diff --git a/pkg/strategy/buyandhold/cmd.go b/pkg/strategy/buyandhold/cmd.go
index 068d47708..2b7322842 100644
--- a/pkg/strategy/buyandhold/cmd.go
+++ b/pkg/strategy/buyandhold/cmd.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/c9s/bbgo/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/bbgo"
+	"github.com/c9s/bbgo/pkg/cmd/cmdutil"
 	"github.com/c9s/bbgo/pkg/types"
 )