diff --git a/packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx b/packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx
index eb9ac4e058a..9166a6bbda5 100644
--- a/packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx
+++ b/packages/grafana-data/src/field/FieldConfigOptionsRegistry.tsx
@@ -1,4 +1,4 @@
-import { Registry } from '../utils';
-import { FieldConfigPropertyItem } from '../types';
+import { Registry } from '../utils/Registry';
+import { FieldConfigPropertyItem } from '../types/fieldOverrides';
 
 export class FieldConfigOptionsRegistry extends Registry<FieldConfigPropertyItem> {}
diff --git a/packages/grafana-data/src/types/fieldOverrides.ts b/packages/grafana-data/src/types/fieldOverrides.ts
index 1795775a556..82ebc708d01 100644
--- a/packages/grafana-data/src/types/fieldOverrides.ts
+++ b/packages/grafana-data/src/types/fieldOverrides.ts
@@ -9,7 +9,7 @@ import {
   GrafanaTheme,
   TimeZone,
 } from '../types';
-import { Registry } from '../utils';
+import { Registry } from '../utils/Registry';
 import { InterpolateFunction } from './panel';
 import { StandardEditorProps } from '../field';
 import { OptionsEditorItem } from './OptionsUIRegistryBuilder';
diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts
index 6fe2d439d2c..66af316e931 100644
--- a/packages/grafana-data/src/types/index.ts
+++ b/packages/grafana-data/src/types/index.ts
@@ -24,7 +24,6 @@ export * from './fieldColor';
 export * from './theme';
 export * from './orgs';
 export * from './flot';
-export * from './OptionsUIRegistryBuilder';
 
 import * as AppEvents from './appEvents';
 import { AppEvent } from './appEvents';
diff --git a/packages/grafana-data/src/utils/OptionsUIBuilders.ts b/packages/grafana-data/src/utils/OptionsUIBuilders.ts
index 7740ba7c277..a9f75559399 100644
--- a/packages/grafana-data/src/utils/OptionsUIBuilders.ts
+++ b/packages/grafana-data/src/utils/OptionsUIBuilders.ts
@@ -1,12 +1,7 @@
-import {
-  FieldType,
-  FieldConfigEditorProps,
-  FieldConfigPropertyItem,
-  PanelOptionsEditorConfig,
-  PanelOptionsEditorItem,
-  FieldConfigEditorConfig,
-} from '../types';
+import { FieldConfigEditorProps, FieldConfigPropertyItem, FieldConfigEditorConfig } from '../types/fieldOverrides';
 import { OptionsUIRegistryBuilder } from '../types/OptionsUIRegistryBuilder';
+import { FieldType } from '../types/dataFrame';
+import { PanelOptionsEditorConfig, PanelOptionsEditorItem } from '../types/panel';
 import {
   numberOverrideProcessor,
   selectOverrideProcessor,
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index 95779325189..1f1d7e3e8af 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -8,7 +8,7 @@ export * from './labels';
 export * from './object';
 export * from './namedColorsPalette';
 export * from './series';
-export * from './OptionsUIBuilders';
+export { PanelOptionsEditorBuilder, FieldConfigEditorBuilder } from './OptionsUIBuilders';
 
 export { getMappedValue } from './valueMappings';
 export { getFlotPairs, getFlotPairsConstant } from './flotPairs';