diff --git a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
index 59ca1294ceb3c84..50573f6b82d71b8 100644
--- a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
+++ b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
@@ -41,7 +41,7 @@ import {
   getRequestInspectorStats,
   getResponseInspectorStats,
 } from '../../../../../ui/public/courier/utils/courier_inspector_utils';
-import { calculateObjectHash } from '../../../visualizations/public/np_ready/public/legacy/calculate_object_hash';
+import { calculateObjectHash } from '../../../../visualizations/public/np_ready/public/legacy/calculate_object_hash';
 import { getTime } from '../../../../../ui/public/timefilter';
 // @ts-ignore
 import { tabifyAggResponse } from '../../../../../ui/public/agg_response/tabify/tabify';
diff --git a/src/legacy/core_plugins/input_control_vis/public/register_vis.js b/src/legacy/core_plugins/input_control_vis/public/register_vis.js
index 731cf2dac9dd2e5..9d3223d279e68f2 100644
--- a/src/legacy/core_plugins/input_control_vis/public/register_vis.js
+++ b/src/legacy/core_plugins/input_control_vis/public/register_vis.js
@@ -17,14 +17,13 @@
  * under the License.
  */
 
-import { visFactory } from 'ui/vis/vis_factory';
 import { VisController } from './vis_controller';
 import { ControlsTab } from './components/editor/controls_tab';
 import { OptionsTab } from './components/editor/options_tab';
-import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
-import { Status } from 'ui/vis/update_status';
 import { i18n } from '@kbn/i18n';
 import { setup as visualizations } from '../../visualizations/public/np_ready/public/legacy';
