diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 0a750cc970f..b57b9bcfdb7 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -1,2 +1 @@
 export { DeleteButton } from './DeleteButton/DeleteButton';
-export { Graph } from './Graph/Graph';
diff --git a/packages/grafana-ui/src/index.ts b/packages/grafana-ui/src/index.ts
index 974d976bbef..f26af66035b 100644
--- a/packages/grafana-ui/src/index.ts
+++ b/packages/grafana-ui/src/index.ts
@@ -1,3 +1,4 @@
 export * from './components';
+export * from './visualizations';
 export * from './types';
 export * from './utils';
diff --git a/packages/grafana-ui/src/components/Graph/Graph.tsx b/packages/grafana-ui/src/visualizations/Graph/Graph.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/Graph/Graph.tsx
rename to packages/grafana-ui/src/visualizations/Graph/Graph.tsx
diff --git a/packages/grafana-ui/src/visualizations/index.ts b/packages/grafana-ui/src/visualizations/index.ts
new file mode 100644
index 00000000000..967432d37c9
--- /dev/null
+++ b/packages/grafana-ui/src/visualizations/index.ts
@@ -0,0 +1 @@
+export { Graph } from './Graph/Graph';
diff --git a/public/app/plugins/panel/graph2/GraphPanel.tsx b/public/app/plugins/panel/graph2/GraphPanel.tsx
index eda200e5e82..a08276e5179 100644
--- a/public/app/plugins/panel/graph2/GraphPanel.tsx
+++ b/public/app/plugins/panel/graph2/GraphPanel.tsx
@@ -3,14 +3,8 @@ import _ from 'lodash';
 import React, { PureComponent } from 'react';
 import colors from 'app/core/utils/colors';
 
-// Components
-import { Graph } from '@grafana/ui';
-
-// Services & Utils
-import { processTimeSeries } from '@grafana/ui';
-
-// Types
-import { PanelProps, NullValueMode } from '@grafana/ui';
+// Components & Types
+import { Graph, PanelProps, NullValueMode, processTimeSeries } from '@grafana/ui';
 import { Options } from './types';
 
 interface Props extends PanelProps<Options> {}