diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
index 1d1df54d62f70..479770a9d0a81 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
@@ -5,8 +5,9 @@
  */
 
 import { functions as commonFunctions } from '../common';
+import { functions as externalFunctions } from '../external';
 import { location } from './location';
 import { markdown } from './markdown';
 import { urlparam } from './urlparam';
 
-export const functions = [location, markdown, urlparam, ...commonFunctions];
+export const functions = [location, markdown, urlparam, ...commonFunctions, ...externalFunctions];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts
index 36fa6497ab6f3..79538941bbbfa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts
@@ -48,10 +48,6 @@ import { rounddate } from './rounddate';
 import { rowCount } from './rowCount';
 import { repeatImage } from './repeatImage';
 import { revealImage } from './revealImage';
-import { savedLens } from './saved_lens';
-import { savedMap } from './saved_map';
-import { savedSearch } from './saved_search';
-import { savedVisualization } from './saved_visualization';
 import { seriesStyle } from './seriesStyle';
 import { shape } from './shape';
 import { sort } from './sort';
@@ -110,10 +106,6 @@ export const functions = [
   revealImage,
   rounddate,
   rowCount,
-  savedLens,
-  savedMap,
-  savedSearch,
-  savedVisualization,
   seriesStyle,
   shape,
   sort,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
new file mode 100644
index 0000000000000..17682c5a72074
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -0,0 +1,12 @@
+/*
+ * 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 { savedLens } from './saved_lens';
+import { savedMap } from './saved_map';
+import { savedSearch } from './saved_search';
+import { savedVisualization } from './saved_visualization';
+
+export const functions = [savedLens, savedMap, savedSearch, savedVisualization];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.test.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.test.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.test.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.test.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.test.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.test.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.test.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.test.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/core.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/core.js
new file mode 100644
index 0000000000000..ba4a564848788
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/core.js
@@ -0,0 +1,37 @@
+/*
+ * 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 { debug } from './debug';
+import { error } from './error';
+import { image } from './image';
+import { markdown } from './markdown';
+import { metric } from './metric';
+import { pie } from './pie';
+import { plot } from './plot';
+import { progress } from './progress';
+import { repeatImage } from './repeat_image';
+import { revealImage } from './reveal_image';
+import { shape } from './shape';
+import { table } from './table';
+import { text } from './text';
+
+export const renderFunctions = [
+  debug,
+  error,
+  image,
+  markdown,
+  metric,
+  pie,
+  plot,
+  progress,
+  repeatImage,
+  revealImage,
+  shape,
+  table,
+  text,
+];
+
+export const renderFunctionFactories = [];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/index.ts
new file mode 100644
index 0000000000000..fb47d61484c47
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/index.ts
@@ -0,0 +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.
+ */
+import { embeddableRendererFactory } from './embeddable';
+
+export const renderFunctions = [];
+export const renderFunctionFactories = [embeddableRendererFactory];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
index c4a9a22be3202..7bcfd6bef4620 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { toExpression } from './lens';
-import { SavedLensInput } from '../../../functions/common/saved_lens';
+import { SavedLensInput } from '../../../functions/external/saved_lens';
 import { fromExpression, Ast } from '@kbn/interpreter/common';
 
 const baseEmbeddableInput = {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
index 445cb7480ff80..5bb45c5ca129e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedLensInput } from '../../../functions/common/saved_lens';
+import { SavedLensInput } from '../../../functions/external/saved_lens';
 
 export function toExpression(input: SavedLensInput): string {
   const expressionParts = [] as string[];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/__examples__/__snapshots__/advanced_filter.stories.storyshot
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.stories.storyshot
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/__examples__/__snapshots__/advanced_filter.stories.storyshot
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/__examples__/advanced_filter.stories.tsx
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.stories.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/__examples__/advanced_filter.stories.tsx
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.scss
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.scss
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
similarity index 96%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
index e4d4510d40f53..8cb8b53ab6976 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.tsx
@@ -7,7 +7,7 @@
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import PropTypes from 'prop-types';
 import React, { FunctionComponent } from 'react';
-import { ComponentStrings } from '../../../../i18n';
+import { ComponentStrings } from '../../../../../i18n';
 
 const { AdvancedFilter: strings } = ComponentStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/component/index.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
similarity index 89%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
index 29692b0c02a41..b481a4b498928 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/advanced_filter/index.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { RendererFactory } from '../../../types';
+import { RendererFactory } from '../../../../types';
 import { AdvancedFilter } from './component';
-import { RendererStrings } from '../../../i18n';
+import { RendererStrings } from '../../../../i18n';
 
 const { advancedFilter: strings } = RendererStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.stories.storyshot
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.stories.storyshot
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.stories.storyshot
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__examples__/dropdown_filter.stories.tsx
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.stories.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__examples__/dropdown_filter.stories.tsx
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.scss
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.scss
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
similarity index 97%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
index 9cade90bd5870..ac08d3dd25d85 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.tsx
@@ -7,7 +7,7 @@
 import { EuiIcon } from '@elastic/eui';
 import PropTypes from 'prop-types';
 import React, { ChangeEvent, FocusEvent, FunctionComponent } from 'react';
-import { ComponentStrings } from '../../../../i18n';
+import { ComponentStrings } from '../../../../../i18n';
 
 const { DropdownFilter: strings } = ComponentStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/index.ts
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
similarity index 93%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
index ee07f7d4402f4..bfc36932a8a07 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/index.tsx
@@ -8,10 +8,10 @@ import { fromExpression, toExpression, Ast } from '@kbn/interpreter/common';
 import { get } from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { syncFilterExpression } from '../../../public/lib/sync_filter_expression';
-import { RendererFactory } from '../../../types';
+import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
+import { RendererFactory } from '../../../../types';
 import { DropdownFilter } from './component';
-import { RendererStrings } from '../../../i18n';
+import { RendererStrings } from '../../../../i18n';
 
 const { dropdownFilter: strings } = RendererStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/index.js
new file mode 100644
index 0000000000000..0654bf0f704e9
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/index.js
@@ -0,0 +1,12 @@
+/*
+ * 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 { advancedFilter } from './advanced_filter';
+import { dropdownFilter } from './dropdown_filter';
+import { timeFilterFactory } from './time_filter';
+
+export const renderFunctions = [advancedFilter, dropdownFilter];
+export const renderFunctionFactories = [timeFilterFactory];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__examples__/time_filter.stories.tsx
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__examples__/time_filter.stories.tsx
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/index.tsx
similarity index 78%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/index.tsx
index 85ea754de670d..cdea7d6591592 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/index.tsx
@@ -4,6 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TimeFilter } from './time_filter';
-
-export { TimeFilter };
+export { TimeFilter } from './time_filter';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/time_filter.tsx
similarity index 98%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/time_filter.tsx
index 487f17fb89d12..3cb192cedde83 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/time_filter.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
 import { fromExpression } from '@kbn/interpreter/common';
-import { UnitStrings } from '../../../../i18n/units';
+import { UnitStrings } from '../../../../../i18n/units';
 
 const { quickRanges: strings } = UnitStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
similarity index 82%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
index 25278adcf4529..03bf18830a761 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/index.tsx
@@ -7,14 +7,14 @@
 import ReactDOM from 'react-dom';
 import React from 'react';
 import { toExpression } from '@kbn/interpreter/common';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/public';
-import { syncFilterExpression } from '../../../public/lib/sync_filter_expression';
-import { RendererStrings } from '../../../i18n';
+import { UI_SETTINGS } from '../../../../../../../src/plugins/data/public';
+import { syncFilterExpression } from '../../../../public/lib/sync_filter_expression';
+import { RendererStrings } from '../../../../i18n';
 import { TimeFilter } from './components';
-import { StartInitializer } from '../../plugin';
-import { RendererHandlers } from '../../../types';
-import { Arguments } from '../../functions/common/timefilterControl';
-import { RendererFactory } from '../../../types';
+import { StartInitializer } from '../../../plugin';
+import { RendererHandlers } from '../../../../types';
+import { Arguments } from '../../../functions/common/timefilterControl';
+import { RendererFactory } from '../../../../types';
 
 const { timeFilter: strings } = RendererStrings;
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/time_filter.scss
similarity index 100%
rename from x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss
rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/time_filter.scss
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js
index 263f2d8ec30b5..38f10afd50cf9 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js
@@ -4,40 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { advancedFilter } from './advanced_filter';
-import { debug } from './debug';
-import { dropdownFilter } from './dropdown_filter';
-import { embeddableRendererFactory } from './embeddable/embeddable';
-import { error } from './error';
-import { image } from './image';
-import { markdown } from './markdown';
-import { metric } from './metric';
-import { pie } from './pie';
-import { plot } from './plot';
-import { progress } from './progress';
-import { repeatImage } from './repeat_image';
-import { revealImage } from './reveal_image';
-import { shape } from './shape';
-import { table } from './table';
-import { text } from './text';
-import { timeFilterFactory } from './time_filter';
+import {
+  renderFunctions as embeddableFunctions,
+  renderFunctionFactories as embeddableFactories,
+} from './embeddable';
 
-export const renderFunctions = [
-  advancedFilter,
-  debug,
-  dropdownFilter,
-  error,
-  image,
-  markdown,
-  metric,
-  pie,
-  plot,
-  progress,
-  repeatImage,
-  revealImage,
-  shape,
-  table,
-  text,
-];
+import {
+  renderFunctions as filterFunctions,
+  renderFunctionFactories as filterFactories,
+} from './filters';
+
+import { renderFunctions as coreFunctions, renderFunctionFactories as coreFactories } from './core';
 
-export const renderFunctionFactories = [embeddableRendererFactory, timeFilterFactory];
+export const renderFunctions = [...coreFunctions, ...filterFunctions, ...embeddableFunctions];
+export const renderFunctionFactories = [
+  ...coreFactories,
+  ...embeddableFactories,
+  ...filterFactories,
+];
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
index 1efcbc9d3a18e..e146a6ca68449 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { savedLens } from '../../../canvas_plugin_src/functions/common/saved_lens';
+import { savedLens } from '../../../canvas_plugin_src/functions/external/saved_lens';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
index 53bcd481f185f..8615565897434 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { savedMap } from '../../../canvas_plugin_src/functions/common/saved_map';
+import { savedMap } from '../../../canvas_plugin_src/functions/external/saved_map';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts
index 718deea5df788..865a7753d9818 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { savedSearch } from '../../../canvas_plugin_src/functions/common/saved_search';
+import { savedSearch } from '../../../canvas_plugin_src/functions/external/saved_search';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
index 21a2e1c1b8800..30f88b51e7576 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { savedVisualization } from '../../../canvas_plugin_src/functions/common/saved_visualization';
+import { savedVisualization } from '../../../canvas_plugin_src/functions/external/saved_visualization';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
 
diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss
index 9cd2bdabd3f45..ccaf6f1c1a478 100644
--- a/x-pack/plugins/canvas/public/style/index.scss
+++ b/x-pack/plugins/canvas/public/style/index.scss
@@ -56,10 +56,10 @@
 @import '../components/workpad_page/workpad_interactive_page/workpad_interactive_page';
 @import '../components/workpad_page/workpad_static_page/workpad_static_page';
 
-@import '../../canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss';
-@import '../../canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss';
+@import '../../canvas_plugin_src/renderers/filters/advanced_filter/component/advanced_filter.scss';
+@import '../../canvas_plugin_src/renderers/filters/dropdown_filter/component/dropdown_filter.scss';
 @import '../../canvas_plugin_src/renderers/embeddable/embeddable.scss';
 @import '../../canvas_plugin_src/renderers/plot/plot.scss';
 @import '../../canvas_plugin_src/renderers/reveal_image/reveal_image.scss';
-@import '../../canvas_plugin_src/renderers/time_filter/time_filter.scss';
+@import '../../canvas_plugin_src/renderers/filters/time_filter/time_filter.scss';
 @import '../../canvas_plugin_src/uis/arguments/image_upload/image_upload.scss';
diff --git a/x-pack/plugins/canvas/types/functions.ts b/x-pack/plugins/canvas/types/functions.ts
index afe5614ac6e5a..b995354e8e9d2 100644
--- a/x-pack/plugins/canvas/types/functions.ts
+++ b/x-pack/plugins/canvas/types/functions.ts
@@ -8,6 +8,7 @@ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { functions as commonFunctions } from '../canvas_plugin_src/functions/common';
 import { functions as browserFunctions } from '../canvas_plugin_src/functions/browser';
 import { functions as serverFunctions } from '../canvas_plugin_src/functions/server';
+import { functions as externalFunctions } from '../canvas_plugin_src/functions/external';
 import { initFunctions } from '../public/functions';
 
 /**
@@ -87,6 +88,7 @@ export type FunctionFactory<FnFactory> =
 type CommonFunction = FunctionFactory<typeof commonFunctions[number]>;
 type BrowserFunction = FunctionFactory<typeof browserFunctions[number]>;
 type ServerFunction = FunctionFactory<typeof serverFunctions[number]>;
+type ExternalFunction = FunctionFactory<typeof externalFunctions[number]>;
 type ClientFunctions = FunctionFactory<
   ReturnType<typeof initFunctions> extends Array<infer U> ? U : never
 >;
@@ -95,7 +97,12 @@ type ClientFunctions = FunctionFactory<
  * A collection of all Canvas Functions.
  */
 
-export type CanvasFunction = CommonFunction | BrowserFunction | ServerFunction | ClientFunctions;
+export type CanvasFunction =
+  | CommonFunction
+  | BrowserFunction
+  | ServerFunction
+  | ExternalFunction
+  | ClientFunctions;
 
 /**
  * Represents a function called by the `case` Function.