diff --git a/botserv/main.go b/botserv/main.go
index fbff1c7..7162645 100644
--- a/botserv/main.go
+++ b/botserv/main.go
@@ -10,7 +10,7 @@ import (
 	"runtime/pprof"
 	"time"
 
-	hbserver "bitbucket.org/hackerbots/server"
+	"bitbucket.org/hackerbots/server"
 	"code.google.com/p/go.net/websocket"
 )
 
@@ -42,23 +42,23 @@ func main() {
 		log.Println("serving profile info at http://localhost:8667/debug/pprof/")
 	}
 
-	conf, err := hbserver.LoadConfig(*config)
+	conf, err := server.LoadConfig(*config)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	sm := http.NewServeMux()
 
-	c := hbserver.NewController(conf, *mprofile, *profile)
+	c := server.NewController(conf, *mprofile, *profile)
 	go c.Run()
 
-	sm.Handle("/", hbserver.JsonHandler(c.Index))
+	sm.Handle("/", server.JsonHandler(c.Index))
 	sm.Handle("/ws/", websocket.Handler(c.AddPlayer))
-	sm.Handle("/game/start/", hbserver.JsonHandler(c.StartGame))
-	sm.Handle("/game/list/", hbserver.JsonHandler(c.ListGames))
-	sm.Handle("/game/stats/", hbserver.JsonHandler(c.GameStats))
-	sm.Handle("/game/bw/", hbserver.JsonHandler(c.BW))
-	sm.Handle("/game/stop/", hbserver.JsonHandler(c.StopGame))
+	sm.Handle("/game/start/", server.JsonHandler(c.StartGame))
+	sm.Handle("/game/list/", server.JsonHandler(c.ListGames))
+	sm.Handle("/game/stats/", server.JsonHandler(c.GameStats))
+	sm.Handle("/game/bw/", server.JsonHandler(c.BW))
+	sm.Handle("/game/stop/", server.JsonHandler(c.StopGame))
 	sm.HandleFunc("/fuck/shit/up/", c.KillServer)
 
 	err = http.ListenAndServe(*addr, sm)