diff --git a/bot/bot.go b/bot/bot.go
index 36d0e83..2386478 100644
--- a/bot/bot.go
+++ b/bot/bot.go
@@ -1,6 +1,26 @@
 package bot
 
-import "github.com/bwmarrin/discordgo"
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"git.kill0.net/chill9/beepboop/lib"
+	"github.com/bwmarrin/discordgo"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+)
+
+var (
+	C Config
+
+	handlers []MessageCreateHandler = []MessageCreateHandler{
+		NewReactionHandler(),
+	}
+)
 
 type Bot struct {
 	Session *discordgo.Session
@@ -45,3 +65,84 @@ func (b *Bot) RegisterCommands() {
 		NArgs: 1,
 	})
 }
+
+func Run() error {
+	setupConfig()
+
+	lib.SeedMathRand()
+
+	if C.DiscordToken == "" {
+		log.Fatalf("Discord token is not set")
+	}
+
+	dg, err := discordgo.New(fmt.Sprintf("Bot %s", C.DiscordToken))
+	if err != nil {
+		log.Fatalf("error creating Discord session: %v\n", err)
+	}
+
+	for _, h := range handlers {
+		h.SetConfig(C)
+		dg.AddHandler(h.Handle)
+	}
+
+	b := NewBot(dg, C)
+	b.RegisterCommands()
+
+	dg.AddHandler(NewCommandHandler(b))
+
+	dg.Identify.Intents = discordgo.IntentsGuildMessages | discordgo.IntentsDirectMessages
+
+	err = dg.Open()
+	if err != nil {
+		log.Fatalf("error opening connection: %v\n", err)
+	}
+
+	log.Info("The bot is now running. Press CTRL-C to exit.")
+
+	defer dg.Close()
+
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+	<-sc
+
+	log.Info("Shutting down")
+
+	return nil
+}
+
+func setupConfig() {
+	var err error
+
+	C = NewConfig()
+
+	flag.Bool("debug", false, "enable debug logging")
+	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
+	pflag.Parse()
+	viper.BindPFlags(pflag.CommandLine)
+
+	viper.SetEnvPrefix("BEEPBOOP")
+	viper.AutomaticEnv()
+
+	viper.SetConfigName("config")
+	viper.SetConfigType("toml")
+	viper.AddConfigPath(".")
+
+	err = viper.ReadInConfig()
+
+	viper.BindEnv("DEBUG")
+	viper.BindEnv("DISCORD_TOKEN")
+	viper.BindEnv("OPEN_WEATHER_MAP_TOKEN")
+
+	if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+		log.Fatalf("fatal error config file: %v", err)
+	}
+
+	err = viper.Unmarshal(&C)
+	if err != nil {
+		log.Fatalf("unable to decode into struct: %v", err)
+	}
+
+	if viper.GetBool("debug") {
+		log.SetLevel(log.DebugLevel)
+	}
+}
diff --git a/bot/handler/reaction.go b/bot/reaction.go
similarity index 90%
rename from bot/handler/reaction.go
rename to bot/reaction.go
index 1e23522..a94e0d8 100644
--- a/bot/handler/reaction.go
+++ b/bot/reaction.go
@@ -1,10 +1,9 @@
-package handler
+package bot
 
 import (
 	"math/rand"
 	"strings"
 
-	"git.kill0.net/chill9/beepboop/bot"
 	"git.kill0.net/chill9/beepboop/lib"
 
 	"github.com/bwmarrin/discordgo"
@@ -13,7 +12,7 @@ import (
 
 type (
 	ReactionHandler struct {
-		Config bot.Config
+		Config Config
 	}
 )
 
@@ -21,7 +20,7 @@ func NewReactionHandler() *ReactionHandler {
 	return new(ReactionHandler)
 }
 
-func (h *ReactionHandler) SetConfig(config bot.Config) {
+func (h *ReactionHandler) SetConfig(config Config) {
 	h.Config = config
 }
 
diff --git a/cmd/bb/main.go b/cmd/bb/main.go
index d6b29e4..13d2dac 100644
--- a/cmd/bb/main.go
+++ b/cmd/bb/main.go
@@ -1,108 +1,13 @@
 package main
 
 import (
-	"flag"
-	"fmt"
-
-	//"log"
-
 	"os"
-	"os/signal"
-	"syscall"
 
 	"git.kill0.net/chill9/beepboop/bot"
-	"git.kill0.net/chill9/beepboop/bot/handler"
-	"git.kill0.net/chill9/beepboop/lib"
-
-	"github.com/bwmarrin/discordgo"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-)
-
-var (
-	C bot.Config
-
-	handlers []bot.MessageCreateHandler = []bot.MessageCreateHandler{
-		handler.NewReactionHandler(),
-	}
 )
 
 func main() {
-	setupConfig()
-
-	lib.SeedMathRand()
-
-	if C.DiscordToken == "" {
-		log.Fatalf("Discord token is not set")
-	}
-
-	dg, err := discordgo.New(fmt.Sprintf("Bot %s", C.DiscordToken))
-	if err != nil {
-		log.Fatalf("error creating Discord session: %v\n", err)
-	}
-
-	for _, h := range handlers {
-		h.SetConfig(C)
-		dg.AddHandler(h.Handle)
-	}
-
-	b := bot.NewBot(dg, C)
-	b.RegisterCommands()
-
-	dg.AddHandler(bot.NewCommandHandler(b))
-
-	dg.Identify.Intents = discordgo.IntentsGuildMessages | discordgo.IntentsDirectMessages
-
-	err = dg.Open()
-	if err != nil {
-		log.Fatalf("error opening connection: %v\n", err)
-	}
-
-	log.Info("The bot is now running. Press CTRL-C to exit.")
-
-	defer dg.Close()
-
-	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
-	<-sc
-
-	log.Info("Shutting down")
-}
-
-func setupConfig() {
-	var err error
-
-	C = bot.NewConfig()
-
-	flag.Bool("debug", false, "enable debug logging")
-	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-	viper.BindPFlags(pflag.CommandLine)
-
-	viper.SetEnvPrefix("BEEPBOOP")
-	viper.AutomaticEnv()
-
-	viper.SetConfigName("config")
-	viper.SetConfigType("toml")
-	viper.AddConfigPath(".")
-
-	err = viper.ReadInConfig()
-
-	viper.BindEnv("DEBUG")
-	viper.BindEnv("DISCORD_TOKEN")
-	viper.BindEnv("OPEN_WEATHER_MAP_TOKEN")
-
-	if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
-		log.Fatalf("fatal error config file: %v", err)
-	}
-
-	err = viper.Unmarshal(&C)
-	if err != nil {
-		log.Fatalf("unable to decode into struct: %v", err)
-	}
-
-	if viper.GetBool("debug") {
-		log.SetLevel(log.DebugLevel)
+	if err := bot.Run(); err != nil {
+		os.Exit(1)
 	}
 }