diff --git a/src/components/search_bar/filters/field_value_selection_filter.test.tsx b/src/components/search_bar/filters/field_value_selection_filter.test.tsx
index c7ece63483..2c6e1708b6 100644
--- a/src/components/search_bar/filters/field_value_selection_filter.test.tsx
+++ b/src/components/search_bar/filters/field_value_selection_filter.test.tsx
@@ -35,7 +35,7 @@ import {
   FieldValueSelectionFilter,
   FieldValueSelectionFilterProps,
 } from './field_value_selection_filter';
-import { Query } from '../query';
+import { Query } from '../query/query';
 
 describe('FieldValueSelectionFilter', () => {
   test('render - options as a function', () => {
diff --git a/src/components/search_bar/filters/field_value_selection_filter.tsx b/src/components/search_bar/filters/field_value_selection_filter.tsx
index c8050b5e42..e64ec40b5f 100644
--- a/src/components/search_bar/filters/field_value_selection_filter.tsx
+++ b/src/components/search_bar/filters/field_value_selection_filter.tsx
@@ -37,7 +37,7 @@ import { OuiFilterButton, OuiFilterSelectItem } from '../../filter_group';
 import { OuiLoadingChart } from '../../loading';
 import { OuiSpacer } from '../../spacer';
 import { OuiIcon } from '../../icon';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import { Clause, Operator, OperatorType, Value } from '../query/ast';
 
 export interface FieldValueOptionType {
diff --git a/src/components/search_bar/filters/field_value_toggle_filter.test.tsx b/src/components/search_bar/filters/field_value_toggle_filter.test.tsx
index d302320252..d786e17cad 100644
--- a/src/components/search_bar/filters/field_value_toggle_filter.test.tsx
+++ b/src/components/search_bar/filters/field_value_toggle_filter.test.tsx
@@ -31,7 +31,7 @@
 import React from 'react';
 import { requiredProps } from '../../../test';
 import { shallow } from 'enzyme';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import {
   FieldValueToggleFilter,
   FieldValueToggleFilterProps,
diff --git a/src/components/search_bar/filters/field_value_toggle_filter.tsx b/src/components/search_bar/filters/field_value_toggle_filter.tsx
index dd05d23bcc..87ccdef532 100644
--- a/src/components/search_bar/filters/field_value_toggle_filter.tsx
+++ b/src/components/search_bar/filters/field_value_toggle_filter.tsx
@@ -31,7 +31,7 @@
 import React, { Component } from 'react';
 import { OuiFilterButton } from '../../filter_group';
 import { isNil } from '../../../services/predicate';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import { Clause, OperatorType, Value } from '../query/ast';
 
 export interface FieldValueToggleFilterConfigType {
diff --git a/src/components/search_bar/filters/field_value_toggle_group_filter.test.tsx b/src/components/search_bar/filters/field_value_toggle_group_filter.test.tsx
index 9bffa3adce..9c1fc333b5 100644
--- a/src/components/search_bar/filters/field_value_toggle_group_filter.test.tsx
+++ b/src/components/search_bar/filters/field_value_toggle_group_filter.test.tsx
@@ -31,7 +31,7 @@
 import React from 'react';
 import { requiredProps } from '../../../test';
 import { shallow } from 'enzyme';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import {
   FieldValueToggleGroupFilter,
   FieldValueToggleGroupFilterProps,
diff --git a/src/components/search_bar/filters/field_value_toggle_group_filter.tsx b/src/components/search_bar/filters/field_value_toggle_group_filter.tsx
index 3daa2d12b5..e800cd98c8 100644
--- a/src/components/search_bar/filters/field_value_toggle_group_filter.tsx
+++ b/src/components/search_bar/filters/field_value_toggle_group_filter.tsx
@@ -30,7 +30,7 @@
 
 import React, { Component } from 'react';
 import { OuiFilterButton } from '../../filter_group';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import { OperatorType } from '../query/ast';
 
 export interface FieldValueToggleGroupFilterItemType {
diff --git a/src/components/search_bar/filters/filters.tsx b/src/components/search_bar/filters/filters.tsx
index da8a283730..1df97379c3 100644
--- a/src/components/search_bar/filters/filters.tsx
+++ b/src/components/search_bar/filters/filters.tsx
@@ -42,7 +42,7 @@ import {
   FieldValueToggleGroupFilter,
   FieldValueToggleGroupFilterConfigType,
 } from './field_value_toggle_group_filter';
-import { Query } from '../query';
+import { Query } from '../query/query';
 
 export const createFilter = (
   index: number,
diff --git a/src/components/search_bar/filters/is_filter.test.tsx b/src/components/search_bar/filters/is_filter.test.tsx
index 284a9b21fa..9311c28043 100644
--- a/src/components/search_bar/filters/is_filter.test.tsx
+++ b/src/components/search_bar/filters/is_filter.test.tsx
@@ -32,7 +32,7 @@ import React from 'react';
 import { requiredProps } from '../../../test';
 import { shallow } from 'enzyme';
 import { IsFilter, IsFilterProps } from './is_filter';
-import { Query } from '../query';
+import { Query } from '../query/query';
 
 describe('IsFilter', () => {
   test('render', () => {
diff --git a/src/components/search_bar/filters/is_filter.tsx b/src/components/search_bar/filters/is_filter.tsx
index d41d17b66b..6b21e8173e 100644
--- a/src/components/search_bar/filters/is_filter.tsx
+++ b/src/components/search_bar/filters/is_filter.tsx
@@ -31,7 +31,7 @@
 import React, { Component } from 'react';
 import { OuiFilterButton } from '../../filter_group';
 import { isNil } from '../../../services/predicate';
-import { Query } from '../query';
+import { Query } from '../query/query';
 import { Clause } from '../query/ast';
 
 export interface IsFilterConfigType {
diff --git a/src/components/search_bar/index.ts b/src/components/search_bar/index.ts
index f91c8acc2a..70a7dc0bca 100644
--- a/src/components/search_bar/index.ts
+++ b/src/components/search_bar/index.ts
@@ -28,12 +28,8 @@
  * under the License.
  */
 
-export {
-  OuiSearchBar,
-  OuiSearchBarProps,
-  QueryType,
-  Query,
-  Ast,
-} from './search_bar';
+export { OuiSearchBar, OuiSearchBarProps, QueryType } from './search_bar';
+export { Query } from './query/query';
+export { AST as Ast } from './query';
 export { SearchFilterConfig } from './search_filters';
 export { FieldValueOptionType } from './filters/field_value_selection_filter';
diff --git a/src/components/search_bar/search_bar.test.tsx b/src/components/search_bar/search_bar.test.tsx
index d605ec5315..07e3357a09 100644
--- a/src/components/search_bar/search_bar.test.tsx
+++ b/src/components/search_bar/search_bar.test.tsx
@@ -33,7 +33,7 @@ import React from 'react';
 import { requiredProps } from '../../test';
 import { mount, shallow } from 'enzyme';
 import { OuiSearchBar } from './search_bar';
-import { Query } from './query';
+import { Query } from './query/query';
 import { keys } from '../../services';
 import { SearchFilterConfig } from './search_filters';
 
diff --git a/src/components/search_bar/search_bar.tsx b/src/components/search_bar/search_bar.tsx
index 57cacc6056..0d21bbc6e5 100644
--- a/src/components/search_bar/search_bar.tsx
+++ b/src/components/search_bar/search_bar.tsx
@@ -33,12 +33,10 @@ import { isString } from '../../services/predicate';
 import { OuiFlexGroup, OuiFlexItem } from '../flex';
 import { OuiSearchBox, SchemaType } from './search_box';
 import { OuiSearchFilters, SearchFilterConfig } from './search_filters';
-import { Query } from './query';
+import { Query } from './query/query';
 import { CommonProps } from '../common';
 import { OuiFieldSearchProps } from '../form/field_search';
 
-export { Query, AST as Ast } from './query';
-
 export type QueryType = Query | string;
 
 type Tools = ReactElement | ReactElement[];
diff --git a/src/components/search_bar/search_filters.test.tsx b/src/components/search_bar/search_filters.test.tsx
index ed7a2b7dd0..71bc6b289b 100644
--- a/src/components/search_bar/search_filters.test.tsx
+++ b/src/components/search_bar/search_filters.test.tsx
@@ -32,7 +32,7 @@ import React from 'react';
 import { requiredProps } from '../../test';
 import { shallow } from 'enzyme';
 import { OuiSearchFilters, SearchFilterConfig } from './search_filters';
-import { Query } from './query';
+import { Query } from './query/query';
 
 describe('OuiSearchFilters', () => {
   test('render - no filters', () => {
diff --git a/src/components/search_bar/search_filters.tsx b/src/components/search_bar/search_filters.tsx
index 775fe12649..b6cee176d0 100644
--- a/src/components/search_bar/search_filters.tsx
+++ b/src/components/search_bar/search_filters.tsx
@@ -30,7 +30,7 @@
 
 import React, { Component, Fragment, ReactElement } from 'react';
 import { createFilter, SearchFilterConfig } from './filters';
-import { Query } from './query';
+import { Query } from './query/query';
 import { OuiFilterGroup } from '../filter_group';
 
 export { SearchFilterConfig } from './filters';