diff --git a/public/app/containers/Explore/ElapsedTime.tsx b/public/app/features/explore/ElapsedTime.tsx
similarity index 100%
rename from public/app/containers/Explore/ElapsedTime.tsx
rename to public/app/features/explore/ElapsedTime.tsx
diff --git a/public/app/containers/Explore/Explore.tsx b/public/app/features/explore/Explore.tsx
similarity index 100%
rename from public/app/containers/Explore/Explore.tsx
rename to public/app/features/explore/Explore.tsx
diff --git a/public/app/containers/Explore/Graph.tsx b/public/app/features/explore/Graph.tsx
similarity index 100%
rename from public/app/containers/Explore/Graph.tsx
rename to public/app/features/explore/Graph.tsx
diff --git a/public/app/containers/Explore/JSONViewer.tsx b/public/app/features/explore/JSONViewer.tsx
similarity index 100%
rename from public/app/containers/Explore/JSONViewer.tsx
rename to public/app/features/explore/JSONViewer.tsx
diff --git a/public/app/containers/Explore/Legend.tsx b/public/app/features/explore/Legend.tsx
similarity index 100%
rename from public/app/containers/Explore/Legend.tsx
rename to public/app/features/explore/Legend.tsx
diff --git a/public/app/containers/Explore/Logs.tsx b/public/app/features/explore/Logs.tsx
similarity index 100%
rename from public/app/containers/Explore/Logs.tsx
rename to public/app/features/explore/Logs.tsx
diff --git a/public/app/containers/Explore/PromQueryField.test.tsx b/public/app/features/explore/PromQueryField.test.tsx
similarity index 100%
rename from public/app/containers/Explore/PromQueryField.test.tsx
rename to public/app/features/explore/PromQueryField.test.tsx
diff --git a/public/app/containers/Explore/PromQueryField.tsx b/public/app/features/explore/PromQueryField.tsx
similarity index 100%
rename from public/app/containers/Explore/PromQueryField.tsx
rename to public/app/features/explore/PromQueryField.tsx
diff --git a/public/app/containers/Explore/QueryField.tsx b/public/app/features/explore/QueryField.tsx
similarity index 100%
rename from public/app/containers/Explore/QueryField.tsx
rename to public/app/features/explore/QueryField.tsx
diff --git a/public/app/containers/Explore/QueryRows.tsx b/public/app/features/explore/QueryRows.tsx
similarity index 100%
rename from public/app/containers/Explore/QueryRows.tsx
rename to public/app/features/explore/QueryRows.tsx
diff --git a/public/app/containers/Explore/Table.tsx b/public/app/features/explore/Table.tsx
similarity index 100%
rename from public/app/containers/Explore/Table.tsx
rename to public/app/features/explore/Table.tsx
diff --git a/public/app/containers/Explore/TimePicker.test.tsx b/public/app/features/explore/TimePicker.test.tsx
similarity index 100%
rename from public/app/containers/Explore/TimePicker.test.tsx
rename to public/app/features/explore/TimePicker.test.tsx
diff --git a/public/app/containers/Explore/TimePicker.tsx b/public/app/features/explore/TimePicker.tsx
similarity index 100%
rename from public/app/containers/Explore/TimePicker.tsx
rename to public/app/features/explore/TimePicker.tsx
diff --git a/public/app/containers/Explore/Typeahead.tsx b/public/app/features/explore/Typeahead.tsx
similarity index 100%
rename from public/app/containers/Explore/Typeahead.tsx
rename to public/app/features/explore/Typeahead.tsx
diff --git a/public/app/containers/Explore/Value.ts b/public/app/features/explore/Value.ts
similarity index 100%
rename from public/app/containers/Explore/Value.ts
rename to public/app/features/explore/Value.ts
diff --git a/public/app/containers/Explore/Wrapper.tsx b/public/app/features/explore/Wrapper.tsx
similarity index 100%
rename from public/app/containers/Explore/Wrapper.tsx
rename to public/app/features/explore/Wrapper.tsx
diff --git a/public/app/containers/Explore/slate-plugins/braces.test.ts b/public/app/features/explore/slate-plugins/braces.test.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/braces.test.ts
rename to public/app/features/explore/slate-plugins/braces.test.ts
diff --git a/public/app/containers/Explore/slate-plugins/braces.ts b/public/app/features/explore/slate-plugins/braces.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/braces.ts
rename to public/app/features/explore/slate-plugins/braces.ts
diff --git a/public/app/containers/Explore/slate-plugins/clear.test.ts b/public/app/features/explore/slate-plugins/clear.test.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/clear.test.ts
rename to public/app/features/explore/slate-plugins/clear.test.ts
diff --git a/public/app/containers/Explore/slate-plugins/clear.ts b/public/app/features/explore/slate-plugins/clear.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/clear.ts
rename to public/app/features/explore/slate-plugins/clear.ts
diff --git a/public/app/containers/Explore/slate-plugins/newline.ts b/public/app/features/explore/slate-plugins/newline.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/newline.ts
rename to public/app/features/explore/slate-plugins/newline.ts
diff --git a/public/app/containers/Explore/slate-plugins/prism/promql.ts b/public/app/features/explore/slate-plugins/prism/promql.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/prism/promql.ts
rename to public/app/features/explore/slate-plugins/prism/promql.ts
diff --git a/public/app/containers/Explore/slate-plugins/runner.ts b/public/app/features/explore/slate-plugins/runner.ts
similarity index 100%
rename from public/app/containers/Explore/slate-plugins/runner.ts
rename to public/app/features/explore/slate-plugins/runner.ts
diff --git a/public/app/containers/Explore/utils/debounce.ts b/public/app/features/explore/utils/debounce.ts
similarity index 100%
rename from public/app/containers/Explore/utils/debounce.ts
rename to public/app/features/explore/utils/debounce.ts
diff --git a/public/app/containers/Explore/utils/dom.ts b/public/app/features/explore/utils/dom.ts
similarity index 100%
rename from public/app/containers/Explore/utils/dom.ts
rename to public/app/features/explore/utils/dom.ts
diff --git a/public/app/containers/Explore/utils/prometheus.test.ts b/public/app/features/explore/utils/prometheus.test.ts
similarity index 100%
rename from public/app/containers/Explore/utils/prometheus.test.ts
rename to public/app/features/explore/utils/prometheus.test.ts
diff --git a/public/app/containers/Explore/utils/prometheus.ts b/public/app/features/explore/utils/prometheus.ts
similarity index 100%
rename from public/app/containers/Explore/utils/prometheus.ts
rename to public/app/features/explore/utils/prometheus.ts
diff --git a/public/app/containers/Explore/utils/query.ts b/public/app/features/explore/utils/query.ts
similarity index 100%
rename from public/app/containers/Explore/utils/query.ts
rename to public/app/features/explore/utils/query.ts
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 160250dce96..015b4ae0b51 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -116,7 +116,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
       template: '<react-container />',
       resolve: {
         roles: () => ['Editor', 'Admin'],
-        component: () => import(/* webpackChunkName: "explore" */ 'app/containers/Explore/Wrapper'),
+        component: () => import(/* webpackChunkName: "explore" */ 'app/features/explore/Wrapper'),
       },
     })
     .when('/org', {