diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index ed7a30f98cd31..03559a77829fd 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -551,10 +551,6 @@ in their infrastructure.
 |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/vis_type_timeseries_enhanced/README.md[visTypeTimeseriesEnhanced]
-|The vis_type_timeseries_enhanced plugin is the x-pack counterpart to the OSS vis_type_timeseries plugin.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
 |This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
 
diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts
index 5339266a47448..415133f711061 100644
--- a/src/plugins/vis_type_timeseries/server/index.ts
+++ b/src/plugins/vis_type_timeseries/server/index.ts
@@ -26,15 +26,6 @@ export const config: PluginConfigDescriptor<VisTypeTimeseriesConfig> = {
   schema: configSchema,
 };
 
-export {
-  AbstractSearchStrategy,
-  ReqFacade,
-} from './lib/search_strategies/strategies/abstract_search_strategy';
-
-export { VisPayload } from '../common/types';
-
-export { DefaultSearchCapabilities } from './lib/search_strategies/default_search_capabilities';
-
 export function plugin(initializerContext: PluginInitializerContext) {
   return new VisTypeTimeseriesPlugin(initializerContext);
 }
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.test.ts
similarity index 95%
rename from src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.test.ts
index d4e3064747ab0..105bfd53ce739 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DefaultSearchCapabilities } from './default_search_capabilities';
-import { ReqFacade } from './strategies/abstract_search_strategy';
-import { VisPayload } from '../../../common/types';
+import type { ReqFacade } from '../strategies/abstract_search_strategy';
+import type { VisPayload } from '../../../../common/types';
 
 describe('DefaultSearchCapabilities', () => {
   let defaultSearchCapabilities: DefaultSearchCapabilities;
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.ts
similarity index 89%
rename from src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.ts
index 1755e25138e8f..996efce4ce66e 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/default_search_capabilities.ts
@@ -11,10 +11,10 @@ import {
   convertIntervalToUnit,
   parseInterval,
   getSuitableUnit,
-} from '../vis_data/helpers/unit_to_seconds';
-import { RESTRICTIONS_KEYS } from '../../../common/ui_restrictions';
-import { ReqFacade } from './strategies/abstract_search_strategy';
-import { VisPayload } from '../../../common/types';
+} from '../../vis_data/helpers/unit_to_seconds';
+import { RESTRICTIONS_KEYS } from '../../../../common/ui_restrictions';
+import type { ReqFacade } from '../strategies/abstract_search_strategy';
+import type { VisPayload } from '../../../../common/types';
 
 const getTimezoneFromRequest = (request: ReqFacade<VisPayload>) => {
   return request.payload.timerange.timezone;
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.test.ts
similarity index 92%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.test.ts
index 6c30895635fe5..443b700386c15 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.test.ts
@@ -1,12 +1,16 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
+
 import { Unit } from '@elastic/datemath';
 import { RollupSearchCapabilities } from './rollup_search_capabilities';
 
-import { ReqFacade, VisPayload } from '../../../../../src/plugins/vis_type_timeseries/server';
+import type { VisPayload } from '../../../../common/types';
+import type { ReqFacade } from '../strategies/abstract_search_strategy';
 
 describe('Rollup Search Capabilities', () => {
   const testTimeZone = 'time_zone';
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.ts
similarity index 86%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.ts
index 015a371bd2a35..787a8ff1b2051 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_capabilities.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/capabilities/rollup_search_capabilities.ts
@@ -1,16 +1,18 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
+
 import { get, has } from 'lodash';
-import { leastCommonInterval, isCalendarInterval } from './lib/interval_helper';
+import { leastCommonInterval, isCalendarInterval } from '../lib/interval_helper';
+
+import { DefaultSearchCapabilities } from './default_search_capabilities';
 
-import {
-  ReqFacade,
-  DefaultSearchCapabilities,
-  VisPayload,
-} from '../../../../../src/plugins/vis_type_timeseries/server';
+import type { VisPayload } from '../../../../common/types';
+import type { ReqFacade } from '../strategies/abstract_search_strategy';
 
 export class RollupSearchCapabilities extends DefaultSearchCapabilities {
   rollupIndex: string;
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
index 7dd7bfe780b52..2df6f002481b5 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
@@ -7,3 +7,11 @@
  */
 
 export { SearchStrategyRegistry } from './search_strategy_registry';
+export { DefaultSearchCapabilities } from './capabilities/default_search_capabilities';
+
+export {
+  AbstractSearchStrategy,
+  ReqFacade,
+  RollupSearchStrategy,
+  DefaultSearchStrategy,
+} from './strategies';
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.test.ts
similarity index 94%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.test.ts
index 31baeadce6527..158c1d74964b3 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.test.ts
@@ -1,8 +1,11 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
+
 import { isCalendarInterval, leastCommonInterval } from './interval_helper';
 
 describe('interval_helper', () => {
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.ts
similarity index 74%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.ts
index 91d73cecdf401..f4ac715b5b0f2 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/lib/interval_helper.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/lib/interval_helper.ts
@@ -1,7 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
 
 import dateMath from '@elastic/datemath';
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
index 81bf8920c54fc..21b746656c043 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
@@ -5,14 +5,13 @@
  * compliance with, at your election, the Elastic License or the Server Side
  * Public License, v 1.
  */
+import { get } from 'lodash';
+import { RequestFacade, SearchStrategyRegistry } from './search_strategy_registry';
+import { AbstractSearchStrategy, DefaultSearchStrategy } from './strategies';
+import { DefaultSearchCapabilities } from './capabilities/default_search_capabilities';
 
-import { SearchStrategyRegistry } from './search_strategy_registry';
-// @ts-ignore
-import { AbstractSearchStrategy } from './strategies/abstract_search_strategy';
-// @ts-ignore
-import { DefaultSearchStrategy } from './strategies/default_search_strategy';
-// @ts-ignore
-import { DefaultSearchCapabilities } from './default_search_capabilities';
+const getPrivateField = <T>(registry: SearchStrategyRegistry, field: string) =>
+  get(registry, field) as T;
 
 class MockSearchStrategy extends AbstractSearchStrategy {
   checkForViability() {
@@ -28,23 +27,21 @@ describe('SearchStrategyRegister', () => {
 
   beforeAll(() => {
     registry = new SearchStrategyRegistry();
+    registry.addStrategy(new DefaultSearchStrategy());
   });
 
   test('should init strategies register', () => {
-    expect(
-      registry.addStrategy({} as AbstractSearchStrategy)[0] instanceof DefaultSearchStrategy
-    ).toBe(true);
+    expect(getPrivateField(registry, 'strategies')).toHaveLength(1);
   });
 
   test('should not add a strategy if it is not an instance of AbstractSearchStrategy', () => {
     const addedStrategies = registry.addStrategy({} as AbstractSearchStrategy);
 
     expect(addedStrategies.length).toEqual(1);
-    expect(addedStrategies[0] instanceof DefaultSearchStrategy).toBe(true);
   });
 
   test('should return a DefaultSearchStrategy instance', async () => {
-    const req = {};
+    const req = {} as RequestFacade;
     const indexPattern = '*';
 
     const { searchStrategy, capabilities } = (await registry.getViableStrategy(req, indexPattern))!;
@@ -62,7 +59,7 @@ describe('SearchStrategyRegister', () => {
   });
 
   test('should return a MockSearchStrategy instance', async () => {
-    const req = {};
+    const req = {} as RequestFacade;
     const indexPattern = '*';
     const anotherSearchStrategy = new MockSearchStrategy();
     registry.addStrategy(anotherSearchStrategy);
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
index 9e7272f14f146..f3bf854f00ef4 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
@@ -6,23 +6,15 @@
  * Public License, v 1.
  */
 
-import { AbstractSearchStrategy } from './strategies/abstract_search_strategy';
-// @ts-ignore
-import { DefaultSearchStrategy } from './strategies/default_search_strategy';
-// @ts-ignore
 import { extractIndexPatterns } from '../../../common/extract_index_patterns';
-
-export type RequestFacade = any;
-
 import { PanelSchema } from '../../../common/types';
+import { AbstractSearchStrategy, ReqFacade } from './strategies';
+
+export type RequestFacade = ReqFacade<any>;
 
 export class SearchStrategyRegistry {
   private strategies: AbstractSearchStrategy[] = [];
 
-  constructor() {
-    this.addStrategy(new DefaultSearchStrategy());
-  }
-
   public addStrategy(searchStrategy: AbstractSearchStrategy) {
     if (searchStrategy instanceof AbstractSearchStrategy) {
       this.strategies.unshift(searchStrategy);
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
similarity index 72%
rename from src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
index a4fc48ccc6266..97876ec2579f0 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
@@ -7,29 +7,35 @@
  */
 
 import { from } from 'rxjs';
-import { AbstractSearchStrategy } from './abstract_search_strategy';
+import { AbstractSearchStrategy, ReqFacade } from './abstract_search_strategy';
+import type { VisPayload } from '../../../../common/types';
+import type { IFieldType } from '../../../../../data/common';
+
+class FooSearchStrategy extends AbstractSearchStrategy {}
 
 describe('AbstractSearchStrategy', () => {
-  let abstractSearchStrategy;
-  let req;
-  let mockedFields;
-  let indexPattern;
+  let abstractSearchStrategy: AbstractSearchStrategy;
+  let req: ReqFacade;
+  let mockedFields: IFieldType[];
+  let indexPattern: string;
 
   beforeEach(() => {
     mockedFields = [];
-    req = {
+    req = ({
       payload: {},
       pre: {
         indexPatternsFetcher: {
           getFieldsForWildcard: jest.fn().mockReturnValue(mockedFields),
         },
       },
-      getIndexPatternsService: jest.fn(() => ({
-        find: jest.fn(() => []),
-      })),
-    };
+      getIndexPatternsService: jest.fn(() =>
+        Promise.resolve({
+          find: jest.fn(() => []),
+        })
+      ),
+    } as unknown) as ReqFacade<VisPayload>;
 
-    abstractSearchStrategy = new AbstractSearchStrategy();
+    abstractSearchStrategy = new FooSearchStrategy();
   });
 
   test('should init an AbstractSearchStrategy instance', () => {
@@ -42,7 +48,7 @@ describe('AbstractSearchStrategy', () => {
     const fields = await abstractSearchStrategy.getFieldsForWildcard(req, indexPattern);
 
     expect(fields).toEqual(mockedFields);
-    expect(req.pre.indexPatternsFetcher.getFieldsForWildcard).toHaveBeenCalledWith({
+    expect(req.pre.indexPatternsFetcher!.getFieldsForWildcard).toHaveBeenCalledWith({
       pattern: indexPattern,
       metaFields: [],
       fieldCapsOptions: { allow_no_indices: true },
@@ -54,7 +60,7 @@ describe('AbstractSearchStrategy', () => {
     const searchFn = jest.fn().mockReturnValue(from(Promise.resolve({})));
 
     const responses = await abstractSearchStrategy.search(
-      {
+      ({
         payload: {
           searchSession: {
             sessionId: '1',
@@ -65,7 +71,7 @@ describe('AbstractSearchStrategy', () => {
         requestContext: {
           search: { search: searchFn },
         },
-      },
+      } as unknown) as ReqFacade<VisPayload>,
       searches
     );
 
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index 966daca87a208..bf7088145f347 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -8,12 +8,13 @@
 
 import type { FakeRequest, IUiSettingsClient, SavedObjectsClientContract } from 'kibana/server';
 
+import { indexPatterns } from '../../../../../data/server';
+
 import type { Framework } from '../../../plugin';
 import type { IndexPatternsFetcher, IFieldType } from '../../../../../data/server';
 import type { VisPayload } from '../../../../common/types';
 import type { IndexPatternsService } from '../../../../../data/common';
-import { indexPatterns } from '../../../../../data/server';
-import { SanitizedFieldType } from '../../../../common/types';
+import type { SanitizedFieldType } from '../../../../common/types';
 import type { VisTypeTimeseriesRequestHandlerContext } from '../../../types';
 
 /**
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.ts
index c6f7474ed86bf..00dbf17945011 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.ts
@@ -7,8 +7,8 @@
  */
 
 import { DefaultSearchStrategy } from './default_search_strategy';
-import { ReqFacade } from './abstract_search_strategy';
-import { VisPayload } from '../../../../common/types';
+import type { ReqFacade } from './abstract_search_strategy';
+import type { VisPayload } from '../../../../common/types';
 
 describe('DefaultSearchStrategy', () => {
   let defaultSearchStrategy: DefaultSearchStrategy;
@@ -20,7 +20,6 @@ describe('DefaultSearchStrategy', () => {
   });
 
   test('should init an DefaultSearchStrategy instance', () => {
-    expect(defaultSearchStrategy.name).toBe('default');
     expect(defaultSearchStrategy.checkForViability).toBeDefined();
     expect(defaultSearchStrategy.search).toBeDefined();
     expect(defaultSearchStrategy.getFieldsForWildcard).toBeDefined();
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
index 803926ad58c50..791ff4efd3936 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.ts
@@ -7,12 +7,10 @@
  */
 
 import { AbstractSearchStrategy, ReqFacade } from './abstract_search_strategy';
-import { DefaultSearchCapabilities } from '../default_search_capabilities';
+import { DefaultSearchCapabilities } from '../capabilities/default_search_capabilities';
 import { VisPayload } from '../../../../common/types';
 
 export class DefaultSearchStrategy extends AbstractSearchStrategy {
-  name = 'default';
-
   checkForViability(req: ReqFacade<VisPayload>) {
     return Promise.resolve({
       isViable: true,
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/index.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/index.ts
new file mode 100644
index 0000000000000..953624e476dc8
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+export { AbstractSearchStrategy, ReqFacade } from './abstract_search_strategy';
+export { DefaultSearchStrategy } from './default_search_strategy';
+export { RollupSearchStrategy } from './rollup_search_strategy';
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.test.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
similarity index 90%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
index e3fbe2daa3756..8e5c2fdabca5d 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.test.ts
@@ -1,13 +1,17 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
+
 import { RollupSearchStrategy } from './rollup_search_strategy';
-import type { ReqFacade, VisPayload } from '../../../../../src/plugins/vis_type_timeseries/server';
 
-jest.mock('../../../../../src/plugins/vis_type_timeseries/server', () => {
-  const actual = jest.requireActual('../../../../../src/plugins/vis_type_timeseries/server');
+import type { VisPayload } from '../../../../common/types';
+import type { ReqFacade } from './abstract_search_strategy';
+
+jest.mock('./abstract_search_strategy', () => {
   class AbstractSearchStrategyMock {
     getFieldsForWildcard() {
       return [
@@ -23,7 +27,6 @@ jest.mock('../../../../../src/plugins/vis_type_timeseries/server', () => {
   }
 
   return {
-    ...actual,
     AbstractSearchStrategy: AbstractSearchStrategyMock,
   };
 });
@@ -52,7 +55,7 @@ describe('Rollup Search Strategy', () => {
   test('should create instance of RollupSearchRequest', () => {
     const rollupSearchStrategy = new RollupSearchStrategy();
 
-    expect(rollupSearchStrategy.name).toBe('rollup');
+    expect(rollupSearchStrategy).toBeDefined();
   });
 
   describe('checkForViability', () => {
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
similarity index 81%
rename from x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
index 60fa51d0995db..5b5a1bd5db79e 100644
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/search_strategies/rollup_search_strategy.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
@@ -1,17 +1,16 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
  */
-import {
-  AbstractSearchStrategy,
-  ReqFacade,
-  VisPayload,
-} from '../../../../../src/plugins/vis_type_timeseries/server';
 
-import { getCapabilitiesForRollupIndices } from '../../../../../src/plugins/data/server';
+import { ReqFacade, AbstractSearchStrategy } from './abstract_search_strategy';
+import { RollupSearchCapabilities } from '../capabilities/rollup_search_capabilities';
+import type { VisPayload } from '../../../../common/types';
 
-import { RollupSearchCapabilities } from './rollup_search_capabilities';
+import { getCapabilitiesForRollupIndices } from '../../../../../data/server';
 
 const getRollupIndices = (rollupData: { [key: string]: any }) => Object.keys(rollupData);
 const isIndexPatternContainsWildcard = (indexPattern: string) => indexPattern.includes('*');
@@ -19,8 +18,6 @@ const isIndexPatternValid = (indexPattern: string) =>
   indexPattern && typeof indexPattern === 'string' && !isIndexPatternContainsWildcard(indexPattern);
 
 export class RollupSearchStrategy extends AbstractSearchStrategy {
-  name = 'rollup';
-
   async search(req: ReqFacade<VisPayload>, bodies: any[]) {
     return super.search(req, bodies, 'rollup');
   }
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/fields_fetcher.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/fields_fetcher.ts
index d94362e681642..d13efcfe37149 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/fields_fetcher.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/fields_fetcher.ts
@@ -6,7 +6,11 @@
  * Public License, v 1.
  */
 
-import { AbstractSearchStrategy, DefaultSearchCapabilities, ReqFacade } from '../../..';
+import {
+  AbstractSearchStrategy,
+  DefaultSearchCapabilities,
+  ReqFacade,
+} from '../../search_strategies';
 
 export const createFieldsFetcher = (
   req: ReqFacade,
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.ts
index d97e948551b1a..a20df9145d987 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.ts
@@ -8,7 +8,8 @@
 
 import moment from 'moment';
 import { getTimerange } from './get_timerange';
-import { ReqFacade, VisPayload } from '../../..';
+import type { ReqFacade } from '../../search_strategies';
+import type { VisPayload } from '../../../../common/types';
 
 describe('getTimerange(req)', () => {
   test('should return a moment object for to and from', () => {
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.ts
index b690ad0fb0325..2797839988ded 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.ts
@@ -7,7 +7,8 @@
  */
 
 import { utc } from 'moment';
-import { ReqFacade, VisPayload } from '../../..';
+import type { ReqFacade } from '../../search_strategies';
+import type { VisPayload } from '../../../../common/types';
 
 export const getTimerange = (req: ReqFacade<VisPayload>) => {
   const { min, max } = req.payload.timerange;
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
index 06ff882190ce5..bcb158ebfe2bb 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
@@ -6,7 +6,7 @@
  * Public License, v 1.
  */
 
-import { DefaultSearchCapabilities } from '../../../search_strategies/default_search_capabilities';
+import { DefaultSearchCapabilities } from '../../../search_strategies/capabilities/default_search_capabilities';
 import { dateHistogram } from './date_histogram';
 import { UI_SETTINGS } from '../../../../../../data/common';
 
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index adcd7e8bbf0d5..43b61f37ba3d3 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -23,10 +23,15 @@ import { PluginStart } from '../../data/server';
 import { visDataRoutes } from './routes/vis';
 // @ts-ignore
 import { fieldsRoutes } from './routes/fields';
-import { SearchStrategyRegistry } from './lib/search_strategies';
 import { uiSettings } from './ui_settings';
 import type { VisTypeTimeseriesRequestHandlerContext, VisTypeTimeseriesRouter } from './types';
 
+import {
+  SearchStrategyRegistry,
+  DefaultSearchStrategy,
+  RollupSearchStrategy,
+} from './lib/search_strategies';
+
 export interface LegacySetup {
   server: Server;
 }
@@ -45,7 +50,6 @@ export interface VisTypeTimeseriesSetup {
     fakeRequest: FakeRequest,
     options: GetVisDataOptions
   ) => ReturnType<GetVisData>;
-  addSearchStrategy: SearchStrategyRegistry['addStrategy'];
 }
 
 export interface Framework {
@@ -76,6 +80,9 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
 
     const searchStrategyRegistry = new SearchStrategyRegistry();
 
+    searchStrategyRegistry.addStrategy(new DefaultSearchStrategy());
+    searchStrategyRegistry.addStrategy(new RollupSearchStrategy());
+
     const framework: Framework = {
       core,
       plugins,
@@ -97,7 +104,6 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
       ) => {
         return await getVisData(requestContext, { ...fakeRequest, body: options }, framework);
       },
-      addSearchStrategy: searchStrategyRegistry.addStrategy.bind(searchStrategyRegistry),
     };
   }
 
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/README.md b/x-pack/plugins/vis_type_timeseries_enhanced/README.md
deleted file mode 100644
index 33aa16d8574ae..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# vis_type_timeseries_enhanced
-
-The `vis_type_timeseries_enhanced` plugin is the x-pack counterpart to the OSS `vis_type_timeseries` plugin.
-
-It exists to provide Elastic-licensed services, or parts of services, which
-enhance existing OSS functionality from `vis_type_timeseries`.
-
-Currently the `vis_type_timeseries_enhanced` plugin doesn't return any APIs which you can
-consume directly.
-
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/jest.config.js b/x-pack/plugins/vis_type_timeseries_enhanced/jest.config.js
deleted file mode 100644
index 17c5c87e3ccc2..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/jest.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/plugins/vis_type_timeseries_enhanced'],
-};
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/kibana.json b/x-pack/plugins/vis_type_timeseries_enhanced/kibana.json
deleted file mode 100644
index 4b296856c3f97..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/kibana.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "visTypeTimeseriesEnhanced",
-  "version": "8.0.0",
-  "kibanaVersion": "kibana",
-  "server": true,
-  "ui": false,
-  "requiredPlugins": [
-    "visTypeTimeseries"
-  ]
-}
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/index.ts b/x-pack/plugins/vis_type_timeseries_enhanced/server/index.ts
deleted file mode 100644
index d2665ec1e2813..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { PluginInitializerContext } from 'src/core/server';
-import { VisTypeTimeseriesEnhanced } from './plugin';
-
-export const plugin = (initializerContext: PluginInitializerContext) =>
-  new VisTypeTimeseriesEnhanced(initializerContext);
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/server/plugin.ts b/x-pack/plugins/vis_type_timeseries_enhanced/server/plugin.ts
deleted file mode 100644
index 0598a691ab7c5..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/server/plugin.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Plugin, PluginInitializerContext, Logger, CoreSetup } from 'src/core/server';
-import { VisTypeTimeseriesSetup } from 'src/plugins/vis_type_timeseries/server';
-import { RollupSearchStrategy } from './search_strategies/rollup_search_strategy';
-
-interface VisTypeTimeseriesEnhancedSetupDependencies {
-  visTypeTimeseries: VisTypeTimeseriesSetup;
-}
-
-export class VisTypeTimeseriesEnhanced
-  implements Plugin<void, void, VisTypeTimeseriesEnhancedSetupDependencies, any> {
-  private logger: Logger;
-
-  constructor(initializerContext: PluginInitializerContext) {
-    this.logger = initializerContext.logger.get('vis_type_timeseries_enhanced');
-  }
-
-  public async setup(
-    core: CoreSetup,
-    { visTypeTimeseries }: VisTypeTimeseriesEnhancedSetupDependencies
-  ) {
-    this.logger.debug('Starting plugin');
-
-    visTypeTimeseries.addSearchStrategy(new RollupSearchStrategy());
-  }
-
-  public start() {}
-}
diff --git a/x-pack/plugins/vis_type_timeseries_enhanced/tsconfig.json b/x-pack/plugins/vis_type_timeseries_enhanced/tsconfig.json
deleted file mode 100644
index c5ec5571917bd..0000000000000
--- a/x-pack/plugins/vis_type_timeseries_enhanced/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": ["*.ts", "server/**/*"],
-  "references": [
-    { "path": "../../../src/core/tsconfig.json" },
-    { "path": "../../../src/plugins/vis_type_timeseries/tsconfig.json" }
-  ]
-}
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index 4975dcfe885ab..64f3cd545a7b5 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -29,7 +29,6 @@
     "plugins/translations/**/*",
     "plugins/triggers_actions_ui/**/*",
     "plugins/ui_actions_enhanced/**/*",
-    "plugins/vis_type_timeseries_enhanced/**/*",
     "plugins/spaces/**/*",
     "plugins/security/**/*",
     "plugins/stack_alerts/**/*",
@@ -96,7 +95,6 @@
     { "path": "./plugins/task_manager/tsconfig.json" },
     { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" },
     { "path": "./plugins/ui_actions_enhanced/tsconfig.json" },
-    { "path": "./plugins/vis_type_timeseries_enhanced/tsconfig.json" },
     { "path": "./plugins/translations/tsconfig.json" },
     { "path": "./plugins/spaces/tsconfig.json" },
     { "path": "./plugins/security/tsconfig.json" },
diff --git a/x-pack/tsconfig.refs.json b/x-pack/tsconfig.refs.json
index fcbc4d40530e1..0de209546ac04 100644
--- a/x-pack/tsconfig.refs.json
+++ b/x-pack/tsconfig.refs.json
@@ -22,7 +22,6 @@
     { "path": "./plugins/task_manager/tsconfig.json" },
     { "path": "./plugins/telemetry_collection_xpack/tsconfig.json" },
     { "path": "./plugins/ui_actions_enhanced/tsconfig.json" },
-    { "path": "./plugins/vis_type_timeseries_enhanced/tsconfig.json" },
     { "path": "./plugins/translations/tsconfig.json" },
     { "path": "./plugins/triggers_actions_ui/tsconfig.json"},
     { "path": "./plugins/spaces/tsconfig.json" },