diff --git a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
index b4a8ff90c3512..34f8c30b51874 100644
--- a/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
+++ b/x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts
@@ -5,59 +5,4 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { Filter, Query, TimeRange } from 'src/plugins/data/public';
-import { AnyAction } from 'redux';
-import { LAYER_TYPE } from '../../common/constants';
-import { DataMeta, MapFilters } from '../../common/descriptor_types';
-import {
-  MapCenterAndZoom,
-  MapRefreshConfig,
-} from '../../../../../plugins/maps/common/descriptor_types';
-
-export type SyncContext = {
-  startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void;
-  stopLoading(dataId: string, requestToken: symbol, data: unknown, meta: DataMeta): void;
-  onLoadError(dataId: string, requestToken: symbol, errorMessage: string): void;
-  updateSourceData(newData: unknown): void;
-  isRequestStillActive(dataId: string, requestToken: symbol): boolean;
-  registerCancelCallback(requestToken: symbol, callback: () => void): void;
-  dataFilters: MapFilters;
-};
-
-export function updateSourceProp(
-  layerId: string,
-  propName: string,
-  value: unknown,
-  newLayerType?: LAYER_TYPE
-): void;
-
-export function setGotoWithCenter(config: MapCenterAndZoom): AnyAction;
-
-export function replaceLayerList(layerList: unknown[]): AnyAction;
-
-export type QueryGroup = {
-  filters: Filter[];
-  query?: Query;
-  timeFilters?: TimeRange;
-  refresh?: boolean;
-};
-
-export function setQuery(query: QueryGroup): AnyAction;
-
-export function setRefreshConfig(config: MapRefreshConfig): AnyAction;
-
-export function disableScrollZoom(): AnyAction;
-
-export function disableInteractive(): AnyAction;
-
-export function disableTooltipControl(): AnyAction;
-
-export function hideToolbarOverlay(): AnyAction;
-
-export function hideLayerControl(): AnyAction;
-
-export function hideViewControl(): AnyAction;
-
-export function setHiddenLayers(hiddenLayerIds: string[]): AnyAction;
-
-export function addLayerWithoutDataSync(layerDescriptor: unknown): AnyAction;
+export * from '../../../../../plugins/maps/public/actions/map_actions';
diff --git a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
index 8fc32aef54770..5e497ff0736b2 100644
--- a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
+++ b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
@@ -4,10 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import _ from 'lodash';
-import { KibanaTilemapSource } from '../layers/sources/kibana_tilemap_source';
-import { EMSTMSSource } from '../layers/sources/ems_tms_source';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaTilemapSource } from '../../../../../plugins/maps/public/layers/sources/kibana_tilemap_source';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { EMSTMSSource } from '../../../../../plugins/maps/public/layers/sources/ems_tms_source';
 import { getInjectedVarFunc } from '../kibana_services';
