diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 33f9c4ccd795d..7857e2989bda6 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -24,7 +24,7 @@ import { Subscription } from 'rxjs';
 import { FilterManager } from './filter_manager';
 import { getFilter } from './test_helpers/get_stub_filter';
 import { getFiltersArray } from './test_helpers/get_filters_array';
-import { esFilters } from '../../../common/es_query';
+import { esFilters } from '../../../common';
 
 import { coreMock } from '../../../../../core/public/mocks';
 const setupMock = coreMock.createSetup();
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index 06e2b77dca238..feab75ed7457f 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -27,7 +27,7 @@ import { mapAndFlattenFilters } from './lib/map_and_flatten_filters';
 import { uniqFilters } from './lib/uniq_filters';
 import { onlyDisabledFiltersChanged } from './lib/only_disabled';
 import { PartitionedFilters } from './types';
-import { esFilters } from '../../../common/es_query';
+import { esFilters } from '../../../common';
 
 export class FilterManager {
   private filters: esFilters.Filter[] = [];
diff --git a/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
index 6bde6b528d07b..34fd662c4ba46 100644
--- a/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { compareFilters } from './compare_filters';
-import { esFilters } from '../../../../common/es_query';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   describe('compare filters', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
index 2a7cbe6e3303b..9b171ab0aacb2 100644
--- a/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/compare_filters.ts
@@ -18,7 +18,7 @@
  */
 
 import { defaults, isEqual, omit } from 'lodash';
-import { esFilters } from '../../../../common/es_query';
+import { esFilters } from '../../../../common';
 
 /**
  * Compare two filters to see if they match
diff --git a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
index 6d6f49cb5e833..6dae14f480b4f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/dedup_filters.ts
@@ -19,7 +19,7 @@
 
 import { filter, find } from 'lodash';
 import { compareFilters } from './compare_filters';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 /**
  * Combine 2 filter collections, removing duplicates
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/generate_filter.test.ts
index f0e5e98f72e93..b8de08fc3a610 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_filter.test.ts
@@ -19,7 +19,8 @@
 
 import { generateFilters } from './generate_filters';
 import { FilterManager } from '../filter_manager';
-import { esFilters, IFieldType, IIndexPattern } from '../../..';
+
+import { esFilters, IFieldType, IIndexPattern } from '../../../../common';
 
 const INDEX_NAME = 'my-index';
 const EXISTS_FIELD_NAME = '_exists_';
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts b/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts
index d250040910feb..42607843df3ba 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_filters.ts
@@ -18,7 +18,8 @@
  */
 
 import _ from 'lodash';
-import { FilterManager, esFilters, IFieldType, IIndexPattern } from '../../..';
+import { esFilters, IFieldType, IIndexPattern } from '../../../../common';
+import { FilterManager } from '../filter_manager';
 
 function getExistingFilter(
   appFilters: esFilters.Filter[],
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
index dfe3a093c6614..9e386bdc7c80d 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.test.ts
@@ -19,7 +19,7 @@
 
 import sinon from 'sinon';
 import { generateMappingChain } from './generate_mapping_chain';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   let mapping: any;
diff --git a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
index b6764389e0db9..1af8482a96e0f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/generate_mapping_chain.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 const noop = () => {
   throw new Error('No mappings have been found for filter.');
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
index 9a0d0d93698f6..3190b6777a9e1 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapAndFlattenFilters } from './map_and_flatten_filters';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapAndFlattenFilters()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
index 5326d59f3e32b..28b5e8d151ff6 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_and_flatten_filters.ts
@@ -19,7 +19,7 @@
 
 import { compact, flatten } from 'lodash';
 import { mapFilter } from './map_filter';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 export const mapAndFlattenFilters = (filters: esFilters.Filter[]) => {
   return compact(flatten(filters)).map((item: esFilters.Filter) => mapFilter(item));
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
index 0d115125451ee..9df07718d5bcb 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapFilter } from './map_filter';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   function getDisplayName(filter: esFilters.Filter) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
index 2dc855caabfd3..a68eafe6bf1c2 100644
--- a/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/map_filter.ts
@@ -30,7 +30,7 @@ import { mapGeoBoundingBox } from './mappers/map_geo_bounding_box';
 import { mapGeoPolygon } from './mappers/map_geo_polygon';
 import { mapDefault } from './mappers/map_default';
 import { generateMappingChain } from './generate_mapping_chain';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 export function mapFilter(filter: esFilters.Filter) {
   /** Mappers **/
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
index f10766901e5b7..f6baaa9218d74 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapDefault } from './map_default';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapDefault()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
index fd84c5c742589..3fee6a063be5a 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_default.ts
@@ -18,7 +18,7 @@
  */
 
 import { find, keys, get } from 'lodash';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapDefault = (filter: esFilters.Filter) => {
   const metaProperty = /(^\$|meta)/;
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
index 63665bdd88ccb..38f9b1554c5c8 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_exists.ts
@@ -18,7 +18,7 @@
  */
 
 import { get } from 'lodash';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapExists = (filter: esFilters.Filter) => {
   if (esFilters.isExistsFilter(filter)) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
index 5fca4a652bad8..322b086c2cf49 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapGeoBoundingBox } from './map_geo_bounding_box';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapGeoBoundingBox()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
index 091e9a3f34000..be63d2de5b0df 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_bounding_box.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 const getFormattedValueFn = (params: any) => {
   return (formatter?: esFilters.FilterValueFormatter) => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
index 1847296016c73..2713f0fd17734 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapGeoPolygon } from './map_geo_polygon';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   let filter: esFilters.GeoPolygonFilter;
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
index a7881b4a145a1..8cca92a81cb5f 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_geo_polygon.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 const POINTS_SEPARATOR = ', ';
 
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
index 4fc6d0b492414..4d6bba6429b47 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapMatchAll } from './map_match_all';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter_manager/lib', () => {
   describe('mapMatchAll()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
index 4e93b1d41e9a8..9a4ea8430a305 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_match_all.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapMatchAll = (filter: esFilters.Filter) => {
   if (esFilters.isMatchAllFilter(filter)) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
index 1847eb37ca42f..faf4b54989e20 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapMissing } from './map_missing';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapMissing()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
index 51dee89ad884b..a1b6474365f40 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_missing.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapMissing = (filter: esFilters.Filter) => {
   if (esFilters.isMissingFilter(filter)) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
index 05372d37264b0..5150b32f118ae 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { mapPhrase } from './map_phrase';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapPhrase()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
index b6e9c2007db97..ae7701bf3a501 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrase.ts
@@ -18,7 +18,7 @@
  */
 
 import { get } from 'lodash';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 const getScriptedPhraseValue = (filter: esFilters.PhraseFilter) =>
   get(filter, ['script', 'script', 'params', 'value']);
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
index 7240d87d02b5a..f8f2aba1309b7 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_phrases.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapPhrases = (filter: esFilters.Filter) => {
   if (!esFilters.isPhrasesFilter(filter)) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
index c60e7d3454fe0..c65bc00b7df61 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapQueryString } from './map_query_string';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapQueryString()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
index 20c3555639a3e..e8e4e68318973 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_query_string.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 export const mapQueryString = (filter: esFilters.Filter) => {
   if (esFilters.isQueryStringFilter(filter)) {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
index c0d5773d6f2c1..2d312351c0f31 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { mapRange } from './map_range';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 describe('filter manager utilities', () => {
   describe('mapRange()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
index 51fb970f5f03e..affc8e6343076 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_range.ts
@@ -18,7 +18,7 @@
  */
 
 import { get, has } from 'lodash';
-import { esFilters } from '../../../../../common/es_query';
+import { esFilters } from '../../../../../common';
 
 const getFormattedValueFn = (left: any, right: any) => {
   return (formatter?: esFilters.FilterValueFormatter) => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
index b9731797c9ee3..a9863696d47cd 100644
--- a/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { onlyDisabledFiltersChanged } from './only_disabled';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   describe('onlyDisabledFiltersChanged()', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
index 0fb6894a297a1..c040d2f2960c7 100644
--- a/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/only_disabled.ts
@@ -18,7 +18,7 @@
  */
 
 import { filter, isEqual } from 'lodash';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 const isEnabled = (f: esFilters.Filter) => f && f.meta && !f.meta.disabled;
 
diff --git a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
index 08eeabc1497e3..f71ac2940f32b 100644
--- a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { uniqFilters } from './uniq_filters';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 describe('filter manager utilities', () => {
   describe('niqFilter', () => {
diff --git a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
index e96c52e6db3de..b6001d698c5f1 100644
--- a/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/uniq_filters.ts
@@ -18,7 +18,7 @@
  */
 import { each, union } from 'lodash';
 import { dedupFilters } from './dedup_filters';
-import { esFilters } from '../../../../../data/public';
+import { esFilters } from '../../../../common';
 
 /**
  * Remove duplicate filters from an array of filters
diff --git a/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
index aa047647c5751..c5f0b11ce13f8 100644
--- a/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_filters_array.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 export function getFiltersArray(): esFilters.Filter[] {
   return [
diff --git a/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
index adc72c961b08b..a531ce7e03984 100644
--- a/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/test_helpers/get_stub_filter.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../common';
 
 export function getFilter(
   store: esFilters.FilterStateStore,
diff --git a/src/plugins/data/public/query/filter_manager/types.ts b/src/plugins/data/public/query/filter_manager/types.ts
index 0b3dbca2d6e0a..0f74a243ca91a 100644
--- a/src/plugins/data/public/query/filter_manager/types.ts
+++ b/src/plugins/data/public/query/filter_manager/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { esFilters } from '../../../../../plugins/data/public';
+import { esFilters } from '../../../common';
 
 export interface PartitionedFilters {
   globalFilters: esFilters.Filter[];
diff --git a/src/plugins/data/public/query/timefilter/get_time.ts b/src/plugins/data/public/query/timefilter/get_time.ts
index 55ee6527fbb1a..41ad1a49af0ff 100644
--- a/src/plugins/data/public/query/timefilter/get_time.ts
+++ b/src/plugins/data/public/query/timefilter/get_time.ts
@@ -18,7 +18,7 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { TimeRange } from 'src/plugins/data/public';
+import { TimeRange } from '../../../common';
 
 // TODO: remove this
 import { IndexPattern, Field } from '../../../../../legacy/core_plugins/data/public/index_patterns';
diff --git a/src/plugins/data/public/query/timefilter/time_history.ts b/src/plugins/data/public/query/timefilter/time_history.ts
index e14c9ac0bc7ca..4dabbb557e9db 100644
--- a/src/plugins/data/public/query/timefilter/time_history.ts
+++ b/src/plugins/data/public/query/timefilter/time_history.ts
@@ -18,9 +18,9 @@
  */
 
 import moment from 'moment';
-import { TimeRange } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { PersistedLog } from '../persisted_log';
+import { TimeRange } from '../../../common';
 
 export class TimeHistory {
   private history: PersistedLog<TimeRange>;
diff --git a/src/plugins/data/public/query/timefilter/timefilter.test.ts b/src/plugins/data/public/query/timefilter/timefilter.test.ts
index cca646508b539..cd904c76ac4d9 100644
--- a/src/plugins/data/public/query/timefilter/timefilter.test.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.test.ts
@@ -34,7 +34,7 @@ import expect from '@kbn/expect';
 import moment from 'moment';
 import { Timefilter } from './timefilter';
 import { Subscription } from 'rxjs';
-import { TimeRange, RefreshInterval } from 'src/plugins/data/public';
+import { TimeRange, RefreshInterval } from '../../../common';
 
 import { timefilterServiceMock } from './timefilter_service.mock';
 const timefilterSetupMock = timefilterServiceMock.createSetupContract();
diff --git a/src/plugins/data/public/query/timefilter/types.ts b/src/plugins/data/public/query/timefilter/types.ts
index 879776cee178e..8b8deea43f808 100644
--- a/src/plugins/data/public/query/timefilter/types.ts
+++ b/src/plugins/data/public/query/timefilter/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { Moment } from 'moment';
-import { RefreshInterval, TimeRange } from 'src/plugins/data/public';
+import { TimeRange, RefreshInterval } from '../../../common';
 
 export interface TimefilterConfig {
   timeDefaults: TimeRange;
diff --git a/src/plugins/kibana_utils/public/field_mapping/mapping_setup.ts b/src/plugins/kibana_utils/public/field_mapping/mapping_setup.ts
index a58efca1c518d..83a3f70ddfba4 100644
--- a/src/plugins/kibana_utils/public/field_mapping/mapping_setup.ts
+++ b/src/plugins/kibana_utils/public/field_mapping/mapping_setup.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { ES_FIELD_TYPES } from 'src/plugins/data/public';
 import { mapValues, isString } from 'lodash';
 import { FieldMappingSpec, MappingObject } from './types';
+import { ES_FIELD_TYPES } from '../../../data/public';
 
 /** @private */
 type ShorthandFieldMapObject = FieldMappingSpec | ES_FIELD_TYPES | 'json';