diff --git a/packages/grafana-data/src/dataframe/DataFrameView.test.ts b/packages/grafana-data/src/dataframe/DataFrameView.test.ts
index a5a219eb138..eb182e60c39 100644
--- a/packages/grafana-data/src/dataframe/DataFrameView.test.ts
+++ b/packages/grafana-data/src/dataframe/DataFrameView.test.ts
@@ -1,5 +1,5 @@
 import { FieldType, DataFrameDTO } from '../types/dataFrame';
-import { DateTime } from '../utils/moment_wrapper';
+import { DateTime } from '../datetime/moment_wrapper';
 import { MutableDataFrame } from './MutableDataFrame';
 import { DataFrameView } from './DataFrameView';
 
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.test.ts b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
index 975232e3902..adf10690ec5 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.test.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.test.ts
@@ -8,7 +8,7 @@ import {
   sortDataFrame,
 } from './processDataFrame';
 import { FieldType, TimeSeries, TableData, DataFrameDTO } from '../types/index';
-import { dateTime } from '../utils/moment_wrapper';
+import { dateTime } from '../datetime/moment_wrapper';
 import { MutableDataFrame } from './MutableDataFrame';
 
 describe('toDataFrame', () => {
diff --git a/packages/grafana-data/src/dataframe/processDataFrame.ts b/packages/grafana-data/src/dataframe/processDataFrame.ts
index 110799ce2ed..6221bb4e658 100644
--- a/packages/grafana-data/src/dataframe/processDataFrame.ts
+++ b/packages/grafana-data/src/dataframe/processDataFrame.ts
@@ -17,7 +17,7 @@ import {
   FieldDTO,
   DataFrameDTO,
 } from '../types/index';
-import { isDateTime } from '../utils/moment_wrapper';
+import { isDateTime } from '../datetime/moment_wrapper';
 import { deprecationWarning } from '../utils/deprecationWarning';
 import { ArrayVector } from '../vector/ArrayVector';
 import { MutableDataFrame } from './MutableDataFrame';
diff --git a/packages/grafana-data/src/utils/datemath.test.ts b/packages/grafana-data/src/datetime/datemath.test.ts
similarity index 98%
rename from packages/grafana-data/src/utils/datemath.test.ts
rename to packages/grafana-data/src/datetime/datemath.test.ts
index 6ffd9194d7f..3443eea2d17 100644
--- a/packages/grafana-data/src/utils/datemath.test.ts
+++ b/packages/grafana-data/src/datetime/datemath.test.ts
@@ -2,7 +2,7 @@ import sinon, { SinonFakeTimers } from 'sinon';
 import each from 'lodash/each';
 
 import * as dateMath from './datemath';
-import { dateTime, DurationUnit, DateTime } from '../utils/moment_wrapper';
+import { dateTime, DurationUnit, DateTime } from './moment_wrapper';
 
 describe('DateMath', () => {
   const spans: DurationUnit[] = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];
diff --git a/packages/grafana-data/src/utils/datemath.ts b/packages/grafana-data/src/datetime/datemath.ts
similarity index 99%
rename from packages/grafana-data/src/utils/datemath.ts
rename to packages/grafana-data/src/datetime/datemath.ts
index 47fe47282c3..29747e15bc7 100644
--- a/packages/grafana-data/src/utils/datemath.ts
+++ b/packages/grafana-data/src/datetime/datemath.ts
@@ -1,7 +1,7 @@
 import includes from 'lodash/includes';
 import isDate from 'lodash/isDate';
 import { DateTime, dateTime, dateTimeForTimeZone, ISO_8601, isDateTime, DurationUnit } from './moment_wrapper';
-import { TimeZone } from '../types';
+import { TimeZone } from '../types/index';
 
 const units: DurationUnit[] = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
 
diff --git a/packages/grafana-data/src/datetime/index.ts b/packages/grafana-data/src/datetime/index.ts
new file mode 100644
index 00000000000..bbaa4ebd95c
--- /dev/null
+++ b/packages/grafana-data/src/datetime/index.ts
@@ -0,0 +1,5 @@
+// Names are too general to export globally
+import * as dateMath from './datemath';
+import * as rangeUtil from './rangeutil';
+export * from './moment_wrapper';
+export { dateMath, rangeUtil };
diff --git a/packages/grafana-data/src/utils/moment_wrapper.ts b/packages/grafana-data/src/datetime/moment_wrapper.ts
similarity index 100%
rename from packages/grafana-data/src/utils/moment_wrapper.ts
rename to packages/grafana-data/src/datetime/moment_wrapper.ts
diff --git a/packages/grafana-data/src/utils/rangeutil.ts b/packages/grafana-data/src/datetime/rangeutil.ts
similarity index 98%
rename from packages/grafana-data/src/utils/rangeutil.ts
rename to packages/grafana-data/src/datetime/rangeutil.ts
index d8eb04ffd07..fcf55b37f4d 100644
--- a/packages/grafana-data/src/utils/rangeutil.ts
+++ b/packages/grafana-data/src/datetime/rangeutil.ts
@@ -4,7 +4,7 @@ import groupBy from 'lodash/groupBy';
 import { RawTimeRange } from '../types/time';
 
 import * as dateMath from './datemath';
-import { isDateTime, DateTime } from '../utils/moment_wrapper';
+import { isDateTime, DateTime } from './moment_wrapper';
 
 const spans: { [key: string]: { display: string; section?: number } } = {
   s: { display: 'second' },
diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index 1762076825b..eca6140807b 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -3,3 +3,4 @@ export * from './types';
 export * from './vector';
 export * from './dataframe';
 export * from './transformations';
+export * from './datetime';
diff --git a/packages/grafana-data/src/types/time.ts b/packages/grafana-data/src/types/time.ts
index ae8137277f3..0eb2c51929d 100644
--- a/packages/grafana-data/src/types/time.ts
+++ b/packages/grafana-data/src/types/time.ts
@@ -1,4 +1,4 @@
-import { DateTime } from '../utils/moment_wrapper';
+import { DateTime } from '../datetime/moment_wrapper';
 
 export interface RawTimeRange {
   from: DateTime | string;
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index a61f4ccafeb..cd0f3b8849d 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -8,13 +8,7 @@ export * from './logs';
 export * from './labels';
 export * from './labels';
 export * from './object';
-export * from './moment_wrapper';
 export * from './thresholds';
 export * from './text';
 
 export { getMappedValue } from './valueMappings';
-
-// Names are too general to export globally
-import * as dateMath from './datemath';
-import * as rangeUtil from './rangeutil';
-export { dateMath, rangeUtil };
diff --git a/public/app/features/explore/utils/ResultProcessor.test.ts b/public/app/features/explore/utils/ResultProcessor.test.ts
index 30860f5d772..efe8ee84eca 100644
--- a/public/app/features/explore/utils/ResultProcessor.test.ts
+++ b/public/app/features/explore/utils/ResultProcessor.test.ts
@@ -1,4 +1,4 @@
-jest.mock('@grafana/data/src/utils/moment_wrapper', () => ({
+jest.mock('@grafana/data/src/datetime/moment_wrapper', () => ({
   dateTime: (ts: any) => {
     return {
       valueOf: () => ts,