diff --git a/http/http.go b/http/http.go
index 9637440..40c2292 100644
--- a/http/http.go
+++ b/http/http.go
@@ -45,7 +45,7 @@ func makeHandler(handler ResponseHandler) httprouter.Handle {
 	}
 }
 
-func NewRouter(s *Server) *httprouter.Router {
+func newRouter(s *Server) *httprouter.Router {
 	r := httprouter.New()
 
 	if s.config.Private {
@@ -79,5 +79,5 @@ func Serve(cfg *config.Config, tkr *tracker.Tracker) {
 	}
 
 	glog.V(0).Info("Starting on ", cfg.Addr)
-	graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, NewRouter(srv))
+	graceful.Run(cfg.Addr, cfg.RequestTimeout.Duration, newRouter(srv))
 }
diff --git a/http/http_test.go b/http/http_test.go
index ab513d4..4f25b91 100644
--- a/http/http_test.go
+++ b/http/http_test.go
@@ -36,7 +36,7 @@ func createServer(tkr *tracker.Tracker, cfg *config.Config) (*httptest.Server, e
 		config:  cfg,
 		tracker: tkr,
 	}
-	return httptest.NewServer(NewRouter(srv)), nil
+	return httptest.NewServer(newRouter(srv)), nil
 }
 
 func announce(p params, srv *httptest.Server) ([]byte, error) {
diff --git a/models/query/query.go b/http/query/query.go
similarity index 100%
rename from models/query/query.go
rename to http/query/query.go
diff --git a/models/query/query_test.go b/http/query/query_test.go
similarity index 100%
rename from models/query/query_test.go
rename to http/query/query_test.go
diff --git a/http/tracker.go b/http/tracker.go
index ab313df..3762bc9 100644
--- a/http/tracker.go
+++ b/http/tracker.go
@@ -10,7 +10,7 @@ import (
 	"github.com/julienschmidt/httprouter"
 
 	"github.com/chihaya/chihaya/config"
-	"github.com/chihaya/chihaya/models/query"
+	"github.com/chihaya/chihaya/http/query"
 	"github.com/chihaya/chihaya/tracker/models"
 )