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 9726f9f1a2ef7b..3def90db909744 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
@@ -20,7 +20,7 @@
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { PointSeriesOptions } from './editors/point_series';
+import { PointSeriesOptions } from './components/options';
 import { getLegendPositions, LegendPositions } from './utils/legend_positions';
 import { palettes } from '@elastic/eui/lib/services';
 
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/basic_options.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/basic_options.tsx
similarity index 98%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/basic_options.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/basic_options.tsx
index ed9c6445dc2355..2bffcb383dde3f 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/basic_options.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/basic_options.tsx
@@ -24,7 +24,7 @@ import { VisOptionsProps } from 'ui/vis/editors/default';
 import { SwitchOption } from './switch';
 import { SelectOption } from './select';
 
-export interface BasicOptionsParams {
+interface BasicOptionsParams {
   addTooltip: boolean;
   legendPosition: string;
 }
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/index.ts
similarity index 70%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/index.ts
index 4a27d44847676d..50ac0752e8d1f7 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/index.ts
@@ -17,15 +17,10 @@
  * under the License.
  */
 
-import 'ui/directives/inequality';
-import { uiModules } from 'ui/modules';
-import pointSeriesOptionsTemplate from './point_series_options.html';
-const module = uiModules.get('kibana');
-
-module.directive('pointSeriesOptions', function () {
-  return {
-    restrict: 'E',
-    template: pointSeriesOptionsTemplate,
-    replace: true
-  };
-});
+export { BasicOptions } from './basic_options';
+export { NumberInputOption } from './number_input';
+export { RangeOption } from './range';
+export { SelectOption } from './select';
+export { SwitchOption } from './switch';
+export { TextInputOption } from './text_input';
+export { TruncateLabelsOption } from './truncate_labels';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/number_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/number_input.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/number_input.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/range.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/range.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/range.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/range.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/select.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/select.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/select.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/select.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/switch.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/switch.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/switch.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/switch.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/text_input.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/text_input.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/text_input.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/text_input.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/truncate_labels.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/truncate_labels.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/truncate_labels.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/truncate_labels.tsx
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/index.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/index.ts
new file mode 100644
index 00000000000000..a9794d9e4647a0
--- /dev/null
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/index.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 * from './common';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/index.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/index.tsx
similarity index 97%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/index.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/index.tsx
index ec8957d101053a..e3805027d658c5 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/index.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/index.tsx
@@ -21,7 +21,7 @@ import React, { useCallback } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { GaugeVisParams } from '../../gauge';
+import { GaugeVisParams } from '../../../gauge';
 import { RangesPanel } from './ranges_panel';
 import { StylePanel } from './style_panel';
 import { LabelsPanel } from './labels_panel';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/labels_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/labels_panel.tsx
similarity index 96%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/labels_panel.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/labels_panel.tsx
index c2b6dc83c7fab8..a24a37ca971d58 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/labels_panel.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/labels_panel.tsx
@@ -22,8 +22,7 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SwitchOption } from '../../controls/switch';
-import { TextInputOption } from '../../controls/text_input';
+import { SwitchOption, TextInputOption } from '../../common';
 import { GaugeOptionsInternalProps } from '.';
 
 function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInternalProps) {
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/ranges_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
similarity index 98%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/ranges_panel.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
index 1807d9a082e310..241c10a06ba8db 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/ranges_panel.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/ranges_panel.tsx
@@ -24,8 +24,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { RangesParamEditor } from 'ui/agg_types/controls/ranges';
-import { SelectOption } from '../../controls/select';
-import { SwitchOption } from '../../controls/switch';
+import { SelectOption, SwitchOption } from '../../common';
 import { GaugeOptionsInternalProps } from '.';
 
 function RangesPanel({
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/style_panel.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/style_panel.tsx
similarity index 96%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/style_panel.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/style_panel.tsx
index 80c2d442ac9b89..ea207af4ee7105 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/gauge/style_panel.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/gauge/style_panel.tsx
@@ -23,8 +23,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { AggGroupNames } from 'ui/vis/editors/default';
-import { SelectOption } from '../../controls/select';
-import { GaugeVisParams } from '../../gauge';
+import { SelectOption } from '../../common';
+import { GaugeVisParams } from '../../../gauge';
 import { GaugeOptionsInternalProps } from '.';
 
 function StylePanel({
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/index.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/index.ts
new file mode 100644
index 00000000000000..63fd215b65acf5
--- /dev/null
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/index.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { GaugeOptions } from './gauge';
+export { PieOptions } from './pie';
+export { PointSeriesOptions } from './point_series';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/pie.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/pie.tsx
similarity index 93%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/pie.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/pie.tsx
index 85d3ac8ce1b19e..a226829dbb6b92 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/pie.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/pie.tsx
@@ -22,10 +22,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { BasicOptions } from '../controls/basic_options';
-import { SwitchOption } from '../controls/switch';
-import { TruncateLabelsOption } from '../controls/truncate_labels';
-import { PieVisParams } from '../pie';
+import { BasicOptions, TruncateLabelsOption, SwitchOption } from '../common';
+import { PieVisParams } from '../../pie';
 
 function PieOptions(props: VisOptionsProps<PieVisParams>) {
   const { stateParams, setValue } = props;
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid_options.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/grid_options.tsx
similarity index 95%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid_options.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/grid_options.tsx
index 069a2a0dcbeab9..d155ad938bf483 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series/grid_options.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/grid_options.tsx
@@ -22,9 +22,8 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SwitchOption } from '../switch';
-import { SelectOption } from '../select';
-import { BasicVislibParams, ValueAxis } from '../../types';
+import { SelectOption, SwitchOption } from '../../common';
+import { BasicVislibParams, ValueAxis } from '../../../types';
 
 function GridOptions({
   stateParams,
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/index.ts b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/index.ts
new file mode 100644
index 00000000000000..fb94ec6743faa1
--- /dev/null
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/index.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 { PointSeriesOptions } from './point_series';
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/point_series.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
similarity index 94%
rename from src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/point_series.tsx
rename to src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
index d94e99d3c54d45..bd8c6bf30b4fb5 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/editors/point_series.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/options/point_series/point_series.tsx
@@ -22,12 +22,9 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SwitchOption } from '../controls/switch';
-import { GridOptions } from '../controls/point_series/grid_options';
-import { BasicOptions } from '../controls/basic_options';
-import { BasicVislibParams } from '../types';
-import { NumberInputOption } from '../controls/number_input';
-import { SelectOption } from '../controls/select';
+import { BasicOptions, NumberInputOption, SelectOption, SwitchOption } from '../../common';
+import { GridOptions } from './grid_options';
+import { BasicVislibParams } from '../../../types';
 
 function PointSeriesOptions(props: VisOptionsProps<BasicVislibParams>) {
   const { stateParams, setValue, vis } = props;
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.html b/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.html
deleted file mode 100644
index b4ebf8ebbd4818..00000000000000
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<div>
-  <div class="vis-option-item" ng-show="vis.hasSchemaAgg('segment', 'date_histogram')">
-    <label>
-      <input type="checkbox" ng-model="editorState.params.addTimeMarker" ng-checked="editorState.params.addTimeMarker">
-      Current time marker
-    </label>
-  </div>
-  <div class="vis-option-item">
-    <label>
-      <input type="checkbox" ng-model="editorState.params.setYExtents">
-      Set Y-Axis Extents
-    </label>
-    <div ng-if="editorState.params.setYExtents">
-      <label>
-        y-max
-        <input name="yMax"
-               class="form-control"
-               type="number"
-               step="0.1"
-               greater-than="editorState.params.yAxis.min"
-               ng-model="editorState.params.yAxis.max"
-               ng-required="editorState.params.setYExtents">
-      </label>
-      <div ng-show="editorState.params.yAxis.min >= editorState.params.yAxis.max">
-        <span class="text-danger">Max must be greater than min</span>
-      </div>
-      <label>
-        y-min
-        <input name="yMin"
-               class="form-control"
-               type="number"
-               step="0.1"
-               less-than="editorState.params.yAxis.max"
-               greater-than="editorState.params.scale === 'log' ? 0 : undefined"
-               ng-model="editorState.params.yAxis.min"
-               ng-required="editorState.params.setYExtents">
-      </label>
-    </div>
-    <div ng-show="editorState.params.setYExtents && editorState.params.scale === 'log' && editorState.params.yAxis.min <= 0">
-      <span class="text-danger">Min must exceed 0 when a log scale is selected</span>
-    </div>
-    <div class="vis-option-item">
-      <label>
-        <input type="checkbox" ng-model="editorState.params.defaultYExtents" ng-disabled="editorState.params.setYExtents">
-        Scale Y-Axis to Data Bounds
-      </label>
-    </div>
-    <div class="vis-option-item">
-      <label>
-        <input type="checkbox" ng-model="editorState.params.orderBucketsBySum">
-        Order buckets by descending sum
-      </label>
-    </div>
-  </div>
-</div>
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 badc4d1b7ad760..6aacd0eaaf1ea9 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
@@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { colorSchemas } from 'ui/vislib/components/color/colormaps';
-import { GaugeOptions } from './editors/gauge';
+import { GaugeOptions } from './components/options';
 
 export default function GaugeVisType(Private) {
   const VisFactory = Private(VisFactoryProvider);
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 c0cf59c72ddcac..8904bf9f275405 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
@@ -21,7 +21,7 @@ import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { colorSchemas } from 'ui/vislib/components/color/colormaps';
-import { GaugeOptions } from './editors/gauge';
+import { GaugeOptions } from './components/options';
 
 export default function GoalVisType(Private) {
   const VisFactory = Private(VisFactoryProvider);
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 15125dd598942d..c809f0f024ebd1 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
@@ -20,7 +20,7 @@
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { PointSeriesOptions } from './editors/point_series';
+import { PointSeriesOptions } from './components/options';
 import { getLegendPositions, LegendPositions } from './utils/legend_positions';
 import { palettes } from '@elastic/eui/lib/services';
 
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 c3f0b6ab0c8a9f..0bb23862e1ebc3 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
@@ -20,7 +20,7 @@
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { PointSeriesOptions } from './editors/point_series';
+import { PointSeriesOptions } from './components/options';
 import { getLegendPositions, LegendPositions } from './utils/legend_positions';
 
 export default function PointSeriesVisType(Private) {
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 60af39099cee62..63588000333999 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
@@ -20,7 +20,7 @@
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { PointSeriesOptions } from './editors/point_series';
+import { PointSeriesOptions } from './components/options';
 import { getLegendPositions, LegendPositions } from './utils/legend_positions';
 import { palettes } from '@elastic/eui/lib/services';
 
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 85727989f09820..104162f2432e54 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
@@ -20,7 +20,7 @@
 import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { i18n } from '@kbn/i18n';
 import { Schemas } from 'ui/vis/editors/default/schemas';
-import { PieOptions } from './editors/pie';
+import { PieOptions } from './components/options';
 
 export default function HistogramVisType(Private) {
   const VisFactory = Private(VisFactoryProvider);
diff --git a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
index b295646e35b05a..c23e8386e50628 100644
--- a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
+++ b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
@@ -25,9 +25,11 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { toastNotifications } from 'ui/notify';
 import { FileLayerField, VectorLayer, ServiceSettings } from 'ui/vis/map/service_settings';
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SelectOption } from '../../../kbn_vislib_vis_types/public/controls/select';
-import { SwitchOption } from '../../../kbn_vislib_vis_types/public/controls/switch';
-import { NumberInputOption } from '../../../kbn_vislib_vis_types/public/controls/number_input';
+import {
+  NumberInputOption,
+  SelectOption,
+  SwitchOption,
+} from '../../../kbn_vislib_vis_types/public/components';
 import { ORIGIN } from '../../../tile_map/common/origin';
 import { WmsOptions } from '../../../tile_map/public/components/wms_options';
 import { mapToLayerWithId } from '../util';
diff --git a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
index 6aaa6364307399..d0cff4013b0e72 100644
--- a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
@@ -23,10 +23,12 @@ import { i18n } from '@kbn/i18n';
 
 import { ServiceSettings } from 'ui/vis/map/service_settings';
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SelectOption } from '../../../kbn_vislib_vis_types/public/controls/select';
-import { RangeOption } from '../../../kbn_vislib_vis_types/public/controls/range';
-import { BasicOptions } from '../../../kbn_vislib_vis_types/public/controls/basic_options';
-import { SwitchOption } from '../../../kbn_vislib_vis_types/public/controls/switch';
+import {
+  BasicOptions,
+  RangeOption,
+  SelectOption,
+  SwitchOption,
+} from '../../../kbn_vislib_vis_types/public/components';
 import { WmsOptions } from './wms_options';
 import { TileMapVisParams } from '../types';
 
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx b/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
index 7c383e70b17932..f2cf69bb63ba43 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { TextInputOption } from '../../../kbn_vislib_vis_types/public/controls/text_input';
+import { TextInputOption } from '../../../kbn_vislib_vis_types/public/components';
 import { WMSOptions } from '../types';
 
 interface WmsInternalOptions {
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx b/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
index 7beedc548b6b81..42cc2776fcae41 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
@@ -24,8 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { toastNotifications } from 'ui/notify';
 import { TmsLayer } from 'ui/vis/map/service_settings';
-import { SelectOption } from '../../../kbn_vislib_vis_types/public/controls/select';
-import { SwitchOption } from '../../../kbn_vislib_vis_types/public/controls/switch';
+import { SelectOption, SwitchOption } from '../../../kbn_vislib_vis_types/public/components';
 import { RegionMapOptionsProps } from '../../../region_map/public/components/region_map_options';
 import { WmsInternalOptions } from './wms_internal_options';
 import { TileMapOptionsProps } from './tile_map_options';
diff --git a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx b/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
index 3d7d2fe41520f0..91bdbf118d16f1 100644
--- a/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
+++ b/src/legacy/core_plugins/vis_type_markdown/public/settings_options.tsx
@@ -23,8 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SwitchOption } from '../../kbn_vislib_vis_types/public/controls/switch';
-import { RangeOption } from '../../kbn_vislib_vis_types/public/controls/range';
+import { RangeOption, SwitchOption } from '../../kbn_vislib_vis_types/public/components';
 import { MarkdownVisParams } from './types';
 
 function SettingsOptions({ stateParams, setValue }: VisOptionsProps<MarkdownVisParams>) {
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
index 728e90e1f36ce6..9e6a2d1a24a85d 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/components/tag_cloud_options.tsx
@@ -23,8 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { ValidatedDualRange } from 'ui/validated_range';
 import { VisOptionsProps } from 'ui/vis/editors/default';
-import { SelectOption } from '../../../kbn_vislib_vis_types/public/controls/select';
-import { SwitchOption } from '../../../kbn_vislib_vis_types/public/controls/switch';
+import { SelectOption, SwitchOption } from '../../../kbn_vislib_vis_types/public/components';
 import { TagCloudVisParams } from '../types';
 
 function TagCloudOptions({ stateParams, setValue, vis }: VisOptionsProps<TagCloudVisParams>) {
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_type.js b/src/legacy/ui/public/vis/vis_types/vislib_vis_type.js
index 0aaf7d90dcfdc8..73eb375da769a1 100644
--- a/src/legacy/ui/public/vis/vis_types/vislib_vis_type.js
+++ b/src/legacy/ui/public/vis/vis_types/vislib_vis_type.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import 'plugins/kbn_vislib_vis_types/controls/point_series_options';
 import 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option';
 import 'plugins/kbn_vislib_vis_types/controls/heatmap_options';
 import 'plugins/kbn_vislib_vis_types/controls/point_series';