diff --git a/src/plugins/vis_types/gauge/public/index.ts b/src/plugins/vis_types/gauge/public/index.ts
index 4219955467ed..4e5a880cde1a 100755
--- a/src/plugins/vis_types/gauge/public/index.ts
+++ b/src/plugins/vis_types/gauge/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { GaugePublicConfig } from '../config';
+import type { GaugePublicConfig } from '../server/config';
 import { VisTypeGaugePlugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<GaugePublicConfig>) {
diff --git a/src/plugins/vis_types/gauge/public/plugin.ts b/src/plugins/vis_types/gauge/public/plugin.ts
index 67d58e579023..49fa0f2c7996 100755
--- a/src/plugins/vis_types/gauge/public/plugin.ts
+++ b/src/plugins/vis_types/gauge/public/plugin.ts
@@ -10,7 +10,7 @@ import { CoreSetup, CoreStart, PluginInitializerContext } from '@kbn/core/public
 import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
-import { GaugePublicConfig } from '../config';
+import type { GaugePublicConfig } from '../server/config';
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 import { VisTypeGaugePluginSetup } from './types';
 import { gaugeVisType, goalVisType } from './vis_type';
diff --git a/src/plugins/vis_types/gauge/config.ts b/src/plugins/vis_types/gauge/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/gauge/config.ts
rename to src/plugins/vis_types/gauge/server/config.ts
diff --git a/src/plugins/vis_types/gauge/server/index.ts b/src/plugins/vis_types/gauge/server/index.ts
index e6d35075c8fb..a3c672fb7f25 100755
--- a/src/plugins/vis_types/gauge/server/index.ts
+++ b/src/plugins/vis_types/gauge/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
-import { configSchema, GaugeConfig } from '../config';
+import { configSchema, GaugeConfig } from './config';
 
 export const config: PluginConfigDescriptor<GaugeConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/gauge/server/plugin.ts b/src/plugins/vis_types/gauge/server/plugin.ts
index f7b51c5d5af8..940ba2e21d89 100755
--- a/src/plugins/vis_types/gauge/server/plugin.ts
+++ b/src/plugins/vis_types/gauge/server/plugin.ts
@@ -11,7 +11,7 @@ import { schema } from '@kbn/config-schema';
 
 import { CoreSetup, Plugin, PluginInitializerContext, UiSettingsParams } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import { GaugeConfig } from '../config';
+import { GaugeConfig } from './config';
 
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/heatmap/public/index.ts b/src/plugins/vis_types/heatmap/public/index.ts
index 595b0ab3507e..73fef1fdb33f 100644
--- a/src/plugins/vis_types/heatmap/public/index.ts
+++ b/src/plugins/vis_types/heatmap/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { HeatmapPublicConfig } from '../config';
+import type { HeatmapPublicConfig } from '../server/config';
 import { VisTypeHeatmapPlugin } from './plugin';
 
 export { heatmapVisType } from './vis_type';
diff --git a/src/plugins/vis_types/heatmap/public/plugin.ts b/src/plugins/vis_types/heatmap/public/plugin.ts
index f2ce2614ec9b..5d8028a00e00 100644
--- a/src/plugins/vis_types/heatmap/public/plugin.ts
+++ b/src/plugins/vis_types/heatmap/public/plugin.ts
@@ -13,7 +13,7 @@ import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { HeatmapPublicConfig } from '../config';
+import type { HeatmapPublicConfig } from '../server/config';
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 import { heatmapVisType } from './vis_type';
 import { setDataViewsStart } from './services';
diff --git a/src/plugins/vis_types/heatmap/config.ts b/src/plugins/vis_types/heatmap/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/heatmap/config.ts
rename to src/plugins/vis_types/heatmap/server/config.ts
diff --git a/src/plugins/vis_types/heatmap/server/index.ts b/src/plugins/vis_types/heatmap/server/index.ts
index 34c3783b62c9..2cc4836b96d0 100644
--- a/src/plugins/vis_types/heatmap/server/index.ts
+++ b/src/plugins/vis_types/heatmap/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
-import { configSchema, HeatmapConfig } from '../config';
+import { configSchema, HeatmapConfig } from './config';
 
 export const config: PluginConfigDescriptor<HeatmapConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/heatmap/server/plugin.ts b/src/plugins/vis_types/heatmap/server/plugin.ts
index dcc1c7c65bab..ebd2c1276313 100644
--- a/src/plugins/vis_types/heatmap/server/plugin.ts
+++ b/src/plugins/vis_types/heatmap/server/plugin.ts
@@ -11,7 +11,7 @@ import { schema } from '@kbn/config-schema';
 
 import { CoreSetup, Plugin, PluginInitializerContext, UiSettingsParams } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import { HeatmapConfig } from '../config';
+import { HeatmapConfig } from './config';
 
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '../common';
 
diff --git a/src/plugins/vis_types/metric/public/index.ts b/src/plugins/vis_types/metric/public/index.ts
index fdc19b16c998..9568fcfad738 100644
--- a/src/plugins/vis_types/metric/public/index.ts
+++ b/src/plugins/vis_types/metric/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { MetricPublicConfig } from '../config';
+import type { MetricPublicConfig } from '../server/config';
 import { MetricVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<MetricPublicConfig>) {
diff --git a/src/plugins/vis_types/metric/public/plugin.ts b/src/plugins/vis_types/metric/public/plugin.ts
index a8be4ca753f0..7ca3775f8f53 100644
--- a/src/plugins/vis_types/metric/public/plugin.ts
+++ b/src/plugins/vis_types/metric/public/plugin.ts
@@ -10,7 +10,7 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/cor
 import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { createMetricVisTypeDefinition } from './metric_vis_type';
-import { MetricPublicConfig } from '../config';
+import type { MetricPublicConfig } from '../server/config';
 import { setDataViewsStart } from './services';
 
 /** @internal */
diff --git a/src/plugins/vis_types/metric/config.ts b/src/plugins/vis_types/metric/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/metric/config.ts
rename to src/plugins/vis_types/metric/server/config.ts
diff --git a/src/plugins/vis_types/metric/server/index.ts b/src/plugins/vis_types/metric/server/index.ts
index bc8d0b0f0f68..490cc996b1bd 100644
--- a/src/plugins/vis_types/metric/server/index.ts
+++ b/src/plugins/vis_types/metric/server/index.ts
@@ -9,7 +9,7 @@
 import { CoreSetup, PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
 
-import { configSchema, MetricConfig } from '../config';
+import { configSchema, MetricConfig } from './config';
 
 export const config: PluginConfigDescriptor<MetricConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/pie/public/index.ts b/src/plugins/vis_types/pie/public/index.ts
index 46110193aefa..ade2e09b9e4e 100644
--- a/src/plugins/vis_types/pie/public/index.ts
+++ b/src/plugins/vis_types/pie/public/index.ts
@@ -8,7 +8,7 @@
 
 import type { PluginInitializerContext } from '@kbn/core/public';
 import { VisTypePiePlugin } from './plugin';
-import type { PiePublicConfig } from '../config';
+import type { PiePublicConfig } from '../server/config';
 
 export { pieVisType } from './vis_type';
 export type { Dimensions, Dimension } from './types';
diff --git a/src/plugins/vis_types/pie/public/plugin.ts b/src/plugins/vis_types/pie/public/plugin.ts
index 31b5591c77a9..9169c6b101c6 100644
--- a/src/plugins/vis_types/pie/public/plugin.ts
+++ b/src/plugins/vis_types/pie/public/plugin.ts
@@ -18,7 +18,7 @@ import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import type { PiePublicConfig } from '../config';
+import type { PiePublicConfig } from '../server/config';
 import { pieVisType } from './vis_type';
 import { setDataViewsStart } from './services';
 
diff --git a/src/plugins/vis_types/pie/config.ts b/src/plugins/vis_types/pie/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/pie/config.ts
rename to src/plugins/vis_types/pie/server/config.ts
diff --git a/src/plugins/vis_types/pie/server/index.ts b/src/plugins/vis_types/pie/server/index.ts
index 6b139e916adc..b9eedd469e90 100644
--- a/src/plugins/vis_types/pie/server/index.ts
+++ b/src/plugins/vis_types/pie/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
-import { configSchema, PieConfig } from '../config';
+import { configSchema, PieConfig } from './config';
 
 export const config: PluginConfigDescriptor<PieConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/pie/server/plugin.ts b/src/plugins/vis_types/pie/server/plugin.ts
index 133220039a73..6a4683ab9bc2 100644
--- a/src/plugins/vis_types/pie/server/plugin.ts
+++ b/src/plugins/vis_types/pie/server/plugin.ts
@@ -8,7 +8,7 @@
 
 import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import type { PieConfig } from '../config';
+import type { PieConfig } from './config';
 
 interface PluginSetupDependencies {
   visualizations: VisualizationsServerSetup;
diff --git a/src/plugins/vis_types/table/public/index.ts b/src/plugins/vis_types/table/public/index.ts
index c8ac2a7db912..d0f51c139b22 100644
--- a/src/plugins/vis_types/table/public/index.ts
+++ b/src/plugins/vis_types/table/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { TablePublicConfig } from '../config';
+import type { TablePublicConfig } from '../server/config';
 import { TableVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<TablePublicConfig>) {
diff --git a/src/plugins/vis_types/table/public/plugin.ts b/src/plugins/vis_types/table/public/plugin.ts
index 992e10cdd247..1fd9af86c5a1 100644
--- a/src/plugins/vis_types/table/public/plugin.ts
+++ b/src/plugins/vis_types/table/public/plugin.ts
@@ -12,7 +12,7 @@ import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
-import { TablePublicConfig } from '../config';
+import type { TablePublicConfig } from '../server/config';
 import { setDataViewsStart, setFormatService } from './services';
 import { registerTableVis } from './register_vis';
 
diff --git a/src/plugins/vis_types/table/config.ts b/src/plugins/vis_types/table/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/table/config.ts
rename to src/plugins/vis_types/table/server/config.ts
diff --git a/src/plugins/vis_types/table/server/index.ts b/src/plugins/vis_types/table/server/index.ts
index 9c8fa74c1fe6..e3bc34431742 100644
--- a/src/plugins/vis_types/table/server/index.ts
+++ b/src/plugins/vis_types/table/server/index.ts
@@ -8,7 +8,7 @@
 
 import { CoreSetup, PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import { configSchema, TableConfig } from '../config';
+import { configSchema, TableConfig } from './config';
 import { VIS_TYPE_TABLE } from '../common';
 
 export const config: PluginConfigDescriptor<TableConfig> = {
diff --git a/src/plugins/vis_types/tagcloud/public/index.ts b/src/plugins/vis_types/tagcloud/public/index.ts
index b5d626cce5b0..2747eb67354b 100644
--- a/src/plugins/vis_types/tagcloud/public/index.ts
+++ b/src/plugins/vis_types/tagcloud/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { TagcloudPublicConfig } from '../config';
+import type { TagcloudPublicConfig } from '../server/config';
 import { TagCloudPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<TagcloudPublicConfig>) {
diff --git a/src/plugins/vis_types/tagcloud/public/plugin.ts b/src/plugins/vis_types/tagcloud/public/plugin.ts
index ec5ae6afaaad..6111bfae9f62 100644
--- a/src/plugins/vis_types/tagcloud/public/plugin.ts
+++ b/src/plugins/vis_types/tagcloud/public/plugin.ts
@@ -11,7 +11,7 @@ import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { getTagCloudVisTypeDefinition } from './tag_cloud_type';
-import { TagcloudPublicConfig } from '../config';
+import type { TagcloudPublicConfig } from '../server/config';
 import { setDataViewsStart } from './services';
 
 /** @internal */
diff --git a/src/plugins/vis_types/tagcloud/config.ts b/src/plugins/vis_types/tagcloud/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/tagcloud/config.ts
rename to src/plugins/vis_types/tagcloud/server/config.ts
diff --git a/src/plugins/vis_types/tagcloud/server/index.ts b/src/plugins/vis_types/tagcloud/server/index.ts
index aba626fba32e..f8cd2c59cb8a 100644
--- a/src/plugins/vis_types/tagcloud/server/index.ts
+++ b/src/plugins/vis_types/tagcloud/server/index.ts
@@ -8,7 +8,7 @@
 
 import { CoreSetup, PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import { configSchema, TagcloudConfig } from '../config';
+import { configSchema, TagcloudConfig } from './config';
 
 export const config: PluginConfigDescriptor<TagcloudConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/timelion/public/index.ts b/src/plugins/vis_types/timelion/public/index.ts
index a11a20865e80..932ca1b7cc31 100644
--- a/src/plugins/vis_types/timelion/public/index.ts
+++ b/src/plugins/vis_types/timelion/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import type { TimelionPublicConfig } from '../config';
+import type { TimelionPublicConfig } from '../server/config';
 import { TimelionVisPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<TimelionPublicConfig>) {
diff --git a/src/plugins/vis_types/timelion/public/plugin.ts b/src/plugins/vis_types/timelion/public/plugin.ts
index a4c412c12fbd..c8221b088435 100644
--- a/src/plugins/vis_types/timelion/public/plugin.ts
+++ b/src/plugins/vis_types/timelion/public/plugin.ts
@@ -40,7 +40,7 @@ import {
 import { getArgValueSuggestions } from './helpers/arg_value_suggestions';
 import { getTimelionVisRenderer } from './timelion_vis_renderer';
 
-import type { TimelionPublicConfig } from '../config';
+import type { TimelionPublicConfig } from '../server/config';
 
 /** @internal */
 export interface TimelionVisDependencies extends Partial<CoreStart> {
diff --git a/src/plugins/vis_types/timelion/config.ts b/src/plugins/vis_types/timelion/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/timelion/config.ts
rename to src/plugins/vis_types/timelion/server/config.ts
diff --git a/src/plugins/vis_types/timelion/server/index.ts b/src/plugins/vis_types/timelion/server/index.ts
index e9b312c8731b..87511de25e13 100644
--- a/src/plugins/vis_types/timelion/server/index.ts
+++ b/src/plugins/vis_types/timelion/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
-import { configSchema, TimelionConfig } from '../config';
+import { configSchema, TimelionConfig } from './config';
 
 export const config: PluginConfigDescriptor<TimelionConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/timelion/server/plugin.ts b/src/plugins/vis_types/timelion/server/plugin.ts
index 5665f80108aa..0b56536c4262 100644
--- a/src/plugins/vis_types/timelion/server/plugin.ts
+++ b/src/plugins/vis_types/timelion/server/plugin.ts
@@ -12,7 +12,7 @@ import type { PluginStart, DataRequestHandlerContext } from '@kbn/data-plugin/se
 import type { PluginStart as DataViewPluginStart } from '@kbn/data-views-plugin/server';
 import { CoreSetup, PluginInitializerContext, Plugin } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import type { TimelionConfig } from '../config';
+import type { TimelionConfig } from './config';
 import { TIMELION_VIS_NAME } from '../common/constants';
 import loadFunctions from './lib/load_functions';
 import { functionsRoute } from './routes/functions';
diff --git a/src/plugins/vis_types/timeseries/public/index.ts b/src/plugins/vis_types/timeseries/public/index.ts
index 8574f4922f77..01022a1411ec 100644
--- a/src/plugins/vis_types/timeseries/public/index.ts
+++ b/src/plugins/vis_types/timeseries/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { VisTypeTimeseriesPublicConfig } from '../config';
+import type { VisTypeTimeseriesPublicConfig } from '../server/config';
 import { MetricsPlugin as Plugin } from './plugin';
 
 export function plugin(
diff --git a/src/plugins/vis_types/timeseries/public/plugin.ts b/src/plugins/vis_types/timeseries/public/plugin.ts
index 432bce9c367c..eb1bffa46ce4 100644
--- a/src/plugins/vis_types/timeseries/public/plugin.ts
+++ b/src/plugins/vis_types/timeseries/public/plugin.ts
@@ -19,7 +19,7 @@ import type { IUiSettingsClient } from '@kbn/core/public';
 import type { HttpSetup } from '@kbn/core-http-browser';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
-import { VisTypeTimeseriesPublicConfig } from '../config';
+import type { VisTypeTimeseriesPublicConfig } from '../server/config';
 
 import { EditorController, TSVB_EDITOR_NAME } from './application/editor_controller';
 
diff --git a/src/plugins/vis_types/timeseries/config.ts b/src/plugins/vis_types/timeseries/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/timeseries/config.ts
rename to src/plugins/vis_types/timeseries/server/config.ts
diff --git a/src/plugins/vis_types/timeseries/server/index.ts b/src/plugins/vis_types/timeseries/server/index.ts
index 9ecb8a92d27d..98e18a534919 100644
--- a/src/plugins/vis_types/timeseries/server/index.ts
+++ b/src/plugins/vis_types/timeseries/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext, PluginConfigDescriptor } from '@kbn/core/server';
-import { VisTypeTimeseriesConfig, config as configSchema } from '../config';
+import { VisTypeTimeseriesConfig, config as configSchema } from './config';
 
 export type { VisTypeTimeseriesSetup } from './plugin';
 
diff --git a/src/plugins/vis_types/timeseries/server/plugin.ts b/src/plugins/vis_types/timeseries/server/plugin.ts
index 6435840269bb..6f7a33e9d8af 100644
--- a/src/plugins/vis_types/timeseries/server/plugin.ts
+++ b/src/plugins/vis_types/timeseries/server/plugin.ts
@@ -26,7 +26,7 @@ import type { PluginStart as DataViewsPublicPluginStart } from '@kbn/data-views-
 import type { FieldFormatsRegistry } from '@kbn/field-formats-plugin/common';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
 import { VIS_TYPE } from '../common/constants';
-import { VisTypeTimeseriesConfig } from '../config';
+import { VisTypeTimeseriesConfig } from './config';
 import { getVisData } from './lib/get_vis_data';
 import { visDataRoutes } from './routes/vis';
 import { fieldsRoutes } from './routes/fields';
diff --git a/src/plugins/vis_types/vega/public/index.ts b/src/plugins/vis_types/vega/public/index.ts
index 746432663dcf..c8b9a42cb2f4 100644
--- a/src/plugins/vis_types/vega/public/index.ts
+++ b/src/plugins/vis_types/vega/public/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/public';
-import { ConfigSchema } from '../config';
+import type { ConfigSchema } from '../server/config';
 import { VegaPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext<ConfigSchema>) {
diff --git a/src/plugins/vis_types/vega/public/plugin.ts b/src/plugins/vis_types/vega/public/plugin.ts
index 96e383979b85..63eed196790d 100644
--- a/src/plugins/vis_types/vega/public/plugin.ts
+++ b/src/plugins/vis_types/vega/public/plugin.ts
@@ -30,7 +30,7 @@ import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
 import type { IServiceSettings } from './vega_view/vega_map_view/service_settings/service_settings_types';
 
-import { ConfigSchema } from '../config';
+import type { ConfigSchema } from '../server/config';
 
 import { getVegaInspectorView } from './vega_inspector';
 import { getVegaVisRenderer } from './vega_vis_renderer';
diff --git a/src/plugins/vis_types/vega/config.ts b/src/plugins/vis_types/vega/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/vega/config.ts
rename to src/plugins/vis_types/vega/server/config.ts
diff --git a/src/plugins/vis_types/vega/server/index.ts b/src/plugins/vis_types/vega/server/index.ts
index b761d6992237..08da62350a35 100644
--- a/src/plugins/vis_types/vega/server/index.ts
+++ b/src/plugins/vis_types/vega/server/index.ts
@@ -8,7 +8,7 @@
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
-import { configSchema, ConfigSchema } from '../config';
+import { configSchema, ConfigSchema } from './config';
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/vislib/public/plugin.ts b/src/plugins/vis_types/vislib/public/plugin.ts
index d53751f0bd6a..72792426d93b 100644
--- a/src/plugins/vis_types/vislib/public/plugin.ts
+++ b/src/plugins/vis_types/vislib/public/plugin.ts
@@ -16,7 +16,7 @@ import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 
 import { LEGACY_HEATMAP_CHARTS_LIBRARY } from '@kbn/vis-type-heatmap-plugin/common';
 import { LEGACY_GAUGE_CHARTS_LIBRARY } from '@kbn/vis-type-gauge-plugin/common';
-import { VislibPublicConfig } from '../config';
+import type { VislibPublicConfig } from '../server/config';
 import { setAnalytics, setI18n, setUsageCollectionStart } from './services';
 import { heatmapVisTypeDefinition } from './heatmap';
 
diff --git a/src/plugins/vis_types/vislib/config.ts b/src/plugins/vis_types/vislib/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/vislib/config.ts
rename to src/plugins/vis_types/vislib/server/config.ts
diff --git a/src/plugins/vis_types/vislib/server/index.ts b/src/plugins/vis_types/vislib/server/index.ts
index 03b3d03d7fc2..83853197d551 100644
--- a/src/plugins/vis_types/vislib/server/index.ts
+++ b/src/plugins/vis_types/vislib/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginConfigDescriptor } from '@kbn/core/server';
-import { configSchema, VislibConfig } from '../config';
+import { configSchema, VislibConfig } from './config';
 
 export const config: PluginConfigDescriptor<VislibConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/xy/public/index.ts b/src/plugins/vis_types/xy/public/index.ts
index b8ec6b68d001..c32299337557 100644
--- a/src/plugins/vis_types/xy/public/index.ts
+++ b/src/plugins/vis_types/xy/public/index.ts
@@ -8,7 +8,7 @@
 
 import type { PluginInitializerContext } from '@kbn/core/public';
 import { VisTypeXyPlugin as Plugin } from './plugin';
-import type { XyPublicConfig } from '../config';
+import type { XyPublicConfig } from '../server/config';
 
 export type { VisTypeXyPluginSetup } from './plugin';
 
diff --git a/src/plugins/vis_types/xy/public/plugin.ts b/src/plugins/vis_types/xy/public/plugin.ts
index 820f2f72f1e6..92c00b6c64c9 100644
--- a/src/plugins/vis_types/xy/public/plugin.ts
+++ b/src/plugins/vis_types/xy/public/plugin.ts
@@ -10,7 +10,7 @@ import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kb
 import type { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
-import type { XyPublicConfig } from '../config';
+import type { XyPublicConfig } from '../server/config';
 import { setUISettings, setPalettesService, setDataViewsStart } from './services';
 
 import { visTypesDefinitions } from './vis_types';
diff --git a/src/plugins/vis_types/xy/config.ts b/src/plugins/vis_types/xy/server/config.ts
similarity index 100%
rename from src/plugins/vis_types/xy/config.ts
rename to src/plugins/vis_types/xy/server/config.ts
diff --git a/src/plugins/vis_types/xy/server/index.ts b/src/plugins/vis_types/xy/server/index.ts
index f0484adf9a5e..8d3bd1241f41 100644
--- a/src/plugins/vis_types/xy/server/index.ts
+++ b/src/plugins/vis_types/xy/server/index.ts
@@ -7,7 +7,7 @@
  */
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
-import { configSchema, XyConfig } from '../config';
+import { configSchema, XyConfig } from './config';
 
 export const config: PluginConfigDescriptor<XyConfig> = {
   exposeToBrowser: {
diff --git a/src/plugins/vis_types/xy/server/plugin.ts b/src/plugins/vis_types/xy/server/plugin.ts
index b77c02030a8a..be44f9daa8ed 100644
--- a/src/plugins/vis_types/xy/server/plugin.ts
+++ b/src/plugins/vis_types/xy/server/plugin.ts
@@ -8,7 +8,7 @@
 
 import { CoreSetup, Plugin, PluginInitializerContext } from '@kbn/core/server';
 import type { VisualizationsServerSetup } from '@kbn/visualizations-plugin/server';
-import type { XyConfig } from '../config';
+import type { XyConfig } from './config';
 
 interface PluginSetupDependencies {
   visualizations: VisualizationsServerSetup;
diff --git a/src/plugins/visualizations/common/content_management/cm_services.ts b/src/plugins/visualizations/server/content_management/cm_services.ts
similarity index 100%
rename from src/plugins/visualizations/common/content_management/cm_services.ts
rename to src/plugins/visualizations/server/content_management/cm_services.ts
diff --git a/src/plugins/visualizations/common/content_management/v1/cm_services.ts b/src/plugins/visualizations/server/content_management/v1/cm_services.ts
similarity index 100%
rename from src/plugins/visualizations/common/content_management/v1/cm_services.ts
rename to src/plugins/visualizations/server/content_management/v1/cm_services.ts
diff --git a/src/plugins/visualizations/server/content_management/visualization_storage.ts b/src/plugins/visualizations/server/content_management/visualization_storage.ts
index 17a3e73b5147..61aa924f7bd9 100644
--- a/src/plugins/visualizations/server/content_management/visualization_storage.ts
+++ b/src/plugins/visualizations/server/content_management/visualization_storage.ts
@@ -9,7 +9,7 @@
 import { SOContentStorage } from '@kbn/content-management-utils';
 
 import { Logger } from '@kbn/logging';
-import { cmServicesDefinition } from '../../common/content_management/cm_services';
+import { cmServicesDefinition } from './cm_services';
 import type {
   VisualizationContentType,
   VisualizationCrudTypes,
diff --git a/x-pack/plugins/graph/public/index.ts b/x-pack/plugins/graph/public/index.ts
index 63e68eae586b..85053d703dd2 100644
--- a/x-pack/plugins/graph/public/index.ts
+++ b/x-pack/plugins/graph/public/index.ts
@@ -7,7 +7,7 @@
 
 import { PluginInitializerContext } from '@kbn/core/public';
 import { GraphPlugin } from './plugin';
-import { ConfigSchema } from '../config';
+import type { ConfigSchema } from '../server/config';
 
 export const plugin = (initializerContext: PluginInitializerContext<ConfigSchema>) =>
   new GraphPlugin(initializerContext);
diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts
index a0fd21dcfa97..f7179f36e204 100644
--- a/x-pack/plugins/graph/public/plugin.ts
+++ b/x-pack/plugins/graph/public/plugin.ts
@@ -32,7 +32,7 @@ import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plu
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
 import { checkLicense } from '../common/check_license';
-import { ConfigSchema } from '../config';
+import type { ConfigSchema } from '../server/config';
 import { CONTENT_ID, LATEST_VERSION } from '../common/content_management';
 
 export interface GraphPluginSetupDependencies {
diff --git a/x-pack/plugins/graph/config.ts b/x-pack/plugins/graph/server/config.ts
similarity index 100%
rename from x-pack/plugins/graph/config.ts
rename to x-pack/plugins/graph/server/config.ts
diff --git a/x-pack/plugins/graph/common/content_management/cm_services.ts b/x-pack/plugins/graph/server/content_management/cm_services.ts
similarity index 100%
rename from x-pack/plugins/graph/common/content_management/cm_services.ts
rename to x-pack/plugins/graph/server/content_management/cm_services.ts
diff --git a/x-pack/plugins/graph/server/content_management/graph_storage.ts b/x-pack/plugins/graph/server/content_management/graph_storage.ts
index 6487f942b29d..d0f57252fdb0 100644
--- a/x-pack/plugins/graph/server/content_management/graph_storage.ts
+++ b/x-pack/plugins/graph/server/content_management/graph_storage.ts
@@ -7,7 +7,7 @@
 
 import { Logger } from '@kbn/logging';
 import { SOContentStorage } from '@kbn/content-management-utils';
-import { cmServicesDefinition } from '../../common/content_management/cm_services';
+import { cmServicesDefinition } from './cm_services';
 import type { GraphCrudTypes } from '../../common/content_management';
 
 const SO_TYPE = 'graph-workspace';
diff --git a/x-pack/plugins/graph/common/content_management/v1/cm_services.ts b/x-pack/plugins/graph/server/content_management/v1/cm_services.ts
similarity index 100%
rename from x-pack/plugins/graph/common/content_management/v1/cm_services.ts
rename to x-pack/plugins/graph/server/content_management/v1/cm_services.ts
diff --git a/x-pack/plugins/graph/server/index.ts b/x-pack/plugins/graph/server/index.ts
index 46877645a850..821a2a28d53d 100644
--- a/x-pack/plugins/graph/server/index.ts
+++ b/x-pack/plugins/graph/server/index.ts
@@ -7,7 +7,7 @@
 
 import { PluginConfigDescriptor, PluginInitializerContext } from '@kbn/core/server';
 
-import { configSchema, ConfigSchema } from '../config';
+import { configSchema, ConfigSchema } from './config';
 
 export const plugin = async (initializerContext: PluginInitializerContext) => {
   const { GraphPlugin } = await import('./plugin');
diff --git a/x-pack/plugins/lens/common/content_management/cm_services.ts b/x-pack/plugins/lens/server/content_management/cm_services.ts
similarity index 100%
rename from x-pack/plugins/lens/common/content_management/cm_services.ts
rename to x-pack/plugins/lens/server/content_management/cm_services.ts
diff --git a/x-pack/plugins/lens/server/content_management/lens_storage.ts b/x-pack/plugins/lens/server/content_management/lens_storage.ts
index 3894ef20af30..e17ea543b8bd 100644
--- a/x-pack/plugins/lens/server/content_management/lens_storage.ts
+++ b/x-pack/plugins/lens/server/content_management/lens_storage.ts
@@ -18,7 +18,7 @@ import {
   type LensSavedObjectAttributes,
   type PartialLensSavedObject,
 } from '../../common/content_management';
-import { cmServicesDefinition } from '../../common/content_management/cm_services';
+import { cmServicesDefinition } from './cm_services';
 
 const searchArgsToSOFindOptions = (args: LensCrudTypes['SearchIn']): SavedObjectsFindOptions => {
   const { query, contentTypeId, options } = args;
diff --git a/x-pack/plugins/lens/common/content_management/v1/cm_services.ts b/x-pack/plugins/lens/server/content_management/v1/cm_services.ts
similarity index 100%
rename from x-pack/plugins/lens/common/content_management/v1/cm_services.ts
rename to x-pack/plugins/lens/server/content_management/v1/cm_services.ts