diff --git a/db/repl.go b/db/repl.go
index 731b0fa..2ef9429 100644
--- a/db/repl.go
+++ b/db/repl.go
@@ -25,11 +25,11 @@ import (
 
 	"github.com/google/cayley/config"
 	"github.com/google/cayley/graph"
-	"github.com/google/cayley/graph/sexp"
 	"github.com/google/cayley/quad/cquads"
 	"github.com/google/cayley/query"
 	"github.com/google/cayley/query/gremlin"
 	"github.com/google/cayley/query/mql"
+	"github.com/google/cayley/query/sexp"
 )
 
 func trace(s string) (string, time.Time) {
diff --git a/graph/sexp/parser.go b/query/sexp/parser.go
similarity index 100%
rename from graph/sexp/parser.go
rename to query/sexp/parser.go
diff --git a/graph/sexp/parser_test.go b/query/sexp/parser_test.go
similarity index 100%
rename from graph/sexp/parser_test.go
rename to query/sexp/parser_test.go
diff --git a/graph/sexp/session.go b/query/sexp/session.go
similarity index 100%
rename from graph/sexp/session.go
rename to query/sexp/session.go