diff --git a/ping.go b/cmd/ping.go
similarity index 72%
rename from ping.go
rename to cmd/ping.go
index 9c4fa3f..2a58a4b 100644
--- a/ping.go
+++ b/cmd/ping.go
@@ -1,17 +1,17 @@
-package main
+package cmd
 
 import (
 	"github.com/kf5grd/keybasebot"
 	"samhofi.us/x/keybase/v2/types/chat1"
 )
 
-var pingAd = chat1.UserBotCommandInput{
+var PingAd = chat1.UserBotCommandInput{
 	Name:        "ping",
 	Usage:       "Replies with Pong!",
 	Description: "You say ping, i say pong!",
 }
 
-func sendPong(m chat1.MsgSummary, b *keybasebot.Bot) (bool, error) {
+func SendPong(m chat1.MsgSummary, b *keybasebot.Bot) (bool, error) {
 	b.KB.SendMessageByConvID(m.ConvID, "Pong!")
 	b.Logger.Info("ping rx in convid %s", m.ConvID)
 	return true, nil
diff --git a/go.mod b/go.mod
index 9e93076..d6e8000 100644
--- a/go.mod
+++ b/go.mod
@@ -5,5 +5,6 @@ go 1.15
 require (
 	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/kf5grd/keybasebot v1.3.1-0.20210114174004-0f0b435f9f41
+	github.com/stretchr/testify v1.7.0 // indirect
 	samhofi.us/x/keybase/v2 v2.0.6
 )
diff --git a/go.sum b/go.sum
index 6b7c7ee..221371e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,21 @@
 github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs=
 github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/kf5grd/keybasebot v1.2.0 h1:X/+dpP64G9mLLGEyZJ5oYK0l2yk8jDk1BVByxVKSo7M=
 github.com/kf5grd/keybasebot v1.2.0/go.mod h1:aLjlXVBN7JQuBkKfUK/VT6fgXY8Gt4TlnNZGd3iPQXg=
 github.com/kf5grd/keybasebot v1.3.0 h1:XWr96H4UmZQnHrvR5whuVJxrrUkqrJm/puGnckyqLFc=
 github.com/kf5grd/keybasebot v1.3.0/go.mod h1:aLjlXVBN7JQuBkKfUK/VT6fgXY8Gt4TlnNZGd3iPQXg=
 github.com/kf5grd/keybasebot v1.3.1-0.20210114174004-0f0b435f9f41 h1:EC0XypakLOr0Ob87vii0XFJURzSQJ0ICATzy+dLEdKk=
 github.com/kf5grd/keybasebot v1.3.1-0.20210114174004-0f0b435f9f41/go.mod h1:aLjlXVBN7JQuBkKfUK/VT6fgXY8Gt4TlnNZGd3iPQXg=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 samhofi.us/x/keybase/v2 v2.0.6 h1:gLluTcyjbwckQxSarF1ig2klL4Li7O/THdxsgo1dUvw=
 samhofi.us/x/keybase/v2 v2.0.6/go.mod h1:lJivwhzMSV+WUg+XUbatszStjjFVcuLGl+xcQpqQ5GQ=
diff --git a/main.go b/main.go
index fab24c6..3b53a7b 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,9 @@ import (
 	"syscall"
 	"time"
 
+	"app/cmd"
+
 	"github.com/kf5grd/keybasebot"
-	bot "github.com/kf5grd/keybasebot"
 	"samhofi.us/x/keybase/v2"
 	"samhofi.us/x/keybase/v2/types/chat1"
 )
@@ -17,7 +18,7 @@ import (
 // stdout, and optionally also to a Keybase chat conversation
 type kbWriter struct {
 	convID chat1.ConvIDStr
-	bot    *bot.Bot
+	bot    *keybasebot.Bot
 }
 
 func (k kbWriter) Write(p []byte) (n int, err error) {
@@ -46,8 +47,8 @@ func main() {
 	b.Commands = append(b.Commands,
 		keybasebot.BotCommand{
 			Name: "Ping",
-			Ad:   &pingAd,
-			Run:  keybasebot.Adapt(sendPong, keybasebot.MessageType("text"), keybasebot.CommandPrefix("!ping")),
+			Ad:   &cmd.PingAd,
+			Run:  keybasebot.Adapt(cmd.SendPong, keybasebot.MessageType("text"), keybasebot.CommandPrefix("!ping")),
 		},
 	)
 	// catch ctrl-c so we can clean up