diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c32bf8cbaa1c3e..0d86726dca836c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -18,6 +18,7 @@
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
+/src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/vis_type_timeseries/ @elastic/kibana-app
 /src/plugins/vis_type_metric/ @elastic/kibana-app
diff --git a/.i18nrc.json b/.i18nrc.json
index dc1be7f5a140b3..2ef92f544ad6b7 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -14,7 +14,7 @@
     "esUi": "src/plugins/es_ui_shared",
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
-    "inputControl": "src/legacy/core_plugins/input_control_vis",
+    "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
     "interpreter": "src/legacy/core_plugins/interpreter",
diff --git a/src/legacy/core_plugins/input_control_vis/index.ts b/src/legacy/core_plugins/input_control_vis/index.ts
deleted file mode 100644
index 0529aa24dffd76..00000000000000
--- a/src/legacy/core_plugins/input_control_vis/index.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
-
-const inputControlVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
-  new Plugin({
-    id: 'input_control_vis',
-    require: ['kibana', 'elasticsearch', 'interpreter'],
-    publicDir: resolve(__dirname, 'public'),
-    uiExports: {
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({}),
-    },
-    init: (server: Legacy.Server) => ({}),
-    config(Joi: any) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-  } as Legacy.PluginSpecOptions);
-
-// eslint-disable-next-line import/no-default-export
-export default inputControlVisPluginInitializer;
diff --git a/src/legacy/core_plugins/input_control_vis/package.json b/src/legacy/core_plugins/input_control_vis/package.json
deleted file mode 100644
index 0d52be412f2fdb..00000000000000
--- a/src/legacy/core_plugins/input_control_vis/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "input_control_vis",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/legacy.ts b/src/legacy/core_plugins/input_control_vis/public/legacy.ts
deleted file mode 100644
index 67299068819e8d..00000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/legacy.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from 'ui/new_platform';
-
-import { plugin } from '.';
-
-import {
-  InputControlVisPluginSetupDependencies,
-  InputControlVisPluginStartDependencies,
-} from './plugin';
-
-const setupPlugins: Readonly<InputControlVisPluginSetupDependencies> = {
-  expressions: npSetup.plugins.expressions,
-  data: npSetup.plugins.data,
-  visualizations: npSetup.plugins.visualizations,
-};
-
-const startPlugins: Readonly<InputControlVisPluginStartDependencies> = {
-  expressions: npStart.plugins.expressions,
-  data: npStart.plugins.data,
-  visualizations: npStart.plugins.visualizations,
-};
-
-const pluginInstance = plugin({} as PluginInitializerContext);
-
-export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core, startPlugins);
diff --git a/src/plugins/input_control_vis/kibana.json b/src/plugins/input_control_vis/kibana.json
new file mode 100644
index 00000000000000..4a4ec328c1352b
--- /dev/null
+++ b/src/plugins/input_control_vis/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "inputControlVis",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": ["data", "expressions", "visualizations"]
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap b/src/plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap
rename to src/plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap b/src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/_control_editor.scss b/src/plugins/input_control_vis/public/components/editor/_control_editor.scss
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/_control_editor.scss
rename to src/plugins/input_control_vis/public/components/editor/_control_editor.scss
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/_index.scss b/src/plugins/input_control_vis/public/components/editor/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/_index.scss
rename to src/plugins/input_control_vis/public/components/editor/_index.scss
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx
rename to src/plugins/input_control_vis/public/components/editor/control_editor.tsx
index 2bd0baea6eff8a..90e875fd43432c 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/control_editor.tsx
@@ -34,7 +34,7 @@ import {
 import { RangeControlEditor } from './range_control_editor';
 import { ListControlEditor } from './list_control_editor';
 import { getTitle, ControlParams, CONTROL_TYPES, ControlParamsOptions } from '../../editor_utils';
-import { IIndexPattern } from '../../../../../../plugins/data/public';
+import { IIndexPattern } from '../../../../data/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface ControlEditorUiProps {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
rename to src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
index db2af742c70bc6..c66dbf968cac1e 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
@@ -23,7 +23,7 @@ import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { getDepsMock, getIndexPatternMock } from '../../test_utils';
 import { ControlsTab, ControlsTabUiProps } from './controls_tab';
-import { Vis } from '../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../visualizations/public';
 
 const indexPatternsMock = {
   get: getIndexPatternMock,
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.tsx b/src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.tsx
rename to src/plugins/input_control_vis/public/components/editor/controls_tab.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx
rename to src/plugins/input_control_vis/public/components/editor/field_select.tsx
index 68cca9bf6c4f28..779f3ad6b1a8a9 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/field_select.tsx
@@ -24,7 +24,7 @@ import { InjectedIntlProps } from 'react-intl';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { EuiFormRow, EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { IIndexPattern, IFieldType } from '../../../../../../plugins/data/public';
+import { IIndexPattern, IFieldType } from '../../../../data/public';
 
 interface FieldSelectUiState {
   isLoading: boolean;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx b/src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
rename to src/plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx b/src/plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx
rename to src/plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx
rename to src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
index 9772cb5fc25488..3da3ae9ba757ce 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/list_control_editor.tsx
@@ -25,11 +25,7 @@ import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import {
-  IIndexPattern,
-  IFieldType,
-  IndexPatternSelect,
-} from '../../../../../../plugins/data/public';
+import { IIndexPattern, IFieldType, IndexPatternSelect } from '../../../../data/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface ListControlEditorState {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx
rename to src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
index 639e3d2f68c751..c53d7abc4d659d 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/options_tab.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
-import { Vis } from '../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../visualizations/public';
 import { OptionsTab, OptionsTabProps } from './options_tab';
 
 describe('OptionsTab', () => {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.tsx b/src/plugins/input_control_vis/public/components/editor/options_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.tsx
rename to src/plugins/input_control_vis/public/components/editor/options_tab.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx b/src/plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx
rename to src/plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx
rename to src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
index 97850879a2d382..b6b852bcfa7073 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx
+++ b/src/plugins/input_control_vis/public/components/editor/range_control_editor.tsx
@@ -24,11 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
 import { FieldSelect } from './field_select';
 import { ControlParams, ControlParamsOptions } from '../../editor_utils';
-import {
-  IIndexPattern,
-  IFieldType,
-  IndexPatternSelect,
-} from '../../../../../../plugins/data/public';
+import { IIndexPattern, IFieldType, IndexPatternSelect } from '../../../../data/public';
 import { InputControlVisDependencies } from '../../plugin';
 
 interface RangeControlEditorProps {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap b/src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap b/src/plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap b/src/plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap b/src/plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap
rename to src/plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/_index.scss b/src/plugins/input_control_vis/public/components/vis/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/_index.scss
rename to src/plugins/input_control_vis/public/components/vis/_index.scss
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/_vis.scss b/src/plugins/input_control_vis/public/components/vis/_vis.scss
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/_vis.scss
rename to src/plugins/input_control_vis/public/components/vis/_vis.scss
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.tsx b/src/plugins/input_control_vis/public/components/vis/form_row.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.tsx
rename to src/plugins/input_control_vis/public/components/vis/form_row.test.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.tsx b/src/plugins/input_control_vis/public/components/vis/form_row.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.tsx
rename to src/plugins/input_control_vis/public/components/vis/form_row.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx b/src/plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
similarity index 99%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
rename to src/plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
index 1712f024f5b7b5..b0b674ad7b6eed 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
@@ -28,8 +28,6 @@ import { InputControlVis } from './input_control_vis';
 import { ListControl } from '../../control/list_control_factory';
 import { RangeControl } from '../../control/range_control_factory';
 
-jest.mock('ui/new_platform');
-
 const mockListControl: ListControl = {
   id: 'mock-list-control',
   isEnabled: () => {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx b/src/plugins/input_control_vis/public/components/vis/input_control_vis.tsx
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx
rename to src/plugins/input_control_vis/public/components/vis/input_control_vis.tsx
index e2497287f35d0d..c0ef99664fdf84 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/input_control_vis.tsx
@@ -23,8 +23,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { CONTROL_TYPES } from '../../editor_utils';
 import { ListControl } from '../../control/list_control_factory';
 import { RangeControl } from '../../control/range_control_factory';
-import { ListControl as ListControlComponent } from '../vis/list_control';
-import { RangeControl as RangeControlComponent } from '../vis/range_control';
+import { ListControl as ListControlComponent } from './list_control';
+import { RangeControl as RangeControlComponent } from './range_control';
 
 function isListControl(control: RangeControl | ListControl): control is ListControl {
   return control.type === CONTROL_TYPES.LIST;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.tsx b/src/plugins/input_control_vis/public/components/vis/list_control.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.tsx
rename to src/plugins/input_control_vis/public/components/vis/list_control.test.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.tsx b/src/plugins/input_control_vis/public/components/vis/list_control.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.tsx
rename to src/plugins/input_control_vis/public/components/vis/list_control.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx b/src/plugins/input_control_vis/public/components/vis/range_control.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx
rename to src/plugins/input_control_vis/public/components/vis/range_control.test.tsx
index 639616151a3951..ff5d572fa21c4f 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/range_control.test.tsx
@@ -23,8 +23,6 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { RangeControl, ceilWithPrecision, floorWithPrecision } from './range_control';
 import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
 
-jest.mock('ui/new_platform');
-
 const control: RangeControlClass = {
   id: 'mock-range-control',
   isEnabled: () => {
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx
rename to src/plugins/input_control_vis/public/components/vis/range_control.tsx
index 0cd2a2b3319801..f028feaf5f84fa 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx
+++ b/src/plugins/input_control_vis/public/components/vis/range_control.tsx
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import React, { PureComponent } from 'react';
-import { ValidatedDualRange } from '../../../../../../../src/plugins/kibana_react/public';
+import { ValidatedDualRange } from '../../../../kibana_react/public';
 import { FormRow } from './form_row';
 import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
 
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.test.ts b/src/plugins/input_control_vis/public/control/control.test.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/control/control.test.ts
rename to src/plugins/input_control_vis/public/control/control.test.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.ts b/src/plugins/input_control_vis/public/control/control.ts
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/control/control.ts
rename to src/plugins/input_control_vis/public/control/control.ts
index 62e0090e466c04..c57b09a19ebc87 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/control.ts
+++ b/src/plugins/input_control_vis/public/control/control.ts
@@ -22,7 +22,7 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-import { Filter } from '../../../../../plugins/data/public';
+import { Filter } from 'src/plugins/data/public';
 import { ControlParams, ControlParamsOptions, CONTROL_TYPES } from '../editor_utils';
 import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control_factory.ts b/src/plugins/input_control_vis/public/control/control_factory.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/control/control_factory.ts
rename to src/plugins/input_control_vis/public/control/control_factory.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts b/src/plugins/input_control_vis/public/control/create_search_source.ts
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
rename to src/plugins/input_control_vis/public/control/create_search_source.ts
index 8f86232f63be78..d6772a7cba5b8e 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
+++ b/src/plugins/input_control_vis/public/control/create_search_source.ts
@@ -23,7 +23,7 @@ import {
   IndexPattern,
   TimefilterContract,
   DataPublicPluginStart,
-} from '../../../../../plugins/data/public';
+} from 'src/plugins/data/public';
 
 export function createSearchSource(
   { create }: DataPublicPluginStart['search']['searchSource'],
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
similarity index 93%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
index 39c9d843e6bce9..a9b7550be44ae3 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
@@ -20,12 +20,8 @@
 import expect from '@kbn/expect';
 
 import { FilterManager } from './filter_manager';
-import { coreMock } from '../../../../../../core/public/mocks';
-import {
-  Filter,
-  IndexPattern,
-  FilterManager as QueryFilterManager,
-} from '../../../../../../plugins/data/public';
+import { coreMock } from '../../../../../core/public/mocks';
+import { Filter, IndexPattern, FilterManager as QueryFilterManager } from '../../../../data/public';
 
 const setupMock = coreMock.createSetup();
 
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
similarity index 93%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
index 90b88a56950e2a..bb806b336c3e08 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
@@ -19,11 +19,7 @@
 
 import _ from 'lodash';
 
-import {
-  FilterManager as QueryFilterManager,
-  IndexPattern,
-  Filter,
-} from '../../../../../../plugins/data/public';
+import { FilterManager as QueryFilterManager, IndexPattern, Filter } from '../../../../data/public';
 
 export abstract class FilterManager {
   constructor(
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
index 5be5d0157541e6..6398c10b63a8c8 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
@@ -19,11 +19,7 @@
 
 import expect from '@kbn/expect';
 
-import {
-  Filter,
-  IndexPattern,
-  FilterManager as QueryFilterManager,
-} from '../../../../../../plugins/data/public';
+import { Filter, IndexPattern, FilterManager as QueryFilterManager } from '../../../../data/public';
 import { PhraseFilterManager } from './phrase_filter_manager';
 
 describe('PhraseFilterManager', function() {
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
index 6f4a95b4919079..bf167afa69bcf2 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
@@ -25,7 +25,7 @@ import {
   esFilters,
   IndexPattern,
   FilterManager as QueryFilterManager,
-} from '../../../../../../plugins/data/public';
+} from '../../../../data/public';
 
 export class PhraseFilterManager extends FilterManager {
   constructor(
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
index c776042ea4ba6b..6e66b6942e5d3c 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
@@ -25,7 +25,7 @@ import {
   RangeFilterMeta,
   IndexPattern,
   FilterManager as QueryFilterManager,
-} from '../../../../../../plugins/data/public';
+} from '../../../../data/public';
 
 describe('RangeFilterManager', function() {
   const controlId = 'control1';
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
similarity index 95%
rename from src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
rename to src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
index 7a6719e85961b7..1a884cf267c411 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
+++ b/src/plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
@@ -20,12 +20,7 @@
 import _ from 'lodash';
 
 import { FilterManager } from './filter_manager';
-import {
-  esFilters,
-  RangeFilter,
-  RangeFilterParams,
-  IFieldType,
-} from '../../../../../../plugins/data/public';
+import { esFilters, RangeFilter, RangeFilterParams, IFieldType } from '../../../../data/public';
 
 interface SliderValue {
   min?: string | number;
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.ts b/src/plugins/input_control_vis/public/control/list_control_factory.test.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.ts
rename to src/plugins/input_control_vis/public/control/list_control_factory.test.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts b/src/plugins/input_control_vis/public/control/list_control_factory.ts
similarity index 99%
rename from src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
rename to src/plugins/input_control_vis/public/control/list_control_factory.ts
index 4b2b1d751ffc77..123ef83277e0b0 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/list_control_factory.ts
@@ -19,17 +19,17 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
-import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
-import { createSearchSource } from './create_search_source';
-import { ControlParams } from '../editor_utils';
-import { InputControlVisDependencies } from '../plugin';
 import {
   IFieldType,
   TimefilterContract,
   SearchSourceFields,
   DataPublicPluginStart,
-} from '../../../../../plugins/data/public';
+} from 'src/plugins/data/public';
+import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
+import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
+import { createSearchSource } from './create_search_source';
+import { ControlParams } from '../editor_utils';
+import { InputControlVisDependencies } from '../plugin';
 
 function getEscapedQuery(query = '') {
   // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.ts b/src/plugins/input_control_vis/public/control/range_control_factory.test.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.ts
rename to src/plugins/input_control_vis/public/control/range_control_factory.test.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts b/src/plugins/input_control_vis/public/control/range_control_factory.ts
similarity index 97%
rename from src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
rename to src/plugins/input_control_vis/public/control/range_control_factory.ts
index 5f3c9994ef3539..326756ad5ffc67 100644
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
+++ b/src/plugins/input_control_vis/public/control/range_control_factory.ts
@@ -20,16 +20,12 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
+import { IFieldType, TimefilterContract, DataPublicPluginStart } from 'src/plugins/data/public';
 import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
 import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { ControlParams } from '../editor_utils';
 import { InputControlVisDependencies } from '../plugin';
-import {
-  IFieldType,
-  TimefilterContract,
-  DataPublicPluginStart,
-} from '../.../../../../../../plugins/data/public';
 
 const minMaxAgg = (field?: IFieldType) => {
   const aggBody: any = {};
diff --git a/src/legacy/core_plugins/input_control_vis/public/editor_utils.ts b/src/plugins/input_control_vis/public/editor_utils.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/editor_utils.ts
rename to src/plugins/input_control_vis/public/editor_utils.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/index.scss b/src/plugins/input_control_vis/public/index.scss
similarity index 80%
rename from src/legacy/core_plugins/input_control_vis/public/index.scss
rename to src/plugins/input_control_vis/public/index.scss
index ac4692494b9238..42fded23d77615 100644
--- a/src/legacy/core_plugins/input_control_vis/public/index.scss
+++ b/src/plugins/input_control_vis/public/index.scss
@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
 // Prefix all styles with "icv" to avoid conflicts.
 // Examples
 //   icvChart
diff --git a/src/legacy/core_plugins/input_control_vis/public/index.ts b/src/plugins/input_control_vis/public/index.ts
similarity index 91%
rename from src/legacy/core_plugins/input_control_vis/public/index.ts
rename to src/plugins/input_control_vis/public/index.ts
index e14c2cc4b69b6b..8edd3fd9996c3f 100644
--- a/src/legacy/core_plugins/input_control_vis/public/index.ts
+++ b/src/plugins/input_control_vis/public/index.ts
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import './index.scss';
+
+import { PluginInitializerContext } from '../../../core/public';
 import { InputControlVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts b/src/plugins/input_control_vis/public/input_control_fn.test.ts
similarity index 92%
rename from src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts
rename to src/plugins/input_control_vis/public/input_control_fn.test.ts
index d654acefd05500..f3ea2d2d6f0ba2 100644
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.test.ts
@@ -18,9 +18,7 @@
  */
 
 import { createInputControlVisFn } from './input_control_fn';
-
-// eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
 
 describe('interpreter/functions#input_control_vis', () => {
   const fn = functionWrapper(createInputControlVisFn());
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts b/src/plugins/input_control_vis/public/input_control_fn.ts
similarity index 93%
rename from src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts
rename to src/plugins/input_control_vis/public/input_control_fn.ts
index e779c6d344ab5d..59c0e03505bb76 100644
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts
+++ b/src/plugins/input_control_vis/public/input_control_fn.ts
@@ -19,11 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  ExpressionFunctionDefinition,
-  KibanaDatatable,
-  Render,
-} from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, KibanaDatatable, Render } from '../../expressions/public';
 
 interface Arguments {
   visConfig: string;
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts b/src/plugins/input_control_vis/public/input_control_vis_type.ts
similarity index 96%
rename from src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
rename to src/plugins/input_control_vis/public/input_control_vis_type.ts
index badea68eec19f9..8114dbf110f8b3 100644
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/plugins/input_control_vis/public/input_control_vis_type.ts
@@ -23,7 +23,7 @@ import { createInputControlVisController } from './vis_controller';
 import { getControlsTab } from './components/editor/controls_tab';
 import { OptionsTab } from './components/editor/options_tab';
 import { InputControlVisDependencies } from './plugin';
-import { defaultFeedbackMessage } from '../../../../plugins/kibana_utils/public';
+import { defaultFeedbackMessage } from '../../kibana_utils/public';
 
 export function createInputControlVisTypeDefinition(deps: InputControlVisDependencies) {
   const InputControlVisController = createInputControlVisController(deps);
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/index.ts b/src/plugins/input_control_vis/public/lineage/index.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/index.ts
rename to src/plugins/input_control_vis/public/lineage/index.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.ts b/src/plugins/input_control_vis/public/lineage/lineage_map.test.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.ts
rename to src/plugins/input_control_vis/public/lineage/lineage_map.test.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.ts b/src/plugins/input_control_vis/public/lineage/lineage_map.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.ts
rename to src/plugins/input_control_vis/public/lineage/lineage_map.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.ts b/src/plugins/input_control_vis/public/lineage/parent_candidates.test.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.ts
rename to src/plugins/input_control_vis/public/lineage/parent_candidates.test.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.ts b/src/plugins/input_control_vis/public/lineage/parent_candidates.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.ts
rename to src/plugins/input_control_vis/public/lineage/parent_candidates.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
similarity index 92%
rename from src/legacy/core_plugins/input_control_vis/public/plugin.ts
rename to src/plugins/input_control_vis/public/plugin.ts
index b7434680654303..9fc7df24c2dcc2 100644
--- a/src/legacy/core_plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -19,11 +19,8 @@
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 
 import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../plugins/visualizations/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
 import { createInputControlVisFn } from './input_control_fn';
 import { createInputControlVisTypeDefinition } from './input_control_vis_type';
 
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/get_deps_mock.tsx b/src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
rename to src/plugins/input_control_vis/public/test_utils/get_deps_mock.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts b/src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
rename to src/plugins/input_control_vis/public/test_utils/get_index_pattern_mock.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/get_index_patterns_mock.ts b/src/plugins/input_control_vis/public/test_utils/get_index_patterns_mock.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/get_index_patterns_mock.ts
rename to src/plugins/input_control_vis/public/test_utils/get_index_patterns_mock.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/get_search_service_mock.ts b/src/plugins/input_control_vis/public/test_utils/get_search_service_mock.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/get_search_service_mock.ts
rename to src/plugins/input_control_vis/public/test_utils/get_search_service_mock.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/index.ts b/src/plugins/input_control_vis/public/test_utils/index.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/index.ts
rename to src/plugins/input_control_vis/public/test_utils/index.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/test_utils/update_component.ts b/src/plugins/input_control_vis/public/test_utils/update_component.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/test_utils/update_component.ts
rename to src/plugins/input_control_vis/public/test_utils/update_component.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx b/src/plugins/input_control_vis/public/vis_controller.tsx
similarity index 98%
rename from src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
rename to src/plugins/input_control_vis/public/vis_controller.tsx
index 818221353afbcb..97506556d7e0a8 100644
--- a/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
+++ b/src/plugins/input_control_vis/public/vis_controller.tsx
@@ -28,8 +28,8 @@ import { ControlParams } from './editor_utils';
 import { RangeControl } from './control/range_control_factory';
 import { ListControl } from './control/list_control_factory';
 import { InputControlVisDependencies } from './plugin';
-import { FilterManager, Filter } from '../../../../plugins/data/public';
-import { VisParams, Vis } from '../../../../plugins/visualizations/public';
+import { FilterManager, Filter } from '../../data/public';
+import { VisParams, Vis } from '../../visualizations/public';
 
 export const createInputControlVisController = (deps: InputControlVisDependencies) => {
   return class InputControlVisController {
diff --git a/src/plugins/input_control_vis/server/index.ts b/src/plugins/input_control_vis/server/index.ts
new file mode 100644
index 00000000000000..043657ba98a3c7
--- /dev/null
+++ b/src/plugins/input_control_vis/server/index.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 { PluginConfigDescriptor } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+export const config: PluginConfigDescriptor = {
+  schema: schema.object({ enabled: schema.boolean({ defaultValue: true }) }),
+};
+
+export const plugin = () => ({
+  setup() {},
+  start() {},
+});