diff --git a/cmd/radiance/blockstore/blockstore.go b/cmd/radiance/blockstore/blockstore.go
new file mode 100644
index 0000000..3a6bfca
--- /dev/null
+++ b/cmd/radiance/blockstore/blockstore.go
@@ -0,0 +1,14 @@
+package blockstore
+
+import (
+	"github.com/spf13/cobra"
+)
+
+var Cmd = cobra.Command{
+	Use:   "blockstore",
+	Short: "Access blockstore database",
+}
+
+func init() {
+	Cmd.AddCommand()
+}
diff --git a/cmd/radiance/gossip/gossip.go b/cmd/radiance/gossip/gossip.go
new file mode 100644
index 0000000..5c59048
--- /dev/null
+++ b/cmd/radiance/gossip/gossip.go
@@ -0,0 +1,19 @@
+package gossip
+
+import (
+	"github.com/certusone/radiance/cmd/radiance/gossip/ping"
+	"github.com/certusone/radiance/cmd/radiance/gossip/pull"
+	"github.com/spf13/cobra"
+)
+
+var Cmd = cobra.Command{
+	Use:   "gossip",
+	Short: "Interact with Solana gossip networks",
+}
+
+func init() {
+	Cmd.AddCommand(
+		&ping.Cmd,
+		&pull.Cmd,
+	)
+}
diff --git a/cmd/gossip/ping/ping.go b/cmd/radiance/gossip/ping/ping.go
similarity index 100%
rename from cmd/gossip/ping/ping.go
rename to cmd/radiance/gossip/ping/ping.go
diff --git a/cmd/gossip/pull/pull.go b/cmd/radiance/gossip/pull/pull.go
similarity index 100%
rename from cmd/gossip/pull/pull.go
rename to cmd/radiance/gossip/pull/pull.go
diff --git a/cmd/gossip/main.go b/cmd/radiance/main.go
similarity index 71%
rename from cmd/gossip/main.go
rename to cmd/radiance/main.go
index a69f23a..c772472 100644
--- a/cmd/gossip/main.go
+++ b/cmd/radiance/main.go
@@ -7,15 +7,15 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/certusone/radiance/cmd/gossip/ping"
-	"github.com/certusone/radiance/cmd/gossip/pull"
+	"github.com/certusone/radiance/cmd/radiance/blockstore"
+	"github.com/certusone/radiance/cmd/radiance/gossip"
 	"github.com/spf13/cobra"
 	"k8s.io/klog/v2"
 )
 
 var cmd = cobra.Command{
-	Use:   "gossip",
-	Short: "Interact with Solana gossip networks",
+	Use:   "radiance",
+	Short: "Solana Go playground",
 }
 
 func init() {
@@ -24,8 +24,8 @@ func init() {
 	cmd.PersistentFlags().AddGoFlagSet(klogFlags)
 
 	cmd.AddCommand(
-		&ping.Cmd,
-		&pull.Cmd,
+		&blockstore.Cmd,
+		&gossip.Cmd,
 	)
 }