diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index c5f3add1d5b..5d8947299b0 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -5,3 +5,4 @@ export * from './dataframe';
 export * from './transformations';
 export * from './datetime';
 export * from './text';
+export * from './logs';
diff --git a/packages/grafana-data/src/logs/index.ts b/packages/grafana-data/src/logs/index.ts
new file mode 100644
index 00000000000..342d17fe08b
--- /dev/null
+++ b/packages/grafana-data/src/logs/index.ts
@@ -0,0 +1,2 @@
+export * from './logs';
+export * from './labels';
diff --git a/packages/grafana-data/src/utils/labels.test.ts b/packages/grafana-data/src/logs/labels.test.ts
similarity index 100%
rename from packages/grafana-data/src/utils/labels.test.ts
rename to packages/grafana-data/src/logs/labels.test.ts
diff --git a/packages/grafana-data/src/utils/labels.ts b/packages/grafana-data/src/logs/labels.ts
similarity index 100%
rename from packages/grafana-data/src/utils/labels.ts
rename to packages/grafana-data/src/logs/labels.ts
diff --git a/packages/grafana-data/src/utils/logs.test.ts b/packages/grafana-data/src/logs/logs.test.ts
similarity index 100%
rename from packages/grafana-data/src/utils/logs.test.ts
rename to packages/grafana-data/src/logs/logs.test.ts
diff --git a/packages/grafana-data/src/utils/logs.ts b/packages/grafana-data/src/logs/logs.ts
similarity index 100%
rename from packages/grafana-data/src/utils/logs.ts
rename to packages/grafana-data/src/logs/logs.ts
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index e83cc5d3957..4de94989a15 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -2,9 +2,6 @@ export * from './registry';
 export * from './deprecationWarning';
 export * from './csv';
 export * from './fieldReducer';
-export * from './logs';
-export * from './labels';
-export * from './labels';
 export * from './object';
 export * from './thresholds';