diff --git a/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js
index 96dad0c01139e..dc3ace69e5a61 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js
@@ -11,7 +11,7 @@ import { isRetina } from '../../../meta';
 import {
   addSpriteSheetToMapFromImageData,
   loadSpriteSheetImageData,
-} from '../../../connected_components/map/mb/utils'; //todo move this implementation
+} from '../../../connected_components/mb_map/utils'; //todo move this implementation
 
 const MB_STYLE_TYPE_TO_OPACITY = {
   fill: ['fill-opacity'],
diff --git a/x-pack/plugins/maps/public/connected_components/_index.scss b/x-pack/plugins/maps/public/connected_components/_index.scss
index a952b3b545922..19c11d3fde662 100644
--- a/x-pack/plugins/maps/public/connected_components/_index.scss
+++ b/x-pack/plugins/maps/public/connected_components/_index.scss
@@ -2,4 +2,4 @@
 @import 'layer_panel/index';
 @import 'widget_overlay/index';
 @import 'toolbar_overlay/index';
-@import 'map/features_tooltip/index';
+@import 'mb_map/features_tooltip/index';
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index 352aed4a8cc93..169875e63a536 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -13,7 +13,7 @@ import uuid from 'uuid/v4';
 import { Filter } from 'src/plugins/data/public';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 // @ts-expect-error
-import { MBMap } from '../map/mb';
+import { MBMap } from '../mb_map';
 // @ts-expect-error
 import { WidgetOverlay } from '../widget_overlay';
 // @ts-expect-error
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_circle.ts b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_circle.ts
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_circle.ts
rename to x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_circle.ts
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.js
similarity index 97%
rename from x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.js
index 0356a8267c18a..089d4be28dff7 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_control.js
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { DRAW_TYPE } from '../../../../../common/constants';
+import { DRAW_TYPE } from '../../../../common/constants';
 import MapboxDraw from '@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw-unminified';
 import DrawRectangle from 'mapbox-gl-draw-rectangle-mode';
 import { DrawCircle } from './draw_circle';
@@ -15,7 +15,7 @@ import {
   createSpatialFilterWithGeometry,
   getBoundingBoxGeometry,
   roundCoordinates,
-} from '../../../../../common/elasticsearch_util';
+} from '../../../../common/elasticsearch_util';
 import { DrawTooltip } from './draw_tooltip';
 
 const DRAW_RECTANGLE = 'draw_rectangle';
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_tooltip.js b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.js
similarity index 97%
rename from x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_tooltip.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.js
index c8bde29b94fb6..dd93b038ff8a1 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_tooltip.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_tooltip.js
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { EuiPopover, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DRAW_TYPE } from '../../../../../common/constants';
+import { DRAW_TYPE } from '../../../../common/constants';
 
 const noop = () => {};
 
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/index.js b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.js
similarity index 83%
rename from x-pack/plugins/maps/public/connected_components/map/mb/draw_control/index.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.js
index bc026c41fcf0a..230ad5b3f39d5 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/index.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/index.js
@@ -6,8 +6,8 @@
 
 import { connect } from 'react-redux';
 import { DrawControl } from './draw_control';
