diff --git a/README.md b/README.md
index aea402a9..cab96e66 100644
--- a/README.md
+++ b/README.md
@@ -2,5 +2,5 @@
 
 ## Installation
 
-    go install ./kava/cmd/kavad
-    go install ./kava/cmd/kavacli
+    go install ./cmd/kavad
+    go install ./cmd/kavacli
diff --git a/kava/cmd/kavacli/main.go b/cmd/kavacli/main.go
similarity index 94%
rename from kava/cmd/kavacli/main.go
rename to cmd/kavacli/main.go
index 67c8b168..a428ed27 100644
--- a/kava/cmd/kavacli/main.go
+++ b/cmd/kavacli/main.go
@@ -19,8 +19,8 @@ import (
 	ibccmd "github.com/cosmos/cosmos-sdk/x/ibc/client/cli"
 	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 
-	"github.com/kava-labs/kava/kava/app"
-	"github.com/kava-labs/kava/kava/types"
+	"github.com/kava-labs/kava/internal/app"
+	"github.com/kava-labs/kava/internal/types"
 )
 
 // rootCmd is the entry point for this binary
@@ -78,3 +78,6 @@ func main() {
 	executor := cli.PrepareMainCmd(rootCmd, "BC", os.ExpandEnv("$HOME/.basecli"))
 	executor.Execute()
 }
+
+func Blarg() {
+	45}
diff --git a/kava/cmd/kavad/main.go b/cmd/kavad/main.go
similarity index 70%
rename from kava/cmd/kavad/main.go
rename to cmd/kavad/main.go
index ef3b1f50..ba3f6b79 100644
--- a/kava/cmd/kavad/main.go
+++ b/cmd/kavad/main.go
@@ -12,7 +12,7 @@ import (
 	"github.com/tendermint/tmlibs/log"
 
 	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/kava-labs/kava/kava/app"
+	"github.com/kava-labs/kava/internal/app"
 )
 
 func main() {
@@ -20,18 +20,18 @@ func main() {
 	ctx := server.NewDefaultContext()
 
 	rootCmd := &cobra.Command{
-		Use:               "basecoind",
-		Short:             "Basecoin Daemon (server)",
+		Use:               "kavad",
+		Short:             "Kava Daemon",
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
 	server.AddCommands(ctx, cdc, rootCmd, server.DefaultAppInit,
-		server.ConstructAppCreator(newApp, "basecoin"),
-		server.ConstructAppExporter(exportAppState, "basecoin"))
+		server.ConstructAppCreator(newApp, "kava"),
+		server.ConstructAppExporter(exportAppState, "kava"))
 
 	// prepare and add flags
-	rootDir := os.ExpandEnv("$HOME/.basecoind")
-	executor := cli.PrepareBaseCmd(rootCmd, "BC", rootDir)
+	rootDir := os.ExpandEnv("$HOME/.kavad")
+	executor := cli.PrepareBaseCmd(rootCmd, "KV", rootDir)
 	executor.Execute()
 }
 
diff --git a/kava/app/app.go b/internal/app/app.go
similarity index 97%
rename from kava/app/app.go
rename to internal/app/app.go
index 393cd7e3..1de4fbe6 100644
--- a/kava/app/app.go
+++ b/internal/app/app.go
@@ -16,7 +16,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/ibc"
 	"github.com/cosmos/cosmos-sdk/x/stake"
 
-	"github.com/kava-labs/kava/kava/types"
+	"github.com/kava-labs/kava/internal/types"
 )
 
 const (
@@ -96,7 +96,7 @@ func MakeCodec() *wire.Codec {
 
 	// register custom AppAccount
 	cdc.RegisterInterface((*sdk.Account)(nil), nil)
-	cdc.RegisterConcrete(&types.AppAccount{}, "basecoin/Account", nil)
+	cdc.RegisterConcrete(&types.AppAccount{}, "kava/Account", nil)
 	return cdc
 }
 
diff --git a/kava/app/app_test.go b/internal/app/app_test.go
similarity index 100%
rename from kava/app/app_test.go
rename to internal/app/app_test.go
diff --git a/kava/types/account.go b/internal/types/account.go
similarity index 100%
rename from kava/types/account.go
rename to internal/types/account.go