-import { getKibanaTileMap } from '../meta';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getKibanaTileMap } from '../../../../../plugins/maps/public/meta';
 
 export function getInitialLayers(layerListJSON, initialLayers = []) {
   if (layerListJSON) {
diff --git a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
index f41ed26b2a05d..5334beaaf714a 100644
--- a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
+++ b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../meta', () => {
+jest.mock('../../../../../plugins/maps/public/meta', () => {
   return {};
 });
 jest.mock('../kibana_services');
@@ -32,7 +32,7 @@ describe('Saved object has layer list', () => {
 
 describe('kibana.yml configured with map.tilemap.url', () => {
   beforeAll(() => {
-    require('../meta').getKibanaTileMap = () => {
+    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
       return {
         url: 'myTileUrl',
       };
@@ -62,7 +62,7 @@ describe('kibana.yml configured with map.tilemap.url', () => {
 
 describe('EMS is enabled', () => {
   beforeAll(() => {
-    require('../meta').getKibanaTileMap = () => {
+    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
       return null;
     };
     require('../kibana_services').getInjectedVarFunc = () => key => {
@@ -106,7 +106,7 @@ describe('EMS is enabled', () => {
 
 describe('EMS is not enabled', () => {
   beforeAll(() => {
-    require('../meta').getKibanaTileMap = () => {
+    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
       return null;
     };
 
diff --git a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
index f846d3d4a617f..990a0613da681 100644
--- a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
+++ b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
@@ -17,7 +17,8 @@ import {
   getFilters,
 } from '../../selectors/map_selectors';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../selectors/ui_selectors';
-import { convertMapExtentToPolygon } from '../../elasticsearch_geo_utils';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { convertMapExtentToPolygon } from '../../../../../../plugins/maps/public/elasticsearch_geo_utils';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
 import { extractReferences, injectReferences } from '../../../common/migrations/references';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/gis_map/index.d.ts b/x-pack/legacy/plugins/maps/public/connected_components/gis_map/index.d.ts
index 00a9400109dc1..8689d88297171 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/gis_map/index.d.ts
+++ b/x-pack/legacy/plugins/maps/public/connected_components/gis_map/index.d.ts
@@ -6,7 +6,8 @@
 
 import React from 'react';
 import { Filter } from 'src/plugins/data/public';
-import { RenderToolTipContent } from '../../layers/tooltips/tooltip_property';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { RenderToolTipContent } from '../../../../../../plugins/maps/public/layers/tooltips/tooltip_property';
 
 export const GisMap: React.ComponentType<{
   addFilters: ((filters: Filter[]) => void) | null;
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/gis_map/view.js b/x-pack/legacy/plugins/maps/public/connected_components/gis_map/view.js
index 97139103ab7c1..358313b8f5b6d 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/gis_map/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/gis_map/view.js
@@ -13,7 +13,8 @@ import { LayerPanel } from '../layer_panel/index';
 import { AddLayerPanel } from '../layer_addpanel/index';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
 import { ExitFullScreenButton } from 'ui/exit_full_screen';
-import { getIndexPatternsFromIds } from '../../index_pattern_util';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getIndexPatternsFromIds } from '../../../../../../plugins/maps/public/index_pattern_util';
 import { ES_GEO_FIELD_TYPE } from '../../../common/constants';
 import { indexPatterns as indexPatternsUtils } from '../../../../../../../src/plugins/data/public';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js
index 762409b256286..cb20d80733c33 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js
@@ -7,7 +7,8 @@
 import React, { Fragment } from 'react';
 import { EuiSpacer, EuiPanel, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { uploadLayerWizardConfig } from '../../../layers/sources/client_file_source';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { uploadLayerWizardConfig } from '../../../../../../../plugins/maps/public/layers/sources/client_file_source';
 
 export const ImportEditor = ({ clearSource, isIndexingTriggered, ...props }) => {
   const editorProperties = getEditorProperties({ isIndexingTriggered, ...props });
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
index b34a432bec88c..67cc17ebaa224 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js
@@ -5,7 +5,8 @@
  */
 
 import React, { Fragment } from 'react';
-import { getLayerWizards } from '../../../layers/layer_wizard_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getLayerWizards } from '../../../../../../../plugins/maps/public/layers/layer_wizard_registry';
 import { EuiTitle, EuiSpacer, EuiCard, EuiIcon } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import _ from 'lodash';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
index f7edcf6e85e25..6c080ace4442a 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
@@ -16,9 +16,11 @@ import {
   EuiFormHelpText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { SingleFieldSelect } from '../../../../components/single_field_select';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { SingleFieldSelect } from '../../../../../../../../plugins/maps/public/components/single_field_select';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { getTermsFields } from '../../../../index_pattern_util';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getTermsFields } from '../../../../../../../../plugins/maps/public/index_pattern_util';
 import {
   getIndexPatternService,
   getIndexPatternSelectComponent,
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
index 0944d0e602c2f..c6a79a398f9af 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.js
@@ -14,7 +14,8 @@ import {
   EuiFormErrorText,
   EuiFormHelpText,
 } from '@elastic/eui';
-import { MetricsEditor } from '../../../../components/metrics_editor';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { MetricsEditor } from '../../../../../../../../plugins/maps/public/components/metrics_editor';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AGG_TYPE } from '../../../../../common/constants';
 
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
index e4e3776c8e92c..d8bf862249448 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/metrics_expression.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../../../../components/metrics_editor', () => ({
+jest.mock('../../../../../../../../plugins/maps/public/components/metric_editor', () => ({
   MetricsEditor: () => {
     return <div>mockMetricsEditor</div>;
   },
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
index eb23607aa2150..bd27450943638 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/layer_settings/layer_settings.js
@@ -8,7 +8,8 @@ import React, { Fragment } from 'react';
 
 import { EuiTitle, EuiPanel, EuiFormRow, EuiFieldText, EuiSpacer } from '@elastic/eui';
 
-import { ValidatedRange } from '../../../components/validated_range';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ValidatedRange } from '../../../../../../../plugins/maps/public/components/validated_range';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ValidatedDualRange } from '../../../../../../../../src/plugins/kibana_react/public';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts
index 6d1d076c723ad..cf4fdc7be70c6 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/view.d.ts
@@ -5,10 +5,4 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { LAYER_TYPE } from '../../../common/constants';
-
-export type OnSourceChangeArgs = {
-  propName: string;
-  value: unknown;
-  newLayerType?: LAYER_TYPE;
-};
+export * from '../../../../../../plugins/maps/public/connected_components/layer_panel/view';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js b/x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
index 416af95581058..7063c50edad6a 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
@@ -8,7 +8,8 @@ import React, { Component, Fragment } from 'react';
 import { EuiIcon } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { createSpatialFilterWithGeometry } from '../../../elasticsearch_geo_utils';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createSpatialFilterWithGeometry } from '../../../../../../../plugins/maps/public/elasticsearch_geo_utils';
 import { GEO_JSON_TYPE } from '../../../../common/constants';
 import { GeometryFilterForm } from '../../../components/geometry_filter_form';
 import { UrlOverflowService } from 'ui/error_url_overflow';
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
index 99abe5d108b5a..df2988d399c5b 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
@@ -16,7 +16,8 @@ import {
   createSpatialFilterWithGeometry,
   getBoundingBoxGeometry,
   roundCoordinates,
-} from '../../../../elasticsearch_geo_utils';
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../../../plugins/maps/public/elasticsearch_geo_utils';
 import { DrawTooltip } from './draw_tooltip';
 
 const mbDrawModes = MapboxDraw.modes;
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
index a2850d2bb6c23..a1d1341b7c4f7 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/utils.js
@@ -5,7 +5,13 @@
  */
 
 import _ from 'lodash';
-import { RGBAImage } from './image_utils';
+import {
+  loadSpriteSheetImageData,
+  addSpriteSheetToMapFromImageData,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../../plugins/maps/public/connected_components/map/mb/utils';
+
+export { loadSpriteSheetImageData, addSpriteSheetToMapFromImageData };
 
 export function removeOrphanedSourcesAndLayers(mbMap, layerList) {
   const mbStyle = mbMap.getStyle();
@@ -95,62 +101,7 @@ export function syncLayerOrderForSingleLayer(mbMap, layerList) {
   });
 }
 
-function getImageData(img) {
-  const canvas = window.document.createElement('canvas');
-  const context = canvas.getContext('2d');
-  if (!context) {
-    throw new Error('failed to create canvas 2d context');
-  }
-  canvas.width = img.width;
-  canvas.height = img.height;
-  context.drawImage(img, 0, 0, img.width, img.height);
-  return context.getImageData(0, 0, img.width, img.height);
-}
-
-export async function loadSpriteSheetImageData(imgUrl) {
-  return new Promise((resolve, reject) => {
-    const image = new Image();
-    if (isCrossOriginUrl(imgUrl)) {
-      image.crossOrigin = 'Anonymous';
-    }
-    image.onload = el => {
-      const imgData = getImageData(el.currentTarget);
-      resolve(imgData);
-    };
-    image.onerror = e => {
-      reject(e);
-    };
-    image.src = imgUrl;
-  });
-}
-
-export function addSpriteSheetToMapFromImageData(json, imgData, mbMap) {
-  for (const imageId in json) {
-    if (!(json.hasOwnProperty(imageId) && !mbMap.hasImage(imageId))) {
-      continue;
-    }
-    const { width, height, x, y, sdf, pixelRatio } = json[imageId];
-    if (typeof width !== 'number' || typeof height !== 'number') {
-      continue;
-    }
-
-    const data = new RGBAImage({ width, height });
-    RGBAImage.copy(imgData, data, { x, y }, { x: 0, y: 0 }, { width, height });
-    mbMap.addImage(imageId, data, { pixelRatio, sdf });
-  }
-}
-
 export async function addSpritesheetToMap(json, imgUrl, mbMap) {
   const imgData = await loadSpriteSheetImageData(imgUrl);
   addSpriteSheetToMapFromImageData(json, imgData, mbMap);
 }
-
-function isCrossOriginUrl(url) {
-  const a = window.document.createElement('a');
-  a.href = url;
-  return (
-    a.protocol !== window.document.location.protocol ||
-    a.host !== window.document.location.host ||
-    a.port !== window.document.location.port
-  );
-}
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
index 2995ea039e7a8..fedc1902d80a2 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
@@ -12,7 +12,8 @@ import {
   removeOrphanedSourcesAndLayers,
   addSpritesheetToMap,
 } from './utils';
-import { getGlyphUrl, isRetina } from '../../../meta';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getGlyphUrl, isRetina } from '../../../../../../../plugins/maps/public/meta';
 import { DECIMAL_DEGREES_PRECISION, ZOOM_PRECISION } from '../../../../common/constants';
 import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
 import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
@@ -23,7 +24,11 @@ import sprites1 from '@elastic/maki/dist/sprite@1.png';
 import sprites2 from '@elastic/maki/dist/sprite@2.png';
 import { DrawControl } from './draw_control';
 import { TooltipControl } from './tooltip_control';
-import { clampToLatBounds, clampToLonBounds } from '../../../elasticsearch_geo_utils';
+import {
+  clampToLatBounds,
+  clampToLonBounds,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../../plugins/maps/public/elasticsearch_geo_utils';
 
 mapboxgl.workerUrl = mbWorkerUrl;
 mapboxgl.setRTLTextPlugin(mbRtlPlugin);
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.tsx
index 9544e8714f265..bdd2d863e6920 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -57,7 +57,8 @@ import {
 } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import { getMapCenter, getMapZoom, getHiddenLayerIds } from '../selectors/map_selectors';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
-import { RenderToolTipContent } from '../layers/tooltips/tooltip_property';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { RenderToolTipContent } from '../../../../../plugins/maps/public/layers/tooltips/tooltip_property';
 
 interface MapEmbeddableConfig {
   editUrl?: string;
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.ts
index 5a036ed47fb62..5deb3057a449e 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.ts
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -27,6 +27,11 @@ import { getInitialLayers } from '../angular/get_initial_layers';
 import { mergeInputWithSavedMap } from './merge_input_with_saved_map';
 import '../angular/services/gis_map_saved_object_loader';
 import { bindSetupCoreAndPlugins, bindStartCoreAndPlugins } from '../plugin';
+// @ts-ignore
+import {
+  bindSetupCoreAndPlugins as bindNpSetupCoreAndPlugins,
+  bindStartCoreAndPlugins as bindNpStartCoreAndPlugins,
+} from '../../../../../plugins/maps/public/plugin'; // eslint-disable-line @kbn/eslint/no-restricted-paths
 
 export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   type = MAP_SAVED_OBJECT_TYPE;
@@ -40,7 +45,9 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   constructor() {
     // Init required services. Necessary while in legacy
     bindSetupCoreAndPlugins(npSetup.core, npSetup.plugins);
+    bindNpSetupCoreAndPlugins(npSetup.core, npSetup.plugins);
     bindStartCoreAndPlugins(npStart.core, npStart.plugins);
+    bindNpStartCoreAndPlugins(npStart.core, npStart.plugins);
   }
 
   async isEditable() {
diff --git a/x-pack/legacy/plugins/maps/public/index.scss b/x-pack/legacy/plugins/maps/public/index.scss
index 328b2e576e0e6..b2ac514299d80 100644
--- a/x-pack/legacy/plugins/maps/public/index.scss
+++ b/x-pack/legacy/plugins/maps/public/index.scss
@@ -14,4 +14,4 @@
 @import './mapbox_hacks';
 @import './connected_components/index';
 @import './components/index';
-@import './layers/index';
+@import '../../../../plugins/maps/public/layers/index';
diff --git a/x-pack/legacy/plugins/maps/public/index.ts b/x-pack/legacy/plugins/maps/public/index.ts
index 2d13f005f1a70..b69485e251be4 100644
--- a/x-pack/legacy/plugins/maps/public/index.ts
+++ b/x-pack/legacy/plugins/maps/public/index.ts
@@ -26,5 +26,9 @@ export const plugin = (initializerContext: PluginInitializerContext) => {
   return new MapsPlugin();
 };
 
-export { RenderTooltipContentParams, ITooltipProperty } from './layers/tooltips/tooltip_property';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export {
+  RenderTooltipContentParams,
+  ITooltipProperty,
+} from '../../../../plugins/maps/public/layers/tooltips/tooltip_property';
 export { MapEmbeddable, MapEmbeddableInput } from './embeddable';
diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
index 3b0f501dc0f60..a6491fe1aa6d4 100644
--- a/x-pack/legacy/plugins/maps/public/kibana_services.js
+++ b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -4,88 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { esFilters, search } from '../../../../../src/plugins/data/public';
-const { getRequestInspectorStats, getResponseInspectorStats } = search;
-
-export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
-export { SearchSource } from '../../../../../src/plugins/data/public';
-
 let indexPatternService;
 export const setIndexPatternService = dataIndexPatterns =>
   (indexPatternService = dataIndexPatterns);
 export const getIndexPatternService = () => indexPatternService;
 
-let autocompleteService;
-export const setAutocompleteService = dataAutoComplete => (autocompleteService = dataAutoComplete);
-export const getAutocompleteService = () => autocompleteService;
-
-let licenseId;
-export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
-export const getLicenseId = () => {
-  return licenseId;
-};
-
 let inspector;
 export const setInspector = newInspector => (inspector = newInspector);
 export const getInspector = () => {
   return inspector;
 };
 
-let fileUploadPlugin;
-export const setFileUpload = fileUpload => (fileUploadPlugin = fileUpload);
-export const getFileUploadComponent = () => {
-  return fileUploadPlugin.JsonUploadAndParse;
-};
-
 let getInjectedVar;
 export const setInjectedVarFunc = getInjectedVarFunc => (getInjectedVar = getInjectedVarFunc);
 export const getInjectedVarFunc = () => getInjectedVar;
 
-let uiSettings;
-export const setUiSettings = coreUiSettings => (uiSettings = coreUiSettings);
-export const getUiSettings = () => uiSettings;
-
 let indexPatternSelectComponent;
 export const setIndexPatternSelect = indexPatternSelect =>
   (indexPatternSelectComponent = indexPatternSelect);
 export const getIndexPatternSelectComponent = () => indexPatternSelectComponent;
 
-let coreHttp;
-export const setHttp = http => (coreHttp = http);
-export const getHttp = () => coreHttp;
-
 let dataTimeFilter;
 export const setTimeFilter = timeFilter => (dataTimeFilter = timeFilter);
 export const getTimeFilter = () => dataTimeFilter;
-
-let toast;
-export const setToasts = notificationToast => (toast = notificationToast);
-export const getToasts = () => toast;
-
-export async function fetchSearchSourceAndRecordWithInspector({
-  searchSource,
-  requestId,
-  requestName,
-  requestDesc,
-  inspectorAdapters,
-  abortSignal,
-}) {
-  const inspectorRequest = inspectorAdapters.requests.start(requestName, {
-    id: requestId,
-    description: requestDesc,
-  });
-  let resp;
-  try {
-    inspectorRequest.stats(getRequestInspectorStats(searchSource));
-    searchSource.getSearchRequestBody().then(body => {
-      inspectorRequest.json(body);
-    });
-    resp = await searchSource.fetch({ abortSignal });
-    inspectorRequest.stats(getResponseInspectorStats(searchSource, resp)).ok({ json: resp });
-  } catch (error) {
-    inspectorRequest.error({ error });
-    throw error;
-  }
-
-  return resp;
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/_index.scss b/x-pack/legacy/plugins/maps/public/layers/_index.scss
deleted file mode 100644
index a2ce58e0381af..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './styles/index';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss b/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
deleted file mode 100644
index b5d9113619c76..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/_index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './components/color_gradient';
-@import './vector/components/style_prop_editor';
-@import './vector/components/color/color_stops';
-@import './vector/components/symbol/icon_select';
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index c08ed6fc6da61..0fa7e1106a6df 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -4,9 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './layers/layer_wizard_registry';
-import './layers/sources/source_registry';
-import './layers/load_layer_wizards';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/layer_wizard_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/sources/source_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import '../../../../plugins/maps/public/layers/load_layer_wizards';
 
 import { Plugin, CoreStart, CoreSetup } from 'src/core/public';
 // @ts-ignore
@@ -17,20 +20,17 @@ import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
 import { MapListing } from './components/map_listing';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import {
-  setLicenseId,
   setInspector,
-  setFileUpload,
   setIndexPatternSelect,
-  setHttp,
   setTimeFilter,
-  setUiSettings,
   setInjectedVarFunc,
-  setToasts,
   setIndexPatternService,
-  setAutocompleteService,
 } from './kibana_services';
 // @ts-ignore
-import { setInjectedVarFunc as npSetInjectedVarFunc } from '../../../../plugins/maps/public/kibana_services'; // eslint-disable-line @kbn/eslint/no-restricted-paths
+import {
+  bindSetupCoreAndPlugins as bindNpSetupCoreAndPlugins,
+  bindStartCoreAndPlugins as bindNpStartCoreAndPlugins,
+} from '../../../../plugins/maps/public/plugin'; // eslint-disable-line @kbn/eslint/no-restricted-paths
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
@@ -63,27 +63,17 @@ interface MapsPluginStartDependencies {
 }
 
 export const bindSetupCoreAndPlugins = (core: CoreSetup, plugins: any) => {
-  const { licensing } = plugins;
-  const { injectedMetadata, http } = core;
-  if (licensing) {
-    licensing.license$.subscribe(({ uid }: { uid: string }) => setLicenseId(uid));
-  }
+  const { injectedMetadata } = core;
   setInjectedVarFunc(injectedMetadata.getInjectedVar);
-  setHttp(http);
-  setUiSettings(core.uiSettings);
   setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
-  npSetInjectedVarFunc(core.injectedMetadata.getInjectedVar);
-  setToasts(core.notifications.toasts);
 };
 
 export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
-  const { file_upload, data, inspector } = plugins;
+  const { data, inspector } = plugins;
   setInspector(inspector);
-  setFileUpload(file_upload);
   setIndexPatternSelect(data.ui.IndexPatternSelect);
   setTimeFilter(data.query.timefilter.timefilter);
   setIndexPatternService(data.indexPatterns);
-  setAutocompleteService(data.autocomplete);
 };
 
 /** @internal */
@@ -96,11 +86,13 @@ export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
       });
 
     bindSetupCoreAndPlugins(core, np);
+    bindNpSetupCoreAndPlugins(core, np);
 
     np.home.featureCatalogue.register(featureCatalogueEntry);
   }
 
   public start(core: CoreStart, plugins: MapsPluginStartDependencies) {
     bindStartCoreAndPlugins(core, plugins);
+    bindNpStartCoreAndPlugins(core, plugins);
   }
 }
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
index 397478cfd1d1b..59346e4c6fb98 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -6,11 +6,16 @@
 
 import { createSelector } from 'reselect';
 import _ from 'lodash';
-import { TileLayer } from '../layers/tile_layer';
-import { VectorTileLayer } from '../layers/vector_tile_layer';
-import { VectorLayer } from '../layers/vector_layer';
-import { HeatmapLayer } from '../layers/heatmap_layer';
-import { BlendedVectorLayer } from '../layers/blended_vector_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { TileLayer } from '../../../../../plugins/maps/public/layers/tile_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { VectorTileLayer } from '../../../../../plugins/maps/public/layers/vector_tile_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { VectorLayer } from '../../../../../plugins/maps/public/layers/vector_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { HeatmapLayer } from '../../../../../plugins/maps/public/layers/heatmap_layer';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { BlendedVectorLayer } from '../../../../../plugins/maps/public/layers/blended_vector_layer';
 import { getTimeFilter } from '../kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
@@ -19,8 +24,10 @@ import {
   TRACKED_LAYER_DESCRIPTOR,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../plugins/maps/public/reducers/util';
-import { InnerJoin } from '../layers/joins/inner_join';
-import { getSourceByType } from '../layers/sources/source_registry';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { InnerJoin } from '../../../../../plugins/maps/public/layers/joins/inner_join';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getSourceByType } from '../../../../../plugins/maps/public/layers/sources/source_registry';
 
 function createLayerInstance(layerDescriptor, inspectorAdapters) {
   const source = createSourceInstance(layerDescriptor.sourceDescriptor, inspectorAdapters);
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
index 1a5ab633a569f..77bd29259647c 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../layers/vector_layer', () => {});
-jest.mock('../layers/blended_vector_layer', () => {});
-jest.mock('../layers/heatmap_layer', () => {});
-jest.mock('../layers/vector_tile_layer', () => {});
-jest.mock('../layers/joins/inner_join', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/vector_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/blended_vector_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/heatmap_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/vector_tile_layer', () => {});
+jest.mock('../../../../../plugins/maps/public/layers/joins/inner_join', () => {});
 jest.mock('../../../../../plugins/maps/public/reducers/non_serializable_instances', () => ({
   getInspectorAdapters: () => {
     return {};
diff --git a/x-pack/plugins/maps/public/actions/map_actions.d.ts b/x-pack/plugins/maps/public/actions/map_actions.d.ts
new file mode 100644
index 0000000000000..debead3ad5c45
--- /dev/null
+++ b/x-pack/plugins/maps/public/actions/map_actions.d.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+
+import { Filter, Query, TimeRange } from 'src/plugins/data/public';
+import { AnyAction } from 'redux';
+import { LAYER_TYPE } from '../../common/constants';
+import {
+  DataMeta,
+  MapFilters,
+  MapCenterAndZoom,
+  MapRefreshConfig,
+} from '../../common/descriptor_types';
+
+export type SyncContext = {
+  startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void;
+  stopLoading(dataId: string, requestToken: symbol, data: unknown, meta: DataMeta): void;
+  onLoadError(dataId: string, requestToken: symbol, errorMessage: string): void;
+  updateSourceData(newData: unknown): void;
+  isRequestStillActive(dataId: string, requestToken: symbol): boolean;
+  registerCancelCallback(requestToken: symbol, callback: () => void): void;
+  dataFilters: MapFilters;
+};
+
+export function updateSourceProp(
+  layerId: string,
+  propName: string,
+  value: unknown,
+  newLayerType?: LAYER_TYPE
+): void;
+
+export function setGotoWithCenter(config: MapCenterAndZoom): AnyAction;
+
+export function replaceLayerList(layerList: unknown[]): AnyAction;
+
+export type QueryGroup = {
+  filters: Filter[];
+  query?: Query;
+  timeFilters?: TimeRange;
+  refresh?: boolean;
+};
+
+export function setQuery(query: QueryGroup): AnyAction;
+
+export function setRefreshConfig(config: MapRefreshConfig): AnyAction;
+
+export function disableScrollZoom(): AnyAction;
+
+export function disableInteractive(): AnyAction;
+
+export function disableTooltipControl(): AnyAction;
+
+export function hideToolbarOverlay(): AnyAction;
+
+export function hideLayerControl(): AnyAction;
+
+export function hideViewControl(): AnyAction;
+
+export function setHiddenLayers(hiddenLayerIds: string[]): AnyAction;
+
+export function addLayerWithoutDataSync(layerDescriptor: unknown): AnyAction;
diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
rename to x-pack/plugins/maps/public/components/__snapshots__/add_tooltip_field_popover.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap
rename to x-pack/plugins/maps/public/components/__snapshots__/tooltip_selector.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
rename to x-pack/plugins/maps/public/components/__snapshots__/validated_range.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js b/x-pack/plugins/maps/public/components/add_tooltip_field_popover.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js
rename to x-pack/plugins/maps/public/components/add_tooltip_field_popover.js
index 07bc54663c1d8..984ace4fd8708 100644
--- a/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.js
+++ b/x-pack/plugins/maps/public/components/add_tooltip_field_popover.js
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { FieldIcon } from '../../../../../../src/plugins/kibana_react/public';
+import { FieldIcon } from '../../../../../src/plugins/kibana_react/public';
 
 const sortByLabel = (a, b) => {
   return a.label.localeCompare(b.label);
diff --git a/x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.test.js b/x-pack/plugins/maps/public/components/add_tooltip_field_popover.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/add_tooltip_field_popover.test.js
rename to x-pack/plugins/maps/public/components/add_tooltip_field_popover.test.js
diff --git a/x-pack/legacy/plugins/maps/public/components/metric_editor.js b/x-pack/plugins/maps/public/components/metric_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/metric_editor.js
rename to x-pack/plugins/maps/public/components/metric_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/components/metric_select.js b/x-pack/plugins/maps/public/components/metric_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/metric_select.js
rename to x-pack/plugins/maps/public/components/metric_select.js
diff --git a/x-pack/legacy/plugins/maps/public/components/metrics_editor.js b/x-pack/plugins/maps/public/components/metrics_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/metrics_editor.js
rename to x-pack/plugins/maps/public/components/metrics_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/components/no_index_pattern_callout.js b/x-pack/plugins/maps/public/components/no_index_pattern_callout.js
similarity index 85%
rename from x-pack/legacy/plugins/maps/public/components/no_index_pattern_callout.js
rename to x-pack/plugins/maps/public/components/no_index_pattern_callout.js
index 3266f13155ca7..1319607546808 100644
--- a/x-pack/legacy/plugins/maps/public/components/no_index_pattern_callout.js
+++ b/x-pack/plugins/maps/public/components/no_index_pattern_callout.js
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import chrome from 'ui/chrome';
-
+import { getHttp } from '../kibana_services';
 import React from 'react';
 import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 export function NoIndexPatternCallout() {
+  const http = getHttp();
   return (
     <EuiCallOut
       title={i18n.translate('xpack.maps.noIndexPattern.messageTitle', {
@@ -24,7 +24,7 @@ export function NoIndexPatternCallout() {
           id="xpack.maps.noIndexPattern.doThisPrefixDescription"
           defaultMessage="You'll need to "
         />
-        <EuiLink href={chrome.addBasePath('/app/kibana#/management/kibana/index_pattern')}>
+        <EuiLink href={http.basePath.prepend('/app/kibana#/management/kibana/index_pattern')}>
           <FormattedMessage
             id="xpack.maps.noIndexPattern.doThisLinkTextDescription"
             defaultMessage="create an index pattern"
@@ -40,7 +40,7 @@ export function NoIndexPatternCallout() {
           id="xpack.maps.noIndexPattern.hintDescription"
           defaultMessage="Don't have any geospatial data sets? "
         />
-        <EuiLink href={chrome.addBasePath('/app/kibana#/home/tutorial_directory/sampleData')}>
+        <EuiLink href={http.basePath.prepend('/app/kibana#/home/tutorial_directory/sampleData')}>
           <FormattedMessage
             id="xpack.maps.noIndexPattern.getStartedLinkText"
             defaultMessage="Get started with some sample data sets."
diff --git a/x-pack/legacy/plugins/maps/public/components/single_field_select.js b/x-pack/plugins/maps/public/components/single_field_select.js
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/components/single_field_select.js
rename to x-pack/plugins/maps/public/components/single_field_select.js
index 98e33454b041b..aadc619b029a8 100644
--- a/x-pack/legacy/plugins/maps/public/components/single_field_select.js
+++ b/x-pack/plugins/maps/public/components/single_field_select.js
@@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 
 import { EuiComboBox, EuiHighlight, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { FieldIcon } from '../../../../../../src/plugins/kibana_react/public';
+import { FieldIcon } from '../../../../../src/plugins/kibana_react/public';
 
 function fieldsToOptions(fields) {
   if (!fields) {
diff --git a/x-pack/legacy/plugins/maps/public/components/tooltip_selector.js b/x-pack/plugins/maps/public/components/tooltip_selector.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/tooltip_selector.js
rename to x-pack/plugins/maps/public/components/tooltip_selector.js
diff --git a/x-pack/legacy/plugins/maps/public/components/tooltip_selector.test.js b/x-pack/plugins/maps/public/components/tooltip_selector.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/tooltip_selector.test.js
rename to x-pack/plugins/maps/public/components/tooltip_selector.test.js
diff --git a/x-pack/legacy/plugins/maps/public/components/validated_range.js b/x-pack/plugins/maps/public/components/validated_range.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/validated_range.js
rename to x-pack/plugins/maps/public/components/validated_range.js
diff --git a/x-pack/legacy/plugins/maps/public/components/validated_range.test.js b/x-pack/plugins/maps/public/components/validated_range.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/components/validated_range.test.js
rename to x-pack/plugins/maps/public/components/validated_range.test.js
diff --git a/x-pack/plugins/maps/public/connected_components/layer_panel/view.d.ts b/x-pack/plugins/maps/public/connected_components/layer_panel/view.d.ts
new file mode 100644
index 0000000000000..6d1d076c723ad
--- /dev/null
+++ b/x-pack/plugins/maps/public/connected_components/layer_panel/view.d.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+
+import { LAYER_TYPE } from '../../../common/constants';
+
+export type OnSourceChangeArgs = {
+  propName: string;
+  value: unknown;
+  newLayerType?: LAYER_TYPE;
+};
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/image_utils.js b/x-pack/plugins/maps/public/connected_components/map/mb/image_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/connected_components/map/mb/image_utils.js
rename to x-pack/plugins/maps/public/connected_components/map/mb/image_utils.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/utils.js b/x-pack/plugins/maps/public/connected_components/map/mb/utils.js
new file mode 100644
index 0000000000000..15aacfbf1f38d
--- /dev/null
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/utils.js
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RGBAImage } from './image_utils';
+
+function getImageData(img) {
+  const canvas = window.document.createElement('canvas');
+  const context = canvas.getContext('2d');
+  if (!context) {
+    throw new Error('failed to create canvas 2d context');
+  }
+  canvas.width = img.width;
+  canvas.height = img.height;
+  context.drawImage(img, 0, 0, img.width, img.height);
+  return context.getImageData(0, 0, img.width, img.height);
+}
+
+function isCrossOriginUrl(url) {
+  const a = window.document.createElement('a');
+  a.href = url;
+  return (
+    a.protocol !== window.document.location.protocol ||
+    a.host !== window.document.location.host ||
+    a.port !== window.document.location.port
+  );
+}
+
+export async function loadSpriteSheetImageData(imgUrl) {
+  return new Promise((resolve, reject) => {
+    const image = new Image();
+    if (isCrossOriginUrl(imgUrl)) {
+      image.crossOrigin = 'Anonymous';
+    }
+    image.onload = el => {
+      const imgData = getImageData(el.currentTarget);
+      resolve(imgData);
+    };
+    image.onerror = e => {
+      reject(e);
+    };
+    image.src = imgUrl;
+  });
+}
+
+export function addSpriteSheetToMapFromImageData(json, imgData, mbMap) {
+  for (const imageId in json) {
+    if (!(json.hasOwnProperty(imageId) && !mbMap.hasImage(imageId))) {
+      continue;
+    }
+    const { width, height, x, y, sdf, pixelRatio } = json[imageId];
+    if (typeof width !== 'number' || typeof height !== 'number') {
+      continue;
+    }
+
+    const data = new RGBAImage({ width, height });
+    RGBAImage.copy(imgData, data, { x, y }, { x: 0, y: 0 }, { width, height });
+    mbMap.addImage(imageId, data, { pixelRatio, sdf });
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js b/x-pack/plugins/maps/public/elasticsearch_geo_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.js
rename to x-pack/plugins/maps/public/elasticsearch_geo_utils.js
diff --git a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js b/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js
similarity index 99%
rename from x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js
rename to x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js
index fb4b0a6e29e6c..5db7556be4639 100644
--- a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js
+++ b/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js
@@ -20,7 +20,7 @@ import {
   convertMapExtentToPolygon,
   roundCoordinates,
 } from './elasticsearch_geo_utils';
-import { indexPatterns } from '../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../src/plugins/data/public';
 
 const geoFieldName = 'location';
 const mapExtent = {
diff --git a/x-pack/legacy/plugins/maps/public/index_pattern_util.js b/x-pack/plugins/maps/public/index_pattern_util.js
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/index_pattern_util.js
rename to x-pack/plugins/maps/public/index_pattern_util.js
index 30a0a6826db83..6cb02c7605e28 100644
--- a/x-pack/legacy/plugins/maps/public/index_pattern_util.js
+++ b/x-pack/plugins/maps/public/index_pattern_util.js
@@ -5,7 +5,7 @@
  */
 
 import { getIndexPatternService } from './kibana_services';
-import { indexPatterns } from '../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../src/plugins/data/public';
 import { ES_GEO_FIELD_TYPE } from '../common/constants';
 
 export async function getIndexPatternsFromIds(indexPatternIds = []) {
diff --git a/x-pack/legacy/plugins/maps/public/index_pattern_util.test.js b/x-pack/plugins/maps/public/index_pattern_util.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/index_pattern_util.test.js
rename to x-pack/plugins/maps/public/index_pattern_util.test.js
diff --git a/x-pack/plugins/maps/public/kibana_services.js b/x-pack/plugins/maps/public/kibana_services.js
index 1073e44fa711e..d2ddecfdf915b 100644
--- a/x-pack/plugins/maps/public/kibana_services.js
+++ b/x-pack/plugins/maps/public/kibana_services.js
@@ -3,7 +3,89 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { esFilters, search } from '../../../../src/plugins/data/public';
+
+export { SearchSource } from '../../../../src/plugins/data/public';
+
+export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
+const { getRequestInspectorStats, getResponseInspectorStats } = search;
+
+let indexPatternService;
+export const setIndexPatternService = dataIndexPatterns =>
+  (indexPatternService = dataIndexPatterns);
+export const getIndexPatternService = () => indexPatternService;
+
+let autocompleteService;
+export const setAutocompleteService = dataAutoComplete => (autocompleteService = dataAutoComplete);
+export const getAutocompleteService = () => autocompleteService;
+
+let licenseId;
+export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
+export const getLicenseId = () => {
+  return licenseId;
+};
+
+let inspector;
+export const setInspector = newInspector => (inspector = newInspector);
+export const getInspector = () => {
+  return inspector;
+};
+
+let fileUploadPlugin;
+export const setFileUpload = fileUpload => (fileUploadPlugin = fileUpload);
+export const getFileUploadComponent = () => {
+  return fileUploadPlugin.JsonUploadAndParse;
+};
 
 let getInjectedVar;
 export const setInjectedVarFunc = getInjectedVarFunc => (getInjectedVar = getInjectedVarFunc);
 export const getInjectedVarFunc = () => getInjectedVar;
+
+let uiSettings;
+export const setUiSettings = coreUiSettings => (uiSettings = coreUiSettings);
+export const getUiSettings = () => uiSettings;
+
+let indexPatternSelectComponent;
+export const setIndexPatternSelect = indexPatternSelect =>
+  (indexPatternSelectComponent = indexPatternSelect);
+export const getIndexPatternSelectComponent = () => indexPatternSelectComponent;
+
+let coreHttp;
+export const setHttp = http => (coreHttp = http);
+export const getHttp = () => coreHttp;
+
+let dataTimeFilter;
+export const setTimeFilter = timeFilter => (dataTimeFilter = timeFilter);
+export const getTimeFilter = () => dataTimeFilter;
+
+let toast;
+export const setToasts = notificationToast => (toast = notificationToast);
+export const getToasts = () => toast;
+
+export async function fetchSearchSourceAndRecordWithInspector({
+  searchSource,
+  requestId,
+  requestName,
+  requestDesc,
+  inspectorAdapters,
+  abortSignal,
+}) {
+  const inspectorRequest = inspectorAdapters.requests.start(requestName, {
+    id: requestId,
+    description: requestDesc,
+  });
+  let resp;
+  try {
+    inspectorRequest.stats(getRequestInspectorStats(searchSource));
+    searchSource.getSearchRequestBody().then(body => {
+      inspectorRequest.json(body);
+    });
+    resp = await searchSource.fetch({ abortSignal });
+    inspectorRequest.stats(getResponseInspectorStats(searchSource, resp)).ok({ json: resp });
+  } catch (error) {
+    inspectorRequest.error({ error });
+    throw error;
+  }
+
+  return resp;
+}
diff --git a/x-pack/plugins/maps/public/layers/_index.scss b/x-pack/plugins/maps/public/layers/_index.scss
new file mode 100644
index 0000000000000..29a5761255278
--- /dev/null
+++ b/x-pack/plugins/maps/public/layers/_index.scss
@@ -0,0 +1 @@
+@import 'styles/index';
diff --git a/x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts b/x-pack/plugins/maps/public/layers/blended_vector_layer.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts
rename to x-pack/plugins/maps/public/layers/blended_vector_layer.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/ems_file_field.ts b/x-pack/plugins/maps/public/layers/fields/ems_file_field.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/ems_file_field.ts
rename to x-pack/plugins/maps/public/layers/fields/ems_file_field.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.test.ts b/x-pack/plugins/maps/public/layers/fields/es_agg_field.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.test.ts
rename to x-pack/plugins/maps/public/layers/fields/es_agg_field.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.ts b/x-pack/plugins/maps/public/layers/fields/es_agg_field.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/es_agg_field.ts
rename to x-pack/plugins/maps/public/layers/fields/es_agg_field.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/es_doc_field.ts b/x-pack/plugins/maps/public/layers/fields/es_doc_field.ts
similarity index 96%
rename from x-pack/legacy/plugins/maps/public/layers/fields/es_doc_field.ts
rename to x-pack/plugins/maps/public/layers/fields/es_doc_field.ts
index 4401452841a46..b7647d881fcf6 100644
--- a/x-pack/legacy/plugins/maps/public/layers/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/layers/fields/es_doc_field.ts
@@ -8,8 +8,8 @@ import { FIELD_ORIGIN } from '../../../common/constants';
 import { ESTooltipProperty } from '../tooltips/es_tooltip_property';
 import { ITooltipProperty, TooltipProperty } from '../tooltips/tooltip_property';
 import { COLOR_PALETTE_MAX_SIZE } from '../../../common/constants';
-import { indexPatterns } from '../../../../../../../src/plugins/data/public';
-import { IFieldType } from '../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../src/plugins/data/public';
+import { IFieldType } from '../../../../../../src/plugins/data/public';
 import { IField, AbstractField } from './field';
 import { IESSource } from '../sources/es_source';
 import { IVectorSource } from '../sources/vector_source';
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/field.ts b/x-pack/plugins/maps/public/layers/fields/field.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/field.ts
rename to x-pack/plugins/maps/public/layers/fields/field.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/kibana_region_field.ts b/x-pack/plugins/maps/public/layers/fields/kibana_region_field.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/kibana_region_field.ts
rename to x-pack/plugins/maps/public/layers/fields/kibana_region_field.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/fields/top_term_percentage_field.ts b/x-pack/plugins/maps/public/layers/fields/top_term_percentage_field.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/fields/top_term_percentage_field.ts
rename to x-pack/plugins/maps/public/layers/fields/top_term_percentage_field.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js b/x-pack/plugins/maps/public/layers/heatmap_layer.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/heatmap_layer.js
rename to x-pack/plugins/maps/public/layers/heatmap_layer.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js b/x-pack/plugins/maps/public/layers/joins/inner_join.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/joins/inner_join.js
rename to x-pack/plugins/maps/public/layers/joins/inner_join.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js b/x-pack/plugins/maps/public/layers/joins/inner_join.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
rename to x-pack/plugins/maps/public/layers/joins/inner_join.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/join.ts b/x-pack/plugins/maps/public/layers/joins/join.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/joins/join.ts
rename to x-pack/plugins/maps/public/layers/joins/join.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/layer.d.ts b/x-pack/plugins/maps/public/layers/layer.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/layer.d.ts
rename to x-pack/plugins/maps/public/layers/layer.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/layer.js b/x-pack/plugins/maps/public/layers/layer.js
similarity index 99%
rename from x-pack/legacy/plugins/maps/public/layers/layer.js
rename to x-pack/plugins/maps/public/layers/layer.js
index e9616be89b601..26bce872b3c2c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/layer.js
+++ b/x-pack/plugins/maps/public/layers/layer.js
@@ -15,7 +15,7 @@ import {
 } from '../../common/constants';
 import uuid from 'uuid/v4';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { copyPersistentState } from '../../../../../plugins/maps/public/reducers/util.js';
+import { copyPersistentState } from '../reducers/util.js';
 import { i18n } from '@kbn/i18n';
 
 export class AbstractLayer {
diff --git a/x-pack/legacy/plugins/maps/public/layers/layer_wizard_registry.ts b/x-pack/plugins/maps/public/layers/layer_wizard_registry.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/layer_wizard_registry.ts
rename to x-pack/plugins/maps/public/layers/layer_wizard_registry.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/load_layer_wizards.js b/x-pack/plugins/maps/public/layers/load_layer_wizards.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/load_layer_wizards.js
rename to x-pack/plugins/maps/public/layers/load_layer_wizards.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js b/x-pack/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js b/x-pack/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
rename to x-pack/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/index.js b/x-pack/plugins/maps/public/layers/sources/client_file_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/client_file_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.d.ts b/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js b/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.js b/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.js
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/index.js b/x-pack/plugins/maps/public/layers/sources/ems_file_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.js b/x-pack/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
rename to x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js b/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js
rename to x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/index.js b/x-pack/plugins/maps/public/layers/sources/ems_tms_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/ems_tms_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js b/x-pack/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
rename to x-pack/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js b/x-pack/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js b/x-pack/plugins/maps/public/layers/sources/ems_unavailable_message.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js
rename to x-pack/plugins/maps/public/layers/sources/ems_unavailable_message.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.d.ts b/x-pack/plugins/maps/public/layers/sources/es_agg_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/es_agg_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js b/x-pack/plugins/maps/public/layers/sources/es_agg_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_agg_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.test.ts b/x-pack/plugins/maps/public/layers/sources/es_agg_source.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_agg_source.test.ts
rename to x-pack/plugins/maps/public/layers/sources/es_agg_source.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/index.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
similarity index 97%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
index 269c2a8b8633a..cd494db3897fb 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { isMetricCountable } from '../../util/is_metric_countable';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 
 export class UpdateSourceEditor extends Component {
   state = {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js
rename to x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts
rename to x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
index da2b663746b9d..ea3a2d2fe634d 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -25,7 +25,7 @@ import { convertToLines } from './convert_to_lines';
 import { AbstractESAggSource } from '../es_agg_source';
 import { DynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
 import { COLOR_GRADIENTS } from '../../styles/color_utils';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { registerSource } from '../source_registry';
 
 const MAX_GEOTILE_LEVEL = 29;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
similarity index 96%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
index ce1f53c33ba53..dea59a1c82f8a 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
@@ -11,7 +11,7 @@ import { getIndexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 
 export class UpdateSourceEditor extends Component {
   state = {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/constants.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/constants.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/constants.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/constants.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
index 73bea574ace28..aeb3835354f07 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
@@ -15,7 +15,7 @@ import { NoIndexPatternCallout } from '../../../components/no_index_pattern_call
 import { i18n } from '@kbn/i18n';
 import { ES_GEO_FIELD_TYPE, SCALING_TYPES } from '../../../../common/constants';
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { ScalingForm } from './scaling_form';
 import { getTermsFields } from '../../../index_pattern_util';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts b/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/index.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx b/x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx b/x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
similarity index 97%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
index c5950f1132974..d86fc6d4026e6 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
+++ b/x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx
@@ -22,8 +22,6 @@ import { SingleFieldSelect } from '../../../components/single_field_select';
 // @ts-ignore
 import { indexPatternService } from '../../../kibana_services';
 // @ts-ignore
-import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
-// @ts-ignore
 import { ValidatedRange } from '../../../components/validated_range';
 import {
   DEFAULT_MAX_INNER_RESULT_WINDOW,
@@ -33,7 +31,7 @@ import {
 } from '../../../../common/constants';
 // @ts-ignore
 import { loadIndexSettings } from './load_index_settings';
-import { IFieldType } from '../../../../../../../../src/plugins/data/public';
+import { IFieldType } from '../../../../../../../src/plugins/data/public';
 import { OnSourceChangeArgs } from '../../../connected_components/layer_panel/view';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
index 9c92ec5801e49..cb6255afd0a42 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
@@ -16,7 +16,7 @@ import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
 import { SORT_ORDER } from '../../../../common/constants';
 import { ESDocField } from '../../fields/es_doc_field';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 import { ScalingForm } from './scaling_form';
 
 export class UpdateSourceEditor extends Component {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js b/x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
rename to x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts b/x-pack/plugins/maps/public/layers/sources/es_source.d.ts
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/es_source.d.ts
index ffd1d343b59e0..65851d0e7bd38 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts
+++ b/x-pack/plugins/maps/public/layers/sources/es_source.d.ts
@@ -6,7 +6,7 @@
 
 import { AbstractVectorSource } from './vector_source';
 import { IVectorSource } from './vector_source';
-import { IndexPattern, SearchSource } from '../../../../../../../src/plugins/data/public';
+import { IndexPattern, SearchSource } from '../../../../../../src/plugins/data/public';
 import { VectorSourceRequestMeta } from '../../../common/descriptor_types';
 
 export interface IESSource extends IVectorSource {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js b/x-pack/plugins/maps/public/layers/sources/es_source.js
similarity index 99%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_source.js
index 441d52d23398a..d90a802a38344 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
+++ b/x-pack/plugins/maps/public/layers/sources/es_source.js
@@ -17,7 +17,7 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
+import { copyPersistentState } from '../../reducers/util';
 import { ES_GEO_FIELD_TYPE } from '../../../common/constants';
 import { DataRequestAbortError } from '../util/data_request';
 import { expandToTileBoundaries } from './es_geo_grid_source/geo_tile_utils';
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.d.ts b/x-pack/plugins/maps/public/layers/sources/es_term_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/es_term_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js b/x-pack/plugins/maps/public/layers/sources/es_term_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.js
rename to x-pack/plugins/maps/public/layers/sources/es_term_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js b/x-pack/plugins/maps/public/layers/sources/es_term_source.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
rename to x-pack/plugins/maps/public/layers/sources/es_term_source.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js b/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts b/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js b/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js b/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js b/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
rename to x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts b/x-pack/plugins/maps/public/layers/sources/source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.js b/x-pack/plugins/maps/public/layers/sources/source.js
similarity index 96%
rename from x-pack/legacy/plugins/maps/public/layers/sources/source.js
rename to x-pack/plugins/maps/public/layers/sources/source.js
index b6b6c10831bb5..368de421e23ce 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/source.js
+++ b/x-pack/plugins/maps/public/layers/sources/source.js
@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
+import { copyPersistentState } from '../../reducers/util';
 
 export class AbstractSource {
   static isIndexingSource = false;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts b/x-pack/plugins/maps/public/layers/sources/source_registry.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts
rename to x-pack/plugins/maps/public/layers/sources/source_registry.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/tms_source.d.ts b/x-pack/plugins/maps/public/layers/sources/tms_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/tms_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/tms_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/tms_source.js b/x-pack/plugins/maps/public/layers/sources/tms_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/tms_source.js
rename to x-pack/plugins/maps/public/layers/sources/tms_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_feature_types.js b/x-pack/plugins/maps/public/layers/sources/vector_feature_types.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/vector_feature_types.js
rename to x-pack/plugins/maps/public/layers/sources/vector_feature_types.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts b/x-pack/plugins/maps/public/layers/sources/vector_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/vector_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js b/x-pack/plugins/maps/public/layers/sources/vector_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/vector_source.js
rename to x-pack/plugins/maps/public/layers/sources/vector_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/index.js b/x-pack/plugins/maps/public/layers/sources/wms_source/index.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/wms_source/index.js
rename to x-pack/plugins/maps/public/layers/sources/wms_source/index.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_client.js b/x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_client.js
rename to x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_client.test.js b/x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_client.test.js
rename to x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js b/x-pack/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js
rename to x-pack/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_source.js b/x-pack/plugins/maps/public/layers/sources/wms_source/wms_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_source.js
rename to x-pack/plugins/maps/public/layers/sources/wms_source/wms_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.d.ts b/x-pack/plugins/maps/public/layers/sources/xyz_tms_source.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.d.ts
rename to x-pack/plugins/maps/public/layers/sources/xyz_tms_source.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.js b/x-pack/plugins/maps/public/layers/sources/xyz_tms_source.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.js
rename to x-pack/plugins/maps/public/layers/sources/xyz_tms_source.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.test.ts b/x-pack/plugins/maps/public/layers/sources/xyz_tms_source.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.test.ts
rename to x-pack/plugins/maps/public/layers/sources/xyz_tms_source.test.ts
diff --git a/x-pack/plugins/maps/public/layers/styles/_index.scss b/x-pack/plugins/maps/public/layers/styles/_index.scss
new file mode 100644
index 0000000000000..a1c4c297a3ac1
--- /dev/null
+++ b/x-pack/plugins/maps/public/layers/styles/_index.scss
@@ -0,0 +1,4 @@
+@import 'components/color_gradient';
+@import 'vector/components/style_prop_editor';
+@import 'vector/components/color/color_stops';
+@import 'vector/components/symbol/icon_select';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/abstract_style.js b/x-pack/plugins/maps/public/layers/styles/abstract_style.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/abstract_style.js
rename to x-pack/plugins/maps/public/layers/styles/abstract_style.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js b/x-pack/plugins/maps/public/layers/styles/color_utils.js
similarity index 98%
rename from x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js
rename to x-pack/plugins/maps/public/layers/styles/color_utils.js
index 09c7d76db1691..23b61b07bf871 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js
+++ b/x-pack/plugins/maps/public/layers/styles/color_utils.js
@@ -10,7 +10,7 @@ import chroma from 'chroma-js';
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 import { ColorGradient } from './components/color_gradient';
 import { COLOR_PALETTE_MAX_SIZE } from '../../../common/constants';
-import { vislibColorMaps } from '../../../../../../../src/plugins/charts/public';
+import { vislibColorMaps } from '../../../../../../src/plugins/charts/public';
 
 const GRADIENT_INTERVALS = 8;
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js b/x-pack/plugins/maps/public/layers/styles/color_utils.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
rename to x-pack/plugins/maps/public/layers/styles/color_utils.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/_color_gradient.scss b/x-pack/plugins/maps/public/layers/styles/components/_color_gradient.scss
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/_color_gradient.scss
rename to x-pack/plugins/maps/public/layers/styles/components/_color_gradient.scss
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/color_gradient.js b/x-pack/plugins/maps/public/layers/styles/components/color_gradient.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/color_gradient.js
rename to x-pack/plugins/maps/public/layers/styles/components/color_gradient.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js b/x-pack/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js
rename to x-pack/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap b/x-pack/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap
rename to x-pack/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js b/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js
rename to x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js b/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
rename to x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js b/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js
rename to x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js b/x-pack/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
rename to x-pack/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js b/x-pack/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
rename to x-pack/plugins/maps/public/layers/styles/heatmap/heatmap_style.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss b/x-pack/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss
rename to x-pack/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss b/x-pack/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx b/x-pack/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx b/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
rename to x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx b/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx
rename to x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx b/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
rename to x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_select.js b/x-pack/plugins/maps/public/layers/styles/vector/components/field_select.js
similarity index 97%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_select.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/field_select.js
index 2f5de507657a5..ed2e7a4eab7ec 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_select.js
+++ b/x-pack/plugins/maps/public/layers/styles/vector/components/field_select.js
@@ -10,7 +10,7 @@ import React from 'react';
 import { EuiComboBox, EuiHighlight, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { FIELD_ORIGIN } from '../../../../../common/constants';
 import { i18n } from '@kbn/i18n';
-import { FieldIcon } from '../../../../../../../../../src/plugins/kibana_react/public';
+import { FieldIcon } from '../../../../../../../../src/plugins/kibana_react/public';
 
 function renderOption(option, searchValue, contentClassName) {
   return (
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js b/x-pack/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/category.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/category.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js b/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js b/x-pack/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
index 5de7b462136e1..ec847e2a5384e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
+++ b/x-pack/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ValidatedDualRange } from '../../../../../../../../../../src/plugins/kibana_react/public';
+import { ValidatedDualRange } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { MIN_SIZE, MAX_SIZE } from '../../vector_style_defaults';
 import { i18n } from '@kbn/i18n';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/stop_input.js b/x-pack/plugins/maps/public/layers/styles/vector/components/stop_input.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/stop_input.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/stop_input.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_map_select.js b/x-pack/plugins/maps/public/layers/styles/vector/components/style_map_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_map_select.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/style_map_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js b/x-pack/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js b/x-pack/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
rename to x-pack/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap b/x-pack/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_color_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_color_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_color_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_color_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_style_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_style_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_style_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_style_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_text_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/static_text_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_text_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/static_text_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts b/x-pack/plugins/maps/public/layers/styles/vector/properties/style_property.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/style_property.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js b/x-pack/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js
rename to x-pack/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_meta.ts b/x-pack/plugins/maps/public/layers/styles/vector/style_meta.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/style_meta.ts
rename to x-pack/plugins/maps/public/layers/styles/vector/style_meta.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js b/x-pack/plugins/maps/public/layers/styles/vector/style_util.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.js
rename to x-pack/plugins/maps/public/layers/styles/vector/style_util.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js b/x-pack/plugins/maps/public/layers/styles/vector/style_util.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/style_util.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/style_util.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js b/x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.js
rename to x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js b/x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts b/x-pack/plugins/maps/public/layers/styles/vector/vector_style.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts
rename to x-pack/plugins/maps/public/layers/styles/vector/vector_style.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/plugins/maps/public/layers/styles/vector/vector_style.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
rename to x-pack/plugins/maps/public/layers/styles/vector/vector_style.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/layers/styles/vector/vector_style.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
rename to x-pack/plugins/maps/public/layers/styles/vector/vector_style.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts b/x-pack/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
rename to x-pack/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/tile_layer.d.ts b/x-pack/plugins/maps/public/layers/tile_layer.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/tile_layer.d.ts
rename to x-pack/plugins/maps/public/layers/tile_layer.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/tile_layer.js b/x-pack/plugins/maps/public/layers/tile_layer.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/tile_layer.js
rename to x-pack/plugins/maps/public/layers/tile_layer.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts b/x-pack/plugins/maps/public/layers/tile_layer.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/tile_layer.test.ts
rename to x-pack/plugins/maps/public/layers/tile_layer.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts b/x-pack/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts
rename to x-pack/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.ts b/x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.ts
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.ts
rename to x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.ts
index 8fd7e173435ce..5c35009881920 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tooltips/es_tooltip_property.ts
+++ b/x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.ts
@@ -7,8 +7,8 @@
 import _ from 'lodash';
 import { ITooltipProperty } from './tooltip_property';
 import { IField } from '../fields/field';
-import { esFilters, IFieldType, IndexPattern } from '../../../../../../../src/plugins/data/public';
-import { PhraseFilter } from '../../../../../../../src/plugins/data/public';
+import { esFilters, IFieldType, IndexPattern } from '../../../../../../src/plugins/data/public';
+import { PhraseFilter } from '../../../../../../src/plugins/data/public';
 
 export class ESTooltipProperty implements ITooltipProperty {
   private readonly _tooltipProperty: ITooltipProperty;
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/join_tooltip_property.ts b/x-pack/plugins/maps/public/layers/tooltips/join_tooltip_property.ts
similarity index 96%
rename from x-pack/legacy/plugins/maps/public/layers/tooltips/join_tooltip_property.ts
rename to x-pack/plugins/maps/public/layers/tooltips/join_tooltip_property.ts
index 02f0920ce3c61..4af236f6e9e36 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tooltips/join_tooltip_property.ts
+++ b/x-pack/plugins/maps/public/layers/tooltips/join_tooltip_property.ts
@@ -6,7 +6,7 @@
 
 import { ITooltipProperty } from './tooltip_property';
 import { IJoin } from '../joins/join';
-import { PhraseFilter } from '../../../../../../../src/plugins/data/public';
+import { PhraseFilter } from '../../../../../../src/plugins/data/public';
 
 export class JoinTooltipProperty implements ITooltipProperty {
   private readonly _tooltipProperty: ITooltipProperty;
diff --git a/x-pack/legacy/plugins/maps/public/layers/tooltips/tooltip_property.ts b/x-pack/plugins/maps/public/layers/tooltips/tooltip_property.ts
similarity index 92%
rename from x-pack/legacy/plugins/maps/public/layers/tooltips/tooltip_property.ts
rename to x-pack/plugins/maps/public/layers/tooltips/tooltip_property.ts
index 46e27bbd770a1..7d680dfe9cae0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/tooltips/tooltip_property.ts
+++ b/x-pack/plugins/maps/public/layers/tooltips/tooltip_property.ts
@@ -5,8 +5,8 @@
  */
 
 import _ from 'lodash';
-import { PhraseFilter } from '../../../../../../../src/plugins/data/public';
-import { TooltipFeature } from '../../../../../../plugins/maps/common/descriptor_types';
+import { PhraseFilter } from '../../../../../../src/plugins/data/public';
+import { TooltipFeature } from '../../../../../plugins/maps/common/descriptor_types';
 
 export interface ITooltipProperty {
   getPropertyKey(): string;
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.ts b/x-pack/plugins/maps/public/layers/util/assign_feature_ids.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.test.ts
rename to x-pack/plugins/maps/public/layers/util/assign_feature_ids.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.ts b/x-pack/plugins/maps/public/layers/util/assign_feature_ids.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/assign_feature_ids.ts
rename to x-pack/plugins/maps/public/layers/util/assign_feature_ids.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.test.js b/x-pack/plugins/maps/public/layers/util/can_skip_fetch.test.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.test.js
rename to x-pack/plugins/maps/public/layers/util/can_skip_fetch.test.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts b/x-pack/plugins/maps/public/layers/util/can_skip_fetch.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts
rename to x-pack/plugins/maps/public/layers/util/can_skip_fetch.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/data_request.ts b/x-pack/plugins/maps/public/layers/util/data_request.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/data_request.ts
rename to x-pack/plugins/maps/public/layers/util/data_request.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/es_agg_utils.test.ts b/x-pack/plugins/maps/public/layers/util/es_agg_utils.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/es_agg_utils.test.ts
rename to x-pack/plugins/maps/public/layers/util/es_agg_utils.test.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/es_agg_utils.ts b/x-pack/plugins/maps/public/layers/util/es_agg_utils.ts
similarity index 95%
rename from x-pack/legacy/plugins/maps/public/layers/util/es_agg_utils.ts
rename to x-pack/plugins/maps/public/layers/util/es_agg_utils.ts
index 9d4f24f80d6cd..329a2a6fc64fb 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/es_agg_utils.ts
+++ b/x-pack/plugins/maps/public/layers/util/es_agg_utils.ts
@@ -5,7 +5,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import _ from 'lodash';
-import { IndexPattern, IFieldType } from '../../../../../../../src/plugins/data/public';
+import { IndexPattern, IFieldType } from '../../../../../../src/plugins/data/public';
 import { TOP_TERM_PERCENTAGE_SUFFIX } from '../../../common/constants';
 
 export function getField(indexPattern: IndexPattern, fieldName: string) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/is_metric_countable.ts b/x-pack/plugins/maps/public/layers/util/is_metric_countable.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/is_metric_countable.ts
rename to x-pack/plugins/maps/public/layers/util/is_metric_countable.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts b/x-pack/plugins/maps/public/layers/util/is_refresh_only_query.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts
rename to x-pack/plugins/maps/public/layers/util/is_refresh_only_query.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/layers/util/mb_filter_expressions.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/util/mb_filter_expressions.ts
rename to x-pack/plugins/maps/public/layers/util/mb_filter_expressions.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts b/x-pack/plugins/maps/public/layers/vector_layer.d.ts
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts
rename to x-pack/plugins/maps/public/layers/vector_layer.d.ts
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.js b/x-pack/plugins/maps/public/layers/vector_layer.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/vector_layer.js
rename to x-pack/plugins/maps/public/layers/vector_layer.js
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js b/x-pack/plugins/maps/public/layers/vector_tile_layer.js
similarity index 100%
rename from x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
rename to x-pack/plugins/maps/public/layers/vector_tile_layer.js
diff --git a/x-pack/legacy/plugins/maps/public/meta.js b/x-pack/plugins/maps/public/meta.js
similarity index 76%
rename from x-pack/legacy/plugins/maps/public/meta.js
rename to x-pack/plugins/maps/public/meta.js
index 4d81785ff7a0a..d4612554cf00b 100644
--- a/x-pack/legacy/plugins/maps/public/meta.js
+++ b/x-pack/plugins/maps/public/meta.js
@@ -11,20 +11,19 @@ import {
   EMS_GLYPHS_PATH,
   EMS_APP_NAME,
 } from '../common/constants';
-import chrome from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
 import { EMSClient } from '@elastic/ems-client';
-import { getLicenseId } from './kibana_services';
+import { getInjectedVarFunc, getLicenseId } from './kibana_services';
 import fetch from 'node-fetch';
 
 const GIS_API_RELATIVE = `../${GIS_API_PATH}`;
 
 export function getKibanaRegionList() {
-  return chrome.getInjected('regionmapLayers');
+  return getInjectedVarFunc()('regionmapLayers');
 }
 
 export function getKibanaTileMap() {
-  return chrome.getInjected('tilemap');
+  return getInjectedVarFunc()('tilemap');
 }
 
 function relativeToAbsolute(url) {
@@ -41,27 +40,27 @@ let emsClient = null;
 let latestLicenseId = null;
 export function getEMSClient() {
   if (!emsClient) {
-    const isEmsEnabled = chrome.getInjected('isEmsEnabled', true);
+    const isEmsEnabled = getInjectedVarFunc()('isEmsEnabled', true);
     if (isEmsEnabled) {
-      const proxyElasticMapsServiceInMaps = chrome.getInjected(
+      const proxyElasticMapsServiceInMaps = getInjectedVarFunc()(
         'proxyElasticMapsServiceInMaps',
         false
       );
       const proxyPath = '';
       const tileApiUrl = proxyElasticMapsServiceInMaps
         ? relativeToAbsolute(`${GIS_API_RELATIVE}/${EMS_TILES_CATALOGUE_PATH}`)
-        : chrome.getInjected('emsTileApiUrl');
+        : getInjectedVarFunc()('emsTileApiUrl');
       const fileApiUrl = proxyElasticMapsServiceInMaps
         ? relativeToAbsolute(`${GIS_API_RELATIVE}/${EMS_FILES_CATALOGUE_PATH}`)
-        : chrome.getInjected('emsFileApiUrl');
+        : getInjectedVarFunc()('emsFileApiUrl');
 
       emsClient = new EMSClient({
         language: i18n.getLocale(),
-        appVersion: chrome.getInjected('kbnPkgVersion'),
+        appVersion: getInjectedVarFunc()('kbnPkgVersion'),
         appName: EMS_APP_NAME,
         tileApiUrl,
         fileApiUrl,
-        landingPageUrl: chrome.getInjected('emsLandingPageUrl'),
+        landingPageUrl: getInjectedVarFunc()('emsLandingPageUrl'),
         fetchFunction: fetchFunction, //import this from client-side, so the right instance is returned (bootstrapped from common/* would not work
         proxyPath,
       });
@@ -87,13 +86,13 @@ export function getEMSClient() {
 }
 
 export function getGlyphUrl() {
-  if (!chrome.getInjected('isEmsEnabled', true)) {
+  if (!getInjectedVarFunc()('isEmsEnabled', true)) {
     return '';
   }
-  return chrome.getInjected('proxyElasticMapsServiceInMaps', false)
+  return getInjectedVarFunc()('proxyElasticMapsServiceInMaps', false)
     ? relativeToAbsolute(`../${GIS_API_PATH}/${EMS_TILES_CATALOGUE_PATH}/${EMS_GLYPHS_PATH}`) +
         `/{fontstack}/{range}`
-    : chrome.getInjected('emsFontLibraryUrl', true);
+    : getInjectedVarFunc()('emsFontLibraryUrl', true);
 }
 
 export function isRetina() {
diff --git a/x-pack/legacy/plugins/maps/public/meta.test.js b/x-pack/plugins/maps/public/meta.test.js
similarity index 57%
rename from x-pack/legacy/plugins/maps/public/meta.test.js
rename to x-pack/plugins/maps/public/meta.test.js
index 64dd73fe109ff..d83f2adb35ef7 100644
--- a/x-pack/legacy/plugins/maps/public/meta.test.js
+++ b/x-pack/plugins/maps/public/meta.test.js
@@ -9,39 +9,24 @@ import { getEMSClient } from './meta';
 
 jest.mock('@elastic/ems-client');
 
-jest.mock('ui/chrome', () => ({
-  getBasePath: () => {
-    return '<basepath>';
-  },
-  getInjected(key) {
-    if (key === 'proxyElasticMapsServiceInMaps') {
-      return false;
-    } else if (key === 'isEmsEnabled') {
-      return true;
-    } else if (key === 'emsFileApiUrl') {
-      return 'https://file-api';
-    } else if (key === 'emsTileApiUrl') {
-      return 'https://tile-api';
-    }
-  },
-  getUiSettingsClient: () => {
-    return {
-      get: () => {
-        return '';
-      },
+describe('default use without proxy', () => {
+  beforeEach(() => {
+    require('./kibana_services').getInjectedVarFunc = () => key => {
+      if (key === 'proxyElasticMapsServiceInMaps') {
+        return false;
+      } else if (key === 'isEmsEnabled') {
+        return true;
+      } else if (key === 'emsFileApiUrl') {
+        return 'https://file-api';
+      } else if (key === 'emsTileApiUrl') {
+        return 'https://tile-api';
+      }
     };
-  },
-}));
-
-jest.mock('./kibana_services', () => {
-  return {
-    getLicenseId() {
+    require('./kibana_services').getLicenseId = () => {
       return 'foobarlicenseid';
-    },
-  };
-});
+    };
+  });
 
-describe('default use without proxy', () => {
   it('should construct EMSClient with absolute file and tile API urls', async () => {
     getEMSClient();
     const mockEmsClientCall = EMSClient.mock.calls[0];
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 506b0c426f0fa..9437c2512ded4 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -8,6 +8,20 @@ import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
 import { Setup as InspectorSetupContract } from 'src/plugins/inspector/public';
 // @ts-ignore
 import { MapView } from './inspector/views/map_view';
+import {
+  setAutocompleteService,
+  setFileUpload,
+  setHttp,
+  setIndexPatternSelect,
+  setIndexPatternService,
+  setInjectedVarFunc,
+  setInspector,
+  setLicenseId,
+  setTimeFilter,
+  setToasts,
+  setUiSettings,
+  // @ts-ignore
+} from './kibana_services';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -15,6 +29,29 @@ export interface MapsPluginSetupDependencies {
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MapsPluginStartDependencies {}
 
+export const bindSetupCoreAndPlugins = (core: CoreSetup, plugins: any) => {
+  const { licensing } = plugins;
+  const { injectedMetadata, http } = core;
+  if (licensing) {
+    licensing.license$.subscribe(({ uid }: { uid: string }) => setLicenseId(uid));
+  }
+  setInjectedVarFunc(injectedMetadata.getInjectedVar);
+  setHttp(http);
+  setUiSettings(core.uiSettings);
+  setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+  setToasts(core.notifications.toasts);
+};
+
+export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
+  const { file_upload, data, inspector } = plugins;
+  setInspector(inspector);
+  setFileUpload(file_upload);
+  setIndexPatternSelect(data.ui.IndexPatternSelect);
+  setTimeFilter(data.query.timefilter.timefilter);
+  setIndexPatternService(data.indexPatterns);
+  setAutocompleteService(data.autocomplete);
+};
+
 /**
  * These are the interfaces with your public contracts. You should export these
  * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces.