diff --git a/src/components/index.js b/src/components/index.js
index a6d565280f5f..e71d9a4f250b 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -256,7 +256,9 @@ export {
 } from './progress';
 
 export {
-  EuiSearchBar
+  EuiSearchBar,
+  Query,
+  Ast
 } from './search_bar';
 
 export {
diff --git a/src/components/search_bar/index.js b/src/components/search_bar/index.js
index a203e6fc36f7..9ad496ff6d86 100644
--- a/src/components/search_bar/index.js
+++ b/src/components/search_bar/index.js
@@ -1,4 +1,3 @@
-export { EuiSearchBar } from './search_bar';
-export { QueryType } from './search_bar';
+export { EuiSearchBar, QueryType, Query, Ast } from './search_bar';
 export { SearchBoxConfigPropTypes } from './search_box';
 export { SearchFiltersFiltersType } from './search_filters';
diff --git a/src/components/search_bar/search_bar.js b/src/components/search_bar/search_bar.js
index 2bda8ae1d34e..b1c18ab1f19a 100644
--- a/src/components/search_bar/search_bar.js
+++ b/src/components/search_bar/search_bar.js
@@ -13,6 +13,8 @@ import PropTypes from 'prop-types';
 import { Query } from './query';
 import { EuiFlexItem } from '../flex/flex_item';
 
+export { Query, AST as Ast } from './query';
+
 export const QueryType = PropTypes.oneOfType([ PropTypes.instanceOf(Query), PropTypes.string ]);
 
 export const SearchBarPropTypes = {
diff --git a/src/services/index.js b/src/services/index.ts
similarity index 88%
rename from src/services/index.js
rename to src/services/index.ts
index aabefafa4cdb..a07bfc4059b6 100644
--- a/src/services/index.js
+++ b/src/services/index.ts
@@ -43,12 +43,6 @@ export {
   Pager
 } from './paging';
 
-// TODO: Migrate these services into the services directory.
-export {
-  Query,
-  AST as Ast,
-} from '../components/search_bar/query';
-
 export {
   Random
 } from './random';