-import { updateDrawState } from '../../../../actions';
-import { getDrawState, isDrawingFilter } from '../../../../selectors/map_selectors';
+import { updateDrawState } from '../../../actions';
+import { getDrawState, isDrawingFilter } from '../../../selectors/map_selectors';
 
 function mapStateToProps(state = {}) {
   return {
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/feature_properties.test.js.snap
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/feature_properties.test.js.snap
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/tooltip_header.test.js.snap b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/tooltip_header.test.js.snap
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/tooltip_header.test.js.snap
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/tooltip_header.test.js.snap
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_geometry_filter_form.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_geometry_filter_form.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_properties.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_properties.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_properties.test.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/feature_properties.test.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/tooltip_header.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/tooltip_header.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/tooltip_header.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.test.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/features_tooltip/tooltip_header.test.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.test.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/get_initial_view.ts b/x-pack/plugins/maps/public/connected_components/mb_map/get_initial_view.ts
similarity index 87%
rename from x-pack/plugins/maps/public/connected_components/map/mb/get_initial_view.ts
rename to x-pack/plugins/maps/public/connected_components/mb_map/get_initial_view.ts
index 20fb8186f9870..853819eb289a3 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/get_initial_view.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/get_initial_view.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { INITIAL_LOCATION } from '../../../../common/constants';
-import { Goto, MapCenterAndZoom } from '../../../../common/descriptor_types';
-import { MapSettings } from '../../../reducers/map';
+import { INITIAL_LOCATION } from '../../../common/constants';
+import { Goto, MapCenterAndZoom } from '../../../common/descriptor_types';
+import { MapSettings } from '../../reducers/map';
 
 export async function getInitialView(
   goto: Goto | null,
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/image_utils.js b/x-pack/plugins/maps/public/connected_components/mb_map/image_utils.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/image_utils.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/image_utils.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/index.js b/x-pack/plugins/maps/public/connected_components/mb_map/index.js
similarity index 84%
rename from x-pack/plugins/maps/public/connected_components/map/mb/index.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/index.js
index 4b8df07bd1f39..cccd5e571d3e8 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/index.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/index.js
@@ -5,7 +5,7 @@
  */
 
 import { connect } from 'react-redux';
-import { MBMap } from './view';
+import { MBMap } from './mb_map';
 import {
   mapExtentChanged,
   mapReady,
@@ -14,7 +14,7 @@ import {
   clearMouseCoordinates,
   clearGoto,
   setMapInitError,
-} from '../../../actions';
+} from '../../actions';
 import {
   getLayerList,
   getMapReady,
@@ -25,9 +25,9 @@ import {
   isViewControlHidden,
   getSpatialFiltersLayer,
   getMapSettings,
-} from '../../../selectors/map_selectors';
+} from '../../selectors/map_selectors';
 
-import { getInspectorAdapters } from '../../../reducers/non_serializable_instances';
+import { getInspectorAdapters } from '../../reducers/non_serializable_instances';
 
 function mapStateToProps(state = {}) {
   return {
@@ -72,7 +72,5 @@ function mapDispatchToProps(dispatch) {
   };
 }
 
-const connectedMBMap = connect(mapStateToProps, mapDispatchToProps, null, {
-  forwardRef: true,
-})(MBMap);
-export { connectedMBMap as MBMap };
+const connected = connect(mapStateToProps, mapDispatchToProps)(MBMap);
+export { connected as MBMap };
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/mb.utils.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/mb.utils.test.js
similarity index 98%
rename from x-pack/plugins/maps/public/connected_components/map/mb/mb.utils.test.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/mb.utils.test.js
index e2050724ef684..a28cc75f6d89d 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/mb.utils.test.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb.utils.test.js
@@ -5,7 +5,7 @@
  */
 
 import { removeOrphanedSourcesAndLayers } from './utils';
-import { SPATIAL_FILTERS_LAYER_ID } from '../../../../common/constants';
+import { SPATIAL_FILTERS_LAYER_ID } from '../../../common/constants';
 import _ from 'lodash';
 
 class MockMbMap {
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.js
similarity index 97%
rename from x-pack/plugins/maps/public/connected_components/map/mb/view.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/mb_map.js
index ddc48cfc9c329..04c376a093623 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.js
@@ -6,15 +6,15 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { ResizeChecker } from '../../../../../../../src/plugins/kibana_utils/public';
+import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
 import { removeOrphanedSourcesAndLayers, addSpritesheetToMap } from './utils';
 import { syncLayerOrder } from './sort_layers';
-import { getGlyphUrl, isRetina } from '../../../meta';
+import { getGlyphUrl, isRetina } from '../../meta';
 import {
   DECIMAL_DEGREES_PRECISION,
   KBN_TOO_MANY_FEATURES_IMAGE_ID,
   ZOOM_PRECISION,
-} from '../../../../common/constants';
+} from '../../../common/constants';
 import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
 import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
 import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js';
@@ -23,9 +23,9 @@ 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 '../../../../common/elasticsearch_util';
+import { clampToLatBounds, clampToLonBounds } from '../../../common/elasticsearch_util';
 import { getInitialView } from './get_initial_view';
-import { getPreserveDrawingBuffer } from '../../../kibana_services';
+import { getPreserveDrawingBuffer } from '../../kibana_services';
 
 mapboxgl.workerUrl = mbWorkerUrl;
 mapboxgl.setRTLTextPlugin(mbRtlPlugin);
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
similarity index 98%
rename from x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts
rename to x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
index e26a1e43509c8..9e85c7b04b266 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.test.ts
@@ -8,8 +8,8 @@
 import _ from 'lodash';
 import { Map as MbMap, Layer as MbLayer, Style as MbStyle } from 'mapbox-gl';
 import { getIsTextLayer, syncLayerOrder } from './sort_layers';
-import { SPATIAL_FILTERS_LAYER_ID } from '../../../../common/constants';
-import { ILayer } from '../../../classes/layers/layer';
+import { SPATIAL_FILTERS_LAYER_ID } from '../../../common/constants';
+import { ILayer } from '../../classes/layers/layer';
 
 let moveCounter = 0;
 
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
similarity index 98%
rename from x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts
rename to x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
index 0c970fe663557..dda43269e32d8 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/sort_layers.ts
@@ -5,7 +5,7 @@
  */
 
 import { Map as MbMap, Layer as MbLayer } from 'mapbox-gl';
-import { ILayer } from '../../../classes/layers/layer';
+import { ILayer } from '../../classes/layers/layer';
 
 // "Layer" is overloaded and can mean the following
 // 1) Map layer (ILayer): A single map layer consists of one to many mapbox layers.
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/__snapshots__/tooltip_control.test.js.snap b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/__snapshots__/tooltip_control.test.js.snap
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/__snapshots__/tooltip_control.test.js.snap
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/__snapshots__/tooltip_control.test.js.snap
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/__snapshots__/tooltip_popover.test.js.snap b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/__snapshots__/tooltip_popover.test.js.snap
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/__snapshots__/tooltip_popover.test.js.snap
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/__snapshots__/tooltip_popover.test.js.snap
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/index.js b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.js
similarity index 94%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/index.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.js
index 407dcf1997aeb..7d2f2b05d6f11 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/index.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.js
@@ -11,13 +11,13 @@ import {
   openOnClickTooltip,
   closeOnHoverTooltip,
   openOnHoverTooltip,
-} from '../../../../actions';
+} from '../../../actions';
 import {
   getLayerList,
   getOpenTooltips,
   getHasLockedTooltips,
   isDrawingFilter,
-} from '../../../../selectors/map_selectors';
+} from '../../../selectors/map_selectors';
 
 function mapStateToProps(state = {}) {
   return {
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.js
similarity index 98%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.js
index edfeb3c76b104..b178eef6fa5d3 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.js
@@ -6,9 +6,9 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { FEATURE_ID_PROPERTY_NAME, LON_INDEX } from '../../../../../common/constants';
+import { FEATURE_ID_PROPERTY_NAME, LON_INDEX } from '../../../../common/constants';
 import { TooltipPopover } from './tooltip_popover';
-import { EXCLUDE_TOO_MANY_FEATURES_BOX } from '../../../../classes/util/mb_filter_expressions';
+import { EXCLUDE_TOO_MANY_FEATURES_BOX } from '../../../classes/util/mb_filter_expressions';
 
 function justifyAnchorLocation(mbLngLat, targetFeature) {
   let popupAnchorLocation = [mbLngLat.lng, mbLngLat.lat]; // default popup location to mouse location
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.test.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_control.test.js
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.js
similarity index 97%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.js
index 4cfddf0034039..ca4864f79940e 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.js
@@ -5,8 +5,8 @@
  */
 
 import React, { Component } from 'react';
-import { LAT_INDEX, LON_INDEX } from '../../../../../common/constants';
-import { FeaturesTooltip } from '../../features_tooltip/features_tooltip';
+import { LAT_INDEX, LON_INDEX } from '../../../../common/constants';
+import { FeaturesTooltip } from '../features_tooltip/features_tooltip';
 import { EuiPopover, EuiText } from '@elastic/eui';
 
 const noop = () => {};
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.test.js
similarity index 98%
rename from x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.test.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.test.js
index 205ca7337277d..b15c3fce6c0b7 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.test.js
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/tooltip_popover.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../../features_tooltip/features_tooltip', () => ({
+jest.mock('../features_tooltip/features_tooltip', () => ({
   FeaturesTooltip: () => {
     return <div>mockFeaturesTooltip</div>;
   },
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/utils.js b/x-pack/plugins/maps/public/connected_components/mb_map/utils.js
similarity index 100%
rename from x-pack/plugins/maps/public/connected_components/map/mb/utils.js
rename to x-pack/plugins/maps/public/connected_components/mb_map/utils.js