diff --git a/public/common/constants/explorer.ts b/common/constants/explorer.ts
similarity index 100%
rename from public/common/constants/explorer.ts
rename to common/constants/explorer.ts
diff --git a/common/index.ts b/common/constants/shared.ts
similarity index 100%
rename from common/index.ts
rename to common/constants/shared.ts
diff --git a/public/common/types/explorer.ts b/common/types/explorer.ts
similarity index 100%
rename from public/common/types/explorer.ts
rename to common/types/explorer.ts
diff --git a/common/utils/index.ts b/common/utils/index.ts
new file mode 100644
index 000000000..a0d10243d
--- /dev/null
+++ b/common/utils/index.ts
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+export { getIndexPatternFromRawQuery } from './query_utils';
\ No newline at end of file
diff --git a/common/utils/query_utils.ts b/common/utils/query_utils.ts
new file mode 100644
index 000000000..0a85cf548
--- /dev/null
+++ b/common/utils/query_utils.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+export const getIndexPatternFromRawQuery = (query: string) : string => {
+  const matches = query.match(/(source|index)\s*=\s*([^|\s]+)/i);
+  if (matches) {
+    return matches[2];
+  }
+  return '';
+};
\ No newline at end of file
diff --git a/public/components/app.tsx b/public/components/app.tsx
index 9a1f4341a..b6a8e1cc1 100644
--- a/public/components/app.tsx
+++ b/public/components/app.tsx
@@ -22,8 +22,8 @@ import { Home as TraceAnalyticsHome } from './trace_analytics/home';
 import { Home as CustomPanelsHome } from './custom_panels/home';
 import { CustomPanelView } from './custom_panels/custom_panel_view';
 import { Home as EventExplorerHome } from './explorer/home';
-import { LogExplorer } from './explorer/logExplorer';
-import { observabilityTitle } from '../../common';
+import { LogExplorer } from './explorer/log_explorer';
+import { observabilityTitle } from '../../common/constants/shared';
 
 interface ObservabilityAppDeps {
   CoreStart: CoreStart;
diff --git a/public/components/explorer/dataGrid.scss b/public/components/explorer/data_grid.scss
similarity index 100%
rename from public/components/explorer/dataGrid.scss
rename to public/components/explorer/data_grid.scss
diff --git a/public/components/explorer/dataGrid.tsx b/public/components/explorer/data_grid.tsx
similarity index 98%
rename from public/components/explorer/dataGrid.tsx
rename to public/components/explorer/data_grid.tsx
index f145cf7f5..7fc2a7861 100644
--- a/public/components/explorer/dataGrid.tsx
+++ b/public/components/explorer/data_grid.tsx
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-import './dataGrid.scss';
+import './data_grid.scss';
 
 import React, { useMemo } from 'react';
 import _ from 'lodash';
diff --git a/public/components/explorer/explorer.tsx b/public/components/explorer/explorer.tsx
index c7adfcec1..6c0d42afc 100644
--- a/public/components/explorer/explorer.tsx
+++ b/public/components/explorer/explorer.tsx
@@ -25,17 +25,17 @@ import {
 } from '@elastic/eui';
 import classNames from 'classnames';
 import { Search } from '../common/seach/search';
-import { CountDistribution } from './visualizations/countDistribution';
-import { DataGrid } from './dataGrid';
+import { CountDistribution } from './visualizations/count_distribution';
+import { DataGrid } from './data_grid';
 import { Sidebar } from './sidebar';
-import { NoResults } from './noResults';
+import { NoResults } from './no_results';
 import { HitsCounter } from './hits_counter/hits_counter';
 import { TimechartHeader } from './timechart_header';
 import { ExplorerVisualizations } from './visualizations';
 import {
   IField,
   IQueryTab
-} from '../../common/types/explorer';
+} from '../../../common/types/explorer';
 import {
   TAB_CHART_TITLE,
   TAB_EVENT_TITLE,
@@ -44,7 +44,8 @@ import {
   RAW_QUERY,
   SELECTED_FIELDS,
   UNSELECTED_FIELDS
-} from '../../common/constants/explorer';
+} from '../../../common/constants/explorer';
+import { getIndexPatternFromRawQuery } from '../../../common/utils';
 import { 
   useFetchEvents,
   useFetchVisualizations
@@ -52,11 +53,11 @@ import {
 import { 
   changeQuery,
   selectQueries
-} from './slices/querySlice';
-import { selectQueryResult } from './slices/queryResultSlice';
-import { selectFields, updateFields } from './slices/fieldSlice';
-import { selectCountDistribution } from './slices/countDistributionSlice';
-import { selectExplorerVisualization } from './slices/visualizationSlice';
+} from './slices/query_slice';
+import { selectQueryResult } from './slices/query_result_slice';
+import { selectFields, updateFields } from './slices/field_slice';
+import { selectCountDistribution } from './slices/count_distribution_slice';
+import { selectExplorerVisualization } from './slices/visualization_slice';
 
 const TAB_EVENT_ID = _.uniqueId(TAB_EVENT_ID_TXT_PFX);
 const TAB_CHART_ID = _.uniqueId(TAB_CHART_ID_TXT_PFX);
@@ -113,18 +114,21 @@ export const Explorer = ({
     [setFixedScrollEl]
   );
 
-  const getIndexFromRawQuery = (rawQuery: string) => rawQuery.split('=')[1].split(' ')[0];
-
-  useEffect(() => {
+  const fetchData = () => {
     if (!query) return;
-    if (query.includes('stats')) {
-      const index = getIndexFromRawQuery(query);
+    if (query.match(/\|\s*stats/i)) {
+      const index = getIndexPatternFromRawQuery(query);
+      if (!index) return;
       getAvailableFields(`search source=${index}`);
       getVisualizations();
     } else {
       getEvents();
-      getCountVisualizations('m');
+      getCountVisualizations('h');
     }
+  };
+
+  useEffect(() => {
+    fetchData();
   }, []);
 
   const handleAddField = (field: IField) => toggleFields(field, UNSELECTED_FIELDS, SELECTED_FIELDS);
@@ -415,18 +419,11 @@ export const Explorer = ({
 
   const handleContentTabClick = (selectedTab: IQueryTab) => setSelectedContentTab(selectedTab.id);
   
-  const handleQuerySearch = (tabId: string) => {
-    if (query.includes('stats')) {
-      const index = getIndexFromRawQuery(query); // index
-      getAvailableFields(`search source=${index}`);
-      getVisualizations();
-      return;
-    } 
-    getEvents();
-    getCountVisualizations('m');
+  const handleQuerySearch = () => {
+    fetchData();
   }
 
-  const handleQueryChange = (query, tabId) => {
+  const handleQueryChange = (query: string, tabId: string) => {
     dispatch(changeQuery({
       tabId,
       query: {
diff --git a/public/components/explorer/home.tsx b/public/components/explorer/home.tsx
index d0c3228a1..a41a3429b 100644
--- a/public/components/explorer/home.tsx
+++ b/public/components/explorer/home.tsx
@@ -12,10 +12,10 @@
 import React from 'react';
 import { uniqueId } from 'lodash';
 import { useDispatch, useSelector } from 'react-redux';
-import { changeQuery } from './slices/querySlice';
-import { initialTabId } from '../../framework/redux/store/sharedState';
+import { changeQuery } from './slices/query_slice';
+import { initialTabId } from '../../framework/redux/store/shared_state';
 import { useHistory } from 'react-router-dom';
-import { selectQueries } from './slices/querySlice';
+import { selectQueries } from './slices/query_slice';
 import {
   EuiPage,
   EuiPageBody,
@@ -30,7 +30,7 @@ import {
   EuiFlexItem
 } from '@elastic/eui';
 import { Search } from '../common/seach/search';
-import { RAW_QUERY } from '../../common/constants/explorer';
+import { RAW_QUERY } from '../../../common/constants/explorer';
 
 export const Home = (props: any) => {
 
@@ -40,18 +40,14 @@ export const Home = (props: any) => {
 
   const queryHistories = [
     {
-      query: "source=opensearch_dashboards_sample_data_flights | where timestamp > timestamp('2021-07-01 00:00:00') and timestamp < timestamp('2021-07-02 00:00:00')",
-      iconType: "tokenEnum"
-    },
-    {
-      query: "source=opensearch_dashboards_sample_data_flights",
+      query: "search source=opensearch_dashboards_sample_data_logs | where utc_time > timestamp('2021-07-01 00:00:00') and utc_time < timestamp('2021-07-02 00:00:00')",
       iconType: "tokenEnum"
     }
   ];
 
   const visHistories = [
     {
-      query: "source=opensearch_dashboards_sample_data_flights | where timestamp > timestamp('2021-07-01 00:00:00') and timestamp < timestamp('2021-07-08 00:00:00') | stats count(Origin) by span(timestamp, '2h')",
+      query: "search source=opensearch_dashboards_sample_data_logs | where utc_time > timestamp('2021-07-01 00:00:00') and utc_time < timestamp('2021-07-02 00:00:00') | stats count() by span(utc_time, '15m')",
       iconType: "tokenHistogram"
     }
   ];
diff --git a/public/components/explorer/hooks/index.ts b/public/components/explorer/hooks/index.ts
index 03c5947c2..f27703147 100644
--- a/public/components/explorer/hooks/index.ts
+++ b/public/components/explorer/hooks/index.ts
@@ -9,5 +9,5 @@
  * GitHub history for details.
  */
 
-export { useFetchEvents } from './useFetchEvents';
-export { useFetchVisualizations } from './useFetchVisualizations';
\ No newline at end of file
+export { useFetchEvents } from './use_fetch_events';
+export { useFetchVisualizations } from './use_fetch_visualizations';
\ No newline at end of file
diff --git a/public/components/explorer/hooks/useFetchEvents.ts b/public/components/explorer/hooks/use_fetch_events.ts
similarity index 93%
rename from public/components/explorer/hooks/useFetchEvents.ts
rename to public/components/explorer/hooks/use_fetch_events.ts
index f8495e912..89f8dab29 100644
--- a/public/components/explorer/hooks/useFetchEvents.ts
+++ b/public/components/explorer/hooks/use_fetch_events.ts
@@ -19,12 +19,12 @@ import {
   RAW_QUERY,
   SELECTED_FIELDS,
   UNSELECTED_FIELDS
-} from '../../../common/constants/explorer';
-import { fetchSuccess, reset as queryResultReset } from '../slices/queryResultSlice';
-import { selectQueries } from '../slices/querySlice';
+} from '../../../../common/constants/explorer';
+import { fetchSuccess, reset as queryResultReset } from '../slices/query_result_slice';
+import { selectQueries } from '../slices/query_slice';
 import {
   updateFields,
-} from '../slices/fieldSlice';
+} from '../slices/field_slice';
 
 export const useFetchEvents = ({
   pplService,
diff --git a/public/components/explorer/hooks/useFetchVisualizations.ts b/public/components/explorer/hooks/use_fetch_visualizations.ts
similarity index 91%
rename from public/components/explorer/hooks/useFetchVisualizations.ts
rename to public/components/explorer/hooks/use_fetch_visualizations.ts
index 6177ccf22..4601b9dfb 100644
--- a/public/components/explorer/hooks/useFetchVisualizations.ts
+++ b/public/components/explorer/hooks/use_fetch_visualizations.ts
@@ -16,10 +16,10 @@ import {
 } from 'react-redux';
 import { 
   RAW_QUERY
-} from '../../../common/constants/explorer';
-import { render as renderCountDis } from '../slices/countDistributionSlice';
-import { selectQueries } from '../slices/querySlice';
-import { render as renderExplorerVis } from '../slices/visualizationSlice';
+} from '../../../../common/constants/explorer';
+import { render as renderCountDis } from '../slices/count_distribution_slice';
+import { selectQueries } from '../slices/query_slice';
+import { render as renderExplorerVis } from '../slices/visualization_slice';
 
 export const useFetchVisualizations = ({
   pplService,
diff --git a/public/components/explorer/LogExplorer.scss b/public/components/explorer/log_explorer.scss
similarity index 100%
rename from public/components/explorer/LogExplorer.scss
rename to public/components/explorer/log_explorer.scss
diff --git a/public/components/explorer/logExplorer.tsx b/public/components/explorer/log_explorer.tsx
similarity index 93%
rename from public/components/explorer/logExplorer.tsx
rename to public/components/explorer/log_explorer.tsx
index 42760012f..62a6b4c1f 100644
--- a/public/components/explorer/logExplorer.tsx
+++ b/public/components/explorer/log_explorer.tsx
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-import './logExplorer.scss';
+import './log_explorer.scss';
 import React, { useEffect, useMemo } from 'react';
 import { useDispatch, useSelector, batch } from 'react-redux';
 import { 
@@ -24,29 +24,29 @@ import {
   EuiTabbedContent
 } from '@elastic/eui';
 import { Explorer } from './explorer';
-import { ILogExplorerProps } from '../../common/types/explorer';
+import { ILogExplorerProps } from '../../../common/types/explorer';
 import {
   TAB_TITLE,
   TAB_ID_TXT_PFX
-} from '../../common/constants/explorer';
+} from '../../../common/constants/explorer';
 import { 
   selectQueryTabs,
   addTab,
   setSelectedQueryTab,
   removeTab
-} from './slices/queryTabSlice';
+} from './slices/query_tab_slice';
 import { 
   init as initFields,
   remove as removefields
-} from './slices/fieldSlice';
+} from './slices/field_slice';
 import {
   init as initQuery,
   remove as removeQuery
-} from './slices/querySlice';
+} from './slices/query_slice';
 import { 
   init as initQueryResult,
   remove as removeQueryResult,
-} from './slices/queryResultSlice';
+} from './slices/query_result_slice';
 
 export const LogExplorer = ({
   pplService,
diff --git a/public/components/explorer/noResults.tsx b/public/components/explorer/no_results.tsx
similarity index 100%
rename from public/components/explorer/noResults.tsx
rename to public/components/explorer/no_results.tsx
diff --git a/public/components/explorer/reducers/fetchReducers.ts b/public/components/explorer/reducers/fetch_reducers.ts
similarity index 100%
rename from public/components/explorer/reducers/fetchReducers.ts
rename to public/components/explorer/reducers/fetch_reducers.ts
diff --git a/public/components/explorer/reducers/index.ts b/public/components/explorer/reducers/index.ts
index 7c7656736..f298b1e8a 100644
--- a/public/components/explorer/reducers/index.ts
+++ b/public/components/explorer/reducers/index.ts
@@ -9,4 +9,4 @@
  * GitHub history for details.
  */
 
-export { fetchSuccess } from './fetchReducers';
\ No newline at end of file
+export { fetchSuccess } from './fetch_reducers';
\ No newline at end of file
diff --git a/public/components/explorer/reducers/queryReducers.ts b/public/components/explorer/reducers/query_reducers.ts
similarity index 100%
rename from public/components/explorer/reducers/queryReducers.ts
rename to public/components/explorer/reducers/query_reducers.ts
diff --git a/public/components/explorer/slices/countDistributionSlice.ts b/public/components/explorer/slices/count_distribution_slice.ts
similarity index 89%
rename from public/components/explorer/slices/countDistributionSlice.ts
rename to public/components/explorer/slices/count_distribution_slice.ts
index fde27af12..8035c862d 100644
--- a/public/components/explorer/slices/countDistributionSlice.ts
+++ b/public/components/explorer/slices/count_distribution_slice.ts
@@ -12,8 +12,8 @@
 import { 
   createSlice
 } from '@reduxjs/toolkit';
-import { initialTabId } from '../../../framework/redux/store/sharedState';
-import { REDUX_EXPL_SLICE_COUNT_DISTRIBUTION } from '../../../common/constants/explorer';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
+import { REDUX_EXPL_SLICE_COUNT_DISTRIBUTION } from '../../../../common/constants/explorer';
 
 const initialState = {
   [initialTabId]: {}
diff --git a/public/components/explorer/slices/fieldSlice.ts b/public/components/explorer/slices/field_slice.ts
similarity index 95%
rename from public/components/explorer/slices/fieldSlice.ts
rename to public/components/explorer/slices/field_slice.ts
index b7c72974b..df8f446fa 100644
--- a/public/components/explorer/slices/fieldSlice.ts
+++ b/public/components/explorer/slices/field_slice.ts
@@ -12,12 +12,12 @@
 import { 
   createSlice
 } from '@reduxjs/toolkit';
-import { initialTabId } from '../../../framework/redux/store/sharedState';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
 import {
   SELECTED_FIELDS,
   UNSELECTED_FIELDS,
   REDUX_EXPL_SLICE_FIELDS
-} from '../../../common/constants/explorer';
+} from '../../../../common/constants/explorer';
 
 const initialFields = {
   [SELECTED_FIELDS]: [],
diff --git a/public/components/explorer/slices/queryResultSlice.ts b/public/components/explorer/slices/query_result_slice.ts
similarity index 95%
rename from public/components/explorer/slices/queryResultSlice.ts
rename to public/components/explorer/slices/query_result_slice.ts
index ce6b509ae..14f9f86c6 100644
--- a/public/components/explorer/slices/queryResultSlice.ts
+++ b/public/components/explorer/slices/query_result_slice.ts
@@ -13,10 +13,10 @@ import {
   createSlice
 } from '@reduxjs/toolkit';
 import { fetchSuccess as fetchSuccessReducer } from '../reducers'
-import { initialTabId } from '../../../framework/redux/store/sharedState';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
 import { 
   REDUX_EXPL_SLICE_QUERY_RESULT
-} from '../../../common/constants/explorer';
+} from '../../../../common/constants/explorer';
 
 const initialState = {
   [initialTabId]: {}
diff --git a/public/components/explorer/slices/querySlice.ts b/public/components/explorer/slices/query_slice.ts
similarity index 94%
rename from public/components/explorer/slices/querySlice.ts
rename to public/components/explorer/slices/query_slice.ts
index 0901f031e..a27491a8c 100644
--- a/public/components/explorer/slices/querySlice.ts
+++ b/public/components/explorer/slices/query_slice.ts
@@ -12,11 +12,11 @@
 import { 
   createSlice
 } from '@reduxjs/toolkit';
-import { initialTabId } from '../../../framework/redux/store/sharedState';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
 import { 
   RAW_QUERY,
   REDUX_EXPL_SLICE_QUERIES
-} from '../../../common/constants/explorer';
+} from '../../../../common/constants/explorer';
 
 const initialState = {
   [initialTabId]: {
diff --git a/public/components/explorer/slices/queryTabSlice.ts b/public/components/explorer/slices/query_tab_slice.ts
similarity index 96%
rename from public/components/explorer/slices/queryTabSlice.ts
rename to public/components/explorer/slices/query_tab_slice.ts
index 9575af7e6..70e234216 100644
--- a/public/components/explorer/slices/queryTabSlice.ts
+++ b/public/components/explorer/slices/query_tab_slice.ts
@@ -12,13 +12,13 @@
 import { 
   createSlice
 } from '@reduxjs/toolkit';
-import { initialTabId } from '../../../framework/redux/store/sharedState';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
 import { 
   SELECTED_QUERY_TAB,
   QUERY_TAB_IDS,
   NEW_SELECTED_QUERY_TAB,
   REDUX_EXPL_SLICE_QUERY_TABS
-} from '../../../common/constants/explorer';
+} from '../../../../common/constants/explorer';
 
 const initialState = {
   queryTabIds: [initialTabId],
diff --git a/public/components/explorer/slices/visualizationSlice.ts b/public/components/explorer/slices/visualization_slice.ts
similarity index 90%
rename from public/components/explorer/slices/visualizationSlice.ts
rename to public/components/explorer/slices/visualization_slice.ts
index 47cde8067..3860e5efc 100644
--- a/public/components/explorer/slices/visualizationSlice.ts
+++ b/public/components/explorer/slices/visualization_slice.ts
@@ -12,8 +12,8 @@
 import { 
   createSlice
 } from '@reduxjs/toolkit';
-import { initialTabId } from '../../../framework/redux/store/sharedState';
-import { REDUX_EXPL_SLICE_VISUALIZATION } from '../../../common/constants/explorer';
+import { initialTabId } from '../../../framework/redux/store/shared_state';
+import { REDUX_EXPL_SLICE_VISUALIZATION } from '../../../../common/constants/explorer';
 
 const initialState = {
   [initialTabId]: {}
diff --git a/public/components/explorer/visualizations/countDistribution/countDistribution.tsx b/public/components/explorer/visualizations/count_distribution/count_distribution.tsx
similarity index 100%
rename from public/components/explorer/visualizations/countDistribution/countDistribution.tsx
rename to public/components/explorer/visualizations/count_distribution/count_distribution.tsx
diff --git a/public/components/explorer/visualizations/countDistribution/index.ts b/public/components/explorer/visualizations/count_distribution/index.ts
similarity index 88%
rename from public/components/explorer/visualizations/countDistribution/index.ts
rename to public/components/explorer/visualizations/count_distribution/index.ts
index 8af18bc68..7a6184b13 100644
--- a/public/components/explorer/visualizations/countDistribution/index.ts
+++ b/public/components/explorer/visualizations/count_distribution/index.ts
@@ -9,4 +9,4 @@
  * GitHub history for details.
  */
 
-export * from './countDistribution';
\ No newline at end of file
+export * from './count_distribution';
\ No newline at end of file
diff --git a/public/components/explorer/visualizations/frameLayout.scss b/public/components/explorer/visualizations/frame_layout.scss
similarity index 100%
rename from public/components/explorer/visualizations/frameLayout.scss
rename to public/components/explorer/visualizations/frame_layout.scss
diff --git a/public/components/explorer/visualizations/frameLayout.tsx b/public/components/explorer/visualizations/frame_layout.tsx
similarity index 97%
rename from public/components/explorer/visualizations/frameLayout.tsx
rename to public/components/explorer/visualizations/frame_layout.tsx
index c0b29ee87..b568d869b 100644
--- a/public/components/explorer/visualizations/frameLayout.tsx
+++ b/public/components/explorer/visualizations/frame_layout.tsx
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-import './frameLayout.scss';
+import './frame_layout.scss';
 
 import React from 'react';
 import { EuiPage, EuiPageSideBar, EuiPageBody } from '@elastic/eui';
diff --git a/public/components/explorer/visualizations/index.tsx b/public/components/explorer/visualizations/index.tsx
index 3567a6212..984e6321d 100644
--- a/public/components/explorer/visualizations/index.tsx
+++ b/public/components/explorer/visualizations/index.tsx
@@ -14,7 +14,7 @@ import './app.scss';
 import _ from 'lodash';
 
 import React from 'react';
-import { FrameLayout } from './frameLayout';
+import { FrameLayout } from './frame_layout';
 import { DataPanel } from './datapanel';
 import { WorkspacePanel } from './workspace_panel';
 import { ConfigPanelWrapper } from './config_panel';
diff --git a/public/components/explorer/visualizations/workspace_panel/chartSwitch.tsx b/public/components/explorer/visualizations/workspace_panel/chart_switch.tsx
similarity index 100%
rename from public/components/explorer/visualizations/workspace_panel/chartSwitch.tsx
rename to public/components/explorer/visualizations/workspace_panel/chart_switch.tsx
diff --git a/public/components/explorer/visualizations/workspace_panel/workspace_panel_wrapper.tsx b/public/components/explorer/visualizations/workspace_panel/workspace_panel_wrapper.tsx
index a8bc38a71..04e4d6fa1 100644
--- a/public/components/explorer/visualizations/workspace_panel/workspace_panel_wrapper.tsx
+++ b/public/components/explorer/visualizations/workspace_panel/workspace_panel_wrapper.tsx
@@ -26,7 +26,7 @@ import {
   EuiPopoverFooter,
   EuiPopoverTitle
 } from '@elastic/eui';
-import { ChartSwitch } from './chartSwitch';
+import { ChartSwitch } from './chart_switch';
 import { SavePanel } from '../shared_components/save_panel'
 
 export function WorkspacePanelWrapper({
diff --git a/public/framework/redux/reducers/index.ts b/public/framework/redux/reducers/index.ts
index 34c816910..9f1759b45 100644
--- a/public/framework/redux/reducers/index.ts
+++ b/public/framework/redux/reducers/index.ts
@@ -11,12 +11,12 @@
 
 import { combineReducers } from 'redux';
 
-import queriesReducer from '../../../components/explorer/slices/querySlice';
-import queryResultsReducer from '../../../components/explorer/slices/queryResultSlice';
-import queryTabReducer from '../../../components/explorer/slices/queryTabSlice';
-import FieldsReducer from '../../../components/explorer/slices/fieldSlice';
-import countDistributionReducer from '../../../components/explorer/slices/countDistributionSlice';
-import explorerVisualizationReducer from '../../../components/explorer/slices/visualizationSlice';
+import queriesReducer from '../../../components/explorer/slices/query_slice';
+import queryResultsReducer from '../../../components/explorer/slices/query_result_slice';
+import queryTabReducer from '../../../components/explorer/slices/query_tab_slice';
+import FieldsReducer from '../../../components/explorer/slices/field_slice';
+import countDistributionReducer from '../../../components/explorer/slices/count_distribution_slice';
+import explorerVisualizationReducer from '../../../components/explorer/slices/visualization_slice';
 
 const rootReducer = combineReducers({
 
diff --git a/public/framework/redux/store/sharedState.ts b/public/framework/redux/store/shared_state.ts
similarity index 89%
rename from public/framework/redux/store/sharedState.ts
rename to public/framework/redux/store/shared_state.ts
index 78ffa3898..221913ee0 100644
--- a/public/framework/redux/store/sharedState.ts
+++ b/public/framework/redux/store/shared_state.ts
@@ -12,6 +12,6 @@
 import { uniqueId } from 'lodash';
 import { 
   TAB_ID_TXT_PFX
-} from '../../../common/constants/explorer'
+} from '../../../../common/constants/explorer'
 
 export const initialTabId: string = uniqueId(TAB_ID_TXT_PFX);
\ No newline at end of file
diff --git a/public/plugin.ts b/public/plugin.ts
index 8e8ea7c16..1660a1807 100644
--- a/public/plugin.ts
+++ b/public/plugin.ts
@@ -24,7 +24,7 @@ import {
   observabilityID,
   observabilityTitle,
   observabilityPluginOrder
-} from '../common/index';
+} from '../common/constants/shared';
 import PPLService from './services/requests/ppl';
 
 export class ObservabilityPlugin implements Plugin<ObservabilitySetup, ObservabilityStart> {
diff --git a/public/services/requests/ppl.ts b/public/services/requests/ppl.ts
index dec6b308e..897bae4fa 100644
--- a/public/services/requests/ppl.ts
+++ b/public/services/requests/ppl.ts
@@ -13,7 +13,7 @@ import { CoreStart } from '../../../../../src/core/public';
 import {
   PPL_BASE,
   PPL_SEARCH
-} from '../../../common/index';
+} from '../../../common/constants/shared';
 
 export default class PPLService {
   private http;
diff --git a/server/adaptors/pplDatasource.ts b/server/adaptors/ppl_datasource.ts
similarity index 95%
rename from server/adaptors/pplDatasource.ts
rename to server/adaptors/ppl_datasource.ts
index f9f70ca92..b5103c20a 100644
--- a/server/adaptors/pplDatasource.ts
+++ b/server/adaptors/ppl_datasource.ts
@@ -58,5 +58,5 @@ export class PPLDataSource {
     pplRes['jsonData'] = data;
   };
 
-  public getDataSource = () => this.pplDataSource;
+  public getDataSource = () : PPLResponse => this.pplDataSource;
 }
\ No newline at end of file
diff --git a/server/adaptors/pplPlugin.ts b/server/adaptors/ppl_plugin.ts
similarity index 95%
rename from server/adaptors/pplPlugin.ts
rename to server/adaptors/ppl_plugin.ts
index 021afd270..221226c90 100644
--- a/server/adaptors/pplPlugin.ts
+++ b/server/adaptors/ppl_plugin.ts
@@ -11,7 +11,7 @@
 
 import {
   PPL_ENDPOINT
-} from '../../common/index';
+} from '../../common/constants/shared';
 
 export const PPLPlugin = function(Client, config, components) {
   const ca = components.clientAction.factory;
diff --git a/server/plugin.ts b/server/plugin.ts
index 611fd84cb..a63a5df92 100644
--- a/server/plugin.ts
+++ b/server/plugin.ts
@@ -20,7 +20,7 @@ import {
 
 import { ObservabilityPluginSetup, ObservabilityPluginStart } from './types';
 import { setupRoutes } from './routes/index';
-import { PPLPlugin } from './adaptors/pplPlugin';
+import { PPLPlugin } from './adaptors/ppl_plugin';
 
 export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup, ObservabilityPluginStart> {
   private readonly logger: Logger;
diff --git a/server/routes/index.ts b/server/routes/index.ts
index a0e739618..8497f96fd 100644
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -13,8 +13,8 @@ import {
   IRouter,
   ILegacyClusterClient
  } from '../../../../src/core/server';
-import { registerPplRoute } from './api/ppl';
-import PPLFacet from '../services/facets/pplFacet';
+import { registerPplRoute } from './ppl';
+import PPLFacet from '../services/facets/ppl_facet';
 import {CustomPanelsRouter} from './custom_panels_router';
 
 export function setupRoutes({
diff --git a/server/routes/api/ppl.ts b/server/routes/ppl.ts
similarity index 79%
rename from server/routes/api/ppl.ts
rename to server/routes/ppl.ts
index f5b99f44b..85b9c001f 100644
--- a/server/routes/api/ppl.ts
+++ b/server/routes/ppl.ts
@@ -11,13 +11,15 @@
 
 import { 
   IRouter,
- } from '../../../../../src/core/server';
+  IOpenSearchDashboardsResponse,
+  ResponseError,
+ } from '../../../../src/core/server';
 import { schema } from '@osd/config-schema';
-import PPLFacet from '../../services/facets/pplFacet';
+import PPLFacet from '../services/facets/ppl_facet';
 import {
   PPL_BASE,
   PPL_SEARCH
-} from '../../../common/index';
+} from '../../common/constants/shared';
 
 export function registerPplRoute({
   router,
@@ -38,7 +40,7 @@ export function registerPplRoute({
     context,
     req,
     res
-  ) => {
+  ) : Promise<IOpenSearchDashboardsResponse<any | ResponseError>> => {
     const queryRes = await facet.describeQuery(req);
     const result: any = {
       body: {
diff --git a/server/services/facets/pplFacet.ts b/server/services/facets/ppl_facet.ts
similarity index 95%
rename from server/services/facets/pplFacet.ts
rename to server/services/facets/ppl_facet.ts
index 4793248df..6c21c97ee 100644
--- a/server/services/facets/pplFacet.ts
+++ b/server/services/facets/ppl_facet.ts
@@ -10,7 +10,7 @@
  */
 
 import _ from 'lodash';
-import { PPLDataSource } from '../../adaptors/pplDatasource';
+import { PPLDataSource } from '../../adaptors/ppl_datasource';
 
 export default class PPLFacet {