diff --git a/http/cayley_http_query.go b/http/cayley_http_query.go
index 4a99dd0..8170e13 100644
--- a/http/cayley_http_query.go
+++ b/http/cayley_http_query.go
@@ -23,8 +23,8 @@ import (
 	"github.com/julienschmidt/httprouter"
 
 	"github.com/google/cayley/graph"
-	"github.com/google/cayley/gremlin"
-	"github.com/google/cayley/mql"
+	"github.com/google/cayley/query/gremlin"
+	"github.com/google/cayley/query/mql"
 )
 
 type SuccessQueryWrapper struct {
diff --git a/gremlin/gremlin_build_iterator.go b/query/gremlin/gremlin_build_iterator.go
similarity index 100%
rename from gremlin/gremlin_build_iterator.go
rename to query/gremlin/gremlin_build_iterator.go
diff --git a/gremlin/gremlin_env.go b/query/gremlin/gremlin_env.go
similarity index 100%
rename from gremlin/gremlin_env.go
rename to query/gremlin/gremlin_env.go
diff --git a/gremlin/gremlin_finals.go b/query/gremlin/gremlin_finals.go
similarity index 100%
rename from gremlin/gremlin_finals.go
rename to query/gremlin/gremlin_finals.go
diff --git a/gremlin/gremlin_functional_test.go b/query/gremlin/gremlin_functional_test.go
similarity index 100%
rename from gremlin/gremlin_functional_test.go
rename to query/gremlin/gremlin_functional_test.go
diff --git a/gremlin/gremlin_session.go b/query/gremlin/gremlin_session.go
similarity index 100%
rename from gremlin/gremlin_session.go
rename to query/gremlin/gremlin_session.go
diff --git a/gremlin/gremlin_test.nt b/query/gremlin/gremlin_test.nt
similarity index 100%
rename from gremlin/gremlin_test.nt
rename to query/gremlin/gremlin_test.nt
diff --git a/gremlin/gremlin_traversals.go b/query/gremlin/gremlin_traversals.go
similarity index 100%
rename from gremlin/gremlin_traversals.go
rename to query/gremlin/gremlin_traversals.go
diff --git a/mql/mql_build_iterator.go b/query/mql/mql_build_iterator.go
similarity index 100%
rename from mql/mql_build_iterator.go
rename to query/mql/mql_build_iterator.go
diff --git a/mql/mql_fill.go b/query/mql/mql_fill.go
similarity index 100%
rename from mql/mql_fill.go
rename to query/mql/mql_fill.go
diff --git a/mql/mql_functional_test.go b/query/mql/mql_functional_test.go
similarity index 100%
rename from mql/mql_functional_test.go
rename to query/mql/mql_functional_test.go
diff --git a/mql/mql_query.go b/query/mql/mql_query.go
similarity index 100%
rename from mql/mql_query.go
rename to query/mql/mql_query.go
diff --git a/mql/mql_session.go b/query/mql/mql_session.go
similarity index 100%
rename from mql/mql_session.go
rename to query/mql/mql_session.go
diff --git a/repl.go b/repl.go
index 6db1ea2..62f3e5e 100644
--- a/repl.go
+++ b/repl.go
@@ -25,9 +25,9 @@ import (
 	"github.com/google/cayley/config"
 	"github.com/google/cayley/graph"
 	"github.com/google/cayley/graph/sexp"
-	"github.com/google/cayley/gremlin"
-	"github.com/google/cayley/mql"
 	"github.com/google/cayley/nquads"
+	"github.com/google/cayley/query/gremlin"
+	"github.com/google/cayley/query/mql"
 )
 
 func trace(s string) (string, time.Time) {