diff --git a/search/query/query_bool_field.go b/search/query/bool_field.go
similarity index 100%
rename from search/query/query_bool_field.go
rename to search/query/bool_field.go
diff --git a/search/query/query_boolean.go b/search/query/boolean.go
similarity index 100%
rename from search/query/query_boolean.go
rename to search/query/boolean.go
diff --git a/search/query/query_conjunction.go b/search/query/conjunction.go
similarity index 100%
rename from search/query/query_conjunction.go
rename to search/query/conjunction.go
diff --git a/search/query/query_date_range.go b/search/query/date_range.go
similarity index 100%
rename from search/query/query_date_range.go
rename to search/query/date_range.go
diff --git a/search/query/query_disjunction.go b/search/query/disjunction.go
similarity index 100%
rename from search/query/query_disjunction.go
rename to search/query/disjunction.go
diff --git a/search/query/query_docid.go b/search/query/docid.go
similarity index 100%
rename from search/query/query_docid.go
rename to search/query/docid.go
diff --git a/search/query/query_fuzzy.go b/search/query/fuzzy.go
similarity index 100%
rename from search/query/query_fuzzy.go
rename to search/query/fuzzy.go
diff --git a/search/query/query_match.go b/search/query/match.go
similarity index 100%
rename from search/query/query_match.go
rename to search/query/match.go
diff --git a/search/query/query_match_all.go b/search/query/match_all.go
similarity index 100%
rename from search/query/query_match_all.go
rename to search/query/match_all.go
diff --git a/search/query/query_match_none.go b/search/query/match_none.go
similarity index 100%
rename from search/query/query_match_none.go
rename to search/query/match_none.go
diff --git a/search/query/query_match_phrase.go b/search/query/match_phrase.go
similarity index 100%
rename from search/query/query_match_phrase.go
rename to search/query/match_phrase.go
diff --git a/search/query/query_numeric_range.go b/search/query/numeric_range.go
similarity index 100%
rename from search/query/query_numeric_range.go
rename to search/query/numeric_range.go
diff --git a/search/query/query_phrase.go b/search/query/phrase.go
similarity index 100%
rename from search/query/query_phrase.go
rename to search/query/phrase.go
diff --git a/search/query/query_prefix.go b/search/query/prefix.go
similarity index 100%
rename from search/query/query_prefix.go
rename to search/query/prefix.go
diff --git a/search/query/query_regexp.go b/search/query/regexp.go
similarity index 100%
rename from search/query/query_regexp.go
rename to search/query/regexp.go
diff --git a/search/query/query_term.go b/search/query/term.go
similarity index 100%
rename from search/query/query_term.go
rename to search/query/term.go
diff --git a/search/query/query_wildcard.go b/search/query/wildcard.go
similarity index 100%
rename from search/query/query_wildcard.go
rename to search/query/wildcard.go