diff --git a/promql/ast.go b/promql/parser/ast.go
similarity index 100%
rename from promql/ast.go
rename to promql/parser/ast.go
diff --git a/promql/generated_parser.y b/promql/parser/generated_parser.y
similarity index 100%
rename from promql/generated_parser.y
rename to promql/parser/generated_parser.y
diff --git a/promql/generated_parser.y.go b/promql/parser/generated_parser.y.go
similarity index 100%
rename from promql/generated_parser.y.go
rename to promql/parser/generated_parser.y.go
diff --git a/promql/lex.go b/promql/parser/lex.go
similarity index 100%
rename from promql/lex.go
rename to promql/parser/lex.go
diff --git a/promql/lex_test.go b/promql/parser/lex_test.go
similarity index 100%
rename from promql/lex_test.go
rename to promql/parser/lex_test.go
diff --git a/promql/parse.go b/promql/parser/parse.go
similarity index 100%
rename from promql/parse.go
rename to promql/parser/parse.go
diff --git a/promql/parse_test.go b/promql/parser/parse_test.go
similarity index 100%
rename from promql/parse_test.go
rename to promql/parser/parse_test.go
diff --git a/promql/printer.go b/promql/parser/printer.go
similarity index 100%
rename from promql/printer.go
rename to promql/parser/printer.go
diff --git a/promql/printer_test.go b/promql/parser/printer_test.go
similarity index 100%
rename from promql/printer_test.go
rename to promql/parser/printer_test.go