From 53e1c95c7696d4155a76cbea09f35668286fc67c Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Wed, 16 Oct 2019 21:24:12 +0200
Subject: [PATCH] Move doc, doc_viewer, context to discover folder (#47436)

* Move doc folder to discover folder

* Move doc_viewer folder to discover folder

* Move context folder to discover folder

* Move context scss import to discover folder

* Introduce angular folder, start migration
---
 .../public/context/components/action_bar/_index.scss      | 1 -
 .../core_plugins/kibana/public/discover/_index.scss       | 8 +++++++-
 .../directives/__snapshots__/no_results.test.js.snap      | 0
 .../discover/{ => angular}/directives/_histogram.scss     | 0
 .../public/discover/{ => angular}/directives/_index.scss  | 0
 .../discover/{ => angular}/directives/_no_results.scss    | 0
 .../discover/{ => angular}/directives/histogram.tsx       | 0
 .../public/discover/{ => angular}/directives/index.js     | 2 +-
 .../discover/{ => angular}/directives/no_results.js       | 0
 .../discover/{ => angular}/directives/no_results.test.js  | 0
 .../discover/{ => angular}/directives/uninitialized.tsx   | 0
 .../{ => angular}/directives/unsupported_index_pattern.js | 0
 .../public/discover/{controllers => angular}/discover.js  | 0
 .../{controllers => angular}/get_painless_error.ts        | 0
 .../kibana/public/{ => discover}/context/NOTES.md         | 4 ++--
 .../kibana/public/{ => discover}/context/_index.scss      | 0
 .../public/{ => discover}/context/api/__tests__/_stubs.js | 0
 .../public/{ => discover}/context/api/__tests__/anchor.js | 0
 .../{ => discover}/context/api/__tests__/predecessors.js  | 0
 .../{ => discover}/context/api/__tests__/successors.js    | 0
 .../kibana/public/{ => discover}/context/api/anchor.js    | 0
 .../kibana/public/{ => discover}/context/api/context.ts   | 2 +-
 .../context/api/utils/__tests__/date_conversion.test.ts   | 0
 .../context/api/utils/__tests__/sorting.test.ts           | 0
 .../{ => discover}/context/api/utils/date_conversion.ts   | 0
 .../context/api/utils/fetch_hits_in_interval.ts           | 0
 .../context/api/utils/generate_intervals.ts               | 0
 .../context/api/utils/get_es_query_search_after.ts        | 0
 .../{ => discover}/context/api/utils/get_es_query_sort.ts | 0
 .../public/{ => discover}/context/api/utils/sorting.ts    | 0
 .../kibana/public/{ => discover}/context/app.html         | 0
 .../kibana/public/{ => discover}/context/app.js           | 2 +-
 .../context/components/action_bar/_action_bar.scss        | 0
 .../discover/context/components/action_bar/_index.scss    | 1 +
 .../context/components/action_bar/action_bar.test.tsx     | 0
 .../context/components/action_bar/action_bar.tsx          | 0
 .../context/components/action_bar/action_bar_directive.ts | 0
 .../context/components/action_bar/action_bar_warning.tsx  | 0
 .../{ => discover}/context/components/action_bar/index.ts | 0
 .../kibana/public/{ => discover}/context/index.html       | 0
 .../kibana/public/{ => discover}/context/index.js         | 2 +-
 .../kibana/public/{ => discover}/context/query/actions.js | 2 +-
 .../public/{ => discover}/context/query/constants.js      | 0
 .../kibana/public/{ => discover}/context/query/index.js   | 0
 .../kibana/public/{ => discover}/context/query/state.js   | 0
 .../context/query_parameters/__tests__/_utils.js          | 0
 .../query_parameters/__tests__/action_add_filter.js       | 0
 .../__tests__/action_set_predecessor_count.js             | 0
 .../__tests__/action_set_query_parameters.js              | 0
 .../__tests__/action_set_successor_count.js               | 0
 .../{ => discover}/context/query_parameters/actions.js    | 0
 .../{ => discover}/context/query_parameters/constants.ts  | 0
 .../{ => discover}/context/query_parameters/index.js      | 0
 .../{ => discover}/context/query_parameters/state.ts      | 0
 .../kibana/public/{ => discover}/doc/doc.test.tsx         | 0
 .../core_plugins/kibana/public/{ => discover}/doc/doc.tsx | 2 +-
 .../kibana/public/{ => discover}/doc/doc_directive.ts     | 0
 .../kibana/public/{ => discover}/doc/index.html           | 0
 .../kibana/public/{ => discover}/doc/index.ts             | 0
 .../public/{ => discover}/doc/use_es_doc_search.test.tsx  | 0
 .../kibana/public/{ => discover}/doc/use_es_doc_search.ts | 2 +-
 .../public/discover/doc_table/components/table_row.js     | 2 +-
 .../doc_viewer/__snapshots__/doc_viewer.test.tsx.snap     | 0
 .../__snapshots__/doc_viewer_render_tab.test.tsx.snap     | 0
 .../public/{ => discover}/doc_viewer/_doc_viewer.scss     | 0
 .../kibana/public/discover/doc_viewer/_index.scss         | 1 +
 .../public/{ => discover}/doc_viewer/doc_viewer.test.tsx  | 0
 .../public/{ => discover}/doc_viewer/doc_viewer.tsx       | 0
 .../{ => discover}/doc_viewer/doc_viewer_directive.ts     | 0
 .../{ => discover}/doc_viewer/doc_viewer_render_error.tsx | 2 +-
 .../doc_viewer/doc_viewer_render_tab.test.tsx             | 0
 .../{ => discover}/doc_viewer/doc_viewer_render_tab.tsx   | 0
 .../public/{ => discover}/doc_viewer/doc_viewer_tab.tsx   | 0
 .../{doc_viewer/index.js => discover/doc_viewer/index.ts} | 2 ++
 src/legacy/core_plugins/kibana/public/discover/index.js   | 7 +++++--
 .../core_plugins/kibana/public/doc_viewer/_index.scss     | 1 -
 src/legacy/core_plugins/kibana/public/index.scss          | 6 ------
 src/legacy/core_plugins/kibana/public/kibana.js           | 2 --
 src/legacy/ui/public/registry/doc_views_helpers.tsx       | 2 +-
 79 files changed, 28 insertions(+), 25 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/public/context/components/action_bar/_index.scss
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/__snapshots__/no_results.test.js.snap (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/_histogram.scss (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/_index.scss (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/_no_results.scss (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/histogram.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/index.js (96%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/no_results.js (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/no_results.test.js (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/uninitialized.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{ => angular}/directives/unsupported_index_pattern.js (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{controllers => angular}/discover.js (100%)
 rename src/legacy/core_plugins/kibana/public/discover/{controllers => angular}/get_painless_error.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/NOTES.md (97%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/_index.scss (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/__tests__/_stubs.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/__tests__/anchor.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/__tests__/predecessors.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/__tests__/successors.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/anchor.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/context.ts (98%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/__tests__/date_conversion.test.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/__tests__/sorting.test.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/date_conversion.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/fetch_hits_in_interval.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/generate_intervals.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/get_es_query_search_after.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/get_es_query_sort.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/api/utils/sorting.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/app.html (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/app.js (99%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/_action_bar.scss (100%)
 create mode 100644 src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/action_bar.test.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/action_bar.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/action_bar_directive.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/action_bar_warning.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/components/action_bar/index.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/index.html (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/index.js (98%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query/actions.js (98%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query/constants.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query/index.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query/state.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/__tests__/_utils.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/__tests__/action_add_filter.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/__tests__/action_set_predecessor_count.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/__tests__/action_set_query_parameters.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/__tests__/action_set_successor_count.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/actions.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/constants.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/index.js (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/context/query_parameters/state.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/doc.test.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/doc.tsx (98%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/doc_directive.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/index.html (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/index.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/use_es_doc_search.test.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc/use_es_doc_search.ts (97%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/_doc_viewer.scss (100%)
 create mode 100644 src/legacy/core_plugins/kibana/public/discover/doc_viewer/_index.scss
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer.test.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer_directive.ts (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer_render_error.tsx (94%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer_render_tab.test.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer_render_tab.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{ => discover}/doc_viewer/doc_viewer_tab.tsx (100%)
 rename src/legacy/core_plugins/kibana/public/{doc_viewer/index.js => discover/doc_viewer/index.ts} (96%)
 delete mode 100644 src/legacy/core_plugins/kibana/public/doc_viewer/_index.scss

diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/_index.scss b/src/legacy/core_plugins/kibana/public/context/components/action_bar/_index.scss
deleted file mode 100644
index 1f54ecea5e1cb..0000000000000
--- a/src/legacy/core_plugins/kibana/public/context/components/action_bar/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './action_bar';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_index.scss b/src/legacy/core_plugins/kibana/public/discover/_index.scss
index 57a6b89c37722..0b0bd12cb268b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/_index.scss
@@ -10,7 +10,7 @@
 
 @import 'components/fetch_error/index';
 @import 'components/field_chooser/index';
-@import 'directives/index';
+@import 'angular/directives/index';
 @import 'doc_table/index';
 
 @import 'hacks';
@@ -18,3 +18,9 @@
 @import 'discover';
 
 @import 'embeddable/index';
+
+// Doc Viewer
+@import 'doc_viewer/index';
+
+// Context styles
+@import 'context/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/_histogram.scss b/src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/_histogram.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/_no_results.scss b/src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/_no_results.scss
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/histogram.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/directives/index.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
index dc834c02759e0..27918bd704f5a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/directives/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
@@ -20,7 +20,7 @@
 import 'ngreact';
 import { wrapInI18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
-import '../../../../../ui/public/render_complete/directive';
+import '../../../../../../ui/public/render_complete/directive';
 
 import { DiscoverNoResults } from './no_results';
 import { DiscoverUninitialized } from './uninitialized';
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/no_results.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/no_results.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/no_results.test.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/no_results.test.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/uninitialized.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/uninitialized.tsx
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/unsupported_index_pattern.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/directives/unsupported_index_pattern.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js b/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/controllers/discover.js
rename to src/legacy/core_plugins/kibana/public/discover/angular/discover.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/get_painless_error.ts b/src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/controllers/get_painless_error.ts
rename to src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/NOTES.md b/src/legacy/core_plugins/kibana/public/discover/context/NOTES.md
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/context/NOTES.md
rename to src/legacy/core_plugins/kibana/public/discover/context/NOTES.md
index 445080c215998..7aaa251348961 100644
--- a/src/legacy/core_plugins/kibana/public/context/NOTES.md
+++ b/src/legacy/core_plugins/kibana/public/discover/context/NOTES.md
@@ -29,11 +29,11 @@ employed in some cases, e.g. when dealing with the isolate scope bindings in
 **Loose Coupling**: An attempt was made to couple the parts that make up this
 app as loosely as possible. This means using pure functions whenever possible
 and isolating the angular directives diligently. To that end, the app has been
-implemented as the independent `ContextApp` directive in [app.js](./app.js). It
+implemented as the independent `ContextApp` directive in [app.js](app.js). It
 does not access the Kibana `AppState` directly but communicates only via its
 directive properties. The binding of these attributes to the state and thereby
 to the route is performed by the `CreateAppRouteController`in
-[index.js](./index.js). Similarly, the `SizePicker` directive only communicates
+[index.js](index.js). Similarly, the `SizePicker` directive only communicates
 with its parent via the passed properties.
 
 
diff --git a/src/legacy/core_plugins/kibana/public/context/_index.scss b/src/legacy/core_plugins/kibana/public/discover/context/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/context/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/context/api/__tests__/_stubs.js b/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/_stubs.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/__tests__/_stubs.js
rename to src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/_stubs.js
diff --git a/src/legacy/core_plugins/kibana/public/context/api/__tests__/anchor.js b/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/__tests__/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/context/api/__tests__/predecessors.js b/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/predecessors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/__tests__/predecessors.js
rename to src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/predecessors.js
diff --git a/src/legacy/core_plugins/kibana/public/context/api/__tests__/successors.js b/src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/successors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/__tests__/successors.js
rename to src/legacy/core_plugins/kibana/public/discover/context/api/__tests__/successors.js
diff --git a/src/legacy/core_plugins/kibana/public/context/api/anchor.js b/src/legacy/core_plugins/kibana/public/discover/context/api/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/context/api/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/context.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/context/api/context.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/context.ts
index baecf8a673521..39c7421d3b912 100644
--- a/src/legacy/core_plugins/kibana/public/context/api/context.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/context/api/context.ts
@@ -18,7 +18,7 @@
  */
 
 // @ts-ignore
-import { SearchSourceProvider, SearchSource } from 'ui/courier';
+import { SearchSourceProvider } from 'ui/courier';
 import { IPrivate } from 'ui/private';
 import { Filter } from '@kbn/es-query';
 import { IndexPatterns, IndexPattern } from 'ui/index_patterns';
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/__tests__/date_conversion.test.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/date_conversion.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/__tests__/date_conversion.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/date_conversion.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/__tests__/sorting.test.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/sorting.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/__tests__/sorting.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/__tests__/sorting.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/date_conversion.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/date_conversion.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/date_conversion.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/date_conversion.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/fetch_hits_in_interval.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/fetch_hits_in_interval.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/fetch_hits_in_interval.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/fetch_hits_in_interval.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/generate_intervals.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/generate_intervals.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/generate_intervals.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/generate_intervals.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/get_es_query_search_after.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_search_after.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/get_es_query_search_after.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_search_after.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/get_es_query_sort.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_sort.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/get_es_query_sort.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/get_es_query_sort.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/api/utils/sorting.ts b/src/legacy/core_plugins/kibana/public/discover/context/api/utils/sorting.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/api/utils/sorting.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/api/utils/sorting.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/app.html b/src/legacy/core_plugins/kibana/public/discover/context/app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/app.html
rename to src/legacy/core_plugins/kibana/public/discover/context/app.html
diff --git a/src/legacy/core_plugins/kibana/public/context/app.js b/src/legacy/core_plugins/kibana/public/discover/context/app.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/context/app.js
rename to src/legacy/core_plugins/kibana/public/discover/context/app.js
index 6b10d80078f80..7754f743632cb 100644
--- a/src/legacy/core_plugins/kibana/public/context/app.js
+++ b/src/legacy/core_plugins/kibana/public/discover/context/app.js
@@ -38,7 +38,7 @@ import {
 import { timefilter } from 'ui/timefilter';
 
 // load directives
-import '../../../data/public/legacy';
+import '../../../../data/public/legacy';
 
 const module = uiModules.get('apps/context', [
   'elasticsearch',
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/_action_bar.scss b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_action_bar.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/_action_bar.scss
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_action_bar.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss
new file mode 100644
index 0000000000000..d54e2caffc122
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/_index.scss
@@ -0,0 +1 @@
+@import 'action_bar';
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar.test.tsx b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar.tsx
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar_directive.ts b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_directive.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_directive.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar_warning.tsx b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_warning.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/action_bar_warning.tsx
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/action_bar_warning.tsx
diff --git a/src/legacy/core_plugins/kibana/public/context/components/action_bar/index.ts b/src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/components/action_bar/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/components/action_bar/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/index.html b/src/legacy/core_plugins/kibana/public/discover/context/index.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/index.html
rename to src/legacy/core_plugins/kibana/public/discover/context/index.html
diff --git a/src/legacy/core_plugins/kibana/public/context/index.js b/src/legacy/core_plugins/kibana/public/discover/context/index.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/context/index.js
rename to src/legacy/core_plugins/kibana/public/discover/context/index.js
index 71044d36d1aa5..902bee2badb7c 100644
--- a/src/legacy/core_plugins/kibana/public/context/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/context/index.js
@@ -25,7 +25,7 @@ import { i18n } from '@kbn/i18n';
 
 import './app';
 import contextAppRouteTemplate from './index.html';
-import { getRootBreadcrumbs } from '../discover/breadcrumbs';
+import { getRootBreadcrumbs } from '../breadcrumbs';
 import { npStart } from 'ui/new_platform';
 import { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 
diff --git a/src/legacy/core_plugins/kibana/public/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/context/query/actions.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/context/query/actions.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query/actions.js
index 72624210fcb49..c55dcc374fa5a 100644
--- a/src/legacy/core_plugins/kibana/public/context/query/actions.js
+++ b/src/legacy/core_plugins/kibana/public/discover/context/query/actions.js
@@ -26,7 +26,7 @@ import { fetchAnchorProvider } from '../api/anchor';
 import { fetchContextProvider } from '../api/context';
 import { QueryParameterActionsProvider } from '../query_parameters';
 import { FAILURE_REASONS, LOADING_STATUS } from './constants';
-import { MarkdownSimple } from '../../../../kibana_react/public';
+import { MarkdownSimple } from '../../../../../kibana_react/public';
 
 export function QueryActionsProvider(Private, Promise) {
   const fetchAnchor = Private(fetchAnchorProvider);
diff --git a/src/legacy/core_plugins/kibana/public/context/query/constants.js b/src/legacy/core_plugins/kibana/public/discover/context/query/constants.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query/constants.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query/constants.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query/index.js b/src/legacy/core_plugins/kibana/public/discover/context/query/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query/index.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query/index.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query/state.js b/src/legacy/core_plugins/kibana/public/discover/context/query/state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query/state.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query/state.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/_utils.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/_utils.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/_utils.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/_utils.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_add_filter.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_add_filter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_add_filter.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_add_filter.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_predecessor_count.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_predecessor_count.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_predecessor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_predecessor_count.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_query_parameters.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_query_parameters.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_query_parameters.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_query_parameters.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_successor_count.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_successor_count.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/__tests__/action_set_successor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/__tests__/action_set_successor_count.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/actions.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/actions.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/actions.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/constants.ts b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/index.js b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/index.js
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/index.js
diff --git a/src/legacy/core_plugins/kibana/public/context/query_parameters/state.ts b/src/legacy/core_plugins/kibana/public/discover/context/query_parameters/state.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/context/query_parameters/state.ts
rename to src/legacy/core_plugins/kibana/public/discover/context/query_parameters/state.ts
diff --git a/src/legacy/core_plugins/kibana/public/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc/doc.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc/doc.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc/doc.tsx b/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/doc/doc.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
index 3b972d88d329f..1f2d2fc532b57 100644
--- a/src/legacy/core_plugins/kibana/public/doc/doc.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc/doc.tsx
@@ -22,7 +22,7 @@ import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent } from '@elastic
 import { IndexPatterns } from 'ui/index_patterns';
 import { metadata } from 'ui/metadata';
 import { ElasticSearchHit } from 'ui/registry/doc_views_types';
-import { DocViewer } from '../doc_viewer/doc_viewer';
+import { DocViewer } from '../doc_viewer';
 import { ElasticRequestState, useEsDocSearch } from './use_es_doc_search';
 
 export interface ElasticSearchResult {
diff --git a/src/legacy/core_plugins/kibana/public/doc/doc_directive.ts b/src/legacy/core_plugins/kibana/public/discover/doc/doc_directive.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc/doc_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/doc/doc_directive.ts
diff --git a/src/legacy/core_plugins/kibana/public/doc/index.html b/src/legacy/core_plugins/kibana/public/discover/doc/index.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc/index.html
rename to src/legacy/core_plugins/kibana/public/discover/doc/index.html
diff --git a/src/legacy/core_plugins/kibana/public/doc/index.ts b/src/legacy/core_plugins/kibana/public/discover/doc/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/doc/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/doc/use_es_doc_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc/use_es_doc_search.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/doc/use_es_doc_search.ts
rename to src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
index acbfbf5f7aedd..d1a01dadb72be 100644
--- a/src/legacy/core_plugins/kibana/public/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/doc/use_es_doc_search.ts
@@ -19,7 +19,7 @@
 import { useEffect, useState } from 'react';
 import { ElasticSearchHit } from 'ui/registry/doc_views_types';
 import { DocProps } from './doc';
-import { IndexPattern } from '../../../data/public/index_patterns';
+import { IndexPattern } from '../../../../data/public/index_patterns';
 
 export enum ElasticRequestState {
   Loading,
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js
index a0a69969b49ff..8e4105bac827e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_table/components/table_row.js
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import $ from 'jquery';
 import rison from 'rison-node';
-import 'plugins/kibana/doc_viewer';
+import '../../doc_viewer';
 import { noWhiteSpace } from '../../../../common/utils/no_white_space';
 import openRowHtml from './table_row/open.html';
 import detailsHtml from './table_row/details.html';
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/_doc_viewer.scss b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/_doc_viewer.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/_doc_viewer.scss
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/_doc_viewer.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_viewer/_index.scss b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/_index.scss
new file mode 100644
index 0000000000000..aaf925f435d81
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/_index.scss
@@ -0,0 +1 @@
+@import 'doc_viewer';
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_directive.ts b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_directive.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_directive.ts
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_error.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_error.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_error.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_error.tsx
index b81610c5569a4..80b9cb5110db7 100644
--- a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_error.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_error.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
 // @ts-ignore
-import { formatMsg, formatStack } from '../../../../ui/public/notify/lib';
+import { formatMsg, formatStack } from 'ui/notify/lib/index';
 
 interface Props {
   error: Error | string | null;
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_tab.test.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_tab.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_render_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_tab.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/doc_viewer_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/doc_viewer_tab.tsx
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/index.js b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/doc_viewer/index.js
rename to src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts
index 0771de0f2d599..8ce94f24128df 100644
--- a/src/legacy/core_plugins/kibana/public/doc_viewer/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/doc_viewer/index.ts
@@ -18,3 +18,5 @@
  */
 
 import './doc_viewer_directive';
+
+export * from './doc_viewer';
diff --git a/src/legacy/core_plugins/kibana/public/discover/index.js b/src/legacy/core_plugins/kibana/public/discover/index.js
index def832107322d..e509936306275 100644
--- a/src/legacy/core_plugins/kibana/public/discover/index.js
+++ b/src/legacy/core_plugins/kibana/public/discover/index.js
@@ -19,12 +19,15 @@
 
 import './saved_searches/saved_searches';
 import { i18n } from '@kbn/i18n';
-import './directives';
+
+import './angular/directives';
 import 'ui/collapsible_sidebar';
 import './components/field_chooser/field_chooser';
-import './controllers/discover';
+import './angular/discover';
 import './doc_table/components/table_row';
 import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
+import './doc';
+import './context';
 
 FeatureCatalogueRegistryProvider.register(() => {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/doc_viewer/_index.scss b/src/legacy/core_plugins/kibana/public/doc_viewer/_index.scss
deleted file mode 100644
index c8fe67fd3bae4..0000000000000
--- a/src/legacy/core_plugins/kibana/public/doc_viewer/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './doc_viewer';
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
index 7a47ca5e8eb1c..7a6a3ca1d01d0 100644
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ b/src/legacy/core_plugins/kibana/public/index.scss
@@ -9,9 +9,6 @@
 // Public UI styles
 @import 'src/legacy/ui/public/index';
 
-// Context styles
-@import './context/index';
-
 // Dev tools styles
 @import './dev_tools/index';
 
@@ -30,9 +27,6 @@
 // Management styles
 @import './management/index';
 
-// Doc Viewer
-@import './doc_viewer/index';
-
 // Dashboard styles
 // MUST STAY AT THE BOTTOM BECAUSE OF DARK THEME IMPORTS
 @import './dashboard/index';
diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js
index 9a96bf26aede6..6c809e84c8c84 100644
--- a/src/legacy/core_plugins/kibana/public/kibana.js
+++ b/src/legacy/core_plugins/kibana/public/kibana.js
@@ -52,9 +52,7 @@ import './discover';
 import './visualize';
 import './dashboard';
 import './management';
-import './doc';
 import './dev_tools';
-import './context';
 import 'ui/vislib';
 import 'ui/agg_response';
 import 'ui/agg_types';
diff --git a/src/legacy/ui/public/registry/doc_views_helpers.tsx b/src/legacy/ui/public/registry/doc_views_helpers.tsx
index 02f276c48124b..1ff00713b10ef 100644
--- a/src/legacy/ui/public/registry/doc_views_helpers.tsx
+++ b/src/legacy/ui/public/registry/doc_views_helpers.tsx
@@ -26,7 +26,7 @@ import {
   AngularController,
   AngularDirective,
 } from './doc_views_types';
-import { DocViewerError } from '../../../core_plugins/kibana/public/doc_viewer/doc_viewer_render_error';
+import { DocViewerError } from '../../../core_plugins/kibana/public/discover/doc_viewer/doc_viewer_render_error';
 
 /**
  * Compiles and injects the give angular template into the given dom node