diff --git a/cmd/basecli/commands/apptx.go b/cmd/basecli/commands/apptx.go
index 1325427d37..acfc5932d1 100644
--- a/cmd/basecli/commands/apptx.go
+++ b/cmd/basecli/commands/apptx.go
@@ -51,7 +51,7 @@ func (s *AppTx) Signers() ([]crypto.PubKey, error) {
 func (s *AppTx) TxBytes() ([]byte, error) {
 	// TODO: verify it is signed
 
-	// Code and comment from: basecoin/cmd/commands/tx.go
+	// Code and comment from: basecoin/cmd/basecoin/commands/tx.go
 	// Don't you hate having to do this?
 	// How many times have I lost an hour over this trick?!
 	txBytes := wire.BinaryBytes(bc.TxS{s.Tx})
diff --git a/cmd/basecli/commands/sendtx.go b/cmd/basecli/commands/sendtx.go
index 15c5d58719..1a338ef29e 100644
--- a/cmd/basecli/commands/sendtx.go
+++ b/cmd/basecli/commands/sendtx.go
@@ -50,7 +50,7 @@ func (s *SendTx) Signers() ([]crypto.PubKey, error) {
 func (s *SendTx) TxBytes() ([]byte, error) {
 	// TODO: verify it is signed
 
-	// Code and comment from: basecoin/cmd/commands/tx.go
+	// Code and comment from: basecoin/cmd/basecoin/commands/tx.go
 	// Don't you hate having to do this?
 	// How many times have I lost an hour over this trick?!
 	txBytes := wire.BinaryBytes(struct {
diff --git a/cmd/commands/ibc.go b/cmd/basecoin/commands/ibc.go
similarity index 100%
rename from cmd/commands/ibc.go
rename to cmd/basecoin/commands/ibc.go
diff --git a/cmd/commands/init.go b/cmd/basecoin/commands/init.go
similarity index 100%
rename from cmd/commands/init.go
rename to cmd/basecoin/commands/init.go
diff --git a/cmd/commands/key.go b/cmd/basecoin/commands/key.go
similarity index 100%
rename from cmd/commands/key.go
rename to cmd/basecoin/commands/key.go
diff --git a/cmd/commands/plugin_util.go b/cmd/basecoin/commands/plugin_util.go
similarity index 100%
rename from cmd/commands/plugin_util.go
rename to cmd/basecoin/commands/plugin_util.go
diff --git a/cmd/commands/relay.go b/cmd/basecoin/commands/relay.go
similarity index 100%
rename from cmd/commands/relay.go
rename to cmd/basecoin/commands/relay.go
diff --git a/cmd/commands/reset.go b/cmd/basecoin/commands/reset.go
similarity index 100%
rename from cmd/commands/reset.go
rename to cmd/basecoin/commands/reset.go
diff --git a/cmd/commands/root.go b/cmd/basecoin/commands/root.go
similarity index 100%
rename from cmd/commands/root.go
rename to cmd/basecoin/commands/root.go
diff --git a/cmd/commands/start.go b/cmd/basecoin/commands/start.go
similarity index 100%
rename from cmd/commands/start.go
rename to cmd/basecoin/commands/start.go
diff --git a/cmd/commands/utils.go b/cmd/basecoin/commands/utils.go
similarity index 100%
rename from cmd/commands/utils.go
rename to cmd/basecoin/commands/utils.go
diff --git a/cmd/commands/utils_test.go b/cmd/basecoin/commands/utils_test.go
similarity index 100%
rename from cmd/commands/utils_test.go
rename to cmd/basecoin/commands/utils_test.go
diff --git a/cmd/commands/version.go b/cmd/basecoin/commands/version.go
similarity index 100%
rename from cmd/commands/version.go
rename to cmd/basecoin/commands/version.go
diff --git a/cmd/basecoin/main.go b/cmd/basecoin/main.go
index 5d74ae5585..23c46c7680 100644
--- a/cmd/basecoin/main.go
+++ b/cmd/basecoin/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/basecoin/cmd/commands"
+	"github.com/tendermint/basecoin/cmd/basecoin/commands"
 	"github.com/tendermint/tmlibs/cli"
 )