+import { Status, visFactory, defaultFeedbackMessage } from '../../visualizations/public';
+
 
 function InputControlVisProvider() {
 
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
index ca9115b729da814..49d4a85a5421e93 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from 'ui/vis/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.js
index 75907618eb859d8..b9f03b51e44e5e4 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/gauge.js
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { visFactory } from 'ui/vis/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
 import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/goal.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/goal.js
index 065f5627e58da78..ff023269fec5a93 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/goal.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/goal.js
@@ -24,7 +24,7 @@ import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
 import { GaugeOptions } from './components/options';
 import { getGaugeCollections, GaugeTypes, ColorModes } from './utils/collections';
 import { vislibVisController } from './controller';
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 
 export default function GoalVisType() {
 
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/heatmap.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/heatmap.js
index b71418b216d0502..a8087d9be1356d5 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/heatmap.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/heatmap.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
index 9246c8a4b939b4e..fdaa22454e2874e 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
index fcf5a04b093d14b..748f1eab11f2740 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
index 44089483b925f4c..93d0ca4a168e82b 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/pie.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/pie.js
index 9780e502bc91ec3..718ffccf0ad6ea8 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/pie.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/pie.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from '../../visualizations/public/np_ready/public/vis_factory';
+import { visFactory } from '../../visualizations/public';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggGroupNames } from 'ui/vis/editors/default';
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 6e62f3e5d5a5568..71ca402d2262718 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -81,7 +81,7 @@ export function getServices() {
 
 // EXPORT legacy static dependencies
 export { angular };
-export { buildVislibDimensions } from 'ui/../../../visualizations/public/np_ready/public/legacy/build_pipeline';
+export { buildVislibDimensions } from '../../../visualizations/public';
 // @ts-ignore
 export { callAfterBindingsWorkaround } from 'ui/compat';
 export {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index aec80b8d13551af..ae4b4d1c779df1d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -27,7 +27,7 @@
 
 import { Vis } from 'ui/vis';
 import { uiModules } from 'ui/modules';
-import { updateOldState } from 'ui/vis/vis_update_state';
+import { updateOldState } from '../../../../visualizations/public';
 import { VisualizeConstants } from '../visualize_constants';
 import { createLegacyClass } from 'ui/utils/legacy_class';
 import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
index 245b4270c6aea12..fcc612ab49bd264 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
@@ -34,7 +34,7 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { memoizeLast } from 'ui/utils/memoize';
+import { memoizeLast } from '../../../../../visualizations/public/np_ready/public/legacy/memoize';
 import { VisType } from '../../kibana_services';
 import { VisTypeAlias } from '../../../../../visualizations/public';
 import { NewVisHelp } from './new_vis_help';
diff --git a/src/legacy/core_plugins/region_map/public/region_map_type.js b/src/legacy/core_plugins/region_map/public/region_map_type.js
index 3a28277f9f4c7da..a4570764ec6def6 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_type.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_type.js
@@ -22,11 +22,9 @@ import { Schemas } from 'ui/vis/editors/default/schemas';
 import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
 import { mapToLayerWithId } from './util';
 import { createRegionMapVisualization } from './region_map_visualization';
-import { Status } from 'ui/vis/update_status';
+import { Status, visFactory } from '../../visualizations/public';
 import { RegionMapOptions } from './components/region_map_options';
 
-import { visFactory } from '../../visualizations/public';
-
 // TODO: reference to TILE_MAP plugin should be removed
 import { ORIGIN } from '../../tile_map/common/origin';
 
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index 243b4c2bf7765a3..c662c60102f4a00 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -22,12 +22,11 @@ import { i18n } from '@kbn/i18n';
 
 import { supports } from 'ui/utils/supports';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { Status } from 'ui/vis/update_status';
 import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
 import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';
 
 import { createTileMapVisualization } from './tile_map_visualization';
-import { visFactory } from '../../visualizations/public';
+import { visFactory, Status } from '../../visualizations/public';
 import { TileMapOptions } from './components/tile_map_options';
 import { MapTypes } from './map_types';
 
diff --git a/src/legacy/core_plugins/vis_type_metric/public/types.ts b/src/legacy/core_plugins/vis_type_metric/public/types.ts
index 18297bb13a40281..ce0e78140a86a46 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/types.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/types.ts
@@ -19,7 +19,7 @@
 
 import { ColorSchemas } from 'ui/vislib/components/color/colormaps';
 import { RangeValues } from 'ui/vis/editors/default/controls/ranges';
-import { SchemaConfig } from 'ui/../../visualizations/public/np_ready/public/legacy/build_pipeline';
+import { SchemaConfig } from '../../visualizations/public';
 import { ColorModes } from '../../kbn_vislib_vis_types/public/utils/collections';
 import { Labels, Style } from '../../kbn_vislib_vis_types/public/types';
 
diff --git a/src/legacy/core_plugins/vis_type_table/public/__tests__/table_vis_controller.js b/src/legacy/core_plugins/vis_type_table/public/__tests__/table_vis_controller.js
index 4153ce2da36a73a..48cc625b9481678 100644
--- a/src/legacy/core_plugins/vis_type_table/public/__tests__/table_vis_controller.js
+++ b/src/legacy/core_plugins/vis_type_table/public/__tests__/table_vis_controller.js
@@ -21,8 +21,7 @@ import $ from 'jquery';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { legacyResponseHandlerProvider } from 'ui/vis/response_handlers/legacy';
-import { Vis } from 'ui/vis';
-import { VisFactoryProvider } from 'ui/vis/vis_factory';
+import { Vis } from '../../../visualizations/public';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { AppStateProvider } from 'ui/state_management/app_state';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
@@ -40,17 +39,11 @@ describe('Table Vis - Controller', async function () {
   let AppState;
   let tableAggResponse;
   let tabifiedResponse;
-  let legacyDependencies;
 
-  ngMock.inject(function ($injector) {
-    Private = $injector.get('Private');
-    legacyDependencies = {
-      // eslint-disable-next-line new-cap
-      createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization,
-    };
+  ngMock.inject(function () {
 
     visualizationsSetup.types.registerVisualization(() =>
-      createTableVisTypeDefinition(legacyDependencies)
+      createTableVisTypeDefinition()
     );
   });
 
diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
index 13e8a4fd9535a1c..08d9eb104350213 100644
--- a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
+++ b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
@@ -25,11 +25,10 @@ import fixtures from 'fixtures/fake_hierarchical_data';
 import sinon from 'sinon';
 import { legacyResponseHandlerProvider } from 'ui/vis/response_handlers/legacy';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { Vis } from 'ui/vis';
+import { Vis } from '../../../../visualizations/public';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 import { round } from 'lodash';
 
-import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { createTableVisTypeDefinition } from '../../table_vis_type';
 import { setup as visualizationsSetup } from '../../../../visualizations/public/np_ready/public/legacy';
 
@@ -39,7 +38,6 @@ describe('Table Vis - AggTable Directive', function () {
   let indexPattern;
   let settings;
   let tableAggResponse;
-  let legacyDependencies;
   const tabifiedData = {};
 
   const init = () => {
@@ -98,13 +96,8 @@ describe('Table Vis - AggTable Directive', function () {
     );
   };
 
-  ngMock.inject(function (Private) {
-    legacyDependencies = {
-      // eslint-disable-next-line new-cap
-      createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization,
-    };
-
-    visualizationsSetup.types.registerVisualization(() => createTableVisTypeDefinition(legacyDependencies));
+  ngMock.inject(function () {
+    visualizationsSetup.types.registerVisualization(() => createTableVisTypeDefinition());
   });
 
   beforeEach(ngMock.module('kibana'));
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
index d7330a77e396df8..380c898ed94c686 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
@@ -20,13 +20,13 @@
 import { i18n } from '@kbn/i18n';
 import { Vis } from 'ui/vis';
 // @ts-ignore
-import { visFactory } from 'ui/../../visualizations/public/np_ready/public/legacy/vis_factory';
 
 // @ts-ignore
 import { Schemas } from 'ui/vis/editors/default/schemas';
 // @ts-ignore
 import { AngularVisController } from 'ui/vis/vis_types/angular_vis_type';
 import { AggGroupNames } from 'ui/vis/editors/default';
+import { visFactory } from '../../visualizations/public';
 import { tableVisResponseHandler } from './table_vis_request_handler';
 // @ts-ignore
 import tableVisTemplate from './table_vis.html';
diff --git a/src/legacy/core_plugins/vis_type_table/public/types.ts b/src/legacy/core_plugins/vis_type_table/public/types.ts
index bc2f4b64f4dcc88..39023d1305cb63e 100644
--- a/src/legacy/core_plugins/vis_type_table/public/types.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { SchemaConfig } from 'ui/../../visualizations/public/np_ready/public/legacy/build_pipeline';
+import { SchemaConfig } from '../../visualizations/public';
 
 export enum AggTypes {
   SUM = 'sum',
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
index 623139385892321..2dbbde812892024 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
@@ -18,9 +18,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Status } from 'ui/../../visualizations/public/np_ready/public/legacy/update_status';
 // @ts-ignore
 import { Schemas } from 'ui/vis/editors/default/schemas';
+import { Status } from '../../visualizations/public';
 
 import { TagCloudOptions } from './components/tag_cloud_options';
 import { visFactory } from '../../visualizations/public';
diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts b/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
index 49e858559cf5981..ca073e7ec31fdd3 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
+++ b/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
@@ -18,11 +18,11 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Status } from 'ui/../../visualizations/public/np_ready/public/legacy/update_status';
 // @ts-ignore
 import { DefaultEditorSize } from 'ui/vis/editor_size';
 // @ts-ignore
 import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
+import { Status } from '../../visualizations/public';
 
 import { visFactory } from '../../visualizations/public';
 import { VegaVisualizationDependencies } from './plugin';
diff --git a/src/legacy/core_plugins/visualizations/public/legacy_imports.ts b/src/legacy/core_plugins/visualizations/public/legacy_imports.ts
new file mode 100644
index 000000000000000..21a702d77202746
--- /dev/null
+++ b/src/legacy/core_plugins/visualizations/public/legacy_imports.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { PersistedState } from '../../../ui/public/persisted_state';
+export { SearchError, SearchSource } from '../../../ui//public/courier';
+export { AggConfig, AggConfigs, setBounds } from '../../../ui/public/agg_types';
+export { isDateHistogramBucketAggConfig } from '../../../ui/public/agg_types/buckets/date_histogram';
+export { createFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
+export { I18nContext } from '../../../ui/public/i18n';
+import '../../../ui/public/directives/bind';
diff --git a/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts b/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts
new file mode 100644
index 000000000000000..e6ca678db563d65
--- /dev/null
+++ b/src/legacy/core_plugins/visualizations/public/legacy_mocks.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { searchSourceMock } from '../../../ui/public/courier/search_source/mocks';
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
index 9bba9cab67625b7..5a9a1830ebdf33d 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization.tsx
@@ -20,12 +20,12 @@
 import { get } from 'lodash';
 import React from 'react';
 
-import { PersistedState } from '../../../../../../ui/public/persisted_state';
-import { memoizeLast } from '../../../../../../ui/public/utils/memoize';
-import { Vis } from '../../../../../../ui/public/vis';
+import { PersistedState } from '../../../legacy_imports';
+import { memoizeLast } from '../legacy/memoize';
 import { VisualizationChart } from './visualization_chart';
 import { VisualizationNoResults } from './visualization_noresults';
 import { VisualizationRequestError } from './visualization_requesterror';
+import { Vis } from '..';
 
 function shouldShowNoResultsMessage(vis: Vis, visData: any): boolean {
   const requiresSearch = get(vis, 'type.requiresSearch');
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
index 2f56f3514c70304..95fd31049d23361 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_chart.tsx
@@ -21,10 +21,10 @@ import React from 'react';
 import * as Rx from 'rxjs';
 import { debounceTime, filter, share, switchMap } from 'rxjs/operators';
 
-import { PersistedState } from '../../../../../../ui/public/persisted_state';
-import { ResizeChecker } from '../../../../../../ui/public/resize_checker';
-import { Vis, VisualizationController } from '../../../../../../ui/public/vis';
+import { PersistedState } from '../../../legacy_imports';
+import { Vis, VisualizationController } from '../vis';
 import { getUpdateStatus } from '../legacy/update_status';
+import { ResizeChecker } from '../../../../../../../plugins/kibana_utils/public';
 
 interface VisualizationChartProps {
   onInit?: () => void;
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_noresults.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_noresults.tsx
index efb187f968349a6..5a964caa46b4bd3 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_noresults.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_noresults.tsx
@@ -19,7 +19,6 @@
 
 import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
 import React from 'react';
-import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
 
 interface VisualizationNoResultsProps {
   onInit?: () => void;
@@ -58,8 +57,5 @@ export class VisualizationNoResults extends React.Component<VisualizationNoResul
     if (this.props.onInit) {
       this.props.onInit();
     }
-    if (this.containerDiv.current) {
-      dispatchRenderComplete(this.containerDiv.current);
-    }
   }
 }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx
index 5111acc8b437c4a..9be1aee363a9ba5 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/visualization_requesterror.tsx
@@ -19,8 +19,7 @@
 
 import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
 import React from 'react';
-import { SearchError } from 'src/legacy/ui/public/courier';
-import { dispatchRenderComplete } from '../../../../../../../plugins/kibana_utils/public';
+import { SearchError } from '../../../legacy_imports';
 
 interface VisualizationRequestErrorProps {
   onInit?: () => void;
@@ -59,8 +58,5 @@ export class VisualizationRequestError extends React.Component<VisualizationRequ
     if (this.props.onInit) {
       this.props.onInit();
     }
-    if (this.containerDiv.current) {
-      dispatchRenderComplete(this.containerDiv.current);
-    }
   }
 }
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/brush_event.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/brush_event.js
index eb5c75b5768d2ea..3b5064b63be3794 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/brush_event.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/brush_event.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { esFilters } from 'src/plugins/data/public';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 export function onBrushEvent(event) {
   const isNumber = event.data.ordered;
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/index.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/index.ts
index 39351805fd2b4c4..4558621dc6615ab 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/index.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/index.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
+// @ts-ignore
 export * from './vis_filters';
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/vis_filters.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/vis_filters.js
index 3fe286c95544bff..9e72cb3402a5a48 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/vis_filters.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/filters/vis_filters.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { pushFilterBarFilters } from '../../../../../../ui/public/vis/push_filters';
 import { onBrushEvent } from './brush_event';
 import { esFilters } from '../../../../../../../plugins/data/public';
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
index 3430e78d6cd0a29..5fce9364dbf4942 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
@@ -48,4 +48,7 @@ export { Vis, VisParams, VisState } from './vis';
 export * from './filters';
 
 export { Status } from './legacy/update_status';
-export { buildPipeline } from './legacy/build_pipeline';
+export { buildPipeline, buildVislibDimensions, SchemaConfig } from './legacy/build_pipeline';
+
+// @ts-ignore
+export { updateOldState } from './legacy/vis_update_state';
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts
index 16cec5d2d9e91c1..ea9e7b7f22da53b 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts
@@ -29,10 +29,5 @@ import { plugin } from '.';
 
 const pluginInstance = plugin({} as PluginInitializerContext);
 
-export const setup = pluginInstance.setup(npSetup.core, {
-  __LEGACY: {
-    VisFiltersProvider,
-    createFilter,
-  },
-});
+export const setup = pluginInstance.setup(npSetup.core);
 export const start = pluginInstance.start(npStart.core);
diff --git a/src/legacy/ui/public/vis/__tests__/_vis.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/_vis.js
similarity index 96%
rename from src/legacy/ui/public/vis/__tests__/_vis.js
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/_vis.js
index 1d5e2de6dafe37f..bd8ce8381608cac 100644
--- a/src/legacy/ui/public/vis/__tests__/_vis.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/_vis.js
@@ -20,9 +20,9 @@
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
-import { Vis } from '..';
+import { Vis } from '../..';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import { start as visualizations } from '../../../../core_plugins/visualizations/public/np_ready/public/legacy';
+import { start as visualizations } from '../../legacy';
 
 describe('Vis Class', function () {
   let indexPattern;
diff --git a/src/legacy/ui/public/vis/__tests__/vis_types/base_vis_type.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/base_vis_type.js
similarity index 94%
rename from src/legacy/ui/public/vis/__tests__/vis_types/base_vis_type.js
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/base_vis_type.js
index 687d3c1982f0fae..5e03b205e76e477 100644
--- a/src/legacy/ui/public/vis/__tests__/vis_types/base_vis_type.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/base_vis_type.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import { BaseVisType } from '../../../../../core_plugins/visualizations/public/np_ready/public/types/base_vis_type';
+import { BaseVisType } from '../../../types/base_vis_type';
 
 describe('Base Vis Type', function () {
   beforeEach(ngMock.module('kibana'));
diff --git a/src/legacy/ui/public/vis/__tests__/vis_types/react_vis_type.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/react_vis_type.js
similarity index 94%
rename from src/legacy/ui/public/vis/__tests__/vis_types/react_vis_type.js
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/react_vis_type.js
index 5dc4840d7ee9db5..bc16c6acbc20c82 100644
--- a/src/legacy/ui/public/vis/__tests__/vis_types/react_vis_type.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_types/react_vis_type.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import { ReactVisType } from '../../../../../core_plugins/visualizations/public/np_ready/public/types/react_vis_type';
+import { ReactVisType } from '../../../types/react_vis_type';
 
 describe('React Vis Type', function () {
 
diff --git a/src/legacy/ui/public/vis/__tests__/vis_update_objs/gauge_objs.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_update_objs/gauge_objs.js
similarity index 100%
rename from src/legacy/ui/public/vis/__tests__/vis_update_objs/gauge_objs.js
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/__tests__/vis_update_objs/gauge_objs.js
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
index bbfeac6b01cd940..e733bad2c012741 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts
@@ -27,8 +27,8 @@ import {
   Schemas,
 } from './build_pipeline';
 import { Vis, VisState } from '..';
-import { AggConfig } from 'ui/agg_types/agg_config';
-import { searchSourceMock } from 'ui/courier/search_source/mocks';
+import { AggConfig } from '../../../legacy_imports';
+import { searchSourceMock } from '../../../legacy_mocks';
 
 jest.mock('ui/new_platform');
 jest.mock('ui/agg_types/buckets/date_histogram', () => ({
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index 1ea1203720c02af..7284493efb03c5d 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -19,12 +19,15 @@
 
 import { cloneDeep, get } from 'lodash';
 // @ts-ignore
-import { AggConfig, setBounds } from 'src/legacy/ui/public/agg_types';
-import { SearchSource } from 'src/legacy/ui/public/courier';
-import { isDateHistogramBucketAggConfig } from 'src/legacy/ui/public/agg_types/buckets/date_histogram';
 import moment from 'moment';
 import { SerializedFieldFormat } from 'src/plugins/expressions/public';
-import { createFormat } from '../../../../../../ui/public/visualize/loader/pipeline_helpers/utilities';
+import {
+  AggConfig,
+  setBounds,
+  SearchSource,
+  isDateHistogramBucketAggConfig,
+  createFormat,
+} from '../../../legacy_imports';
 import { Vis, VisParams, VisState } from '..';
 
 interface SchemaConfigParams {
diff --git a/src/legacy/ui/public/utils/memoize.test.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/memoize.test.ts
similarity index 100%
rename from src/legacy/ui/public/utils/memoize.test.ts
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/memoize.test.ts
diff --git a/src/legacy/ui/public/utils/memoize.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/memoize.ts
similarity index 100%
rename from src/legacy/ui/public/utils/memoize.ts
rename to src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/memoize.ts
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
index 3c0915effb58f62..6d32a6df5f1ec63 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/update_status.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PersistedState } from '../../../../../../ui/public/persisted_state';
+import { PersistedState } from '../../../legacy_imports';
 import { calculateObjectHash } from './calculate_object_hash';
 import { Vis } from '../vis';
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/vis_update_state.test.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/vis_update_state.test.js
index 3ea6d2ab2e1672b..98dd2e3cbb2f747 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/vis_update_state.test.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/vis_update_state.test.js
@@ -21,7 +21,7 @@ import _ from 'lodash';
 import { updateOldState } from './vis_update_state';
 
 // eslint-disable-next-line camelcase
-import { pre_6_1, since_6_1 } from '../../../../../../ui/public/vis/__tests__/vis_update_objs/gauge_objs';
+import { pre_6_1, since_6_1 } from './__tests__/vis_update_objs/gauge_objs';
 
 function watchForChanges(obj) {
   const originalObject = _.cloneDeep(obj);
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
index 5d7ab12a677cfd2..04e086056289591 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts
@@ -35,10 +35,6 @@ import { VisFiltersProvider, createFilter } from 'ui/vis/vis_filters';
 /* eslint-enable */
 
 const createSetupContract = (): VisualizationsSetup => ({
-  filters: {
-    VisFiltersProvider: jest.fn(),
-    createFilter: jest.fn(),
-  },
   types: {
     registerVisualization: jest.fn(),
     registerAlias: jest.fn(),
@@ -57,12 +53,7 @@ const createStartContract = (): VisualizationsStart => ({
 const createInstance = async () => {
   const plugin = new VisualizationsPlugin({} as PluginInitializerContext);
 
-  const setup = plugin.setup(coreMock.createSetup(), {
-    __LEGACY: {
-      VisFiltersProvider,
-      createFilter,
-    },
-  });
+  const setup = plugin.setup(coreMock.createSetup());
   const doStart = () => plugin.start(coreMock.createStart());
 
   return {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
index 497e9c3feba180b..25f46c1dd8fb51e 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts
@@ -18,6 +18,7 @@
  */
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { TypesService, TypesSetup, TypesStart } from './types';
+import { setUISettings, setTypes } from './services';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -41,23 +42,23 @@ export interface VisualizationsStart {
  *
  * @internal
  */
-export class VisualizationsPlugin
-  implements
-    Plugin<VisualizationsSetup, VisualizationsStart> {
+export class VisualizationsPlugin implements Plugin<VisualizationsSetup, VisualizationsStart> {
   private readonly types: TypesService = new TypesService();
 
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(core: CoreSetup) {
-
+    setUISettings(core.uiSettings);
     return {
       types: this.types.setup(),
     };
   }
 
   public start(core: CoreStart) {
+    const types = this.types.start();
+    setTypes(types);
     return {
-      types: this.types.start(),
+      types,
     };
   }
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts
new file mode 100644
index 000000000000000..9a4a6650fc83edb
--- /dev/null
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsClientContract } from 'src/core/public';
+import { TypesStart } from './types';
+import { createGetterSetter } from '../../../../../../plugins/kibana_utils/public';
+
+export const [getUISettings, setUISettings] = createGetterSetter<UiSettingsClientContract>(
+  'UISettings'
+);
+
+export const [getTypes, setTypes] = createGetterSetter<TypesStart>('Types');
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/base_vis_type.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/base_vis_type.js
index 30d806bc305af4a..2dc657ecde05b2a 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/base_vis_type.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/base_vis_type.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { createFiltersFromEvent, onBrushEvent } from '../vis_filters';
+import { createFiltersFromEvent, onBrushEvent } from '../filters';
 
 export class BaseVisType {
   constructor(opts = {}) {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/react_vis_type.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/react_vis_type.js
index 1dad16332fbcfe4..1667104a8606480 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/types/react_vis_type.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/types/react_vis_type.js
@@ -19,8 +19,8 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import chrome from '../../../../../../ui/public/chrome';
-import { I18nContext } from '../../../../../../ui/public/i18n';
+import { getUISettings } from '../services';
+import { I18nContext } from '../../../legacy_imports';
 import { BaseVisType } from './base_vis_type';
 
 
@@ -35,7 +35,7 @@ class ReactVisController {
 
     return new Promise((resolve) => {
       const Component = this.vis.type.visConfig.component;
-      const config = chrome.getUiSettingsClient();
+      const config = getUISettings();
       render(
         <I18nContext>
           <Component
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.d.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.d.ts
index e7d96c341b97026..6e6a2174d6ad140 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.d.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.d.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { VisType } from './types/vis_type';
-import { AggConfigs } from '../../../../../ui/public/agg_types/agg_configs';
+import { VisType } from './types';
+import { AggConfigs } from '../../legacy_imports';
 import { Status } from './legacy/update_status';
 
 export interface Vis {
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.js
index af14ea52556a136..bfbce39fcf40246 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.js
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis.js
@@ -29,16 +29,9 @@
 
 import { EventEmitter } from 'events';
 import _ from 'lodash';
-import '../../../../../ui/public/render_complete/directive';
-import { AggConfigs } from '../agg_types/agg_configs';
-import { PersistedState } from '../persisted_state';
-import { updateVisualizationConfig } from './vis_update';
-import { SearchSource } from '../courier';
-import { start as visualizations } from '../../../core_plugins/visualizations/public/np_ready/public/legacy';
-
-import '../directives/bind';
-
-const visTypes = visualizations.types;
+import { AggConfigs, PersistedState, SearchSource } from '../../legacy_imports';
+import { updateVisualizationConfig } from './legacy/vis_update';
+import { getTypes } from './services';
 
 class Vis extends EventEmitter {
   constructor(indexPattern, visState) {
@@ -50,6 +43,7 @@ class Vis extends EventEmitter {
         type: visState
       };
     }
+
     this.indexPattern = indexPattern;
     this._setUiState(new PersistedState());
     this.setCurrentState(visState);
@@ -72,7 +66,7 @@ class Vis extends EventEmitter {
     this.title = state.title || '';
     const type = state.type || this.type;
     if (_.isString(type)) {
-      this.type = visTypes.get(type);
+      this.type = getTypes().get(type);
       if (!this.type) {
         throw new Error(`Invalid type "${type}"`);
       }
diff --git a/src/legacy/ui/public/agg_types/agg_configs.ts b/src/legacy/ui/public/agg_types/agg_configs.ts
index 38aea86e0e0b726..71348dbe75e364d 100644
--- a/src/legacy/ui/public/agg_types/agg_configs.ts
+++ b/src/legacy/ui/public/agg_types/agg_configs.ts
@@ -28,12 +28,13 @@
 
 import _ from 'lodash';
 import { TimeRange } from 'src/plugins/data/public';
-import { Schemas } from '../../../core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline';
 import { Schema } from '../vis/editors/default/schemas';
 import { AggConfig, AggConfigOptions } from './agg_config';
 import { AggGroupNames } from '../vis/editors/default/agg_groups';
 import { IndexPattern } from '../../../core_plugins/data/public';
 
+type Schemas = Record<string, any>;
+
 function removeParentAggs(obj: any) {
   for (const prop in obj) {
     if (prop === 'parentAggs') delete obj[prop];
diff --git a/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts b/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts
index ceeed4e9e1d6787..b09ed60e7186f9a 100644
--- a/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts
+++ b/src/legacy/ui/public/inspector/build_tabular_inspector_data.ts
@@ -19,7 +19,7 @@
 
 import { set } from 'lodash';
 // @ts-ignore
-import { createFilter } from '../vis/vis_filters';
+import { createFilter } from '../../../core_plugins/visualizations/public';
 import { FormattedData } from './adapters';
 
 interface Column {
diff --git a/src/legacy/ui/public/vis/__tests__/index.js b/src/legacy/ui/public/vis/__tests__/index.js
index 93a0bf026ae5d1c..46074f2c5197b74 100644
--- a/src/legacy/ui/public/vis/__tests__/index.js
+++ b/src/legacy/ui/public/vis/__tests__/index.js
@@ -19,6 +19,3 @@
 
 import './_agg_config';
 import './_agg_configs';
-import './_vis';
-describe('Vis Component', function () {
-});
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js
index ce94c3a5f68abba..3d054b8f8a2fbd3 100644
--- a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js
+++ b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend.js
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
 import html from './vislib_vis_legend.html';
 import { Data } from '../../vislib/lib/data';
 import { uiModules } from '../../modules';
-import { createFiltersFromEvent } from '../vis_filters';
+import { createFiltersFromEvent } from '../../../../core_plugins/visualizations/public';
 import { htmlIdGenerator, keyCodes } from '@elastic/eui';
 import { getTableAggs } from '../../visualize/loader/pipeline_helpers/utilities';
 
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
index c2d8ed7f5f9c177..280e35c447f92dc 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { visFactory } from 'ui/vis/vis_factory';
+import { visFactory } from '../../../../../../src/legacy/core_plugins/visualizations/public';
 
 import { SelfChangingEditor } from './self_changing_editor';
 import { SelfChangingComponent } from './self_changing_components';